~ubuntu-branches/ubuntu/lucid/gnome-power-manager/lucid-updates
» Revision
150
: debian/patches/90-autotools.patch
« back to all changes in this revision
Viewing changes to debian/patches/90-autotools.patch
- browse files at revision 150
- compare with another revision
- download diff
- download tarball
- view history from revision 150
- Committer: Bazaar Package Importer
- Author(s): Martin Pitt
- Date: 2010-02-05 13:28:09 UTC
- mfrom: (2.1.49 upstream)
- Revision ID: james.westby@ubuntu.com-20100205132809-jfmqtr00ri6flcv2
Tags: 2.29.2-0ubuntu1
* New upstream release:
- Move the power management preferences into the hardware section of the
control center.
- Use the name of 'Power' for the power management preferences capplet
- Don't rely on the cached value of the lid status, to fix a double
suspend issue (LP: #425411)
- Add a flag to inhibit consolekit events just after we resumed
- Don't automatically suspend if there are suspend inhibits
- Do not exit if hal is not available
- Only connect to HAL if there is no xrandr backlight hardware
- Fix compile when using an ld that defaults to --as-needed
- Enable the help action in gnome-power-statistics. Fixes #607005
- Ensure the window is realized before we invalidate it. Fixes #604918
- Don't show the user a sleep failed link pointing to the quirk site
- Show the device name even when using UPower
- Translation updates.
* Drop patches accepted upstream:
+ 03-run-without-hal.patch
+ 04-dont-connect-to-hal-with-xrandr.patch
+ 09-fix-double-suspend.patch
* Regenerate 90-autotools.patch.
- Move the power management preferences into the hardware section of the
control center.
- Use the name of 'Power' for the power management preferences capplet
- Don't rely on the cached value of the lid status, to fix a double
suspend issue (LP: #425411)
- Add a flag to inhibit consolekit events just after we resumed
- Don't automatically suspend if there are suspend inhibits
- Do not exit if hal is not available
- Only connect to HAL if there is no xrandr backlight hardware
- Fix compile when using an ld that defaults to --as-needed
- Enable the help action in gnome-power-statistics. Fixes #607005
- Ensure the window is realized before we invalidate it. Fixes #604918
- Don't show the user a sleep failed link pointing to the quirk site
- Show the device name even when using UPower
- Translation updates.
* Drop patches accepted upstream:
+ 03-run-without-hal.patch
+ 04-dont-connect-to-hal-with-xrandr.patch
+ 09-fix-double-suspend.patch
* Regenerate 90-autotools.patch.
- files removed:
- debian/patches/03-run-without-hal.patch
- files modified:
- ChangeLog
added
removed
debian/patches/90-autotools.patch
1
Index: gnome-power-manager-2.29.1/aclocal.m4
2
===================================================================
3
--- gnome-power-manager-2.29.1.orig/aclocal.m4 2009-11-02 13:05:44.000000000 +0000
4
+++ gnome-power-manager-2.29.1/aclocal.m4 2010-01-19 00:28:50.000000000 +0000
5
@@ -13,8 +13,8 @@
6
7
m4_ifndef([AC_AUTOCONF_VERSION],
8
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
9
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
10
-[m4_warning([this file was generated for autoconf 2.63.
11
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
12
+[m4_warning([this file was generated for autoconf 2.64.
13
You have another version of autoconf. It may work, but is not guaranteed to.
14
If you have problems, you may need to regenerate the build system entirely.
15
To do so, use the procedure documented by the package, typically `autoreconf'.])])
1
diff -Nur gnome-power-manager-2.29.2/aclocal.m4 gnome-power-manager-2.29.2.new/aclocal.m4
2
--- gnome-power-manager-2.29.2/aclocal.m4 2010-01-27 12:28:43.000000000 -0800
3
+++ gnome-power-manager-2.29.2.new/aclocal.m4 2010-02-05 13:12:55.000000000 -0800
16
4
@@ -739,14 +739,16 @@
17
5
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
18
6
# ---------------------------------------------
50
38
fi
51
39
# Put the nasty error message in config.log where it belongs
52
40
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
53
Index: gnome-power-manager-2.29.1/applets/brightness/Makefile.in
54
===================================================================
55
--- gnome-power-manager-2.29.1.orig/applets/brightness/Makefile.in 2009-11-02 13:05:46.000000000 +0000
56
+++ gnome-power-manager-2.29.1/applets/brightness/Makefile.in 2010-01-19 00:29:09.000000000 +0000
57
@@ -222,6 +222,7 @@
58
PACKAGE_NAME = @PACKAGE_NAME@
59
PACKAGE_STRING = @PACKAGE_STRING@
60
PACKAGE_TARNAME = @PACKAGE_TARNAME@
61
+PACKAGE_URL = @PACKAGE_URL@
62
PACKAGE_VERSION = @PACKAGE_VERSION@
63
PANEL_CFLAGS = @PANEL_CFLAGS@
64
PANEL_LIBS = @PANEL_LIBS@
65
Index: gnome-power-manager-2.29.1/applets/inhibit/Makefile.in
66
===================================================================
67
--- gnome-power-manager-2.29.1.orig/applets/inhibit/Makefile.in 2009-11-02 13:05:47.000000000 +0000
68
+++ gnome-power-manager-2.29.1/applets/inhibit/Makefile.in 2010-01-19 00:29:09.000000000 +0000
69
@@ -221,6 +221,7 @@
70
PACKAGE_NAME = @PACKAGE_NAME@
71
PACKAGE_STRING = @PACKAGE_STRING@
72
PACKAGE_TARNAME = @PACKAGE_TARNAME@
73
+PACKAGE_URL = @PACKAGE_URL@
74
PACKAGE_VERSION = @PACKAGE_VERSION@
75
PANEL_CFLAGS = @PANEL_CFLAGS@
76
PANEL_LIBS = @PANEL_LIBS@
77
Index: gnome-power-manager-2.29.1/applets/Makefile.in
78
===================================================================
79
--- gnome-power-manager-2.29.1.orig/applets/Makefile.in 2009-11-02 13:05:46.000000000 +0000
80
+++ gnome-power-manager-2.29.1/applets/Makefile.in 2010-01-19 00:29:09.000000000 +0000
81
@@ -201,6 +201,7 @@
82
PACKAGE_NAME = @PACKAGE_NAME@
83
PACKAGE_STRING = @PACKAGE_STRING@
84
PACKAGE_TARNAME = @PACKAGE_TARNAME@
85
+PACKAGE_URL = @PACKAGE_URL@
86
PACKAGE_VERSION = @PACKAGE_VERSION@
87
PANEL_CFLAGS = @PANEL_CFLAGS@
88
PANEL_LIBS = @PANEL_LIBS@
89
Index: gnome-power-manager-2.29.1/config.h.in
90
===================================================================
91
--- gnome-power-manager-2.29.1.orig/config.h.in 2009-11-02 13:06:06.000000000 +0000
92
+++ gnome-power-manager-2.29.1/config.h.in 2010-01-19 00:28:50.000000000 +0000
93
@@ -100,6 +100,9 @@
94
/* Define to the one symbol short name of this package. */
95
#undef PACKAGE_TARNAME
96
41
diff -Nur gnome-power-manager-2.29.2/compile gnome-power-manager-2.29.2.new/compile
42
--- gnome-power-manager-2.29.2/compile 2010-01-27 08:25:00.000000000 -0800
43
+++ gnome-power-manager-2.29.2.new/compile 2010-02-05 13:13:00.000000000 -0800
44
@@ -1,7 +1,7 @@
45
#! /bin/sh
46
# Wrapper for compilers which do not understand `-c -o'.
47
48
-scriptversion=2009-04-28.21; # UTC
49
+scriptversion=2009-10-06.20; # UTC
50
51
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
52
# Foundation, Inc.
53
@@ -124,9 +124,9 @@
54
ret=$?
55
56
if test -f "$cofile"; then
57
- mv "$cofile" "$ofile"
58
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
59
elif test -f "${cofile}bj"; then
60
- mv "${cofile}bj" "$ofile"
61
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
62
fi
63
64
rmdir "$lockdir"
65
diff -Nur gnome-power-manager-2.29.2/config.guess gnome-power-manager-2.29.2.new/config.guess
66
--- gnome-power-manager-2.29.2/config.guess 2010-01-27 08:25:02.000000000 -0800
67
+++ gnome-power-manager-2.29.2.new/config.guess 2010-02-05 13:13:00.000000000 -0800
68
@@ -1,10 +1,10 @@
69
#! /bin/sh
70
# Attempt to guess a canonical system name.
71
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
72
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
73
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
74
# Free Software Foundation, Inc.
75
76
-timestamp='2009-04-27'
77
+timestamp='2009-06-10'
78
79
# This file is free software; you can redistribute it and/or modify it
80
# under the terms of the GNU General Public License as published by
81
@@ -170,7 +170,7 @@
82
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
83
eval $set_cc_for_build
84
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
85
- | grep __ELF__ >/dev/null
86
+ | grep -q __ELF__
87
then
88
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
89
# Return netbsd for either. FIX?
90
@@ -656,7 +656,7 @@
91
# => hppa64-hp-hpux11.23
92
93
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
94
- grep __LP64__ >/dev/null
95
+ grep -q __LP64__
96
then
97
HP_ARCH="hppa2.0w"
98
else
99
@@ -822,6 +822,9 @@
100
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
101
echo i${UNAME_MACHINE}-pc-mks
102
exit ;;
103
+ 8664:Windows_NT:*)
104
+ echo x86_64-pc-mks
105
+ exit ;;
106
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
107
# How do we know it's Interix rather than the generic POSIX subsystem?
108
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
109
@@ -882,40 +885,17 @@
110
m68*:Linux:*:*)
111
echo ${UNAME_MACHINE}-unknown-linux-gnu
112
exit ;;
113
- mips:Linux:*:*)
114
+ mips:Linux:*:* | mips64:Linux:*:*)
115
eval $set_cc_for_build
116
sed 's/^ //' << EOF >$dummy.c
117
#undef CPU
118
- #undef mips
119
- #undef mipsel
120
+ #undef ${UNAME_MACHINE}
121
+ #undef ${UNAME_MACHINE}el
122
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
123
- CPU=mipsel
124
+ CPU=${UNAME_MACHINE}el
125
#else
126
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
127
- CPU=mips
128
- #else
129
- CPU=
130
- #endif
131
- #endif
132
-EOF
133
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
134
- /^CPU/{
135
- s: ::g
136
- p
137
- }'`"
138
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
139
- ;;
140
- mips64:Linux:*:*)
141
- eval $set_cc_for_build
142
- sed 's/^ //' << EOF >$dummy.c
143
- #undef CPU
144
- #undef mips64
145
- #undef mips64el
146
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
147
- CPU=mips64el
148
- #else
149
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
150
- CPU=mips64
151
+ CPU=${UNAME_MACHINE}
152
#else
153
CPU=
154
#endif
155
@@ -947,7 +927,7 @@
156
EV67) UNAME_MACHINE=alphaev67 ;;
157
EV68*) UNAME_MACHINE=alphaev68 ;;
158
esac
159
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
160
+ objdump --private-headers /bin/sh | grep -q ld.so.1
161
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
162
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
163
exit ;;
164
@@ -1001,14 +981,6 @@
165
elf32-i386)
166
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
167
;;
168
- a.out-i386-linux)
169
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
170
- exit ;;
171
- "")
172
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
173
- # one that does not give us useful --help.
174
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
175
- exit ;;
176
esac
177
# Determine whether the default compiler is a.out or elf
178
eval $set_cc_for_build
179
@@ -1074,7 +1046,7 @@
180
i*86:syllable:*:*)
181
echo ${UNAME_MACHINE}-pc-syllable
182
exit ;;
183
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
184
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
185
echo i386-unknown-lynxos${UNAME_RELEASE}
186
exit ;;
187
i*86:*DOS:*:*)
188
@@ -1182,7 +1154,7 @@
189
rs6000:LynxOS:2.*:*)
190
echo rs6000-unknown-lynxos${UNAME_RELEASE}
191
exit ;;
192
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
193
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
194
echo powerpc-unknown-lynxos${UNAME_RELEASE}
195
exit ;;
196
SM[BE]S:UNIX_SV:*:*)
197
diff -Nur gnome-power-manager-2.29.2/config.h.in~ gnome-power-manager-2.29.2.new/config.h.in~
198
--- gnome-power-manager-2.29.2/config.h.in~ 1969-12-31 16:00:00.000000000 -0800
199
+++ gnome-power-manager-2.29.2.new/config.h.in~ 2010-02-05 13:12:35.000000000 -0800
200
@@ -0,0 +1,116 @@
201
+/* config.h.in. Generated from configure.ac by autoheader. */
202
+
203
+/* always defined to indicate that i18n is enabled */
204
+#undef ENABLE_NLS
205
+
206
+/* foo */
207
+#undef GETTEXT_PACKAGE
208
+
209
+/* Define if we are building applets */
210
+#undef HAVE_APPLETS
211
+
212
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
213
+#undef HAVE_BIND_TEXTDOMAIN_CODESET
214
+
215
+/* Define to 1 if you have the `dcgettext' function. */
216
+#undef HAVE_DCGETTEXT
217
+
218
+/* Define to 1 if you have the <dlfcn.h> header file. */
219
+#undef HAVE_DLFCN_H
220
+
221
+/* Define if the DPMS extension is available */
222
+#undef HAVE_DPMS_EXTENSION
223
+
224
+/* Define if have gconf defaults */
225
+#undef HAVE_GCONF_DEFAULTS
226
+
227
+/* Define if the GNU gettext() function is already present or preinstalled. */
228
+#undef HAVE_GETTEXT
229
+
230
+/* Define if we have HAL support */
231
+#undef HAVE_HAL
232
+
233
+/* Define to 1 if you have the <inttypes.h> header file. */
234
+#undef HAVE_INTTYPES_H
235
+
236
+/* Define if Solaris kstat is support */
237
+#undef HAVE_KSTAT
238
+
239
+/* Define if your <locale.h> file defines LC_MESSAGES. */
240
+#undef HAVE_LC_MESSAGES
241
+
242
+/* Define to 1 if you have the <locale.h> header file. */
243
+#undef HAVE_LOCALE_H
244
+
245
+/* Define to 1 if you have the <memory.h> header file. */
246
+#undef HAVE_MEMORY_H
247
+
248
+/* Define to 1 if you have the <stdint.h> header file. */
249
+#undef HAVE_STDINT_H
250
+
251
+/* Define to 1 if you have the <stdlib.h> header file. */
252
+#undef HAVE_STDLIB_H
253
+
254
+/* Define to 1 if you have the <strings.h> header file. */
255
+#undef HAVE_STRINGS_H
256
+
257
+/* Define to 1 if you have the <string.h> header file. */
258
+#undef HAVE_STRING_H
259
+
260
+/* Define to 1 if you have the <sys/stat.h> header file. */
261
+#undef HAVE_SYS_STAT_H
262
+
263
+/* Define to 1 if you have the <sys/types.h> header file. */
264
+#undef HAVE_SYS_TYPES_H
265
+
266
+/* Define if we want to use the self tests */
267
+#undef HAVE_TESTS
268
+
269
+/* Define to 1 if you have the <unistd.h> header file. */
270
+#undef HAVE_UNISTD_H
271
+
272
+/* Define if XF86XK_Battery is available */
273
+#undef HAVE_XF86XK_BATTERY
274
+
275
+/* Define if XF86XK_Hibernate is available */
276
+#undef HAVE_XF86XK_HIBERNATE
277
+
278
+/* Define if XF86XK_Suspend is available */
279
+#undef HAVE_XF86XK_SUSPEND
280
+
281
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
282
+ */
283
+#undef LT_OBJDIR
284
+
285
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
286
+#undef NO_MINUS_C_MINUS_O
287
+
288
+/* Name of package */
289
+#undef PACKAGE
290
+
291
+/* Define to the address where bug reports for this package should be sent. */
292
+#undef PACKAGE_BUGREPORT
293
+
294
+/* Define to the full name of this package. */
295
+#undef PACKAGE_NAME
296
+
297
+/* Define to the full name and version of this package. */
298
+#undef PACKAGE_STRING
299
+
300
+/* Define to the one symbol short name of this package. */
301
+#undef PACKAGE_TARNAME
302
+
97
303
+/* Define to the home page for this package. */
98
304
+#undef PACKAGE_URL
99
305
+
100
/* Define to the version of this package. */
101
#undef PACKAGE_VERSION
102
103
Index: gnome-power-manager-2.29.1/configure
104
===================================================================
105
--- gnome-power-manager-2.29.1.orig/configure 2009-11-02 13:05:51.000000000 +0000
106
+++ gnome-power-manager-2.29.1/configure 2010-01-19 00:29:07.000000000 +0000
107
@@ -1,18 +1,20 @@
306
+/* Define to the version of this package. */
307
+#undef PACKAGE_VERSION
308
+
309
+/* Define to 1 if you have the ANSI C header files. */
310
+#undef STDC_HEADERS
311
+
312
+/* Version number of package */
313
+#undef VERSION
314
+
315
+/* Define to 1 if the X Window System is missing or not being used. */
316
+#undef X_DISPLAY_MISSING
317
diff -Nur gnome-power-manager-2.29.2/config.sub gnome-power-manager-2.29.2.new/config.sub
318
--- gnome-power-manager-2.29.2/config.sub 2010-01-27 08:25:01.000000000 -0800
319
+++ gnome-power-manager-2.29.2.new/config.sub 2010-02-05 13:13:00.000000000 -0800
320
@@ -1,10 +1,10 @@
108
321
#! /bin/sh
109
# Guess values for system-dependent variables and create Makefiles.
110
-# Generated by GNU Autoconf 2.63 for gnome-power-manager 2.29.1.
111
+# Generated by GNU Autoconf 2.64 for gnome-power-manager 2.29.1.
112
#
113
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
114
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
115
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
116
+# Foundation, Inc.
117
+#
118
# This configure script is free software; the Free Software Foundation
119
# gives unlimited permission to copy, distribute and modify it.
120
-## --------------------- ##
121
-## M4sh Initialization. ##
122
-## --------------------- ##
123
+## -------------------- ##
124
+## M4sh Initialization. ##
125
+## -------------------- ##
126
127
# Be more Bourne compatible
128
DUALCASE=1; export DUALCASE # for MKS sh
129
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
130
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
131
emulate sh
132
NULLCMD=:
133
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
134
@@ -20,23 +22,15 @@
135
alias -g '${1+"$@"}'='"$@"'
136
setopt NO_GLOB_SUBST
137
else
138
- case `(set -o) 2>/dev/null` in
139
- *posix*) set -o posix ;;
140
+ case `(set -o) 2>/dev/null` in #(
141
+ *posix*) :
142
+ set -o posix ;; #(
143
+ *) :
144
+ ;;
145
esac
146
-
147
fi
148
149
150
-
151
-
152
-# PATH needs CR
153
-# Avoid depending upon Character Ranges.
154
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
155
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
156
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
157
-as_cr_digits='0123456789'
158
-as_cr_alnum=$as_cr_Letters$as_cr_digits
159
-
160
as_nl='
161
'
162
export as_nl
163
@@ -44,7 +38,13 @@
164
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
165
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
166
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
167
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
168
+# Prefer a ksh shell builtin over an external printf program on Solaris,
169
+# but without wasting forks for bash or zsh.
170
+if test -z "$BASH_VERSION$ZSH_VERSION" \
171
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
172
+ as_echo='print -r --'
173
+ as_echo_n='print -rn --'
174
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
175
as_echo='printf %s\n'
176
as_echo_n='printf %s'
177
else
178
@@ -55,7 +55,7 @@
179
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
180
as_echo_n_body='eval
181
arg=$1;
182
- case $arg in
183
+ case $arg in #(
184
*"$as_nl"*)
185
expr "X$arg" : "X\\(.*\\)$as_nl";
186
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
187
@@ -78,13 +78,6 @@
188
}
189
fi
190
191
-# Support unset when possible.
192
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
193
- as_unset=unset
194
-else
195
- as_unset=false
196
-fi
197
-
198
199
# IFS
200
# We need space, tab and new line, in precisely that order. Quoting is
201
@@ -94,15 +87,15 @@
202
IFS=" "" $as_nl"
203
204
# Find who we are. Look in the path if we contain no directory separator.
205
-case $0 in
206
+case $0 in #((
207
*[\\/]* ) as_myself=$0 ;;
208
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
209
for as_dir in $PATH
210
do
211
IFS=$as_save_IFS
212
test -z "$as_dir" && as_dir=.
213
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
214
-done
215
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
216
+ done
217
IFS=$as_save_IFS
218
219
;;
220
@@ -114,12 +107,16 @@
221
fi
222
if test ! -f "$as_myself"; then
223
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
224
- { (exit 1); exit 1; }
225
+ exit 1
226
fi
227
228
-# Work around bugs in pre-3.0 UWIN ksh.
229
-for as_var in ENV MAIL MAILPATH
230
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
231
+# Unset variables that we do not need and which cause bugs (e.g. in
232
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
233
+# suppresses any "Segmentation fault" message there. '((' could
234
+# trigger a bug in pdksh 5.2.14.
235
+for as_var in BASH_ENV ENV MAIL MAILPATH
236
+do eval test x\${$as_var+set} = xset \
237
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
238
done
239
PS1='$ '
240
PS2='> '
241
@@ -131,330 +128,299 @@
242
LANGUAGE=C
243
export LANGUAGE
244
245
-# Required to use basename.
246
-if expr a : '\(a\)' >/dev/null 2>&1 &&
247
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
248
- as_expr=expr
249
-else
250
- as_expr=false
251
-fi
252
-
253
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
254
- as_basename=basename
255
-else
256
- as_basename=false
257
-fi
258
-
259
-
260
-# Name of the executable.
261
-as_me=`$as_basename -- "$0" ||
262
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
263
- X"$0" : 'X\(//\)$' \| \
264
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
265
-$as_echo X/"$0" |
266
- sed '/^.*\/\([^/][^/]*\)\/*$/{
267
- s//\1/
268
- q
269
- }
270
- /^X\/\(\/\/\)$/{
271
- s//\1/
272
- q
273
- }
274
- /^X\/\(\/\).*/{
275
- s//\1/
276
- q
277
- }
278
- s/.*/./; q'`
279
-
280
# CDPATH.
281
-$as_unset CDPATH
282
-
283
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
284
285
if test "x$CONFIG_SHELL" = x; then
286
- if (eval ":") 2>/dev/null; then
287
- as_have_required=yes
288
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
289
+ emulate sh
290
+ NULLCMD=:
291
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
292
+ # is contrary to our usage. Disable this feature.
293
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
294
+ setopt NO_GLOB_SUBST
295
else
296
- as_have_required=no
297
+ case \`(set -o) 2>/dev/null\` in #(
298
+ *posix*) :
299
+ set -o posix ;; #(
300
+ *) :
301
+ ;;
302
+esac
303
fi
304
-
305
- if test $as_have_required = yes && (eval ":
306
-(as_func_return () {
307
- (exit \$1)
308
-}
309
-as_func_success () {
310
- as_func_return 0
311
-}
312
-as_func_failure () {
313
- as_func_return 1
314
-}
315
-as_func_ret_success () {
316
- return 0
317
-}
318
-as_func_ret_failure () {
319
- return 1
320
-}
321
+"
322
+ as_required="as_fn_return () { (exit \$1); }
323
+as_fn_success () { as_fn_return 0; }
324
+as_fn_failure () { as_fn_return 1; }
325
+as_fn_ret_success () { return 0; }
326
+as_fn_ret_failure () { return 1; }
327
328
exitcode=0
329
-if as_func_success; then
330
- :
331
-else
332
- exitcode=1
333
- echo as_func_success failed.
334
-fi
335
-
336
-if as_func_failure; then
337
- exitcode=1
338
- echo as_func_failure succeeded.
339
-fi
340
-
341
-if as_func_ret_success; then
342
- :
343
-else
344
- exitcode=1
345
- echo as_func_ret_success failed.
346
-fi
347
-
348
-if as_func_ret_failure; then
349
- exitcode=1
350
- echo as_func_ret_failure succeeded.
351
-fi
352
-
353
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
354
- :
355
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
356
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
357
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
358
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
359
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
360
+
361
+else
362
+ exitcode=1; echo positional parameters were not saved.
363
+fi
364
+test x\$exitcode = x0 || exit 1"
365
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
366
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
367
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
368
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
369
+test \$(( 1 + 1 )) = 2 || exit 1"
370
+ if (eval "$as_required") 2>/dev/null; then :
371
+ as_have_required=yes
372
else
373
- exitcode=1
374
- echo positional parameters were not saved.
375
+ as_have_required=no
376
fi
377
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
378
379
-test \$exitcode = 0) || { (exit 1); exit 1; }
380
-
381
-(
382
- as_lineno_1=\$LINENO
383
- as_lineno_2=\$LINENO
384
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
385
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
386
-") 2> /dev/null; then
387
- :
388
else
389
- as_candidate_shells=
390
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
391
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
392
+as_found=false
393
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
394
do
395
IFS=$as_save_IFS
396
test -z "$as_dir" && as_dir=.
397
- case $as_dir in
398
+ as_found=:
399
+ case $as_dir in #(
400
/*)
401
for as_base in sh bash ksh sh5; do
402
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
403
+ # Try only shells that exist, to save several forks.
404
+ as_shell=$as_dir/$as_base
405
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
406
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
407
+ CONFIG_SHELL=$as_shell as_have_required=yes
408
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
409
+ break 2
410
+fi
411
+fi
412
done;;
413
esac
414
+ as_found=false
415
done
416
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
417
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
418
+ CONFIG_SHELL=$SHELL as_have_required=yes
419
+fi; }
420
IFS=$as_save_IFS
421
422
423
- for as_shell in $as_candidate_shells $SHELL; do
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
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
428
- emulate sh
429
- NULLCMD=:
430
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
431
- # is contrary to our usage. Disable this feature.
432
- alias -g '${1+"$@"}'='"$@"'
433
- setopt NO_GLOB_SUBST
434
-else
435
- case `(set -o) 2>/dev/null` in
436
- *posix*) set -o posix ;;
437
-esac
438
-
439
-fi
440
-
441
-
442
-:
443
-_ASEOF
444
-}; then
445
- CONFIG_SHELL=$as_shell
446
- as_have_required=yes
447
- if { "$as_shell" 2> /dev/null <<\_ASEOF
448
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
449
- emulate sh
450
- NULLCMD=:
451
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
452
- # is contrary to our usage. Disable this feature.
453
- alias -g '${1+"$@"}'='"$@"'
454
- setopt NO_GLOB_SUBST
455
-else
456
- case `(set -o) 2>/dev/null` in
457
- *posix*) set -o posix ;;
458
-esac
459
-
460
-fi
461
-
462
-
463
-:
464
-(as_func_return () {
465
- (exit $1)
466
-}
467
-as_func_success () {
468
- as_func_return 0
469
-}
470
-as_func_failure () {
471
- as_func_return 1
472
-}
473
-as_func_ret_success () {
474
- return 0
475
-}
476
-as_func_ret_failure () {
477
- return 1
478
-}
479
-
480
-exitcode=0
481
-if as_func_success; then
482
- :
483
-else
484
- exitcode=1
485
- echo as_func_success failed.
486
-fi
487
-
488
-if as_func_failure; then
489
- exitcode=1
490
- echo as_func_failure succeeded.
491
-fi
492
-
493
-if as_func_ret_success; then
494
- :
495
-else
496
- exitcode=1
497
- echo as_func_ret_success failed.
498
-fi
499
-
500
-if as_func_ret_failure; then
501
- exitcode=1
502
- echo as_func_ret_failure succeeded.
503
-fi
504
-
505
-if ( set x; as_func_ret_success y && test x = "$1" ); then
506
- :
507
-else
508
- exitcode=1
509
- echo positional parameters were not saved.
510
-fi
511
-
512
-test $exitcode = 0) || { (exit 1); exit 1; }
513
-
514
-(
515
- as_lineno_1=$LINENO
516
- as_lineno_2=$LINENO
517
- test "x$as_lineno_1" != "x$as_lineno_2" &&
518
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
519
-
520
-_ASEOF
521
-}; then
522
- break
523
-fi
524
-
525
-fi
526
-
527
- done
528
-
529
- if test "x$CONFIG_SHELL" != x; then
530
- for as_var in BASH_ENV ENV
531
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
532
- done
533
+ if test "x$CONFIG_SHELL" != x; then :
534
+ # We cannot yet assume a decent shell, so we have to provide a
535
+ # neutralization value for shells without unset; and this also
536
+ # works around shells that cannot unset nonexistent variables.
537
+ BASH_ENV=/dev/null
538
+ ENV=/dev/null
539
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
540
export CONFIG_SHELL
541
exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
542
fi
543
544
-
545
- if test $as_have_required = no; then
546
- echo This script requires a shell more modern than all the
547
- echo shells that I found on your system. Please install a
548
- echo modern shell, or manually run the script under such a
549
- echo shell if you do have one.
550
- { (exit 1); exit 1; }
551
+ if test x$as_have_required = xno; then :
552
+ $as_echo "$0: This script requires a shell more modern than all"
553
+ $as_echo "$0: the shells that I found on your system."
554
+ if test x${ZSH_VERSION+set} = xset ; then
555
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
556
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
557
+ else
558
+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
559
+$0: including any error possibly output before this
560
+$0: message. Then install a modern shell, or manually run
561
+$0: the script under such a shell if you do have one."
562
+ fi
563
+ exit 1
564
fi
565
-
566
-
567
fi
568
-
569
fi
570
+SHELL=${CONFIG_SHELL-/bin/sh}
571
+export SHELL
572
+# Unset more variables known to interfere with behavior of common tools.
573
+CLICOLOR_FORCE= GREP_OPTIONS=
574
+unset CLICOLOR_FORCE GREP_OPTIONS
575
+
576
+## --------------------- ##
577
+## M4sh Shell Functions. ##
578
+## --------------------- ##
579
+# as_fn_unset VAR
580
+# ---------------
581
+# Portably unset VAR.
582
+as_fn_unset ()
583
+{
584
+ { eval $1=; unset $1;}
585
+}
586
+as_unset=as_fn_unset
587
+
588
+# as_fn_set_status STATUS
589
+# -----------------------
590
+# Set $? to STATUS, without forking.
591
+as_fn_set_status ()
592
+{
593
+ return $1
594
+} # as_fn_set_status
595
+
596
+# as_fn_exit STATUS
597
+# -----------------
598
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
599
+as_fn_exit ()
600
+{
601
+ set +e
602
+ as_fn_set_status $1
603
+ exit $1
604
+} # as_fn_exit
605
+
606
+# as_fn_mkdir_p
607
+# -------------
608
+# Create "$as_dir" as a directory, including parents if necessary.
609
+as_fn_mkdir_p ()
610
+{
611
612
+ case $as_dir in #(
613
+ -*) as_dir=./$as_dir;;
614
+ esac
615
+ test -d "$as_dir" || eval $as_mkdir_p || {
616
+ as_dirs=
617
+ while :; do
618
+ case $as_dir in #(
619
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
620
+ *) as_qdir=$as_dir;;
621
+ esac
622
+ as_dirs="'$as_qdir' $as_dirs"
623
+ as_dir=`$as_dirname -- "$as_dir" ||
624
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
625
+ X"$as_dir" : 'X\(//\)[^/]' \| \
626
+ X"$as_dir" : 'X\(//\)$' \| \
627
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
628
+$as_echo X"$as_dir" |
629
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
630
+ s//\1/
631
+ q
632
+ }
633
+ /^X\(\/\/\)[^/].*/{
634
+ s//\1/
635
+ q
636
+ }
637
+ /^X\(\/\/\)$/{
638
+ s//\1/
639
+ q
640
+ }
641
+ /^X\(\/\).*/{
642
+ s//\1/
643
+ q
644
+ }
645
+ s/.*/./; q'`
646
+ test -d "$as_dir" && break
647
+ done
648
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
649
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
650
651
652
-(eval "as_func_return () {
653
- (exit \$1)
654
-}
655
-as_func_success () {
656
- as_func_return 0
657
-}
658
-as_func_failure () {
659
- as_func_return 1
660
-}
661
-as_func_ret_success () {
662
- return 0
663
-}
664
-as_func_ret_failure () {
665
- return 1
666
-}
667
+} # as_fn_mkdir_p
668
+# as_fn_append VAR VALUE
669
+# ----------------------
670
+# Append the text in VALUE to the end of the definition contained in VAR. Take
671
+# advantage of any shell optimizations that allow amortized linear growth over
672
+# repeated appends, instead of the typical quadratic growth present in naive
673
+# implementations.
674
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
675
+ eval 'as_fn_append ()
676
+ {
677
+ eval $1+=\$2
678
+ }'
679
+else
680
+ as_fn_append ()
681
+ {
682
+ eval $1=\$$1\$2
683
+ }
684
+fi # as_fn_append
685
686
-exitcode=0
687
-if as_func_success; then
688
- :
689
+# as_fn_arith ARG...
690
+# ------------------
691
+# Perform arithmetic evaluation on the ARGs, and store the result in the
692
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
693
+# must be portable across $(()) and expr.
694
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
695
+ eval 'as_fn_arith ()
696
+ {
697
+ as_val=$(( $* ))
698
+ }'
699
else
700
- exitcode=1
701
- echo as_func_success failed.
702
-fi
703
+ as_fn_arith ()
704
+ {
705
+ as_val=`expr "$@" || test $? -eq 1`
706
+ }
707
+fi # as_fn_arith
708
709
-if as_func_failure; then
710
- exitcode=1
711
- echo as_func_failure succeeded.
712
-fi
713
714
-if as_func_ret_success; then
715
- :
716
+# as_fn_error ERROR [LINENO LOG_FD]
717
+# ---------------------------------
718
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
719
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
720
+# script with status $?, using 1 if that was 0.
721
+as_fn_error ()
722
+{
723
+ as_status=$?; test $as_status -eq 0 && as_status=1
724
+ if test "$3"; then
725
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
726
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
727
+ fi
728
+ $as_echo "$as_me: error: $1" >&2
729
+ as_fn_exit $as_status
730
+} # as_fn_error
731
+
732
+if expr a : '\(a\)' >/dev/null 2>&1 &&
733
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
734
+ as_expr=expr
735
else
736
- exitcode=1
737
- echo as_func_ret_success failed.
738
+ as_expr=false
739
fi
740
741
-if as_func_ret_failure; then
742
- exitcode=1
743
- echo as_func_ret_failure succeeded.
744
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
745
+ as_basename=basename
746
+else
747
+ as_basename=false
748
fi
749
750
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
751
- :
752
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
753
+ as_dirname=dirname
754
else
755
- exitcode=1
756
- echo positional parameters were not saved.
757
+ as_dirname=false
758
fi
759
760
-test \$exitcode = 0") || {
761
- echo No shell found that supports shell functions.
762
- echo Please tell bug-autoconf@gnu.org about your system,
763
- echo including any error possibly output before this message.
764
- echo This can help us improve future autoconf versions.
765
- echo Configuration will now proceed without shell functions.
766
-}
767
+as_me=`$as_basename -- "$0" ||
768
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
769
+ X"$0" : 'X\(//\)$' \| \
770
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
771
+$as_echo X/"$0" |
772
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
773
+ s//\1/
774
+ q
775
+ }
776
+ /^X\/\(\/\/\)$/{
777
+ s//\1/
778
+ q
779
+ }
780
+ /^X\/\(\/\).*/{
781
+ s//\1/
782
+ q
783
+ }
784
+ s/.*/./; q'`
785
786
+# Avoid depending upon Character Ranges.
787
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
788
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
789
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
790
+as_cr_digits='0123456789'
791
+as_cr_alnum=$as_cr_Letters$as_cr_digits
792
793
794
- as_lineno_1=$LINENO
795
- as_lineno_2=$LINENO
796
- test "x$as_lineno_1" != "x$as_lineno_2" &&
797
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
798
-
799
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
800
- # uniformly replaced by the line number. The first 'sed' inserts a
801
- # line-number line after each line using $LINENO; the second 'sed'
802
- # does the real work. The second script uses 'N' to pair each
803
- # line-number line with the line containing $LINENO, and appends
804
- # trailing '-' during substitution so that $LINENO is not a special
805
- # case at line end.
806
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
807
- # scripts with optimization help from Paolo Bonzini. Blame Lee
808
- # E. McMahon (1931-1989) for sed's syntax. :-)
809
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
810
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
811
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
812
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
813
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
814
sed -n '
815
p
816
/[$]LINENO/=
817
@@ -471,8 +437,7 @@
818
s/-\n.*//
819
' >$as_me.lineno &&
820
chmod +x "$as_me.lineno" ||
821
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
822
- { (exit 1); exit 1; }; }
823
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
824
825
# Don't try to exec as it changes $[0], causing all sort of problems
826
# (the dirname of $[0] is not the place where we might find the
827
@@ -482,29 +447,18 @@
828
exit
829
}
830
831
-
832
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
833
- as_dirname=dirname
834
-else
835
- as_dirname=false
836
-fi
837
-
838
ECHO_C= ECHO_N= ECHO_T=
839
-case `echo -n x` in
840
+case `echo -n x` in #(((((
841
-n*)
842
- case `echo 'x\c'` in
843
+ case `echo 'xy\c'` in
844
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
845
- *) ECHO_C='\c';;
846
+ xy) ECHO_C='\c';;
847
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
848
+ ECHO_T=' ';;
849
esac;;
850
*)
851
ECHO_N='-n';;
852
esac
853
-if expr a : '\(a\)' >/dev/null 2>&1 &&
854
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
855
- as_expr=expr
856
-else
857
- as_expr=false
858
-fi
859
860
rm -f conf$$ conf$$.exe conf$$.file
861
if test -d conf$$.dir; then
862
@@ -534,7 +488,7 @@
863
rmdir conf$$.dir 2>/dev/null
864
865
if mkdir -p . 2>/dev/null; then
866
- as_mkdir_p=:
867
+ as_mkdir_p='mkdir -p "$as_dir"'
868
else
869
test -d ./-p && rmdir ./-p
870
as_mkdir_p=false
871
@@ -553,10 +507,10 @@
872
if test -d "$1"; then
873
test -d "$1/.";
874
else
875
- case $1 in
876
+ case $1 in #(
877
-*)set "./$1";;
878
esac;
879
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
880
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
881
???[sx]*):;;*)false;;esac;fi
882
'\'' sh
883
'
884
@@ -571,7 +525,6 @@
885
886
887
888
-
889
# Check that we are running under the correct shell.
890
SHELL=${CONFIG_SHELL-/bin/sh}
891
892
@@ -738,7 +691,6 @@
893
subdirs=
894
MFLAGS=
895
MAKEFLAGS=
896
-SHELL=${CONFIG_SHELL-/bin/sh}
897
898
# Identity of this package.
899
PACKAGE_NAME='gnome-power-manager'
900
@@ -746,6 +698,7 @@
901
PACKAGE_VERSION='2.29.1'
902
PACKAGE_STRING='gnome-power-manager 2.29.1'
903
PACKAGE_BUGREPORT=''
904
+PACKAGE_URL=''
905
906
ac_unique_file="src"
907
# Factoring default headers for most tests.
908
@@ -1003,6 +956,7 @@
909
program_transform_name
910
prefix
911
exec_prefix
912
+PACKAGE_URL
913
PACKAGE_BUGREPORT
914
PACKAGE_STRING
915
PACKAGE_VERSION
916
@@ -1181,8 +1135,7 @@
917
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
918
# Reject names that are not valid shell variable names.
919
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
920
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
921
- { (exit 1); exit 1; }; }
922
+ as_fn_error "invalid feature name: $ac_useropt"
923
ac_useropt_orig=$ac_useropt
924
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
925
case $ac_user_opts in
926
@@ -1208,8 +1161,7 @@
927
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
928
# Reject names that are not valid shell variable names.
929
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
930
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
931
- { (exit 1); exit 1; }; }
932
+ as_fn_error "invalid feature name: $ac_useropt"
933
ac_useropt_orig=$ac_useropt
934
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
935
case $ac_user_opts in
936
@@ -1413,8 +1365,7 @@
937
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
938
# Reject names that are not valid shell variable names.
939
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
940
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
941
- { (exit 1); exit 1; }; }
942
+ as_fn_error "invalid package name: $ac_useropt"
943
ac_useropt_orig=$ac_useropt
944
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
945
case $ac_user_opts in
946
@@ -1430,8 +1381,7 @@
947
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
948
# Reject names that are not valid shell variable names.
949
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
950
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
951
- { (exit 1); exit 1; }; }
952
+ as_fn_error "invalid package name: $ac_useropt"
953
ac_useropt_orig=$ac_useropt
954
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
955
case $ac_user_opts in
956
@@ -1461,17 +1411,17 @@
957
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
958
x_libraries=$ac_optarg ;;
959
960
- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
961
-Try \`$0 --help' for more information." >&2
962
- { (exit 1); exit 1; }; }
963
+ -*) as_fn_error "unrecognized option: \`$ac_option'
964
+Try \`$0 --help' for more information."
965
;;
966
967
*=*)
968
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
969
# Reject names that are not valid shell variable names.
970
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
971
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
972
- { (exit 1); exit 1; }; }
973
+ case $ac_envvar in #(
974
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
975
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
976
+ esac
977
eval $ac_envvar=\$ac_optarg
978
export $ac_envvar ;;
979
980
@@ -1488,15 +1438,13 @@
981
982
if test -n "$ac_prev"; then
983
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
984
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
985
- { (exit 1); exit 1; }; }
986
+ as_fn_error "missing argument to $ac_option"
987
fi
988
989
if test -n "$ac_unrecognized_opts"; then
990
case $enable_option_checking in
991
no) ;;
992
- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
993
- { (exit 1); exit 1; }; } ;;
994
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
995
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
996
esac
997
fi
998
@@ -1519,8 +1467,7 @@
999
[\\/$]* | ?:[\\/]* ) continue;;
1000
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
1001
esac
1002
- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
1003
- { (exit 1); exit 1; }; }
1004
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
1005
done
1006
1007
# There might be people who depend on the old broken behavior: `$host'
1008
@@ -1550,11 +1497,9 @@
1009
ac_pwd=`pwd` && test -n "$ac_pwd" &&
1010
ac_ls_di=`ls -di .` &&
1011
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
1012
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
1013
- { (exit 1); exit 1; }; }
1014
+ as_fn_error "working directory cannot be determined"
1015
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
1016
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
1017
- { (exit 1); exit 1; }; }
1018
+ as_fn_error "pwd does not report name of working directory"
1019
1020
1021
# Find the source files, if location was not specified.
1022
@@ -1593,13 +1538,11 @@
1023
fi
1024
if test ! -r "$srcdir/$ac_unique_file"; then
1025
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1026
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1027
- { (exit 1); exit 1; }; }
1028
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
1029
fi
1030
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1031
ac_abs_confdir=`(
1032
- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
1033
- { (exit 1); exit 1; }; }
1034
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
1035
pwd)`
1036
# When building in place, set srcdir=.
1037
if test "$ac_abs_confdir" = "$ac_pwd"; then
1038
@@ -1796,6 +1739,7 @@
1039
Use these variables to override the choices made by `configure' or to help
1040
it to find libraries and programs with nonstandard names/locations.
1041
1042
+Report bugs to the package provider.
1043
_ACEOF
1044
ac_status=$?
1045
fi
1046
@@ -1859,21 +1803,411 @@
1047
if $ac_init_version; then
1048
cat <<\_ACEOF
1049
gnome-power-manager configure 2.29.1
1050
-generated by GNU Autoconf 2.63
1051
+generated by GNU Autoconf 2.64
1052
1053
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1054
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1055
+Copyright (C) 2009 Free Software Foundation, Inc.
1056
This configure script is free software; the Free Software Foundation
1057
gives unlimited permission to copy, distribute and modify it.
1058
_ACEOF
1059
exit
1060
fi
1061
+
1062
+## ------------------------ ##
1063
+## Autoconf initialization. ##
1064
+## ------------------------ ##
1065
+
1066
+# ac_fn_c_try_compile LINENO
1067
+# --------------------------
1068
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
1069
+ac_fn_c_try_compile ()
1070
+{
1071
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1072
+ rm -f conftest.$ac_objext
1073
+ if { { ac_try="$ac_compile"
1074
+case "(($ac_try" in
1075
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1076
+ *) ac_try_echo=$ac_try;;
1077
+esac
1078
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1079
+$as_echo "$ac_try_echo"; } >&5
1080
+ (eval "$ac_compile") 2>conftest.err
1081
+ ac_status=$?
1082
+ if test -s conftest.err; then
1083
+ grep -v '^ *+' conftest.err >conftest.er1
1084
+ cat conftest.er1 >&5
1085
+ mv -f conftest.er1 conftest.err
1086
+ fi
1087
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1088
+ test $ac_status = 0; } && {
1089
+ test -z "$ac_c_werror_flag" ||
1090
+ test ! -s conftest.err
1091
+ } && test -s conftest.$ac_objext; then :
1092
+ ac_retval=0
1093
+else
1094
+ $as_echo "$as_me: failed program was:" >&5
1095
+sed 's/^/| /' conftest.$ac_ext >&5
1096
+
1097
+ ac_retval=1
1098
+fi
1099
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1100
+ return $ac_retval
1101
+
1102
+} # ac_fn_c_try_compile
1103
+
1104
+# ac_fn_c_try_link LINENO
1105
+# -----------------------
1106
+# Try to link conftest.$ac_ext, and return whether this succeeded.
1107
+ac_fn_c_try_link ()
1108
+{
1109
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1110
+ rm -f conftest.$ac_objext conftest$ac_exeext
1111
+ if { { ac_try="$ac_link"
1112
+case "(($ac_try" in
1113
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1114
+ *) ac_try_echo=$ac_try;;
1115
+esac
1116
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1117
+$as_echo "$ac_try_echo"; } >&5
1118
+ (eval "$ac_link") 2>conftest.err
1119
+ ac_status=$?
1120
+ if test -s conftest.err; then
1121
+ grep -v '^ *+' conftest.err >conftest.er1
1122
+ cat conftest.er1 >&5
1123
+ mv -f conftest.er1 conftest.err
1124
+ fi
1125
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1126
+ test $ac_status = 0; } && {
1127
+ test -z "$ac_c_werror_flag" ||
1128
+ test ! -s conftest.err
1129
+ } && test -s conftest$ac_exeext && {
1130
+ test "$cross_compiling" = yes ||
1131
+ $as_test_x conftest$ac_exeext
1132
+ }; then :
1133
+ ac_retval=0
1134
+else
1135
+ $as_echo "$as_me: failed program was:" >&5
1136
+sed 's/^/| /' conftest.$ac_ext >&5
1137
+
1138
+ ac_retval=1
1139
+fi
1140
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
1141
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
1142
+ # interfere with the next link command; also delete a directory that is
1143
+ # left behind by Apple's compiler. We do this before executing the actions.
1144
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1145
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1146
+ return $ac_retval
1147
+
1148
+} # ac_fn_c_try_link
1149
+
1150
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
1151
+# -------------------------------------------------------
1152
+# Tests whether HEADER exists and can be compiled using the include files in
1153
+# INCLUDES, setting the cache variable VAR accordingly.
1154
+ac_fn_c_check_header_compile ()
1155
+{
1156
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1157
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1158
+$as_echo_n "checking for $2... " >&6; }
1159
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1160
+ $as_echo_n "(cached) " >&6
1161
+else
1162
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1163
+/* end confdefs.h. */
1164
+$4
1165
+#include <$2>
1166
+_ACEOF
1167
+if ac_fn_c_try_compile "$LINENO"; then :
1168
+ eval "$3=yes"
1169
+else
1170
+ eval "$3=no"
1171
+fi
1172
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1173
+fi
1174
+eval ac_res=\$$3
1175
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1176
+$as_echo "$ac_res" >&6; }
1177
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1178
+
1179
+} # ac_fn_c_check_header_compile
1180
+
1181
+# ac_fn_c_try_cpp LINENO
1182
+# ----------------------
1183
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
1184
+ac_fn_c_try_cpp ()
1185
+{
1186
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1187
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
1188
+case "(($ac_try" in
1189
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1190
+ *) ac_try_echo=$ac_try;;
1191
+esac
1192
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1193
+$as_echo "$ac_try_echo"; } >&5
1194
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
1195
+ ac_status=$?
1196
+ if test -s conftest.err; then
1197
+ grep -v '^ *+' conftest.err >conftest.er1
1198
+ cat conftest.er1 >&5
1199
+ mv -f conftest.er1 conftest.err
1200
+ fi
1201
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1202
+ test $ac_status = 0; } >/dev/null && {
1203
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1204
+ test ! -s conftest.err
1205
+ }; then :
1206
+ ac_retval=0
1207
+else
1208
+ $as_echo "$as_me: failed program was:" >&5
1209
+sed 's/^/| /' conftest.$ac_ext >&5
1210
+
1211
+ ac_retval=1
1212
+fi
1213
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1214
+ return $ac_retval
1215
+
1216
+} # ac_fn_c_try_cpp
1217
+
1218
+# ac_fn_c_try_run LINENO
1219
+# ----------------------
1220
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
1221
+# that executables *can* be run.
1222
+ac_fn_c_try_run ()
1223
+{
1224
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1225
+ if { { ac_try="$ac_link"
1226
+case "(($ac_try" in
1227
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1228
+ *) ac_try_echo=$ac_try;;
1229
+esac
1230
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1231
+$as_echo "$ac_try_echo"; } >&5
1232
+ (eval "$ac_link") 2>&5
1233
+ ac_status=$?
1234
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1235
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
1236
+ { { case "(($ac_try" in
1237
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1238
+ *) ac_try_echo=$ac_try;;
1239
+esac
1240
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1241
+$as_echo "$ac_try_echo"; } >&5
1242
+ (eval "$ac_try") 2>&5
1243
+ ac_status=$?
1244
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1245
+ test $ac_status = 0; }; }; then :
1246
+ ac_retval=0
1247
+else
1248
+ $as_echo "$as_me: program exited with status $ac_status" >&5
1249
+ $as_echo "$as_me: failed program was:" >&5
1250
+sed 's/^/| /' conftest.$ac_ext >&5
1251
+
1252
+ ac_retval=$ac_status
1253
+fi
1254
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1255
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1256
+ return $ac_retval
1257
+
1258
+} # ac_fn_c_try_run
1259
+
1260
+# ac_fn_c_check_func LINENO FUNC VAR
1261
+# ----------------------------------
1262
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
1263
+ac_fn_c_check_func ()
1264
+{
1265
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1266
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1267
+$as_echo_n "checking for $2... " >&6; }
1268
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1269
+ $as_echo_n "(cached) " >&6
1270
+else
1271
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1272
+/* end confdefs.h. */
1273
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
1274
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
1275
+#define $2 innocuous_$2
1276
+
1277
+/* System header to define __stub macros and hopefully few prototypes,
1278
+ which can conflict with char $2 (); below.
1279
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1280
+ <limits.h> exists even on freestanding compilers. */
1281
+
1282
+#ifdef __STDC__
1283
+# include <limits.h>
1284
+#else
1285
+# include <assert.h>
1286
+#endif
1287
+
1288
+#undef $2
1289
+
1290
+/* Override any GCC internal prototype to avoid an error.
1291
+ Use char because int might match the return type of a GCC
1292
+ builtin and then its argument prototype would still apply. */
1293
+#ifdef __cplusplus
1294
+extern "C"
1295
+#endif
1296
+char $2 ();
1297
+/* The GNU C library defines this for functions which it implements
1298
+ to always fail with ENOSYS. Some functions are actually named
1299
+ something starting with __ and the normal name is an alias. */
1300
+#if defined __stub_$2 || defined __stub___$2
1301
+choke me
1302
+#endif
1303
+
1304
+int
1305
+main ()
1306
+{
1307
+return $2 ();
1308
+ ;
1309
+ return 0;
1310
+}
1311
+_ACEOF
1312
+if ac_fn_c_try_link "$LINENO"; then :
1313
+ eval "$3=yes"
1314
+else
1315
+ eval "$3=no"
1316
+fi
1317
+rm -f core conftest.err conftest.$ac_objext \
1318
+ conftest$ac_exeext conftest.$ac_ext
1319
+fi
1320
+eval ac_res=\$$3
1321
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1322
+$as_echo "$ac_res" >&6; }
1323
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1324
+
1325
+} # ac_fn_c_check_func
1326
+
1327
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
1328
+# -------------------------------------------------------
1329
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
1330
+# the include files in INCLUDES and setting the cache variable VAR
1331
+# accordingly.
1332
+ac_fn_c_check_header_mongrel ()
1333
+{
1334
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1335
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1336
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1337
+$as_echo_n "checking for $2... " >&6; }
1338
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1339
+ $as_echo_n "(cached) " >&6
1340
+fi
1341
+eval ac_res=\$$3
1342
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1343
+$as_echo "$ac_res" >&6; }
1344
+else
1345
+ # Is the header compilable?
1346
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
1347
+$as_echo_n "checking $2 usability... " >&6; }
1348
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1349
+/* end confdefs.h. */
1350
+$4
1351
+#include <$2>
1352
+_ACEOF
1353
+if ac_fn_c_try_compile "$LINENO"; then :
1354
+ ac_header_compiler=yes
1355
+else
1356
+ ac_header_compiler=no
1357
+fi
1358
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1359
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
1360
+$as_echo "$ac_header_compiler" >&6; }
1361
+
1362
+# Is the header present?
1363
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
1364
+$as_echo_n "checking $2 presence... " >&6; }
1365
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1366
+/* end confdefs.h. */
1367
+#include <$2>
1368
+_ACEOF
1369
+if ac_fn_c_try_cpp "$LINENO"; then :
1370
+ ac_header_preproc=yes
1371
+else
1372
+ ac_header_preproc=no
1373
+fi
1374
+rm -f conftest.err conftest.$ac_ext
1375
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
1376
+$as_echo "$ac_header_preproc" >&6; }
1377
+
1378
+# So? What about this header?
1379
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
1380
+ yes:no: )
1381
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
1382
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
1383
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
1384
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1385
+ ;;
1386
+ no:yes:* )
1387
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
1388
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
1389
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
1390
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
1391
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
1392
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
1393
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
1394
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
1395
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
1396
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1397
+ ;;
1398
+esac
1399
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1400
+$as_echo_n "checking for $2... " >&6; }
1401
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1402
+ $as_echo_n "(cached) " >&6
1403
+else
1404
+ eval "$3=\$ac_header_compiler"
1405
+fi
1406
+eval ac_res=\$$3
1407
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1408
+$as_echo "$ac_res" >&6; }
1409
+fi
1410
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1411
+
1412
+} # ac_fn_c_check_header_mongrel
1413
+
1414
+# ac_fn_c_check_decl LINENO SYMBOL VAR
1415
+# ------------------------------------
1416
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
1417
+ac_fn_c_check_decl ()
1418
+{
1419
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1420
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
1421
+$as_echo_n "checking whether $2 is declared... " >&6; }
1422
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1423
+ $as_echo_n "(cached) " >&6
1424
+else
1425
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1426
+/* end confdefs.h. */
1427
+$4
1428
+int
1429
+main ()
1430
+{
1431
+#ifndef $2
1432
+ (void) $2;
1433
+#endif
1434
+
1435
+ ;
1436
+ return 0;
1437
+}
1438
+_ACEOF
1439
+if ac_fn_c_try_compile "$LINENO"; then :
1440
+ eval "$3=yes"
1441
+else
1442
+ eval "$3=no"
1443
+fi
1444
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1445
+fi
1446
+eval ac_res=\$$3
1447
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1448
+$as_echo "$ac_res" >&6; }
1449
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1450
+
1451
+} # ac_fn_c_check_decl
1452
cat >config.log <<_ACEOF
1453
This file contains any messages produced by compilers while
1454
running configure, to aid debugging if configure makes a mistake.
1455
1456
It was created by gnome-power-manager $as_me 2.29.1, which was
1457
-generated by GNU Autoconf 2.63. Invocation command line was
1458
+generated by GNU Autoconf 2.64. Invocation command line was
1459
1460
$ $0 $@
1461
1462
@@ -1909,8 +2243,8 @@
1463
do
1464
IFS=$as_save_IFS
1465
test -z "$as_dir" && as_dir=.
1466
- $as_echo "PATH: $as_dir"
1467
-done
1468
+ $as_echo "PATH: $as_dir"
1469
+ done
1470
IFS=$as_save_IFS
1471
1472
} >&5
1473
@@ -1947,9 +2281,9 @@
1474
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
1475
esac
1476
case $ac_pass in
1477
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
1478
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
1479
2)
1480
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
1481
+ as_fn_append ac_configure_args1 " '$ac_arg'"
1482
if test $ac_must_keep_next = true; then
1483
ac_must_keep_next=false # Got value, back to normal.
1484
else
1485
@@ -1965,13 +2299,13 @@
1486
-* ) ac_must_keep_next=true ;;
1487
esac
1488
fi
1489
- ac_configure_args="$ac_configure_args '$ac_arg'"
1490
+ as_fn_append ac_configure_args " '$ac_arg'"
1491
;;
1492
esac
1493
done
1494
done
1495
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
1496
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
1497
+{ ac_configure_args0=; unset ac_configure_args0;}
1498
+{ ac_configure_args1=; unset ac_configure_args1;}
1499
1500
# When interrupted or exit'd, cleanup temporary files, and complete
1501
# config.log. We remove comments because anyway the quotes in there
1502
@@ -1996,13 +2330,13 @@
1503
case $ac_val in #(
1504
*${as_nl}*)
1505
case $ac_var in #(
1506
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
1507
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
1508
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
1509
esac
1510
case $ac_var in #(
1511
_ | IFS | as_nl) ;; #(
1512
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
1513
- *) $as_unset $ac_var ;;
1514
+ *) { eval $ac_var=; unset $ac_var;} ;;
1515
esac ;;
1516
esac
1517
done
1518
@@ -2074,39 +2408,41 @@
1519
exit $exit_status
1520
' 0
1521
for ac_signal in 1 2 13 15; do
1522
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
1523
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
1524
done
1525
ac_signal=0
1526
1527
# confdefs.h avoids OS command line length limits that DEFS can exceed.
1528
rm -f -r conftest* confdefs.h
1529
1530
+$as_echo "/* confdefs.h */" > confdefs.h
1531
+
1532
# Predefined preprocessor variables.
1533
1534
cat >>confdefs.h <<_ACEOF
1535
#define PACKAGE_NAME "$PACKAGE_NAME"
1536
_ACEOF
1537
1538
-
1539
cat >>confdefs.h <<_ACEOF
1540
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
1541
_ACEOF
1542
1543
-
1544
cat >>confdefs.h <<_ACEOF
1545
#define PACKAGE_VERSION "$PACKAGE_VERSION"
1546
_ACEOF
1547
1548
-
1549
cat >>confdefs.h <<_ACEOF
1550
#define PACKAGE_STRING "$PACKAGE_STRING"
1551
_ACEOF
1552
1553
-
1554
cat >>confdefs.h <<_ACEOF
1555
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
1556
_ACEOF
1557
1558
+cat >>confdefs.h <<_ACEOF
1559
+#define PACKAGE_URL "$PACKAGE_URL"
1560
+_ACEOF
1561
+
1562
1563
# Let the site file select an alternate cache file if it wants to.
1564
# Prefer an explicitly selected file to automatically selected ones.
1565
@@ -2125,7 +2461,7 @@
1566
do
1567
test "x$ac_site_file" = xNONE && continue
1568
if test -r "$ac_site_file"; then
1569
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
1570
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
1571
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
1572
sed 's/^/| /' "$ac_site_file" >&5
1573
. "$ac_site_file"
1574
@@ -2136,7 +2472,7 @@
1575
# Some versions of bash will fail to source /dev/null (special
1576
# files actually), so we avoid doing that.
1577
if test -f "$cache_file"; then
1578
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
1579
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
1580
$as_echo "$as_me: loading cache $cache_file" >&6;}
1581
case $cache_file in
1582
[\\/]* | ?:[\\/]* ) . "$cache_file";;
1583
@@ -2144,7 +2480,7 @@
1584
esac
1585
fi
1586
else
1587
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
1588
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
1589
$as_echo "$as_me: creating cache $cache_file" >&6;}
1590
>$cache_file
1591
fi
1592
@@ -2159,11 +2495,11 @@
1593
eval ac_new_val=\$ac_env_${ac_var}_value
1594
case $ac_old_set,$ac_new_set in
1595
set,)
1596
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1597
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1598
$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
1599
ac_cache_corrupted=: ;;
1600
,set)
1601
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
1602
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
1603
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
1604
ac_cache_corrupted=: ;;
1605
,);;
1606
@@ -2173,17 +2509,17 @@
1607
ac_old_val_w=`echo x $ac_old_val`
1608
ac_new_val_w=`echo x $ac_new_val`
1609
if test "$ac_old_val_w" != "$ac_new_val_w"; then
1610
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1611
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
1612
$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1613
ac_cache_corrupted=:
1614
else
1615
- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
1616
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
1617
$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
1618
eval $ac_var=\$ac_old_val
1619
fi
1620
- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
1621
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
1622
$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
1623
- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
1624
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
1625
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
1626
fi;;
1627
esac
1628
@@ -2195,43 +2531,20 @@
1629
esac
1630
case " $ac_configure_args " in
1631
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
1632
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
1633
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
1634
esac
1635
fi
1636
done
1637
if $ac_cache_corrupted; then
1638
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1639
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1640
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1641
- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
1642
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
1643
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
1644
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
1645
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
1646
- { (exit 1); exit 1; }; }
1647
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
1648
fi
1649
-
1650
-
1651
-
1652
-
1653
-
1654
-
1655
-
1656
-
1657
-
1658
-
1659
-
1660
-
1661
-
1662
-
1663
-
1664
-
1665
-
1666
-
1667
-
1668
-
1669
-
1670
-
1671
-
1672
-
1673
+## -------------------- ##
1674
+## Main body of script. ##
1675
+## -------------------- ##
1676
1677
ac_ext=c
1678
ac_cpp='$CPP $CPPFLAGS'
1679
@@ -2245,24 +2558,16 @@
1680
1681
ac_aux_dir=
1682
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
1683
- if test -f "$ac_dir/install-sh"; then
1684
- ac_aux_dir=$ac_dir
1685
- ac_install_sh="$ac_aux_dir/install-sh -c"
1686
- break
1687
- elif test -f "$ac_dir/install.sh"; then
1688
- ac_aux_dir=$ac_dir
1689
- ac_install_sh="$ac_aux_dir/install.sh -c"
1690
- break
1691
- elif test -f "$ac_dir/shtool"; then
1692
- ac_aux_dir=$ac_dir
1693
- ac_install_sh="$ac_aux_dir/shtool install -c"
1694
- break
1695
- fi
1696
+ for ac_t in install-sh install.sh shtool; do
1697
+ if test -f "$ac_dir/$ac_t"; then
1698
+ ac_aux_dir=$ac_dir
1699
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
1700
+ break 2
1701
+ fi
1702
+ done
1703
done
1704
if test -z "$ac_aux_dir"; then
1705
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
1706
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
1707
- { (exit 1); exit 1; }; }
1708
+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
1709
fi
1710
1711
# These three variables are undocumented and unsupported,
1712
@@ -2288,10 +2593,10 @@
1713
# OS/2's system install, which has a completely different semantic
1714
# ./install, which can be erroneously created by make from ./install.sh.
1715
# Reject install programs that cannot install multiple files.
1716
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
1717
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
1718
$as_echo_n "checking for a BSD-compatible install... " >&6; }
1719
if test -z "$INSTALL"; then
1720
-if test "${ac_cv_path_install+set}" = set; then
1721
+if test "${ac_cv_path_install+set}" = set; then :
1722
$as_echo_n "(cached) " >&6
1723
else
1724
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1725
@@ -2299,11 +2604,11 @@
1726
do
1727
IFS=$as_save_IFS
1728
test -z "$as_dir" && as_dir=.
1729
- # Account for people who put trailing slashes in PATH elements.
1730
-case $as_dir/ in
1731
- ./ | .// | /cC/* | \
1732
+ # Account for people who put trailing slashes in PATH elements.
1733
+case $as_dir/ in #((
1734
+ ./ | .// | /[cC]/* | \
1735
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
1736
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
1737
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
1738
/usr/ucb/* ) ;;
1739
*)
1740
# OSF1 and SCO ODT 3.0 have their own names for install.
1741
@@ -2340,7 +2645,7 @@
1742
;;
1743
esac
1744
1745
-done
1746
+ done
1747
IFS=$as_save_IFS
1748
1749
rm -rf conftest.one conftest.two conftest.dir
1750
@@ -2356,7 +2661,7 @@
1751
INSTALL=$ac_install_sh
1752
fi
1753
fi
1754
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
1755
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
1756
$as_echo "$INSTALL" >&6; }
1757
1758
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
1759
@@ -2367,7 +2672,7 @@
1760
1761
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1762
1763
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
1764
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
1765
$as_echo_n "checking whether build environment is sane... " >&6; }
1766
# Just in case
1767
sleep 1
1768
@@ -2378,15 +2683,11 @@
1769
'
1770
case `pwd` in
1771
*[\\\"\#\$\&\'\`$am_lf]*)
1772
- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
1773
-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
1774
- { (exit 1); exit 1; }; };;
1775
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
1776
esac
1777
case $srcdir in
1778
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
1779
- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
1780
-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
1781
- { (exit 1); exit 1; }; };;
1782
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
1783
esac
1784
1785
# Do `set' in a subshell so we don't clobber the current shell's
1786
@@ -2408,11 +2709,8 @@
1787
# if, for instance, CONFIG_SHELL is bash and it inherits a
1788
# broken ls alias from the environment. This has actually
1789
# happened. Such a system could not be considered "sane".
1790
- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
1791
-alias in your environment" >&5
1792
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
1793
-alias in your environment" >&2;}
1794
- { (exit 1); exit 1; }; }
1795
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
1796
+alias in your environment" "$LINENO" 5
1797
fi
1798
1799
test "$2" = conftest.file
1800
@@ -2421,13 +2719,10 @@
1801
# Ok.
1802
:
1803
else
1804
- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
1805
-Check your system clock" >&5
1806
-$as_echo "$as_me: error: newly created file is older than distributed files!
1807
-Check your system clock" >&2;}
1808
- { (exit 1); exit 1; }; }
1809
+ as_fn_error "newly created file is older than distributed files!
1810
+Check your system clock" "$LINENO" 5
1811
fi
1812
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
1813
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1814
$as_echo "yes" >&6; }
1815
test "$program_prefix" != NONE &&
1816
program_transform_name="s&^&$program_prefix&;$program_transform_name"
1817
@@ -2455,7 +2750,7 @@
1818
am_missing_run="$MISSING --run "
1819
else
1820
am_missing_run=
1821
- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
1822
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
1823
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
1824
fi
1825
1826
@@ -2476,9 +2771,9 @@
1827
if test -n "$ac_tool_prefix"; then
1828
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
1829
set dummy ${ac_tool_prefix}strip; ac_word=$2
1830
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1831
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1832
$as_echo_n "checking for $ac_word... " >&6; }
1833
-if test "${ac_cv_prog_STRIP+set}" = set; then
1834
+if test "${ac_cv_prog_STRIP+set}" = set; then :
1835
$as_echo_n "(cached) " >&6
1836
else
1837
if test -n "$STRIP"; then
1838
@@ -2489,24 +2784,24 @@
1839
do
1840
IFS=$as_save_IFS
1841
test -z "$as_dir" && as_dir=.
1842
- for ac_exec_ext in '' $ac_executable_extensions; do
1843
+ for ac_exec_ext in '' $ac_executable_extensions; do
1844
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1845
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
1846
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1847
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1848
break 2
1849
fi
1850
done
1851
-done
1852
+ done
1853
IFS=$as_save_IFS
1854
1855
fi
1856
fi
1857
STRIP=$ac_cv_prog_STRIP
1858
if test -n "$STRIP"; then
1859
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
1860
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1861
$as_echo "$STRIP" >&6; }
1862
else
1863
- { $as_echo "$as_me:$LINENO: result: no" >&5
1864
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1865
$as_echo "no" >&6; }
1866
fi
1867
1868
@@ -2516,9 +2811,9 @@
1869
ac_ct_STRIP=$STRIP
1870
# Extract the first word of "strip", so it can be a program name with args.
1871
set dummy strip; ac_word=$2
1872
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1873
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1874
$as_echo_n "checking for $ac_word... " >&6; }
1875
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
1876
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
1877
$as_echo_n "(cached) " >&6
1878
else
1879
if test -n "$ac_ct_STRIP"; then
1880
@@ -2529,24 +2824,24 @@
1881
do
1882
IFS=$as_save_IFS
1883
test -z "$as_dir" && as_dir=.
1884
- for ac_exec_ext in '' $ac_executable_extensions; do
1885
+ for ac_exec_ext in '' $ac_executable_extensions; do
1886
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1887
ac_cv_prog_ac_ct_STRIP="strip"
1888
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1889
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1890
break 2
1891
fi
1892
done
1893
-done
1894
+ done
1895
IFS=$as_save_IFS
1896
1897
fi
1898
fi
1899
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
1900
if test -n "$ac_ct_STRIP"; then
1901
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
1902
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
1903
$as_echo "$ac_ct_STRIP" >&6; }
1904
else
1905
- { $as_echo "$as_me:$LINENO: result: no" >&5
1906
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1907
$as_echo "no" >&6; }
1908
fi
1909
1910
@@ -2555,7 +2850,7 @@
1911
else
1912
case $cross_compiling:$ac_tool_warned in
1913
yes:)
1914
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
1915
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1916
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1917
ac_tool_warned=yes ;;
1918
esac
1919
@@ -2568,10 +2863,10 @@
1920
fi
1921
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1922
1923
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
1924
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
1925
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
1926
if test -z "$MKDIR_P"; then
1927
- if test "${ac_cv_path_mkdir+set}" = set; then
1928
+ if test "${ac_cv_path_mkdir+set}" = set; then :
1929
$as_echo_n "(cached) " >&6
1930
else
1931
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1932
@@ -2579,7 +2874,7 @@
1933
do
1934
IFS=$as_save_IFS
1935
test -z "$as_dir" && as_dir=.
1936
- for ac_prog in mkdir gmkdir; do
1937
+ for ac_prog in mkdir gmkdir; do
1938
for ac_exec_ext in '' $ac_executable_extensions; do
1939
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
1940
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
1941
@@ -2591,7 +2886,7 @@
1942
esac
1943
done
1944
done
1945
-done
1946
+ done
1947
IFS=$as_save_IFS
1948
1949
fi
1950
@@ -2607,7 +2902,7 @@
1951
MKDIR_P="$ac_install_sh -d"
1952
fi
1953
fi
1954
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
1955
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
1956
$as_echo "$MKDIR_P" >&6; }
1957
1958
mkdir_p="$MKDIR_P"
1959
@@ -2620,9 +2915,9 @@
1960
do
1961
# Extract the first word of "$ac_prog", so it can be a program name with args.
1962
set dummy $ac_prog; ac_word=$2
1963
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1964
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1965
$as_echo_n "checking for $ac_word... " >&6; }
1966
-if test "${ac_cv_prog_AWK+set}" = set; then
1967
+if test "${ac_cv_prog_AWK+set}" = set; then :
1968
$as_echo_n "(cached) " >&6
1969
else
1970
if test -n "$AWK"; then
1971
@@ -2633,24 +2928,24 @@
1972
do
1973
IFS=$as_save_IFS
1974
test -z "$as_dir" && as_dir=.
1975
- for ac_exec_ext in '' $ac_executable_extensions; do
1976
+ for ac_exec_ext in '' $ac_executable_extensions; do
1977
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1978
ac_cv_prog_AWK="$ac_prog"
1979
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1980
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1981
break 2
1982
fi
1983
done
1984
-done
1985
+ done
1986
IFS=$as_save_IFS
1987
1988
fi
1989
fi
1990
AWK=$ac_cv_prog_AWK
1991
if test -n "$AWK"; then
1992
- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
1993
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
1994
$as_echo "$AWK" >&6; }
1995
else
1996
- { $as_echo "$as_me:$LINENO: result: no" >&5
1997
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1998
$as_echo "no" >&6; }
1999
fi
2000
2001
@@ -2658,11 +2953,11 @@
2002
test -n "$AWK" && break
2003
done
2004
2005
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
2006
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
2007
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
2008
set x ${MAKE-make}
2009
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
2010
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
2011
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
2012
$as_echo_n "(cached) " >&6
2013
else
2014
cat >conftest.make <<\_ACEOF
2015
@@ -2680,11 +2975,11 @@
2016
rm -f conftest.make
2017
fi
2018
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
2019
- { $as_echo "$as_me:$LINENO: result: yes" >&5
2020
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2021
$as_echo "yes" >&6; }
2022
SET_MAKE=
2023
else
2024
- { $as_echo "$as_me:$LINENO: result: no" >&5
2025
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2026
$as_echo "no" >&6; }
2027
SET_MAKE="MAKE=${MAKE-make}"
2028
fi
2029
@@ -2704,9 +2999,7 @@
2030
am__isrc=' -I$(srcdir)'
2031
# test to see if srcdir already configured
2032
if test -f $srcdir/config.status; then
2033
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
2034
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
2035
- { (exit 1); exit 1; }; }
2036
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
2037
fi
2038
fi
2039
2040
@@ -2768,9 +3061,7 @@
2041
am__isrc=' -I$(srcdir)'
2042
# test to see if srcdir already configured
2043
if test -f $srcdir/config.status; then
2044
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
2045
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
2046
- { (exit 1); exit 1; }; }
2047
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
2048
fi
2049
fi
2050
2051
@@ -2832,7 +3123,7 @@
2052
2053
# enable nice build output on automake1.11
2054
# Check whether --enable-silent-rules was given.
2055
-if test "${enable_silent_rules+set}" = set; then
2056
+if test "${enable_silent_rules+set}" = set; then :
2057
enableval=$enable_silent_rules;
2058
fi
2059
2060
@@ -2852,9 +3143,9 @@
2061
if test -n "$ac_tool_prefix"; then
2062
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
2063
set dummy ${ac_tool_prefix}gcc; ac_word=$2
2064
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2065
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2066
$as_echo_n "checking for $ac_word... " >&6; }
2067
-if test "${ac_cv_prog_CC+set}" = set; then
2068
+if test "${ac_cv_prog_CC+set}" = set; then :
2069
$as_echo_n "(cached) " >&6
2070
else
2071
if test -n "$CC"; then
2072
@@ -2865,24 +3156,24 @@
2073
do
2074
IFS=$as_save_IFS
2075
test -z "$as_dir" && as_dir=.
2076
- for ac_exec_ext in '' $ac_executable_extensions; do
2077
+ for ac_exec_ext in '' $ac_executable_extensions; do
2078
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2079
ac_cv_prog_CC="${ac_tool_prefix}gcc"
2080
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2081
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2082
break 2
2083
fi
2084
done
2085
-done
2086
+ done
2087
IFS=$as_save_IFS
2088
2089
fi
2090
fi
2091
CC=$ac_cv_prog_CC
2092
if test -n "$CC"; then
2093
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
2094
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
2095
$as_echo "$CC" >&6; }
2096
else
2097
- { $as_echo "$as_me:$LINENO: result: no" >&5
2098
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2099
$as_echo "no" >&6; }
2100
fi
2101
2102
@@ -2892,9 +3183,9 @@
2103
ac_ct_CC=$CC
2104
# Extract the first word of "gcc", so it can be a program name with args.
2105
set dummy gcc; ac_word=$2
2106
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2107
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2108
$as_echo_n "checking for $ac_word... " >&6; }
2109
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
2110
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
2111
$as_echo_n "(cached) " >&6
2112
else
2113
if test -n "$ac_ct_CC"; then
2114
@@ -2905,24 +3196,24 @@
2115
do
2116
IFS=$as_save_IFS
2117
test -z "$as_dir" && as_dir=.
2118
- for ac_exec_ext in '' $ac_executable_extensions; do
2119
+ for ac_exec_ext in '' $ac_executable_extensions; do
2120
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2121
ac_cv_prog_ac_ct_CC="gcc"
2122
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2123
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2124
break 2
2125
fi
2126
done
2127
-done
2128
+ done
2129
IFS=$as_save_IFS
2130
2131
fi
2132
fi
2133
ac_ct_CC=$ac_cv_prog_ac_ct_CC
2134
if test -n "$ac_ct_CC"; then
2135
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2136
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
2137
$as_echo "$ac_ct_CC" >&6; }
2138
else
2139
- { $as_echo "$as_me:$LINENO: result: no" >&5
2140
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2141
$as_echo "no" >&6; }
2142
fi
2143
2144
@@ -2931,7 +3222,7 @@
2145
else
2146
case $cross_compiling:$ac_tool_warned in
2147
yes:)
2148
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
2149
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2150
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2151
ac_tool_warned=yes ;;
2152
esac
2153
@@ -2945,9 +3236,9 @@
2154
if test -n "$ac_tool_prefix"; then
2155
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
2156
set dummy ${ac_tool_prefix}cc; ac_word=$2
2157
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2158
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2159
$as_echo_n "checking for $ac_word... " >&6; }
2160
-if test "${ac_cv_prog_CC+set}" = set; then
2161
+if test "${ac_cv_prog_CC+set}" = set; then :
2162
$as_echo_n "(cached) " >&6
2163
else
2164
if test -n "$CC"; then
2165
@@ -2958,24 +3249,24 @@
2166
do
2167
IFS=$as_save_IFS
2168
test -z "$as_dir" && as_dir=.
2169
- for ac_exec_ext in '' $ac_executable_extensions; do
2170
+ for ac_exec_ext in '' $ac_executable_extensions; do
2171
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2172
ac_cv_prog_CC="${ac_tool_prefix}cc"
2173
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2174
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2175
break 2
2176
fi
2177
done
2178
-done
2179
+ done
2180
IFS=$as_save_IFS
2181
2182
fi
2183
fi
2184
CC=$ac_cv_prog_CC
2185
if test -n "$CC"; then
2186
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
2187
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
2188
$as_echo "$CC" >&6; }
2189
else
2190
- { $as_echo "$as_me:$LINENO: result: no" >&5
2191
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2192
$as_echo "no" >&6; }
2193
fi
2194
2195
@@ -2985,9 +3276,9 @@
2196
if test -z "$CC"; then
2197
# Extract the first word of "cc", so it can be a program name with args.
2198
set dummy cc; ac_word=$2
2199
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2200
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2201
$as_echo_n "checking for $ac_word... " >&6; }
2202
-if test "${ac_cv_prog_CC+set}" = set; then
2203
+if test "${ac_cv_prog_CC+set}" = set; then :
2204
$as_echo_n "(cached) " >&6
2205
else
2206
if test -n "$CC"; then
2207
@@ -2999,18 +3290,18 @@
2208
do
2209
IFS=$as_save_IFS
2210
test -z "$as_dir" && as_dir=.
2211
- for ac_exec_ext in '' $ac_executable_extensions; do
2212
+ for ac_exec_ext in '' $ac_executable_extensions; do
2213
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2214
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
2215
ac_prog_rejected=yes
2216
continue
2217
fi
2218
ac_cv_prog_CC="cc"
2219
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2220
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2221
break 2
2222
fi
2223
done
2224
-done
2225
+ done
2226
IFS=$as_save_IFS
2227
2228
if test $ac_prog_rejected = yes; then
2229
@@ -3029,10 +3320,10 @@
2230
fi
2231
CC=$ac_cv_prog_CC
2232
if test -n "$CC"; then
2233
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
2234
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
2235
$as_echo "$CC" >&6; }
2236
else
2237
- { $as_echo "$as_me:$LINENO: result: no" >&5
2238
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2239
$as_echo "no" >&6; }
2240
fi
2241
2242
@@ -3044,9 +3335,9 @@
2243
do
2244
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2245
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2246
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2247
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2248
$as_echo_n "checking for $ac_word... " >&6; }
2249
-if test "${ac_cv_prog_CC+set}" = set; then
2250
+if test "${ac_cv_prog_CC+set}" = set; then :
2251
$as_echo_n "(cached) " >&6
2252
else
2253
if test -n "$CC"; then
2254
@@ -3057,24 +3348,24 @@
2255
do
2256
IFS=$as_save_IFS
2257
test -z "$as_dir" && as_dir=.
2258
- for ac_exec_ext in '' $ac_executable_extensions; do
2259
+ for ac_exec_ext in '' $ac_executable_extensions; do
2260
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2261
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
2262
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2263
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2264
break 2
2265
fi
2266
done
2267
-done
2268
+ done
2269
IFS=$as_save_IFS
2270
2271
fi
2272
fi
2273
CC=$ac_cv_prog_CC
2274
if test -n "$CC"; then
2275
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
2276
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
2277
$as_echo "$CC" >&6; }
2278
else
2279
- { $as_echo "$as_me:$LINENO: result: no" >&5
2280
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2281
$as_echo "no" >&6; }
2282
fi
2283
2284
@@ -3088,9 +3379,9 @@
2285
do
2286
# Extract the first word of "$ac_prog", so it can be a program name with args.
2287
set dummy $ac_prog; ac_word=$2
2288
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2289
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2290
$as_echo_n "checking for $ac_word... " >&6; }
2291
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
2292
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
2293
$as_echo_n "(cached) " >&6
2294
else
2295
if test -n "$ac_ct_CC"; then
2296
@@ -3101,24 +3392,24 @@
2297
do
2298
IFS=$as_save_IFS
2299
test -z "$as_dir" && as_dir=.
2300
- for ac_exec_ext in '' $ac_executable_extensions; do
2301
+ for ac_exec_ext in '' $ac_executable_extensions; do
2302
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2303
ac_cv_prog_ac_ct_CC="$ac_prog"
2304
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2305
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2306
break 2
2307
fi
2308
done
2309
-done
2310
+ done
2311
IFS=$as_save_IFS
2312
2313
fi
2314
fi
2315
ac_ct_CC=$ac_cv_prog_ac_ct_CC
2316
if test -n "$ac_ct_CC"; then
2317
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2318
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
2319
$as_echo "$ac_ct_CC" >&6; }
2320
else
2321
- { $as_echo "$as_me:$LINENO: result: no" >&5
2322
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2323
$as_echo "no" >&6; }
2324
fi
2325
2326
@@ -3131,7 +3422,7 @@
2327
else
2328
case $cross_compiling:$ac_tool_warned in
2329
yes:)
2330
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
2331
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2332
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2333
ac_tool_warned=yes ;;
2334
esac
2335
@@ -3142,73 +3433,55 @@
2336
fi
2337
2338
2339
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2340
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2341
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2342
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
2343
-See \`config.log' for more details." >&5
2344
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
2345
-See \`config.log' for more details." >&2;}
2346
- { (exit 1); exit 1; }; }; }
2347
+as_fn_error "no acceptable C compiler found in \$PATH
2348
+See \`config.log' for more details." "$LINENO" 5; }
2349
2350
# Provide some information about the compiler.
2351
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
2352
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
2353
set X $ac_compile
2354
ac_compiler=$2
2355
-{ (ac_try="$ac_compiler --version >&5"
2356
-case "(($ac_try" in
2357
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2358
- *) ac_try_echo=$ac_try;;
2359
-esac
2360
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2361
-$as_echo "$ac_try_echo") >&5
2362
- (eval "$ac_compiler --version >&5") 2>&5
2363
- ac_status=$?
2364
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2365
- (exit $ac_status); }
2366
-{ (ac_try="$ac_compiler -v >&5"
2367
-case "(($ac_try" in
2368
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2369
- *) ac_try_echo=$ac_try;;
2370
-esac
2371
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2372
-$as_echo "$ac_try_echo") >&5
2373
- (eval "$ac_compiler -v >&5") 2>&5
2374
- ac_status=$?
2375
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2376
- (exit $ac_status); }
2377
-{ (ac_try="$ac_compiler -V >&5"
2378
+for ac_option in --version -v -V -qversion; do
2379
+ { { ac_try="$ac_compiler $ac_option >&5"
2380
case "(($ac_try" in
2381
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2382
*) ac_try_echo=$ac_try;;
2383
esac
2384
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2385
-$as_echo "$ac_try_echo") >&5
2386
- (eval "$ac_compiler -V >&5") 2>&5
2387
- ac_status=$?
2388
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2389
- (exit $ac_status); }
2390
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2391
+$as_echo "$ac_try_echo"; } >&5
2392
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
2393
+ ac_status=$?
2394
+ if test -s conftest.err; then
2395
+ sed '10a\
2396
+... rest of stderr output deleted ...
2397
+ 10q' conftest.err >conftest.er1
2398
+ cat conftest.er1 >&5
2399
+ rm -f conftest.er1 conftest.err
2400
+ fi
2401
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2402
+ test $ac_status = 0; }
2403
+done
2404
2405
-cat >conftest.$ac_ext <<_ACEOF
2406
-/* confdefs.h. */
2407
-_ACEOF
2408
-cat confdefs.h >>conftest.$ac_ext
2409
-cat >>conftest.$ac_ext <<_ACEOF
2410
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2411
/* end confdefs.h. */
2412
-
2413
+#include <stdio.h>
2414
int
2415
main ()
2416
{
2417
+FILE *f = fopen ("conftest.out", "w");
2418
+ return ferror (f) || fclose (f) != 0;
2419
2420
;
2421
return 0;
2422
}
2423
_ACEOF
2424
ac_clean_files_save=$ac_clean_files
2425
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
2426
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
2427
# Try to create an executable without -o first, disregard a.out.
2428
# It will help us diagnose broken compilers, and finding out an intuition
2429
# of exeext.
2430
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
2431
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
2432
$as_echo_n "checking for C compiler default output file name... " >&6; }
2433
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
2434
2435
@@ -3225,17 +3498,17 @@
2436
done
2437
rm -f $ac_rmfiles
2438
2439
-if { (ac_try="$ac_link_default"
2440
+if { { ac_try="$ac_link_default"
2441
case "(($ac_try" in
2442
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2443
*) ac_try_echo=$ac_try;;
2444
esac
2445
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2446
-$as_echo "$ac_try_echo") >&5
2447
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2448
+$as_echo "$ac_try_echo"; } >&5
2449
(eval "$ac_link_default") 2>&5
2450
ac_status=$?
2451
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2452
- (exit $ac_status); }; then
2453
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2454
+ test $ac_status = 0; }; then :
2455
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
2456
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
2457
# in a Makefile. We should not override ac_cv_exeext if it was cached,
2458
@@ -3252,7 +3525,7 @@
2459
# certainly right.
2460
break;;
2461
*.* )
2462
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
2463
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
2464
then :; else
2465
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2466
fi
2467
@@ -3271,84 +3544,75 @@
2468
else
2469
ac_file=''
2470
fi
2471
-
2472
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
2473
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
2474
$as_echo "$ac_file" >&6; }
2475
-if test -z "$ac_file"; then
2476
+if test -z "$ac_file"; then :
2477
$as_echo "$as_me: failed program was:" >&5
2478
sed 's/^/| /' conftest.$ac_ext >&5
2479
2480
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2481
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2482
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2483
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
2484
-See \`config.log' for more details." >&5
2485
-$as_echo "$as_me: error: C compiler cannot create executables
2486
-See \`config.log' for more details." >&2;}
2487
- { (exit 77); exit 77; }; }; }
2488
+{ as_fn_set_status 77
2489
+as_fn_error "C compiler cannot create executables
2490
+See \`config.log' for more details." "$LINENO" 5; }; }
2491
fi
2492
-
2493
ac_exeext=$ac_cv_exeext
2494
2495
# Check that the compiler produces executables we can run. If not, either
2496
# the compiler is broken, or we cross compile.
2497
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
2498
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
2499
$as_echo_n "checking whether the C compiler works... " >&6; }
2500
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
2501
# If not cross compiling, check that we can run a simple program.
2502
if test "$cross_compiling" != yes; then
2503
if { ac_try='./$ac_file'
2504
- { (case "(($ac_try" in
2505
+ { { case "(($ac_try" in
2506
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2507
*) ac_try_echo=$ac_try;;
2508
esac
2509
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2510
-$as_echo "$ac_try_echo") >&5
2511
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2512
+$as_echo "$ac_try_echo"; } >&5
2513
(eval "$ac_try") 2>&5
2514
ac_status=$?
2515
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2516
- (exit $ac_status); }; }; then
2517
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2518
+ test $ac_status = 0; }; }; then
2519
cross_compiling=no
2520
else
2521
if test "$cross_compiling" = maybe; then
2522
cross_compiling=yes
2523
else
2524
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2525
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2526
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2527
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
2528
+as_fn_error "cannot run C compiled programs.
2529
If you meant to cross compile, use \`--host'.
2530
-See \`config.log' for more details." >&5
2531
-$as_echo "$as_me: error: cannot run C compiled programs.
2532
-If you meant to cross compile, use \`--host'.
2533
-See \`config.log' for more details." >&2;}
2534
- { (exit 1); exit 1; }; }; }
2535
+See \`config.log' for more details." "$LINENO" 5; }
2536
fi
2537
fi
2538
fi
2539
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
2540
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2541
$as_echo "yes" >&6; }
2542
2543
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
2544
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
2545
ac_clean_files=$ac_clean_files_save
2546
# Check that the compiler produces executables we can run. If not, either
2547
# the compiler is broken, or we cross compile.
2548
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
2549
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
2550
$as_echo_n "checking whether we are cross compiling... " >&6; }
2551
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
2552
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
2553
$as_echo "$cross_compiling" >&6; }
2554
2555
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
2556
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
2557
$as_echo_n "checking for suffix of executables... " >&6; }
2558
-if { (ac_try="$ac_link"
2559
+if { { ac_try="$ac_link"
2560
case "(($ac_try" in
2561
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2562
*) ac_try_echo=$ac_try;;
2563
esac
2564
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2565
-$as_echo "$ac_try_echo") >&5
2566
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2567
+$as_echo "$ac_try_echo"; } >&5
2568
(eval "$ac_link") 2>&5
2569
ac_status=$?
2570
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2571
- (exit $ac_status); }; then
2572
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2573
+ test $ac_status = 0; }; then :
2574
# If both `conftest.exe' and `conftest' are `present' (well, observable)
2575
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
2576
# work properly (i.e., refer to `conftest.exe'), while it won't with
2577
@@ -3363,32 +3627,24 @@
2578
esac
2579
done
2580
else
2581
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2582
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2583
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2584
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
2585
-See \`config.log' for more details." >&5
2586
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
2587
-See \`config.log' for more details." >&2;}
2588
- { (exit 1); exit 1; }; }; }
2589
+as_fn_error "cannot compute suffix of executables: cannot compile and link
2590
+See \`config.log' for more details." "$LINENO" 5; }
2591
fi
2592
-
2593
rm -f conftest$ac_cv_exeext
2594
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
2595
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
2596
$as_echo "$ac_cv_exeext" >&6; }
2597
2598
rm -f conftest.$ac_ext
2599
EXEEXT=$ac_cv_exeext
2600
ac_exeext=$EXEEXT
2601
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
2602
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
2603
$as_echo_n "checking for suffix of object files... " >&6; }
2604
-if test "${ac_cv_objext+set}" = set; then
2605
+if test "${ac_cv_objext+set}" = set; then :
2606
$as_echo_n "(cached) " >&6
2607
else
2608
- cat >conftest.$ac_ext <<_ACEOF
2609
-/* confdefs.h. */
2610
-_ACEOF
2611
-cat confdefs.h >>conftest.$ac_ext
2612
-cat >>conftest.$ac_ext <<_ACEOF
2613
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2614
/* end confdefs.h. */
2615
2616
int
2617
@@ -3400,17 +3656,17 @@
2618
}
2619
_ACEOF
2620
rm -f conftest.o conftest.obj
2621
-if { (ac_try="$ac_compile"
2622
+if { { ac_try="$ac_compile"
2623
case "(($ac_try" in
2624
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2625
*) ac_try_echo=$ac_try;;
2626
esac
2627
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2628
-$as_echo "$ac_try_echo") >&5
2629
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2630
+$as_echo "$ac_try_echo"; } >&5
2631
(eval "$ac_compile") 2>&5
2632
ac_status=$?
2633
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2634
- (exit $ac_status); }; then
2635
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2636
+ test $ac_status = 0; }; then :
2637
for ac_file in conftest.o conftest.obj conftest.*; do
2638
test -f "$ac_file" || continue;
2639
case $ac_file in
2640
@@ -3423,31 +3679,23 @@
2641
$as_echo "$as_me: failed program was:" >&5
2642
sed 's/^/| /' conftest.$ac_ext >&5
2643
2644
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2645
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2646
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2647
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
2648
-See \`config.log' for more details." >&5
2649
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
2650
-See \`config.log' for more details." >&2;}
2651
- { (exit 1); exit 1; }; }; }
2652
+as_fn_error "cannot compute suffix of object files: cannot compile
2653
+See \`config.log' for more details." "$LINENO" 5; }
2654
fi
2655
-
2656
rm -f conftest.$ac_cv_objext conftest.$ac_ext
2657
fi
2658
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
2659
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
2660
$as_echo "$ac_cv_objext" >&6; }
2661
OBJEXT=$ac_cv_objext
2662
ac_objext=$OBJEXT
2663
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
2664
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
2665
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
2666
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
2667
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
2668
$as_echo_n "(cached) " >&6
2669
else
2670
- cat >conftest.$ac_ext <<_ACEOF
2671
-/* confdefs.h. */
2672
-_ACEOF
2673
-cat confdefs.h >>conftest.$ac_ext
2674
-cat >>conftest.$ac_ext <<_ACEOF
2675
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2676
/* end confdefs.h. */
2677
2678
int
2679
@@ -3461,37 +3709,16 @@
2680
return 0;
2681
}
2682
_ACEOF
2683
-rm -f conftest.$ac_objext
2684
-if { (ac_try="$ac_compile"
2685
-case "(($ac_try" in
2686
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2687
- *) ac_try_echo=$ac_try;;
2688
-esac
2689
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2690
-$as_echo "$ac_try_echo") >&5
2691
- (eval "$ac_compile") 2>conftest.er1
2692
- ac_status=$?
2693
- grep -v '^ *+' conftest.er1 >conftest.err
2694
- rm -f conftest.er1
2695
- cat conftest.err >&5
2696
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2697
- (exit $ac_status); } && {
2698
- test -z "$ac_c_werror_flag" ||
2699
- test ! -s conftest.err
2700
- } && test -s conftest.$ac_objext; then
2701
+if ac_fn_c_try_compile "$LINENO"; then :
2702
ac_compiler_gnu=yes
2703
else
2704
- $as_echo "$as_me: failed program was:" >&5
2705
-sed 's/^/| /' conftest.$ac_ext >&5
2706
-
2707
- ac_compiler_gnu=no
2708
+ ac_compiler_gnu=no
2709
fi
2710
-
2711
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2712
ac_cv_c_compiler_gnu=$ac_compiler_gnu
2713
2714
fi
2715
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
2716
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
2717
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
2718
if test $ac_compiler_gnu = yes; then
2719
GCC=yes
2720
@@ -3500,20 +3727,16 @@
2721
fi
2722
ac_test_CFLAGS=${CFLAGS+set}
2723
ac_save_CFLAGS=$CFLAGS
2724
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
2725
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
2726
$as_echo_n "checking whether $CC accepts -g... " >&6; }
2727
-if test "${ac_cv_prog_cc_g+set}" = set; then
2728
+if test "${ac_cv_prog_cc_g+set}" = set; then :
2729
$as_echo_n "(cached) " >&6
2730
else
2731
ac_save_c_werror_flag=$ac_c_werror_flag
2732
ac_c_werror_flag=yes
2733
ac_cv_prog_cc_g=no
2734
CFLAGS="-g"
2735
- cat >conftest.$ac_ext <<_ACEOF
2736
-/* confdefs.h. */
2737
-_ACEOF
2738
-cat confdefs.h >>conftest.$ac_ext
2739
-cat >>conftest.$ac_ext <<_ACEOF
2740
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2741
/* end confdefs.h. */
2742
2743
int
2744
@@ -3524,35 +3747,11 @@
2745
return 0;
2746
}
2747
_ACEOF
2748
-rm -f conftest.$ac_objext
2749
-if { (ac_try="$ac_compile"
2750
-case "(($ac_try" in
2751
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2752
- *) ac_try_echo=$ac_try;;
2753
-esac
2754
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2755
-$as_echo "$ac_try_echo") >&5
2756
- (eval "$ac_compile") 2>conftest.er1
2757
- ac_status=$?
2758
- grep -v '^ *+' conftest.er1 >conftest.err
2759
- rm -f conftest.er1
2760
- cat conftest.err >&5
2761
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2762
- (exit $ac_status); } && {
2763
- test -z "$ac_c_werror_flag" ||
2764
- test ! -s conftest.err
2765
- } && test -s conftest.$ac_objext; then
2766
+if ac_fn_c_try_compile "$LINENO"; then :
2767
ac_cv_prog_cc_g=yes
2768
else
2769
- $as_echo "$as_me: failed program was:" >&5
2770
-sed 's/^/| /' conftest.$ac_ext >&5
2771
-
2772
- CFLAGS=""
2773
- cat >conftest.$ac_ext <<_ACEOF
2774
-/* confdefs.h. */
2775
-_ACEOF
2776
-cat confdefs.h >>conftest.$ac_ext
2777
-cat >>conftest.$ac_ext <<_ACEOF
2778
+ CFLAGS=""
2779
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2780
/* end confdefs.h. */
2781
2782
int
2783
@@ -3563,36 +3762,12 @@
2784
return 0;
2785
}
2786
_ACEOF
2787
-rm -f conftest.$ac_objext
2788
-if { (ac_try="$ac_compile"
2789
-case "(($ac_try" in
2790
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2791
- *) ac_try_echo=$ac_try;;
2792
-esac
2793
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2794
-$as_echo "$ac_try_echo") >&5
2795
- (eval "$ac_compile") 2>conftest.er1
2796
- ac_status=$?
2797
- grep -v '^ *+' conftest.er1 >conftest.err
2798
- rm -f conftest.er1
2799
- cat conftest.err >&5
2800
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2801
- (exit $ac_status); } && {
2802
- test -z "$ac_c_werror_flag" ||
2803
- test ! -s conftest.err
2804
- } && test -s conftest.$ac_objext; then
2805
- :
2806
-else
2807
- $as_echo "$as_me: failed program was:" >&5
2808
-sed 's/^/| /' conftest.$ac_ext >&5
2809
+if ac_fn_c_try_compile "$LINENO"; then :
2810
2811
- ac_c_werror_flag=$ac_save_c_werror_flag
2812
+else
2813
+ ac_c_werror_flag=$ac_save_c_werror_flag
2814
CFLAGS="-g"
2815
- cat >conftest.$ac_ext <<_ACEOF
2816
-/* confdefs.h. */
2817
-_ACEOF
2818
-cat confdefs.h >>conftest.$ac_ext
2819
-cat >>conftest.$ac_ext <<_ACEOF
2820
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2821
/* end confdefs.h. */
2822
2823
int
2824
@@ -3603,42 +3778,17 @@
2825
return 0;
2826
}
2827
_ACEOF
2828
-rm -f conftest.$ac_objext
2829
-if { (ac_try="$ac_compile"
2830
-case "(($ac_try" in
2831
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2832
- *) ac_try_echo=$ac_try;;
2833
-esac
2834
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2835
-$as_echo "$ac_try_echo") >&5
2836
- (eval "$ac_compile") 2>conftest.er1
2837
- ac_status=$?
2838
- grep -v '^ *+' conftest.er1 >conftest.err
2839
- rm -f conftest.er1
2840
- cat conftest.err >&5
2841
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2842
- (exit $ac_status); } && {
2843
- test -z "$ac_c_werror_flag" ||
2844
- test ! -s conftest.err
2845
- } && test -s conftest.$ac_objext; then
2846
+if ac_fn_c_try_compile "$LINENO"; then :
2847
ac_cv_prog_cc_g=yes
2848
-else
2849
- $as_echo "$as_me: failed program was:" >&5
2850
-sed 's/^/| /' conftest.$ac_ext >&5
2851
-
2852
-
2853
fi
2854
-
2855
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2856
fi
2857
-
2858
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2859
fi
2860
-
2861
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2862
ac_c_werror_flag=$ac_save_c_werror_flag
2863
fi
2864
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
2865
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
2866
$as_echo "$ac_cv_prog_cc_g" >&6; }
2867
if test "$ac_test_CFLAGS" = set; then
2868
CFLAGS=$ac_save_CFLAGS
2869
@@ -3655,18 +3805,14 @@
2870
CFLAGS=
2871
fi
2872
fi
2873
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
2874
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
2875
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
2876
-if test "${ac_cv_prog_cc_c89+set}" = set; then
2877
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
2878
$as_echo_n "(cached) " >&6
2879
else
2880
ac_cv_prog_cc_c89=no
2881
ac_save_CC=$CC
2882
-cat >conftest.$ac_ext <<_ACEOF
2883
-/* confdefs.h. */
2884
-_ACEOF
2885
-cat confdefs.h >>conftest.$ac_ext
2886
-cat >>conftest.$ac_ext <<_ACEOF
2887
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2888
/* end confdefs.h. */
2889
#include <stdarg.h>
2890
#include <stdio.h>
2891
@@ -3723,32 +3869,9 @@
2892
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
2893
do
2894
CC="$ac_save_CC $ac_arg"
2895
- rm -f conftest.$ac_objext
2896
-if { (ac_try="$ac_compile"
2897
-case "(($ac_try" in
2898
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2899
- *) ac_try_echo=$ac_try;;
2900
-esac
2901
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2902
-$as_echo "$ac_try_echo") >&5
2903
- (eval "$ac_compile") 2>conftest.er1
2904
- ac_status=$?
2905
- grep -v '^ *+' conftest.er1 >conftest.err
2906
- rm -f conftest.er1
2907
- cat conftest.err >&5
2908
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2909
- (exit $ac_status); } && {
2910
- test -z "$ac_c_werror_flag" ||
2911
- test ! -s conftest.err
2912
- } && test -s conftest.$ac_objext; then
2913
+ if ac_fn_c_try_compile "$LINENO"; then :
2914
ac_cv_prog_cc_c89=$ac_arg
2915
-else
2916
- $as_echo "$as_me: failed program was:" >&5
2917
-sed 's/^/| /' conftest.$ac_ext >&5
2918
-
2919
-
2920
fi
2921
-
2922
rm -f core conftest.err conftest.$ac_objext
2923
test "x$ac_cv_prog_cc_c89" != "xno" && break
2924
done
2925
@@ -3759,17 +3882,19 @@
2926
# AC_CACHE_VAL
2927
case "x$ac_cv_prog_cc_c89" in
2928
x)
2929
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
2930
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
2931
$as_echo "none needed" >&6; } ;;
2932
xno)
2933
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
2934
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
2935
$as_echo "unsupported" >&6; } ;;
2936
*)
2937
CC="$CC $ac_cv_prog_cc_c89"
2938
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
2939
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
2940
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
2941
esac
2942
+if test "x$ac_cv_prog_cc_c89" != xno; then :
2943
2944
+fi
2945
2946
ac_ext=c
2947
ac_cpp='$CPP $CPPFLAGS'
2948
@@ -3788,7 +3913,7 @@
2949
.PHONY: am__doit
2950
END
2951
# If we don't find an include directive, just comment out the code.
2952
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
2953
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
2954
$as_echo_n "checking for style of include used by $am_make... " >&6; }
2955
am__include="#"
2956
am__quote=
2957
@@ -3816,12 +3941,12 @@
2958
fi
2959
2960
2961
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
2962
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
2963
$as_echo "$_am_result" >&6; }
2964
rm -f confinc confmf
2965
2966
# Check whether --enable-dependency-tracking was given.
2967
-if test "${enable_dependency_tracking+set}" = set; then
2968
+if test "${enable_dependency_tracking+set}" = set; then :
2969
enableval=$enable_dependency_tracking;
2970
fi
2971
2972
@@ -3841,9 +3966,9 @@
2973
2974
depcc="$CC" am_compiler_list=
2975
2976
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
2977
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
2978
$as_echo_n "checking dependency style of $depcc... " >&6; }
2979
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
2980
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
2981
$as_echo_n "(cached) " >&6
2982
else
2983
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
2984
@@ -3951,7 +4076,7 @@
2985
fi
2986
2987
fi
2988
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
2989
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
2990
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
2991
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
2992
2993
@@ -3968,9 +4093,9 @@
2994
2995
depcc="$CC" am_compiler_list=
2996
2997
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
2998
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
2999
$as_echo_n "checking dependency style of $depcc... " >&6; }
3000
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
3001
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
3002
$as_echo_n "(cached) " >&6
3003
else
3004
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
3005
@@ -4078,7 +4203,7 @@
3006
fi
3007
3008
fi
3009
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
3010
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
3011
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
3012
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
3013
3014
@@ -4094,22 +4219,18 @@
3015
3016
3017
if test "x$CC" != xcc; then
3018
- { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
3019
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
3020
$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
3021
else
3022
- { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
3023
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
3024
$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
3025
fi
3026
set dummy $CC; ac_cc=`$as_echo "$2" |
3027
sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
3028
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
3029
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
3030
$as_echo_n "(cached) " >&6
3031
else
3032
- cat >conftest.$ac_ext <<_ACEOF
3033
-/* confdefs.h. */
3034
-_ACEOF
3035
-cat confdefs.h >>conftest.$ac_ext
3036
-cat >>conftest.$ac_ext <<_ACEOF
3037
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3038
/* end confdefs.h. */
3039
3040
int
3041
@@ -4125,63 +4246,63 @@
3042
# existing .o file with -o, though they will create one.
3043
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
3044
rm -f conftest2.*
3045
-if { (case "(($ac_try" in
3046
+if { { case "(($ac_try" in
3047
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3048
*) ac_try_echo=$ac_try;;
3049
esac
3050
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3051
-$as_echo "$ac_try_echo") >&5
3052
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3053
+$as_echo "$ac_try_echo"; } >&5
3054
(eval "$ac_try") 2>&5
3055
ac_status=$?
3056
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3057
- (exit $ac_status); } &&
3058
- test -f conftest2.$ac_objext && { (case "(($ac_try" in
3059
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3060
+ test $ac_status = 0; } &&
3061
+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
3062
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3063
*) ac_try_echo=$ac_try;;
3064
esac
3065
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3066
-$as_echo "$ac_try_echo") >&5
3067
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3068
+$as_echo "$ac_try_echo"; } >&5
3069
(eval "$ac_try") 2>&5
3070
ac_status=$?
3071
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3072
- (exit $ac_status); };
3073
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3074
+ test $ac_status = 0; };
3075
then
3076
eval ac_cv_prog_cc_${ac_cc}_c_o=yes
3077
if test "x$CC" != xcc; then
3078
# Test first that cc exists at all.
3079
if { ac_try='cc -c conftest.$ac_ext >&5'
3080
- { (case "(($ac_try" in
3081
+ { { case "(($ac_try" in
3082
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3083
*) ac_try_echo=$ac_try;;
3084
esac
3085
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3086
-$as_echo "$ac_try_echo") >&5
3087
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3088
+$as_echo "$ac_try_echo"; } >&5
3089
(eval "$ac_try") 2>&5
3090
ac_status=$?
3091
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3092
- (exit $ac_status); }; }; then
3093
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3094
+ test $ac_status = 0; }; }; then
3095
ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
3096
rm -f conftest2.*
3097
- if { (case "(($ac_try" in
3098
+ if { { case "(($ac_try" in
3099
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3100
*) ac_try_echo=$ac_try;;
3101
esac
3102
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3103
-$as_echo "$ac_try_echo") >&5
3104
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3105
+$as_echo "$ac_try_echo"; } >&5
3106
(eval "$ac_try") 2>&5
3107
ac_status=$?
3108
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3109
- (exit $ac_status); } &&
3110
- test -f conftest2.$ac_objext && { (case "(($ac_try" in
3111
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3112
+ test $ac_status = 0; } &&
3113
+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
3114
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3115
*) ac_try_echo=$ac_try;;
3116
esac
3117
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3118
-$as_echo "$ac_try_echo") >&5
3119
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3120
+$as_echo "$ac_try_echo"; } >&5
3121
(eval "$ac_try") 2>&5
3122
ac_status=$?
3123
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3124
- (exit $ac_status); };
3125
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3126
+ test $ac_status = 0; };
3127
then
3128
# cc works too.
3129
:
3130
@@ -4198,15 +4319,13 @@
3131
3132
fi
3133
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
3134
- { $as_echo "$as_me:$LINENO: result: yes" >&5
3135
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3136
$as_echo "yes" >&6; }
3137
else
3138
- { $as_echo "$as_me:$LINENO: result: no" >&5
3139
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3140
$as_echo "no" >&6; }
3141
3142
-cat >>confdefs.h <<\_ACEOF
3143
-#define NO_MINUS_C_MINUS_O 1
3144
-_ACEOF
3145
+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
3146
3147
fi
3148
3149
@@ -4226,102 +4345,10 @@
3150
3151
3152
3153
-# Find a good install program. We prefer a C program (faster),
3154
-# so one script is as good as another. But avoid the broken or
3155
-# incompatible versions:
3156
-# SysV /etc/install, /usr/sbin/install
3157
-# SunOS /usr/etc/install
3158
-# IRIX /sbin/install
3159
-# AIX /bin/install
3160
-# AmigaOS /C/install, which installs bootblocks on floppy discs
3161
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
3162
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
3163
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
3164
-# OS/2's system install, which has a completely different semantic
3165
-# ./install, which can be erroneously created by make from ./install.sh.
3166
-# Reject install programs that cannot install multiple files.
3167
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
3168
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
3169
-if test -z "$INSTALL"; then
3170
-if test "${ac_cv_path_install+set}" = set; then
3171
- $as_echo_n "(cached) " >&6
3172
-else
3173
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3174
-for as_dir in $PATH
3175
-do
3176
- IFS=$as_save_IFS
3177
- test -z "$as_dir" && as_dir=.
3178
- # Account for people who put trailing slashes in PATH elements.
3179
-case $as_dir/ in
3180
- ./ | .// | /cC/* | \
3181
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
3182
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
3183
- /usr/ucb/* ) ;;
3184
- *)
3185
- # OSF1 and SCO ODT 3.0 have their own names for install.
3186
- # Don't use installbsd from OSF since it installs stuff as root
3187
- # by default.
3188
- for ac_prog in ginstall scoinst install; do
3189
- for ac_exec_ext in '' $ac_executable_extensions; do
3190
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
3191
- if test $ac_prog = install &&
3192
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
3193
- # AIX install. It has an incompatible calling convention.
3194
- :
3195
- elif test $ac_prog = install &&
3196
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
3197
- # program-specific install script used by HP pwplus--don't use.
3198
- :
3199
- else
3200
- rm -rf conftest.one conftest.two conftest.dir
3201
- echo one > conftest.one
3202
- echo two > conftest.two
3203
- mkdir conftest.dir
3204
- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
3205
- test -s conftest.one && test -s conftest.two &&
3206
- test -s conftest.dir/conftest.one &&
3207
- test -s conftest.dir/conftest.two
3208
- then
3209
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
3210
- break 3
3211
- fi
3212
- fi
3213
- fi
3214
- done
3215
- done
3216
- ;;
3217
-esac
3218
-
3219
-done
3220
-IFS=$as_save_IFS
3221
-
3222
-rm -rf conftest.one conftest.two conftest.dir
3223
-
3224
-fi
3225
- if test "${ac_cv_path_install+set}" = set; then
3226
- INSTALL=$ac_cv_path_install
3227
- else
3228
- # As a last resort, use the slow shell script. Don't cache a
3229
- # value for INSTALL within a source directory, because that will
3230
- # break other packages using the cache if that directory is
3231
- # removed, or if the value is a relative name.
3232
- INSTALL=$ac_install_sh
3233
- fi
3234
-fi
3235
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
3236
-$as_echo "$INSTALL" >&6; }
3237
-
3238
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
3239
-# It thinks the first close brace ends the variable substitution.
3240
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
3241
-
3242
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
3243
-
3244
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
3245
3246
case `pwd` in
3247
*\ * | *\ *)
3248
- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
3249
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
3250
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
3251
esac
3252
3253
@@ -4346,35 +4373,27 @@
3254
3255
# Make sure we can run config.sub.
3256
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
3257
- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
3258
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
3259
- { (exit 1); exit 1; }; }
3260
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
3261
3262
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
3263
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
3264
$as_echo_n "checking build system type... " >&6; }
3265
-if test "${ac_cv_build+set}" = set; then
3266
+if test "${ac_cv_build+set}" = set; then :
3267
$as_echo_n "(cached) " >&6
3268
else
3269
ac_build_alias=$build_alias
3270
test "x$ac_build_alias" = x &&
3271
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
3272
test "x$ac_build_alias" = x &&
3273
- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
3274
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
3275
- { (exit 1); exit 1; }; }
3276
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
3277
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
3278
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
3279
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
3280
- { (exit 1); exit 1; }; }
3281
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
3282
3283
fi
3284
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
3285
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
3286
$as_echo "$ac_cv_build" >&6; }
3287
case $ac_cv_build in
3288
*-*-*) ;;
3289
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
3290
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
3291
- { (exit 1); exit 1; }; };;
3292
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
3293
esac
3294
build=$ac_cv_build
3295
ac_save_IFS=$IFS; IFS='-'
3296
@@ -4390,28 +4409,24 @@
3297
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
3298
3299
3300
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
3301
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
3302
$as_echo_n "checking host system type... " >&6; }
3303
-if test "${ac_cv_host+set}" = set; then
3304
+if test "${ac_cv_host+set}" = set; then :
3305
$as_echo_n "(cached) " >&6
3306
else
3307
if test "x$host_alias" = x; then
3308
ac_cv_host=$ac_cv_build
3309
else
3310
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
3311
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
3312
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
3313
- { (exit 1); exit 1; }; }
3314
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
3315
fi
3316
3317
fi
3318
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
3319
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
3320
$as_echo "$ac_cv_host" >&6; }
3321
case $ac_cv_host in
3322
*-*-*) ;;
3323
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
3324
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
3325
- { (exit 1); exit 1; }; };;
3326
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
3327
esac
3328
host=$ac_cv_host
3329
ac_save_IFS=$IFS; IFS='-'
3330
@@ -4427,9 +4442,9 @@
3331
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
3332
3333
3334
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
3335
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
3336
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
3337
-if test "${ac_cv_path_SED+set}" = set; then
3338
+if test "${ac_cv_path_SED+set}" = set; then :
3339
$as_echo_n "(cached) " >&6
3340
else
3341
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
3342
@@ -4437,7 +4452,7 @@
3343
ac_script="$ac_script$as_nl$ac_script"
3344
done
3345
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
3346
- $as_unset ac_script || ac_script=
3347
+ { ac_script=; unset ac_script;}
3348
if test -z "$SED"; then
3349
ac_path_SED_found=false
3350
# Loop through the user's path and test for each of PROGNAME-LIST
3351
@@ -4446,7 +4461,7 @@
3352
do
3353
IFS=$as_save_IFS
3354
test -z "$as_dir" && as_dir=.
3355
- for ac_prog in sed gsed; do
3356
+ for ac_prog in sed gsed; do
3357
for ac_exec_ext in '' $ac_executable_extensions; do
3358
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
3359
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
3360
@@ -4466,7 +4481,7 @@
3361
$as_echo '' >> "conftest.nl"
3362
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
3363
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
3364
- ac_count=`expr $ac_count + 1`
3365
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
3366
if test $ac_count -gt ${ac_path_SED_max-0}; then
3367
# Best one so far, save it but keep looking for a better one
3368
ac_cv_path_SED="$ac_path_SED"
3369
@@ -4481,19 +4496,17 @@
3370
$ac_path_SED_found && break 3
3371
done
3372
done
3373
-done
3374
+ done
3375
IFS=$as_save_IFS
3376
if test -z "$ac_cv_path_SED"; then
3377
- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
3378
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
3379
- { (exit 1); exit 1; }; }
3380
+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
3381
fi
3382
else
3383
ac_cv_path_SED=$SED
3384
fi
3385
3386
fi
3387
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
3388
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
3389
$as_echo "$ac_cv_path_SED" >&6; }
3390
SED="$ac_cv_path_SED"
3391
rm -f conftest.sed
3392
@@ -4511,9 +4524,9 @@
3393
3394
3395
3396
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
3397
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
3398
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
3399
-if test "${ac_cv_path_GREP+set}" = set; then
3400
+if test "${ac_cv_path_GREP+set}" = set; then :
3401
$as_echo_n "(cached) " >&6
3402
else
3403
if test -z "$GREP"; then
3404
@@ -4524,7 +4537,7 @@
3405
do
3406
IFS=$as_save_IFS
3407
test -z "$as_dir" && as_dir=.
3408
- for ac_prog in grep ggrep; do
3409
+ for ac_prog in grep ggrep; do
3410
for ac_exec_ext in '' $ac_executable_extensions; do
3411
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
3412
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
3413
@@ -4544,7 +4557,7 @@
3414
$as_echo 'GREP' >> "conftest.nl"
3415
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
3416
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
3417
- ac_count=`expr $ac_count + 1`
3418
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
3419
if test $ac_count -gt ${ac_path_GREP_max-0}; then
3420
# Best one so far, save it but keep looking for a better one
3421
ac_cv_path_GREP="$ac_path_GREP"
3422
@@ -4559,26 +4572,24 @@
3423
$ac_path_GREP_found && break 3
3424
done
3425
done
3426
-done
3427
+ done
3428
IFS=$as_save_IFS
3429
if test -z "$ac_cv_path_GREP"; then
3430
- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
3431
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
3432
- { (exit 1); exit 1; }; }
3433
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
3434
fi
3435
else
3436
ac_cv_path_GREP=$GREP
3437
fi
3438
3439
fi
3440
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
3441
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
3442
$as_echo "$ac_cv_path_GREP" >&6; }
3443
GREP="$ac_cv_path_GREP"
3444
3445
3446
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
3447
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
3448
$as_echo_n "checking for egrep... " >&6; }
3449
-if test "${ac_cv_path_EGREP+set}" = set; then
3450
+if test "${ac_cv_path_EGREP+set}" = set; then :
3451
$as_echo_n "(cached) " >&6
3452
else
3453
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
3454
@@ -4592,7 +4603,7 @@
3455
do
3456
IFS=$as_save_IFS
3457
test -z "$as_dir" && as_dir=.
3458
- for ac_prog in egrep; do
3459
+ for ac_prog in egrep; do
3460
for ac_exec_ext in '' $ac_executable_extensions; do
3461
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
3462
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
3463
@@ -4612,7 +4623,7 @@
3464
$as_echo 'EGREP' >> "conftest.nl"
3465
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
3466
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
3467
- ac_count=`expr $ac_count + 1`
3468
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
3469
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
3470
# Best one so far, save it but keep looking for a better one
3471
ac_cv_path_EGREP="$ac_path_EGREP"
3472
@@ -4627,12 +4638,10 @@
3473
$ac_path_EGREP_found && break 3
3474
done
3475
done
3476
-done
3477
+ done
3478
IFS=$as_save_IFS
3479
if test -z "$ac_cv_path_EGREP"; then
3480
- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
3481
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
3482
- { (exit 1); exit 1; }; }
3483
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
3484
fi
3485
else
3486
ac_cv_path_EGREP=$EGREP
3487
@@ -4640,14 +4649,14 @@
3488
3489
fi
3490
fi
3491
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
3492
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
3493
$as_echo "$ac_cv_path_EGREP" >&6; }
3494
EGREP="$ac_cv_path_EGREP"
3495
3496
3497
-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
3498
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
3499
$as_echo_n "checking for fgrep... " >&6; }
3500
-if test "${ac_cv_path_FGREP+set}" = set; then
3501
+if test "${ac_cv_path_FGREP+set}" = set; then :
3502
$as_echo_n "(cached) " >&6
3503
else
3504
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
3505
@@ -4661,7 +4670,7 @@
3506
do
3507
IFS=$as_save_IFS
3508
test -z "$as_dir" && as_dir=.
3509
- for ac_prog in fgrep; do
3510
+ for ac_prog in fgrep; do
3511
for ac_exec_ext in '' $ac_executable_extensions; do
3512
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
3513
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
3514
@@ -4681,7 +4690,7 @@
3515
$as_echo 'FGREP' >> "conftest.nl"
3516
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
3517
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
3518
- ac_count=`expr $ac_count + 1`
3519
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
3520
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
3521
# Best one so far, save it but keep looking for a better one
3522
ac_cv_path_FGREP="$ac_path_FGREP"
3523
@@ -4696,12 +4705,10 @@
3524
$ac_path_FGREP_found && break 3
3525
done
3526
done
3527
-done
3528
+ done
3529
IFS=$as_save_IFS
3530
if test -z "$ac_cv_path_FGREP"; then
3531
- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
3532
-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
3533
- { (exit 1); exit 1; }; }
3534
+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
3535
fi
3536
else
3537
ac_cv_path_FGREP=$FGREP
3538
@@ -4709,7 +4716,7 @@
3539
3540
fi
3541
fi
3542
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
3543
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
3544
$as_echo "$ac_cv_path_FGREP" >&6; }
3545
FGREP="$ac_cv_path_FGREP"
3546
3547
@@ -4735,7 +4742,7 @@
3548
3549
3550
# Check whether --with-gnu-ld was given.
3551
-if test "${with_gnu_ld+set}" = set; then
3552
+if test "${with_gnu_ld+set}" = set; then :
3553
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
3554
else
3555
with_gnu_ld=no
3556
@@ -4744,7 +4751,7 @@
3557
ac_prog=ld
3558
if test "$GCC" = yes; then
3559
# Check if gcc -print-prog-name=ld gives a path.
3560
- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
3561
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
3562
$as_echo_n "checking for ld used by $CC... " >&6; }
3563
case $host in
3564
*-*-mingw*)
3565
@@ -4774,13 +4781,13 @@
3566
;;
3567
esac
3568
elif test "$with_gnu_ld" = yes; then
3569
- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
3570
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
3571
$as_echo_n "checking for GNU ld... " >&6; }
3572
else
3573
- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
3574
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
3575
$as_echo_n "checking for non-GNU ld... " >&6; }
3576
fi
3577
-if test "${lt_cv_path_LD+set}" = set; then
3578
+if test "${lt_cv_path_LD+set}" = set; then :
3579
$as_echo_n "(cached) " >&6
3580
else
3581
if test -z "$LD"; then
3582
@@ -4811,18 +4818,16 @@
3583
3584
LD="$lt_cv_path_LD"
3585
if test -n "$LD"; then
3586
- { $as_echo "$as_me:$LINENO: result: $LD" >&5
3587
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
3588
$as_echo "$LD" >&6; }
3589
else
3590
- { $as_echo "$as_me:$LINENO: result: no" >&5
3591
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3592
$as_echo "no" >&6; }
3593
fi
3594
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
3595
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
3596
- { (exit 1); exit 1; }; }
3597
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
3598
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
3599
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
3600
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
3601
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
3602
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
3603
$as_echo_n "(cached) " >&6
3604
else
3605
# I'd rather use --version here, but apparently some GNU lds only accept -v.
3606
@@ -4835,7 +4840,7 @@
3607
;;
3608
esac
3609
fi
3610
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
3611
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
3612
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
3613
with_gnu_ld=$lt_cv_prog_gnu_ld
3614
3615
@@ -4847,9 +4852,9 @@
3616
3617
3618
3619
-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
3620
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
3621
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
3622
-if test "${lt_cv_path_NM+set}" = set; then
3623
+if test "${lt_cv_path_NM+set}" = set; then :
3624
$as_echo_n "(cached) " >&6
3625
else
3626
if test -n "$NM"; then
3627
@@ -4896,7 +4901,7 @@
3628
: ${lt_cv_path_NM=no}
3629
fi
3630
fi
3631
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
3632
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
3633
$as_echo "$lt_cv_path_NM" >&6; }
3634
if test "$lt_cv_path_NM" != "no"; then
3635
NM="$lt_cv_path_NM"
3636
@@ -4907,9 +4912,9 @@
3637
do
3638
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3639
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3640
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3641
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3642
$as_echo_n "checking for $ac_word... " >&6; }
3643
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then
3644
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
3645
$as_echo_n "(cached) " >&6
3646
else
3647
if test -n "$DUMPBIN"; then
3648
@@ -4920,24 +4925,24 @@
3649
do
3650
IFS=$as_save_IFS
3651
test -z "$as_dir" && as_dir=.
3652
- for ac_exec_ext in '' $ac_executable_extensions; do
3653
+ for ac_exec_ext in '' $ac_executable_extensions; do
3654
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3655
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
3656
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3657
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3658
break 2
3659
fi
3660
done
3661
-done
3662
+ done
3663
IFS=$as_save_IFS
3664
3665
fi
3666
fi
3667
DUMPBIN=$ac_cv_prog_DUMPBIN
3668
if test -n "$DUMPBIN"; then
3669
- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
3670
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
3671
$as_echo "$DUMPBIN" >&6; }
3672
else
3673
- { $as_echo "$as_me:$LINENO: result: no" >&5
3674
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3675
$as_echo "no" >&6; }
3676
fi
3677
3678
@@ -4951,9 +4956,9 @@
3679
do
3680
# Extract the first word of "$ac_prog", so it can be a program name with args.
3681
set dummy $ac_prog; ac_word=$2
3682
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3683
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3684
$as_echo_n "checking for $ac_word... " >&6; }
3685
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
3686
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
3687
$as_echo_n "(cached) " >&6
3688
else
3689
if test -n "$ac_ct_DUMPBIN"; then
3690
@@ -4964,24 +4969,24 @@
3691
do
3692
IFS=$as_save_IFS
3693
test -z "$as_dir" && as_dir=.
3694
- for ac_exec_ext in '' $ac_executable_extensions; do
3695
+ for ac_exec_ext in '' $ac_executable_extensions; do
3696
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3697
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
3698
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3699
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3700
break 2
3701
fi
3702
done
3703
-done
3704
+ done
3705
IFS=$as_save_IFS
3706
3707
fi
3708
fi
3709
ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
3710
if test -n "$ac_ct_DUMPBIN"; then
3711
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
3712
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
3713
$as_echo "$ac_ct_DUMPBIN" >&6; }
3714
else
3715
- { $as_echo "$as_me:$LINENO: result: no" >&5
3716
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3717
$as_echo "no" >&6; }
3718
fi
3719
3720
@@ -4994,7 +4999,7 @@
3721
else
3722
case $cross_compiling:$ac_tool_warned in
3723
yes:)
3724
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3725
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3726
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3727
ac_tool_warned=yes ;;
3728
esac
3729
@@ -5014,44 +5019,44 @@
3730
3731
3732
3733
-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
3734
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
3735
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
3736
-if test "${lt_cv_nm_interface+set}" = set; then
3737
+if test "${lt_cv_nm_interface+set}" = set; then :
3738
$as_echo_n "(cached) " >&6
3739
else
3740
lt_cv_nm_interface="BSD nm"
3741
echo "int some_variable = 0;" > conftest.$ac_ext
3742
- (eval echo "\"\$as_me:5024: $ac_compile\"" >&5)
3743
+ (eval echo "\"\$as_me:5029: $ac_compile\"" >&5)
3744
(eval "$ac_compile" 2>conftest.err)
3745
cat conftest.err >&5
3746
- (eval echo "\"\$as_me:5027: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
3747
+ (eval echo "\"\$as_me:5032: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
3748
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
3749
cat conftest.err >&5
3750
- (eval echo "\"\$as_me:5030: output\"" >&5)
3751
+ (eval echo "\"\$as_me:5035: output\"" >&5)
3752
cat conftest.out >&5
3753
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
3754
lt_cv_nm_interface="MS dumpbin"
3755
fi
3756
rm -f conftest*
3757
fi
3758
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
3759
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
3760
$as_echo "$lt_cv_nm_interface" >&6; }
3761
3762
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
3763
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
3764
$as_echo_n "checking whether ln -s works... " >&6; }
3765
LN_S=$as_ln_s
3766
if test "$LN_S" = "ln -s"; then
3767
- { $as_echo "$as_me:$LINENO: result: yes" >&5
3768
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3769
$as_echo "yes" >&6; }
3770
else
3771
- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
3772
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
3773
$as_echo "no, using $LN_S" >&6; }
3774
fi
3775
3776
# find the maximum length of command line arguments
3777
-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
3778
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
3779
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
3780
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
3781
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
3782
$as_echo_n "(cached) " >&6
3783
else
3784
i=0
3785
@@ -5169,10 +5174,10 @@
3786
fi
3787
3788
if test -n $lt_cv_sys_max_cmd_len ; then
3789
- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
3790
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
3791
$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
3792
else
3793
- { $as_echo "$as_me:$LINENO: result: none" >&5
3794
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
3795
$as_echo "none" >&6; }
3796
fi
3797
max_cmd_len=$lt_cv_sys_max_cmd_len
3798
@@ -5186,7 +5191,7 @@
3799
: ${MV="mv -f"}
3800
: ${RM="rm -f"}
3801
3802
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
3803
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
3804
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
3805
# Try some XSI features
3806
xsi_shell=no
3807
@@ -5196,17 +5201,17 @@
3808
&& eval 'test $(( 1 + 1 )) -eq 2 \
3809
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3810
&& xsi_shell=yes
3811
-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
3812
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
3813
$as_echo "$xsi_shell" >&6; }
3814
3815
3816
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
3817
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
3818
$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
3819
lt_shell_append=no
3820
( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
3821
>/dev/null 2>&1 \
3822
&& lt_shell_append=yes
3823
-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
3824
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
3825
$as_echo "$lt_shell_append" >&6; }
3826
3827
3828
@@ -5241,14 +5246,14 @@
3829
3830
3831
3832
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
3833
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
3834
$as_echo_n "checking for $LD option to reload object files... " >&6; }
3835
-if test "${lt_cv_ld_reload_flag+set}" = set; then
3836
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
3837
$as_echo_n "(cached) " >&6
3838
else
3839
lt_cv_ld_reload_flag='-r'
3840
fi
3841
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
3842
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
3843
$as_echo "$lt_cv_ld_reload_flag" >&6; }
3844
reload_flag=$lt_cv_ld_reload_flag
3845
case $reload_flag in
3846
@@ -5277,9 +5282,9 @@
3847
if test -n "$ac_tool_prefix"; then
3848
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
3849
set dummy ${ac_tool_prefix}objdump; ac_word=$2
3850
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3851
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3852
$as_echo_n "checking for $ac_word... " >&6; }
3853
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
3854
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
3855
$as_echo_n "(cached) " >&6
3856
else
3857
if test -n "$OBJDUMP"; then
3858
@@ -5290,24 +5295,24 @@
3859
do
3860
IFS=$as_save_IFS
3861
test -z "$as_dir" && as_dir=.
3862
- for ac_exec_ext in '' $ac_executable_extensions; do
3863
+ for ac_exec_ext in '' $ac_executable_extensions; do
3864
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3865
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
3866
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3867
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3868
break 2
3869
fi
3870
done
3871
-done
3872
+ done
3873
IFS=$as_save_IFS
3874
3875
fi
3876
fi
3877
OBJDUMP=$ac_cv_prog_OBJDUMP
3878
if test -n "$OBJDUMP"; then
3879
- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
3880
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
3881
$as_echo "$OBJDUMP" >&6; }
3882
else
3883
- { $as_echo "$as_me:$LINENO: result: no" >&5
3884
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3885
$as_echo "no" >&6; }
3886
fi
3887
3888
@@ -5317,9 +5322,9 @@
3889
ac_ct_OBJDUMP=$OBJDUMP
3890
# Extract the first word of "objdump", so it can be a program name with args.
3891
set dummy objdump; ac_word=$2
3892
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3893
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3894
$as_echo_n "checking for $ac_word... " >&6; }
3895
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
3896
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
3897
$as_echo_n "(cached) " >&6
3898
else
3899
if test -n "$ac_ct_OBJDUMP"; then
3900
@@ -5330,24 +5335,24 @@
3901
do
3902
IFS=$as_save_IFS
3903
test -z "$as_dir" && as_dir=.
3904
- for ac_exec_ext in '' $ac_executable_extensions; do
3905
+ for ac_exec_ext in '' $ac_executable_extensions; do
3906
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3907
ac_cv_prog_ac_ct_OBJDUMP="objdump"
3908
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3909
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3910
break 2
3911
fi
3912
done
3913
-done
3914
+ done
3915
IFS=$as_save_IFS
3916
3917
fi
3918
fi
3919
ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
3920
if test -n "$ac_ct_OBJDUMP"; then
3921
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
3922
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
3923
$as_echo "$ac_ct_OBJDUMP" >&6; }
3924
else
3925
- { $as_echo "$as_me:$LINENO: result: no" >&5
3926
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3927
$as_echo "no" >&6; }
3928
fi
3929
3930
@@ -5356,7 +5361,7 @@
3931
else
3932
case $cross_compiling:$ac_tool_warned in
3933
yes:)
3934
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3935
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3936
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3937
ac_tool_warned=yes ;;
3938
esac
3939
@@ -5376,9 +5381,9 @@
3940
3941
3942
3943
-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
3944
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
3945
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
3946
-if test "${lt_cv_deplibs_check_method+set}" = set; then
3947
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
3948
$as_echo_n "(cached) " >&6
3949
else
3950
lt_cv_file_magic_cmd='$MAGIC_CMD'
3951
@@ -5572,7 +5577,7 @@
3952
esac
3953
3954
fi
3955
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
3956
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
3957
$as_echo "$lt_cv_deplibs_check_method" >&6; }
3958
file_magic_cmd=$lt_cv_file_magic_cmd
3959
deplibs_check_method=$lt_cv_deplibs_check_method
3960
@@ -5592,9 +5597,9 @@
3961
if test -n "$ac_tool_prefix"; then
3962
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
3963
set dummy ${ac_tool_prefix}ar; ac_word=$2
3964
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3965
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3966
$as_echo_n "checking for $ac_word... " >&6; }
3967
-if test "${ac_cv_prog_AR+set}" = set; then
3968
+if test "${ac_cv_prog_AR+set}" = set; then :
3969
$as_echo_n "(cached) " >&6
3970
else
3971
if test -n "$AR"; then
3972
@@ -5605,24 +5610,24 @@
3973
do
3974
IFS=$as_save_IFS
3975
test -z "$as_dir" && as_dir=.
3976
- for ac_exec_ext in '' $ac_executable_extensions; do
3977
+ for ac_exec_ext in '' $ac_executable_extensions; do
3978
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3979
ac_cv_prog_AR="${ac_tool_prefix}ar"
3980
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3981
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3982
break 2
3983
fi
3984
done
3985
-done
3986
+ done
3987
IFS=$as_save_IFS
3988
3989
fi
3990
fi
3991
AR=$ac_cv_prog_AR
3992
if test -n "$AR"; then
3993
- { $as_echo "$as_me:$LINENO: result: $AR" >&5
3994
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
3995
$as_echo "$AR" >&6; }
3996
else
3997
- { $as_echo "$as_me:$LINENO: result: no" >&5
3998
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3999
$as_echo "no" >&6; }
4000
fi
4001
4002
@@ -5632,9 +5637,9 @@
4003
ac_ct_AR=$AR
4004
# Extract the first word of "ar", so it can be a program name with args.
4005
set dummy ar; ac_word=$2
4006
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4007
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4008
$as_echo_n "checking for $ac_word... " >&6; }
4009
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
4010
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
4011
$as_echo_n "(cached) " >&6
4012
else
4013
if test -n "$ac_ct_AR"; then
4014
@@ -5645,24 +5650,24 @@
4015
do
4016
IFS=$as_save_IFS
4017
test -z "$as_dir" && as_dir=.
4018
- for ac_exec_ext in '' $ac_executable_extensions; do
4019
+ for ac_exec_ext in '' $ac_executable_extensions; do
4020
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4021
ac_cv_prog_ac_ct_AR="ar"
4022
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4023
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4024
break 2
4025
fi
4026
done
4027
-done
4028
+ done
4029
IFS=$as_save_IFS
4030
4031
fi
4032
fi
4033
ac_ct_AR=$ac_cv_prog_ac_ct_AR
4034
if test -n "$ac_ct_AR"; then
4035
- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
4036
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
4037
$as_echo "$ac_ct_AR" >&6; }
4038
else
4039
- { $as_echo "$as_me:$LINENO: result: no" >&5
4040
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4041
$as_echo "no" >&6; }
4042
fi
4043
4044
@@ -5671,7 +5676,7 @@
4045
else
4046
case $cross_compiling:$ac_tool_warned in
4047
yes:)
4048
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4049
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4050
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4051
ac_tool_warned=yes ;;
4052
esac
4053
@@ -5697,9 +5702,9 @@
4054
if test -n "$ac_tool_prefix"; then
4055
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4056
set dummy ${ac_tool_prefix}strip; ac_word=$2
4057
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4058
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4059
$as_echo_n "checking for $ac_word... " >&6; }
4060
-if test "${ac_cv_prog_STRIP+set}" = set; then
4061
+if test "${ac_cv_prog_STRIP+set}" = set; then :
4062
$as_echo_n "(cached) " >&6
4063
else
4064
if test -n "$STRIP"; then
4065
@@ -5710,24 +5715,24 @@
4066
do
4067
IFS=$as_save_IFS
4068
test -z "$as_dir" && as_dir=.
4069
- for ac_exec_ext in '' $ac_executable_extensions; do
4070
+ for ac_exec_ext in '' $ac_executable_extensions; do
4071
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4072
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
4073
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4074
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4075
break 2
4076
fi
4077
done
4078
-done
4079
+ done
4080
IFS=$as_save_IFS
4081
4082
fi
4083
fi
4084
STRIP=$ac_cv_prog_STRIP
4085
if test -n "$STRIP"; then
4086
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
4087
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
4088
$as_echo "$STRIP" >&6; }
4089
else
4090
- { $as_echo "$as_me:$LINENO: result: no" >&5
4091
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4092
$as_echo "no" >&6; }
4093
fi
4094
4095
@@ -5737,9 +5742,9 @@
4096
ac_ct_STRIP=$STRIP
4097
# Extract the first word of "strip", so it can be a program name with args.
4098
set dummy strip; ac_word=$2
4099
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4100
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4101
$as_echo_n "checking for $ac_word... " >&6; }
4102
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
4103
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
4104
$as_echo_n "(cached) " >&6
4105
else
4106
if test -n "$ac_ct_STRIP"; then
4107
@@ -5750,24 +5755,24 @@
4108
do
4109
IFS=$as_save_IFS
4110
test -z "$as_dir" && as_dir=.
4111
- for ac_exec_ext in '' $ac_executable_extensions; do
4112
+ for ac_exec_ext in '' $ac_executable_extensions; do
4113
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4114
ac_cv_prog_ac_ct_STRIP="strip"
4115
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4116
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4117
break 2
4118
fi
4119
done
4120
-done
4121
+ done
4122
IFS=$as_save_IFS
4123
4124
fi
4125
fi
4126
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
4127
if test -n "$ac_ct_STRIP"; then
4128
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
4129
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
4130
$as_echo "$ac_ct_STRIP" >&6; }
4131
else
4132
- { $as_echo "$as_me:$LINENO: result: no" >&5
4133
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4134
$as_echo "no" >&6; }
4135
fi
4136
4137
@@ -5776,7 +5781,7 @@
4138
else
4139
case $cross_compiling:$ac_tool_warned in
4140
yes:)
4141
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4142
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4143
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4144
ac_tool_warned=yes ;;
4145
esac
4146
@@ -5796,9 +5801,9 @@
4147
if test -n "$ac_tool_prefix"; then
4148
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
4149
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
4150
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4151
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4152
$as_echo_n "checking for $ac_word... " >&6; }
4153
-if test "${ac_cv_prog_RANLIB+set}" = set; then
4154
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
4155
$as_echo_n "(cached) " >&6
4156
else
4157
if test -n "$RANLIB"; then
4158
@@ -5809,24 +5814,24 @@
4159
do
4160
IFS=$as_save_IFS
4161
test -z "$as_dir" && as_dir=.
4162
- for ac_exec_ext in '' $ac_executable_extensions; do
4163
+ for ac_exec_ext in '' $ac_executable_extensions; do
4164
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4165
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
4166
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4167
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4168
break 2
4169
fi
4170
done
4171
-done
4172
+ done
4173
IFS=$as_save_IFS
4174
4175
fi
4176
fi
4177
RANLIB=$ac_cv_prog_RANLIB
4178
if test -n "$RANLIB"; then
4179
- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
4180
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
4181
$as_echo "$RANLIB" >&6; }
4182
else
4183
- { $as_echo "$as_me:$LINENO: result: no" >&5
4184
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4185
$as_echo "no" >&6; }
4186
fi
4187
4188
@@ -5836,9 +5841,9 @@
4189
ac_ct_RANLIB=$RANLIB
4190
# Extract the first word of "ranlib", so it can be a program name with args.
4191
set dummy ranlib; ac_word=$2
4192
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4193
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4194
$as_echo_n "checking for $ac_word... " >&6; }
4195
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
4196
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
4197
$as_echo_n "(cached) " >&6
4198
else
4199
if test -n "$ac_ct_RANLIB"; then
4200
@@ -5849,24 +5854,24 @@
4201
do
4202
IFS=$as_save_IFS
4203
test -z "$as_dir" && as_dir=.
4204
- for ac_exec_ext in '' $ac_executable_extensions; do
4205
+ for ac_exec_ext in '' $ac_executable_extensions; do
4206
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4207
ac_cv_prog_ac_ct_RANLIB="ranlib"
4208
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4209
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4210
break 2
4211
fi
4212
done
4213
-done
4214
+ done
4215
IFS=$as_save_IFS
4216
4217
fi
4218
fi
4219
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
4220
if test -n "$ac_ct_RANLIB"; then
4221
- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
4222
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
4223
$as_echo "$ac_ct_RANLIB" >&6; }
4224
else
4225
- { $as_echo "$as_me:$LINENO: result: no" >&5
4226
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4227
$as_echo "no" >&6; }
4228
fi
4229
4230
@@ -5875,7 +5880,7 @@
4231
else
4232
case $cross_compiling:$ac_tool_warned in
4233
yes:)
4234
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4235
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4236
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4237
ac_tool_warned=yes ;;
4238
esac
4239
@@ -5953,9 +5958,9 @@
4240
4241
4242
# Check for command to grab the raw symbol name followed by C symbol from nm.
4243
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
4244
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
4245
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
4246
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
4247
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
4248
$as_echo_n "(cached) " >&6
4249
else
4250
4251
@@ -6071,18 +6076,18 @@
4252
int main(){nm_test_var='a';nm_test_func();return(0);}
4253
_LT_EOF
4254
4255
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4256
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
4257
(eval $ac_compile) 2>&5
4258
ac_status=$?
4259
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4260
- (exit $ac_status); }; then
4261
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4262
+ test $ac_status = 0; }; then
4263
# Now try to grab the symbols.
4264
nlist=conftest.nm
4265
- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
4266
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
4267
(eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
4268
ac_status=$?
4269
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4270
- (exit $ac_status); } && test -s "$nlist"; then
4271
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4272
+ test $ac_status = 0; } && test -s "$nlist"; then
4273
# Try sorting and uniquifying the output.
4274
if sort "$nlist" | uniq > "$nlist"T; then
4275
mv -f "$nlist"T "$nlist"
4276
@@ -6135,11 +6140,11 @@
4277
lt_save_CFLAGS="$CFLAGS"
4278
LIBS="conftstm.$ac_objext"
4279
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
4280
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4281
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
4282
(eval $ac_link) 2>&5
4283
ac_status=$?
4284
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4285
- (exit $ac_status); } && test -s conftest${ac_exeext}; then
4286
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4287
+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
4288
pipe_works=yes
4289
fi
4290
LIBS="$lt_save_LIBS"
4291
@@ -6173,10 +6178,10 @@
4292
lt_cv_sys_global_symbol_to_cdecl=
4293
fi
4294
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
4295
- { $as_echo "$as_me:$LINENO: result: failed" >&5
4296
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
4297
$as_echo "failed" >&6; }
4298
else
4299
- { $as_echo "$as_me:$LINENO: result: ok" >&5
4300
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
4301
$as_echo "ok" >&6; }
4302
fi
4303
4304
@@ -6203,7 +6208,7 @@
4305
4306
4307
# Check whether --enable-libtool-lock was given.
4308
-if test "${enable_libtool_lock+set}" = set; then
4309
+if test "${enable_libtool_lock+set}" = set; then :
4310
enableval=$enable_libtool_lock;
4311
fi
4312
4313
@@ -6215,11 +6220,11 @@
4314
ia64-*-hpux*)
4315
# Find out which ABI we are using.
4316
echo 'int i;' > conftest.$ac_ext
4317
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4318
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
4319
(eval $ac_compile) 2>&5
4320
ac_status=$?
4321
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4322
- (exit $ac_status); }; then
4323
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4324
+ test $ac_status = 0; }; then
4325
case `/usr/bin/file conftest.$ac_objext` in
4326
*ELF-32*)
4327
HPUX_IA64_MODE="32"
4328
@@ -6233,12 +6238,12 @@
4329
;;
4330
*-*-irix6*)
4331
# Find out which ABI we are using.
4332
- echo '#line 6236 "configure"' > conftest.$ac_ext
4333
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4334
+ echo '#line 6241 "configure"' > conftest.$ac_ext
4335
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
4336
(eval $ac_compile) 2>&5
4337
ac_status=$?
4338
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4339
- (exit $ac_status); }; then
4340
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4341
+ test $ac_status = 0; }; then
4342
if test "$lt_cv_prog_gnu_ld" = yes; then
4343
case `/usr/bin/file conftest.$ac_objext` in
4344
*32-bit*)
4345
@@ -6272,11 +6277,11 @@
4346
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
4347
# Find out which ABI we are using.
4348
echo 'int i;' > conftest.$ac_ext
4349
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4350
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
4351
(eval $ac_compile) 2>&5
4352
ac_status=$?
4353
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4354
- (exit $ac_status); }; then
4355
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4356
+ test $ac_status = 0; }; then
4357
case `/usr/bin/file conftest.o` in
4358
*32-bit*)
4359
case $host in
4360
@@ -6325,9 +6330,9 @@
4361
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
4362
SAVE_CFLAGS="$CFLAGS"
4363
CFLAGS="$CFLAGS -belf"
4364
- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
4365
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
4366
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
4367
-if test "${lt_cv_cc_needs_belf+set}" = set; then
4368
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
4369
$as_echo_n "(cached) " >&6
4370
else
4371
ac_ext=c
4372
@@ -6336,11 +6341,7 @@
4373
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4374
ac_compiler_gnu=$ac_cv_c_compiler_gnu
4375
4376
- cat >conftest.$ac_ext <<_ACEOF
4377
-/* confdefs.h. */
4378
-_ACEOF
4379
-cat confdefs.h >>conftest.$ac_ext
4380
-cat >>conftest.$ac_ext <<_ACEOF
4381
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4382
/* end confdefs.h. */
4383
4384
int
4385
@@ -6351,38 +6352,13 @@
4386
return 0;
4387
}
4388
_ACEOF
4389
-rm -f conftest.$ac_objext conftest$ac_exeext
4390
-if { (ac_try="$ac_link"
4391
-case "(($ac_try" in
4392
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4393
- *) ac_try_echo=$ac_try;;
4394
-esac
4395
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4396
-$as_echo "$ac_try_echo") >&5
4397
- (eval "$ac_link") 2>conftest.er1
4398
- ac_status=$?
4399
- grep -v '^ *+' conftest.er1 >conftest.err
4400
- rm -f conftest.er1
4401
- cat conftest.err >&5
4402
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4403
- (exit $ac_status); } && {
4404
- test -z "$ac_c_werror_flag" ||
4405
- test ! -s conftest.err
4406
- } && test -s conftest$ac_exeext && {
4407
- test "$cross_compiling" = yes ||
4408
- $as_test_x conftest$ac_exeext
4409
- }; then
4410
+if ac_fn_c_try_link "$LINENO"; then :
4411
lt_cv_cc_needs_belf=yes
4412
else
4413
- $as_echo "$as_me: failed program was:" >&5
4414
-sed 's/^/| /' conftest.$ac_ext >&5
4415
-
4416
- lt_cv_cc_needs_belf=no
4417
+ lt_cv_cc_needs_belf=no
4418
fi
4419
-
4420
-rm -rf conftest.dSYM
4421
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
4422
- conftest$ac_exeext conftest.$ac_ext
4423
+rm -f core conftest.err conftest.$ac_objext \
4424
+ conftest$ac_exeext conftest.$ac_ext
4425
ac_ext=c
4426
ac_cpp='$CPP $CPPFLAGS'
4427
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4428
@@ -6390,7 +6366,7 @@
4429
ac_compiler_gnu=$ac_cv_c_compiler_gnu
4430
4431
fi
4432
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
4433
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
4434
$as_echo "$lt_cv_cc_needs_belf" >&6; }
4435
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
4436
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
4437
@@ -6400,11 +6376,11 @@
4438
sparc*-*solaris*)
4439
# Find out which ABI we are using.
4440
echo 'int i;' > conftest.$ac_ext
4441
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4442
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
4443
(eval $ac_compile) 2>&5
4444
ac_status=$?
4445
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4446
- (exit $ac_status); }; then
4447
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4448
+ test $ac_status = 0; }; then
4449
case `/usr/bin/file conftest.o` in
4450
*64-bit*)
4451
case $lt_cv_prog_gnu_ld in
4452
@@ -6430,9 +6406,9 @@
4453
if test -n "$ac_tool_prefix"; then
4454
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
4455
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
4456
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4457
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4458
$as_echo_n "checking for $ac_word... " >&6; }
4459
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
4460
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
4461
$as_echo_n "(cached) " >&6
4462
else
4463
if test -n "$DSYMUTIL"; then
4464
@@ -6443,24 +6419,24 @@
4465
do
4466
IFS=$as_save_IFS
4467
test -z "$as_dir" && as_dir=.
4468
- for ac_exec_ext in '' $ac_executable_extensions; do
4469
+ for ac_exec_ext in '' $ac_executable_extensions; do
4470
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4471
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
4472
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4473
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4474
break 2
4475
fi
4476
done
4477
-done
4478
+ done
4479
IFS=$as_save_IFS
4480
4481
fi
4482
fi
4483
DSYMUTIL=$ac_cv_prog_DSYMUTIL
4484
if test -n "$DSYMUTIL"; then
4485
- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
4486
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
4487
$as_echo "$DSYMUTIL" >&6; }
4488
else
4489
- { $as_echo "$as_me:$LINENO: result: no" >&5
4490
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4491
$as_echo "no" >&6; }
4492
fi
4493
4494
@@ -6470,9 +6446,9 @@
4495
ac_ct_DSYMUTIL=$DSYMUTIL
4496
# Extract the first word of "dsymutil", so it can be a program name with args.
4497
set dummy dsymutil; ac_word=$2
4498
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4499
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4500
$as_echo_n "checking for $ac_word... " >&6; }
4501
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
4502
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
4503
$as_echo_n "(cached) " >&6
4504
else
4505
if test -n "$ac_ct_DSYMUTIL"; then
4506
@@ -6483,24 +6459,24 @@
4507
do
4508
IFS=$as_save_IFS
4509
test -z "$as_dir" && as_dir=.
4510
- for ac_exec_ext in '' $ac_executable_extensions; do
4511
+ for ac_exec_ext in '' $ac_executable_extensions; do
4512
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4513
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
4514
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4515
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4516
break 2
4517
fi
4518
done
4519
-done
4520
+ done
4521
IFS=$as_save_IFS
4522
4523
fi
4524
fi
4525
ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
4526
if test -n "$ac_ct_DSYMUTIL"; then
4527
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
4528
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
4529
$as_echo "$ac_ct_DSYMUTIL" >&6; }
4530
else
4531
- { $as_echo "$as_me:$LINENO: result: no" >&5
4532
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4533
$as_echo "no" >&6; }
4534
fi
4535
4536
@@ -6509,7 +6485,7 @@
4537
else
4538
case $cross_compiling:$ac_tool_warned in
4539
yes:)
4540
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4541
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4542
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4543
ac_tool_warned=yes ;;
4544
esac
4545
@@ -6522,9 +6498,9 @@
4546
if test -n "$ac_tool_prefix"; then
4547
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
4548
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
4549
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4550
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4551
$as_echo_n "checking for $ac_word... " >&6; }
4552
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
4553
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
4554
$as_echo_n "(cached) " >&6
4555
else
4556
if test -n "$NMEDIT"; then
4557
@@ -6535,24 +6511,24 @@
4558
do
4559
IFS=$as_save_IFS
4560
test -z "$as_dir" && as_dir=.
4561
- for ac_exec_ext in '' $ac_executable_extensions; do
4562
+ for ac_exec_ext in '' $ac_executable_extensions; do
4563
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4564
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
4565
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4566
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4567
break 2
4568
fi
4569
done
4570
-done
4571
+ done
4572
IFS=$as_save_IFS
4573
4574
fi
4575
fi
4576
NMEDIT=$ac_cv_prog_NMEDIT
4577
if test -n "$NMEDIT"; then
4578
- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
4579
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
4580
$as_echo "$NMEDIT" >&6; }
4581
else
4582
- { $as_echo "$as_me:$LINENO: result: no" >&5
4583
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4584
$as_echo "no" >&6; }
4585
fi
4586
4587
@@ -6562,9 +6538,9 @@
4588
ac_ct_NMEDIT=$NMEDIT
4589
# Extract the first word of "nmedit", so it can be a program name with args.
4590
set dummy nmedit; ac_word=$2
4591
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4592
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4593
$as_echo_n "checking for $ac_word... " >&6; }
4594
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
4595
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
4596
$as_echo_n "(cached) " >&6
4597
else
4598
if test -n "$ac_ct_NMEDIT"; then
4599
@@ -6575,24 +6551,24 @@
4600
do
4601
IFS=$as_save_IFS
4602
test -z "$as_dir" && as_dir=.
4603
- for ac_exec_ext in '' $ac_executable_extensions; do
4604
+ for ac_exec_ext in '' $ac_executable_extensions; do
4605
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4606
ac_cv_prog_ac_ct_NMEDIT="nmedit"
4607
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4608
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4609
break 2
4610
fi
4611
done
4612
-done
4613
+ done
4614
IFS=$as_save_IFS
4615
4616
fi
4617
fi
4618
ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
4619
if test -n "$ac_ct_NMEDIT"; then
4620
- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
4621
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
4622
$as_echo "$ac_ct_NMEDIT" >&6; }
4623
else
4624
- { $as_echo "$as_me:$LINENO: result: no" >&5
4625
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4626
$as_echo "no" >&6; }
4627
fi
4628
4629
@@ -6601,7 +6577,7 @@
4630
else
4631
case $cross_compiling:$ac_tool_warned in
4632
yes:)
4633
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4634
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4635
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4636
ac_tool_warned=yes ;;
4637
esac
4638
@@ -6614,9 +6590,9 @@
4639
if test -n "$ac_tool_prefix"; then
4640
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
4641
set dummy ${ac_tool_prefix}lipo; ac_word=$2
4642
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4643
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4644
$as_echo_n "checking for $ac_word... " >&6; }
4645
-if test "${ac_cv_prog_LIPO+set}" = set; then
4646
+if test "${ac_cv_prog_LIPO+set}" = set; then :
4647
$as_echo_n "(cached) " >&6
4648
else
4649
if test -n "$LIPO"; then
4650
@@ -6627,24 +6603,24 @@
4651
do
4652
IFS=$as_save_IFS
4653
test -z "$as_dir" && as_dir=.
4654
- for ac_exec_ext in '' $ac_executable_extensions; do
4655
+ for ac_exec_ext in '' $ac_executable_extensions; do
4656
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4657
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
4658
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4659
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4660
break 2
4661
fi
4662
done
4663
-done
4664
+ done
4665
IFS=$as_save_IFS
4666
4667
fi
4668
fi
4669
LIPO=$ac_cv_prog_LIPO
4670
if test -n "$LIPO"; then
4671
- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
4672
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
4673
$as_echo "$LIPO" >&6; }
4674
else
4675
- { $as_echo "$as_me:$LINENO: result: no" >&5
4676
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4677
$as_echo "no" >&6; }
4678
fi
4679
4680
@@ -6654,9 +6630,9 @@
4681
ac_ct_LIPO=$LIPO
4682
# Extract the first word of "lipo", so it can be a program name with args.
4683
set dummy lipo; ac_word=$2
4684
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4685
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4686
$as_echo_n "checking for $ac_word... " >&6; }
4687
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
4688
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
4689
$as_echo_n "(cached) " >&6
4690
else
4691
if test -n "$ac_ct_LIPO"; then
4692
@@ -6667,24 +6643,24 @@
4693
do
4694
IFS=$as_save_IFS
4695
test -z "$as_dir" && as_dir=.
4696
- for ac_exec_ext in '' $ac_executable_extensions; do
4697
+ for ac_exec_ext in '' $ac_executable_extensions; do
4698
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4699
ac_cv_prog_ac_ct_LIPO="lipo"
4700
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4701
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4702
break 2
4703
fi
4704
done
4705
-done
4706
+ done
4707
IFS=$as_save_IFS
4708
4709
fi
4710
fi
4711
ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
4712
if test -n "$ac_ct_LIPO"; then
4713
- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
4714
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
4715
$as_echo "$ac_ct_LIPO" >&6; }
4716
else
4717
- { $as_echo "$as_me:$LINENO: result: no" >&5
4718
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4719
$as_echo "no" >&6; }
4720
fi
4721
4722
@@ -6693,7 +6669,7 @@
4723
else
4724
case $cross_compiling:$ac_tool_warned in
4725
yes:)
4726
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4727
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4728
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4729
ac_tool_warned=yes ;;
4730
esac
4731
@@ -6706,9 +6682,9 @@
4732
if test -n "$ac_tool_prefix"; then
4733
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
4734
set dummy ${ac_tool_prefix}otool; ac_word=$2
4735
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4736
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4737
$as_echo_n "checking for $ac_word... " >&6; }
4738
-if test "${ac_cv_prog_OTOOL+set}" = set; then
4739
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
4740
$as_echo_n "(cached) " >&6
4741
else
4742
if test -n "$OTOOL"; then
4743
@@ -6719,24 +6695,24 @@
4744
do
4745
IFS=$as_save_IFS
4746
test -z "$as_dir" && as_dir=.
4747
- for ac_exec_ext in '' $ac_executable_extensions; do
4748
+ for ac_exec_ext in '' $ac_executable_extensions; do
4749
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4750
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
4751
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4752
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4753
break 2
4754
fi
4755
done
4756
-done
4757
+ done
4758
IFS=$as_save_IFS
4759
4760
fi
4761
fi
4762
OTOOL=$ac_cv_prog_OTOOL
4763
if test -n "$OTOOL"; then
4764
- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
4765
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
4766
$as_echo "$OTOOL" >&6; }
4767
else
4768
- { $as_echo "$as_me:$LINENO: result: no" >&5
4769
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4770
$as_echo "no" >&6; }
4771
fi
4772
4773
@@ -6746,9 +6722,9 @@
4774
ac_ct_OTOOL=$OTOOL
4775
# Extract the first word of "otool", so it can be a program name with args.
4776
set dummy otool; ac_word=$2
4777
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4778
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4779
$as_echo_n "checking for $ac_word... " >&6; }
4780
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
4781
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
4782
$as_echo_n "(cached) " >&6
4783
else
4784
if test -n "$ac_ct_OTOOL"; then
4785
@@ -6759,24 +6735,24 @@
4786
do
4787
IFS=$as_save_IFS
4788
test -z "$as_dir" && as_dir=.
4789
- for ac_exec_ext in '' $ac_executable_extensions; do
4790
+ for ac_exec_ext in '' $ac_executable_extensions; do
4791
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4792
ac_cv_prog_ac_ct_OTOOL="otool"
4793
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4794
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4795
break 2
4796
fi
4797
done
4798
-done
4799
+ done
4800
IFS=$as_save_IFS
4801
4802
fi
4803
fi
4804
ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
4805
if test -n "$ac_ct_OTOOL"; then
4806
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
4807
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
4808
$as_echo "$ac_ct_OTOOL" >&6; }
4809
else
4810
- { $as_echo "$as_me:$LINENO: result: no" >&5
4811
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4812
$as_echo "no" >&6; }
4813
fi
4814
4815
@@ -6785,7 +6761,7 @@
4816
else
4817
case $cross_compiling:$ac_tool_warned in
4818
yes:)
4819
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4820
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4821
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4822
ac_tool_warned=yes ;;
4823
esac
4824
@@ -6798,9 +6774,9 @@
4825
if test -n "$ac_tool_prefix"; then
4826
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
4827
set dummy ${ac_tool_prefix}otool64; ac_word=$2
4828
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4829
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4830
$as_echo_n "checking for $ac_word... " >&6; }
4831
-if test "${ac_cv_prog_OTOOL64+set}" = set; then
4832
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
4833
$as_echo_n "(cached) " >&6
4834
else
4835
if test -n "$OTOOL64"; then
4836
@@ -6811,24 +6787,24 @@
4837
do
4838
IFS=$as_save_IFS
4839
test -z "$as_dir" && as_dir=.
4840
- for ac_exec_ext in '' $ac_executable_extensions; do
4841
+ for ac_exec_ext in '' $ac_executable_extensions; do
4842
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4843
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
4844
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4845
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4846
break 2
4847
fi
4848
done
4849
-done
4850
+ done
4851
IFS=$as_save_IFS
4852
4853
fi
4854
fi
4855
OTOOL64=$ac_cv_prog_OTOOL64
4856
if test -n "$OTOOL64"; then
4857
- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
4858
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
4859
$as_echo "$OTOOL64" >&6; }
4860
else
4861
- { $as_echo "$as_me:$LINENO: result: no" >&5
4862
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4863
$as_echo "no" >&6; }
4864
fi
4865
4866
@@ -6838,9 +6814,9 @@
4867
ac_ct_OTOOL64=$OTOOL64
4868
# Extract the first word of "otool64", so it can be a program name with args.
4869
set dummy otool64; ac_word=$2
4870
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4871
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4872
$as_echo_n "checking for $ac_word... " >&6; }
4873
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
4874
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
4875
$as_echo_n "(cached) " >&6
4876
else
4877
if test -n "$ac_ct_OTOOL64"; then
4878
@@ -6851,24 +6827,24 @@
4879
do
4880
IFS=$as_save_IFS
4881
test -z "$as_dir" && as_dir=.
4882
- for ac_exec_ext in '' $ac_executable_extensions; do
4883
+ for ac_exec_ext in '' $ac_executable_extensions; do
4884
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4885
ac_cv_prog_ac_ct_OTOOL64="otool64"
4886
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4887
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4888
break 2
4889
fi
4890
done
4891
-done
4892
+ done
4893
IFS=$as_save_IFS
4894
4895
fi
4896
fi
4897
ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
4898
if test -n "$ac_ct_OTOOL64"; then
4899
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
4900
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
4901
$as_echo "$ac_ct_OTOOL64" >&6; }
4902
else
4903
- { $as_echo "$as_me:$LINENO: result: no" >&5
4904
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4905
$as_echo "no" >&6; }
4906
fi
4907
4908
@@ -6877,7 +6853,7 @@
4909
else
4910
case $cross_compiling:$ac_tool_warned in
4911
yes:)
4912
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4913
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4914
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4915
ac_tool_warned=yes ;;
4916
esac
4917
@@ -6913,9 +6889,9 @@
4918
4919
4920
4921
- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
4922
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
4923
$as_echo_n "checking for -single_module linker flag... " >&6; }
4924
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
4925
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
4926
$as_echo_n "(cached) " >&6
4927
else
4928
lt_cv_apple_cc_single_mod=no
4929
@@ -6940,22 +6916,18 @@
4930
rm -f conftest.*
4931
fi
4932
fi
4933
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
4934
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
4935
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
4936
- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
4937
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
4938
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
4939
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
4940
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
4941
$as_echo_n "(cached) " >&6
4942
else
4943
lt_cv_ld_exported_symbols_list=no
4944
save_LDFLAGS=$LDFLAGS
4945
echo "_main" > conftest.sym
4946
LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
4947
- cat >conftest.$ac_ext <<_ACEOF
4948
-/* confdefs.h. */
4949
-_ACEOF
4950
-cat confdefs.h >>conftest.$ac_ext
4951
-cat >>conftest.$ac_ext <<_ACEOF
4952
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4953
/* end confdefs.h. */
4954
4955
int
4956
@@ -6966,42 +6938,17 @@
4957
return 0;
4958
}
4959
_ACEOF
4960
-rm -f conftest.$ac_objext conftest$ac_exeext
4961
-if { (ac_try="$ac_link"
4962
-case "(($ac_try" in
4963
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4964
- *) ac_try_echo=$ac_try;;
4965
-esac
4966
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4967
-$as_echo "$ac_try_echo") >&5
4968
- (eval "$ac_link") 2>conftest.er1
4969
- ac_status=$?
4970
- grep -v '^ *+' conftest.er1 >conftest.err
4971
- rm -f conftest.er1
4972
- cat conftest.err >&5
4973
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4974
- (exit $ac_status); } && {
4975
- test -z "$ac_c_werror_flag" ||
4976
- test ! -s conftest.err
4977
- } && test -s conftest$ac_exeext && {
4978
- test "$cross_compiling" = yes ||
4979
- $as_test_x conftest$ac_exeext
4980
- }; then
4981
+if ac_fn_c_try_link "$LINENO"; then :
4982
lt_cv_ld_exported_symbols_list=yes
4983
else
4984
- $as_echo "$as_me: failed program was:" >&5
4985
-sed 's/^/| /' conftest.$ac_ext >&5
4986
-
4987
- lt_cv_ld_exported_symbols_list=no
4988
+ lt_cv_ld_exported_symbols_list=no
4989
fi
4990
-
4991
-rm -rf conftest.dSYM
4992
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
4993
- conftest$ac_exeext conftest.$ac_ext
4994
+rm -f core conftest.err conftest.$ac_objext \
4995
+ conftest$ac_exeext conftest.$ac_ext
4996
LDFLAGS="$save_LDFLAGS"
4997
4998
fi
4999
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
5000
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
5001
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
5002
case $host_os in
5003
rhapsody* | darwin1.[012])
5004
@@ -7043,14 +6990,14 @@
5005
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5006
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5007
ac_compiler_gnu=$ac_cv_c_compiler_gnu
5008
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
5009
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
5010
$as_echo_n "checking how to run the C preprocessor... " >&6; }
5011
# On Suns, sometimes $CPP names a directory.
5012
if test -n "$CPP" && test -d "$CPP"; then
5013
CPP=
5014
fi
5015
if test -z "$CPP"; then
5016
- if test "${ac_cv_prog_CPP+set}" = set; then
5017
+ if test "${ac_cv_prog_CPP+set}" = set; then :
5018
$as_echo_n "(cached) " >&6
5019
else
5020
# Double quotes because CPP needs to be expanded
5021
@@ -7065,11 +7012,7 @@
5022
# <limits.h> exists even on freestanding compilers.
5023
# On the NeXT, cc -E runs the code through the compiler's parser,
5024
# not just through cpp. "Syntax error" is here to catch this case.
5025
- cat >conftest.$ac_ext <<_ACEOF
5026
-/* confdefs.h. */
5027
-_ACEOF
5028
-cat confdefs.h >>conftest.$ac_ext
5029
-cat >>conftest.$ac_ext <<_ACEOF
5030
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5031
/* end confdefs.h. */
5032
#ifdef __STDC__
5033
# include <limits.h>
5034
@@ -7078,78 +7021,34 @@
5035
#endif
5036
Syntax error
5037
_ACEOF
5038
-if { (ac_try="$ac_cpp conftest.$ac_ext"
5039
-case "(($ac_try" in
5040
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5041
- *) ac_try_echo=$ac_try;;
5042
-esac
5043
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5044
-$as_echo "$ac_try_echo") >&5
5045
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
5046
- ac_status=$?
5047
- grep -v '^ *+' conftest.er1 >conftest.err
5048
- rm -f conftest.er1
5049
- cat conftest.err >&5
5050
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5051
- (exit $ac_status); } >/dev/null && {
5052
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5053
- test ! -s conftest.err
5054
- }; then
5055
- :
5056
-else
5057
- $as_echo "$as_me: failed program was:" >&5
5058
-sed 's/^/| /' conftest.$ac_ext >&5
5059
+if ac_fn_c_try_cpp "$LINENO"; then :
5060
5061
+else
5062
# Broken: fails on valid input.
5063
continue
5064
fi
5065
-
5066
rm -f conftest.err conftest.$ac_ext
5067
5068
# OK, works on sane cases. Now check whether nonexistent headers
5069
# can be detected and how.
5070
- cat >conftest.$ac_ext <<_ACEOF
5071
-/* confdefs.h. */
5072
-_ACEOF
5073
-cat confdefs.h >>conftest.$ac_ext
5074
-cat >>conftest.$ac_ext <<_ACEOF
5075
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5076
/* end confdefs.h. */
5077
#include <ac_nonexistent.h>
5078
_ACEOF
5079
-if { (ac_try="$ac_cpp conftest.$ac_ext"
5080
-case "(($ac_try" in
5081
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5082
- *) ac_try_echo=$ac_try;;
5083
-esac
5084
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5085
-$as_echo "$ac_try_echo") >&5
5086
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
5087
- ac_status=$?
5088
- grep -v '^ *+' conftest.er1 >conftest.err
5089
- rm -f conftest.er1
5090
- cat conftest.err >&5
5091
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5092
- (exit $ac_status); } >/dev/null && {
5093
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5094
- test ! -s conftest.err
5095
- }; then
5096
+if ac_fn_c_try_cpp "$LINENO"; then :
5097
# Broken: success on invalid input.
5098
continue
5099
else
5100
- $as_echo "$as_me: failed program was:" >&5
5101
-sed 's/^/| /' conftest.$ac_ext >&5
5102
-
5103
# Passes both tests.
5104
ac_preproc_ok=:
5105
break
5106
fi
5107
-
5108
rm -f conftest.err conftest.$ac_ext
5109
5110
done
5111
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
5112
rm -f conftest.err conftest.$ac_ext
5113
-if $ac_preproc_ok; then
5114
+if $ac_preproc_ok; then :
5115
break
5116
fi
5117
5118
@@ -7161,7 +7060,7 @@
5119
else
5120
ac_cv_prog_CPP=$CPP
5121
fi
5122
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
5123
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
5124
$as_echo "$CPP" >&6; }
5125
ac_preproc_ok=false
5126
for ac_c_preproc_warn_flag in '' yes
5127
@@ -7172,11 +7071,7 @@
5128
# <limits.h> exists even on freestanding compilers.
5129
# On the NeXT, cc -E runs the code through the compiler's parser,
5130
# not just through cpp. "Syntax error" is here to catch this case.
5131
- cat >conftest.$ac_ext <<_ACEOF
5132
-/* confdefs.h. */
5133
-_ACEOF
5134
-cat confdefs.h >>conftest.$ac_ext
5135
-cat >>conftest.$ac_ext <<_ACEOF
5136
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5137
/* end confdefs.h. */
5138
#ifdef __STDC__
5139
# include <limits.h>
5140
@@ -7185,87 +7080,40 @@
5141
#endif
5142
Syntax error
5143
_ACEOF
5144
-if { (ac_try="$ac_cpp conftest.$ac_ext"
5145
-case "(($ac_try" in
5146
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5147
- *) ac_try_echo=$ac_try;;
5148
-esac
5149
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5150
-$as_echo "$ac_try_echo") >&5
5151
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
5152
- ac_status=$?
5153
- grep -v '^ *+' conftest.er1 >conftest.err
5154
- rm -f conftest.er1
5155
- cat conftest.err >&5
5156
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5157
- (exit $ac_status); } >/dev/null && {
5158
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5159
- test ! -s conftest.err
5160
- }; then
5161
- :
5162
-else
5163
- $as_echo "$as_me: failed program was:" >&5
5164
-sed 's/^/| /' conftest.$ac_ext >&5
5165
+if ac_fn_c_try_cpp "$LINENO"; then :
5166
5167
+else
5168
# Broken: fails on valid input.
5169
continue
5170
fi
5171
-
5172
rm -f conftest.err conftest.$ac_ext
5173
5174
# OK, works on sane cases. Now check whether nonexistent headers
5175
# can be detected and how.
5176
- cat >conftest.$ac_ext <<_ACEOF
5177
-/* confdefs.h. */
5178
-_ACEOF
5179
-cat confdefs.h >>conftest.$ac_ext
5180
-cat >>conftest.$ac_ext <<_ACEOF
5181
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5182
/* end confdefs.h. */
5183
#include <ac_nonexistent.h>
5184
_ACEOF
5185
-if { (ac_try="$ac_cpp conftest.$ac_ext"
5186
-case "(($ac_try" in
5187
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5188
- *) ac_try_echo=$ac_try;;
5189
-esac
5190
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5191
-$as_echo "$ac_try_echo") >&5
5192
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
5193
- ac_status=$?
5194
- grep -v '^ *+' conftest.er1 >conftest.err
5195
- rm -f conftest.er1
5196
- cat conftest.err >&5
5197
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5198
- (exit $ac_status); } >/dev/null && {
5199
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5200
- test ! -s conftest.err
5201
- }; then
5202
+if ac_fn_c_try_cpp "$LINENO"; then :
5203
# Broken: success on invalid input.
5204
continue
5205
else
5206
- $as_echo "$as_me: failed program was:" >&5
5207
-sed 's/^/| /' conftest.$ac_ext >&5
5208
-
5209
# Passes both tests.
5210
ac_preproc_ok=:
5211
break
5212
fi
5213
-
5214
rm -f conftest.err conftest.$ac_ext
5215
5216
done
5217
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
5218
rm -f conftest.err conftest.$ac_ext
5219
-if $ac_preproc_ok; then
5220
- :
5221
+if $ac_preproc_ok; then :
5222
+
5223
else
5224
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
5225
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5226
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5227
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
5228
-See \`config.log' for more details." >&5
5229
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
5230
-See \`config.log' for more details." >&2;}
5231
- { (exit 1); exit 1; }; }; }
5232
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
5233
+See \`config.log' for more details." "$LINENO" 5; }
5234
fi
5235
5236
ac_ext=c
5237
@@ -7275,16 +7123,12 @@
5238
ac_compiler_gnu=$ac_cv_c_compiler_gnu
5239
5240
5241
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
5242
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
5243
$as_echo_n "checking for ANSI C header files... " >&6; }
5244
-if test "${ac_cv_header_stdc+set}" = set; then
5245
+if test "${ac_cv_header_stdc+set}" = set; then :
5246
$as_echo_n "(cached) " >&6
5247
else
5248
- cat >conftest.$ac_ext <<_ACEOF
5249
-/* confdefs.h. */
5250
-_ACEOF
5251
-cat confdefs.h >>conftest.$ac_ext
5252
-cat >>conftest.$ac_ext <<_ACEOF
5253
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5254
/* end confdefs.h. */
5255
#include <stdlib.h>
5256
#include <stdarg.h>
5257
@@ -7299,48 +7143,23 @@
5258
return 0;
5259
}
5260
_ACEOF
5261
-rm -f conftest.$ac_objext
5262
-if { (ac_try="$ac_compile"
5263
-case "(($ac_try" in
5264
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5265
- *) ac_try_echo=$ac_try;;
5266
-esac
5267
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5268
-$as_echo "$ac_try_echo") >&5
5269
- (eval "$ac_compile") 2>conftest.er1
5270
- ac_status=$?
5271
- grep -v '^ *+' conftest.er1 >conftest.err
5272
- rm -f conftest.er1
5273
- cat conftest.err >&5
5274
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5275
- (exit $ac_status); } && {
5276
- test -z "$ac_c_werror_flag" ||
5277
- test ! -s conftest.err
5278
- } && test -s conftest.$ac_objext; then
5279
+if ac_fn_c_try_compile "$LINENO"; then :
5280
ac_cv_header_stdc=yes
5281
else
5282
- $as_echo "$as_me: failed program was:" >&5
5283
-sed 's/^/| /' conftest.$ac_ext >&5
5284
-
5285
- ac_cv_header_stdc=no
5286
+ ac_cv_header_stdc=no
5287
fi
5288
-
5289
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5290
5291
if test $ac_cv_header_stdc = yes; then
5292
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
5293
- cat >conftest.$ac_ext <<_ACEOF
5294
-/* confdefs.h. */
5295
-_ACEOF
5296
-cat confdefs.h >>conftest.$ac_ext
5297
-cat >>conftest.$ac_ext <<_ACEOF
5298
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5299
/* end confdefs.h. */
5300
#include <string.h>
5301
5302
_ACEOF
5303
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
5304
- $EGREP "memchr" >/dev/null 2>&1; then
5305
- :
5306
+ $EGREP "memchr" >/dev/null 2>&1; then :
5307
+
5308
else
5309
ac_cv_header_stdc=no
5310
fi
5311
@@ -7350,18 +7169,14 @@
5312
5313
if test $ac_cv_header_stdc = yes; then
5314
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
5315
- cat >conftest.$ac_ext <<_ACEOF
5316
-/* confdefs.h. */
5317
-_ACEOF
5318
-cat confdefs.h >>conftest.$ac_ext
5319
-cat >>conftest.$ac_ext <<_ACEOF
5320
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5321
/* end confdefs.h. */
5322
#include <stdlib.h>
5323
5324
_ACEOF
5325
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
5326
- $EGREP "free" >/dev/null 2>&1; then
5327
- :
5328
+ $EGREP "free" >/dev/null 2>&1; then :
5329
+
5330
else
5331
ac_cv_header_stdc=no
5332
fi
5333
@@ -7371,14 +7186,10 @@
5334
5335
if test $ac_cv_header_stdc = yes; then
5336
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
5337
- if test "$cross_compiling" = yes; then
5338
+ if test "$cross_compiling" = yes; then :
5339
:
5340
else
5341
- cat >conftest.$ac_ext <<_ACEOF
5342
-/* confdefs.h. */
5343
-_ACEOF
5344
-cat confdefs.h >>conftest.$ac_ext
5345
-cat >>conftest.$ac_ext <<_ACEOF
5346
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5347
/* end confdefs.h. */
5348
#include <ctype.h>
5349
#include <stdlib.h>
5350
@@ -7405,118 +7216,34 @@
5351
return 0;
5352
}
5353
_ACEOF
5354
-rm -f conftest$ac_exeext
5355
-if { (ac_try="$ac_link"
5356
-case "(($ac_try" in
5357
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5358
- *) ac_try_echo=$ac_try;;
5359
-esac
5360
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5361
-$as_echo "$ac_try_echo") >&5
5362
- (eval "$ac_link") 2>&5
5363
- ac_status=$?
5364
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5365
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
5366
- { (case "(($ac_try" in
5367
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5368
- *) ac_try_echo=$ac_try;;
5369
-esac
5370
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5371
-$as_echo "$ac_try_echo") >&5
5372
- (eval "$ac_try") 2>&5
5373
- ac_status=$?
5374
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5375
- (exit $ac_status); }; }; then
5376
- :
5377
-else
5378
- $as_echo "$as_me: program exited with status $ac_status" >&5
5379
-$as_echo "$as_me: failed program was:" >&5
5380
-sed 's/^/| /' conftest.$ac_ext >&5
5381
+if ac_fn_c_try_run "$LINENO"; then :
5382
5383
-( exit $ac_status )
5384
-ac_cv_header_stdc=no
5385
+else
5386
+ ac_cv_header_stdc=no
5387
fi
5388
-rm -rf conftest.dSYM
5389
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
5390
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
5391
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
5392
fi
5393
5394
-
5395
fi
5396
fi
5397
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
5398
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
5399
$as_echo "$ac_cv_header_stdc" >&6; }
5400
if test $ac_cv_header_stdc = yes; then
5401
5402
-cat >>confdefs.h <<\_ACEOF
5403
-#define STDC_HEADERS 1
5404
-_ACEOF
5405
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
5406
5407
fi
5408
5409
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
5410
-
5411
-
5412
-
5413
-
5414
-
5415
-
5416
-
5417
-
5418
-
5419
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
5420
inttypes.h stdint.h unistd.h
5421
-do
5422
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
5423
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
5424
-$as_echo_n "checking for $ac_header... " >&6; }
5425
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
5426
- $as_echo_n "(cached) " >&6
5427
-else
5428
- cat >conftest.$ac_ext <<_ACEOF
5429
-/* confdefs.h. */
5430
-_ACEOF
5431
-cat confdefs.h >>conftest.$ac_ext
5432
-cat >>conftest.$ac_ext <<_ACEOF
5433
-/* end confdefs.h. */
5434
-$ac_includes_default
5435
-
5436
-#include <$ac_header>
5437
-_ACEOF
5438
-rm -f conftest.$ac_objext
5439
-if { (ac_try="$ac_compile"
5440
-case "(($ac_try" in
5441
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5442
- *) ac_try_echo=$ac_try;;
5443
-esac
5444
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5445
-$as_echo "$ac_try_echo") >&5
5446
- (eval "$ac_compile") 2>conftest.er1
5447
- ac_status=$?
5448
- grep -v '^ *+' conftest.er1 >conftest.err
5449
- rm -f conftest.er1
5450
- cat conftest.err >&5
5451
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5452
- (exit $ac_status); } && {
5453
- test -z "$ac_c_werror_flag" ||
5454
- test ! -s conftest.err
5455
- } && test -s conftest.$ac_objext; then
5456
- eval "$as_ac_Header=yes"
5457
-else
5458
- $as_echo "$as_me: failed program was:" >&5
5459
-sed 's/^/| /' conftest.$ac_ext >&5
5460
-
5461
- eval "$as_ac_Header=no"
5462
-fi
5463
-
5464
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5465
-fi
5466
-ac_res=`eval 'as_val=${'$as_ac_Header'}
5467
- $as_echo "$as_val"'`
5468
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
5469
-$as_echo "$ac_res" >&6; }
5470
-as_val=`eval 'as_val=${'$as_ac_Header'}
5471
- $as_echo "$as_val"'`
5472
- if test "x$as_val" = x""yes; then
5473
+do :
5474
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
5475
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
5476
+"
5477
+eval as_val=\$$as_ac_Header
5478
+ if test "x$as_val" = x""yes; then :
5479
cat >>confdefs.h <<_ACEOF
5480
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
5481
_ACEOF
5482
@@ -7526,62 +7253,13 @@
5483
done
5484
5485
5486
-
5487
for ac_header in dlfcn.h
5488
-do
5489
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
5490
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
5491
-$as_echo_n "checking for $ac_header... " >&6; }
5492
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
5493
- $as_echo_n "(cached) " >&6
5494
-else
5495
- cat >conftest.$ac_ext <<_ACEOF
5496
-/* confdefs.h. */
5497
-_ACEOF
5498
-cat confdefs.h >>conftest.$ac_ext
5499
-cat >>conftest.$ac_ext <<_ACEOF
5500
-/* end confdefs.h. */
5501
-$ac_includes_default
5502
-
5503
-#include <$ac_header>
5504
-_ACEOF
5505
-rm -f conftest.$ac_objext
5506
-if { (ac_try="$ac_compile"
5507
-case "(($ac_try" in
5508
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5509
- *) ac_try_echo=$ac_try;;
5510
-esac
5511
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5512
-$as_echo "$ac_try_echo") >&5
5513
- (eval "$ac_compile") 2>conftest.er1
5514
- ac_status=$?
5515
- grep -v '^ *+' conftest.er1 >conftest.err
5516
- rm -f conftest.er1
5517
- cat conftest.err >&5
5518
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5519
- (exit $ac_status); } && {
5520
- test -z "$ac_c_werror_flag" ||
5521
- test ! -s conftest.err
5522
- } && test -s conftest.$ac_objext; then
5523
- eval "$as_ac_Header=yes"
5524
-else
5525
- $as_echo "$as_me: failed program was:" >&5
5526
-sed 's/^/| /' conftest.$ac_ext >&5
5527
-
5528
- eval "$as_ac_Header=no"
5529
-fi
5530
-
5531
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5532
-fi
5533
-ac_res=`eval 'as_val=${'$as_ac_Header'}
5534
- $as_echo "$as_val"'`
5535
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
5536
-$as_echo "$ac_res" >&6; }
5537
-as_val=`eval 'as_val=${'$as_ac_Header'}
5538
- $as_echo "$as_val"'`
5539
- if test "x$as_val" = x""yes; then
5540
+do :
5541
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
5542
+"
5543
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
5544
cat >>confdefs.h <<_ACEOF
5545
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
5546
+#define HAVE_DLFCN_H 1
5547
_ACEOF
5548
5549
fi
5550
@@ -7601,7 +7279,7 @@
5551
5552
5553
# Check whether --enable-shared was given.
5554
-if test "${enable_shared+set}" = set; then
5555
+if test "${enable_shared+set}" = set; then :
5556
enableval=$enable_shared; p=${PACKAGE-default}
5557
case $enableval in
5558
yes) enable_shared=yes ;;
5559
@@ -7632,7 +7310,7 @@
5560
5561
5562
# Check whether --enable-static was given.
5563
-if test "${enable_static+set}" = set; then
5564
+if test "${enable_static+set}" = set; then :
5565
enableval=$enable_static; p=${PACKAGE-default}
5566
case $enableval in
5567
yes) enable_static=yes ;;
5568
@@ -7664,7 +7342,7 @@
5569
5570
5571
# Check whether --with-pic was given.
5572
-if test "${with_pic+set}" = set; then
5573
+if test "${with_pic+set}" = set; then :
5574
withval=$with_pic; pic_mode="$withval"
5575
else
5576
pic_mode=default
5577
@@ -7680,7 +7358,7 @@
5578
5579
5580
# Check whether --enable-fast-install was given.
5581
-if test "${enable_fast_install+set}" = set; then
5582
+if test "${enable_fast_install+set}" = set; then :
5583
enableval=$enable_fast_install; p=${PACKAGE-default}
5584
case $enableval in
5585
yes) enable_fast_install=yes ;;
5586
@@ -7761,9 +7439,9 @@
5587
setopt NO_GLOB_SUBST
5588
fi
5589
5590
-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
5591
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
5592
$as_echo_n "checking for objdir... " >&6; }
5593
-if test "${lt_cv_objdir+set}" = set; then
5594
+if test "${lt_cv_objdir+set}" = set; then :
5595
$as_echo_n "(cached) " >&6
5596
else
5597
rm -f .libs 2>/dev/null
5598
@@ -7776,7 +7454,7 @@
5599
fi
5600
rmdir .libs 2>/dev/null
5601
fi
5602
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
5603
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
5604
$as_echo "$lt_cv_objdir" >&6; }
5605
objdir=$lt_cv_objdir
5606
5607
@@ -7869,9 +7547,9 @@
5608
case $deplibs_check_method in
5609
file_magic*)
5610
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
5611
- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
5612
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
5613
$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
5614
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
5615
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
5616
$as_echo_n "(cached) " >&6
5617
else
5618
case $MAGIC_CMD in
5619
@@ -7922,10 +7600,10 @@
5620
5621
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
5622
if test -n "$MAGIC_CMD"; then
5623
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
5624
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
5625
$as_echo "$MAGIC_CMD" >&6; }
5626
else
5627
- { $as_echo "$as_me:$LINENO: result: no" >&5
5628
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5629
$as_echo "no" >&6; }
5630
fi
5631
5632
@@ -7935,9 +7613,9 @@
5633
5634
if test -z "$lt_cv_path_MAGIC_CMD"; then
5635
if test -n "$ac_tool_prefix"; then
5636
- { $as_echo "$as_me:$LINENO: checking for file" >&5
5637
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
5638
$as_echo_n "checking for file... " >&6; }
5639
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
5640
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
5641
$as_echo_n "(cached) " >&6
5642
else
5643
case $MAGIC_CMD in
5644
@@ -7988,10 +7666,10 @@
5645
5646
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
5647
if test -n "$MAGIC_CMD"; then
5648
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
5649
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
5650
$as_echo "$MAGIC_CMD" >&6; }
5651
else
5652
- { $as_echo "$as_me:$LINENO: result: no" >&5
5653
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5654
$as_echo "no" >&6; }
5655
fi
5656
5657
@@ -8072,9 +7750,9 @@
5658
if test "$GCC" = yes; then
5659
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
5660
5661
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
5662
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
5663
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
5664
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
5665
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
5666
$as_echo_n "(cached) " >&6
5667
else
5668
lt_cv_prog_compiler_rtti_exceptions=no
5669
@@ -8090,11 +7768,11 @@
5670
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
5671
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
5672
-e 's:$: $lt_compiler_flag:'`
5673
- (eval echo "\"\$as_me:8093: $lt_compile\"" >&5)
5674
+ (eval echo "\"\$as_me:7771: $lt_compile\"" >&5)
5675
(eval "$lt_compile" 2>conftest.err)
5676
ac_status=$?
5677
cat conftest.err >&5
5678
- echo "$as_me:8097: \$? = $ac_status" >&5
5679
+ echo "$as_me:7775: \$? = $ac_status" >&5
5680
if (exit $ac_status) && test -s "$ac_outfile"; then
5681
# The compiler can only warn and ignore the option if not recognized
5682
# So say no if there are warnings other than the usual output.
5683
@@ -8107,7 +7785,7 @@
5684
$RM conftest*
5685
5686
fi
5687
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
5688
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
5689
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
5690
5691
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
5692
@@ -8127,7 +7805,7 @@
5693
lt_prog_compiler_pic=
5694
lt_prog_compiler_static=
5695
5696
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
5697
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
5698
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
5699
5700
if test "$GCC" = yes; then
5701
@@ -8399,7 +8077,7 @@
5702
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
5703
;;
5704
esac
5705
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
5706
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
5707
$as_echo "$lt_prog_compiler_pic" >&6; }
5708
5709
5710
@@ -8411,9 +8089,9 @@
5711
# Check to make sure the PIC flag actually works.
5712
#
5713
if test -n "$lt_prog_compiler_pic"; then
5714
- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
5715
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
5716
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
5717
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
5718
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
5719
$as_echo_n "(cached) " >&6
5720
else
5721
lt_cv_prog_compiler_pic_works=no
5722
@@ -8429,11 +8107,11 @@
5723
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
5724
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
5725
-e 's:$: $lt_compiler_flag:'`
5726
- (eval echo "\"\$as_me:8432: $lt_compile\"" >&5)
5727
+ (eval echo "\"\$as_me:8110: $lt_compile\"" >&5)
5728
(eval "$lt_compile" 2>conftest.err)
5729
ac_status=$?
5730
cat conftest.err >&5
5731
- echo "$as_me:8436: \$? = $ac_status" >&5
5732
+ echo "$as_me:8114: \$? = $ac_status" >&5
5733
if (exit $ac_status) && test -s "$ac_outfile"; then
5734
# The compiler can only warn and ignore the option if not recognized
5735
# So say no if there are warnings other than the usual output.
5736
@@ -8446,7 +8124,7 @@
5737
$RM conftest*
5738
5739
fi
5740
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
5741
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
5742
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
5743
5744
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
5745
@@ -8470,9 +8148,9 @@
5746
# Check to make sure the static flag actually works.
5747
#
5748
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
5749
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
5750
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
5751
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
5752
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
5753
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
5754
$as_echo_n "(cached) " >&6
5755
else
5756
lt_cv_prog_compiler_static_works=no
5757
@@ -8498,7 +8176,7 @@
5758
LDFLAGS="$save_LDFLAGS"
5759
5760
fi
5761
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
5762
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
5763
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
5764
5765
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
5766
@@ -8513,9 +8191,9 @@
5767
5768
5769
5770
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
5771
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
5772
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
5773
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
5774
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
5775
$as_echo_n "(cached) " >&6
5776
else
5777
lt_cv_prog_compiler_c_o=no
5778
@@ -8534,11 +8212,11 @@
5779
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
5780
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
5781
-e 's:$: $lt_compiler_flag:'`
5782
- (eval echo "\"\$as_me:8537: $lt_compile\"" >&5)
5783
+ (eval echo "\"\$as_me:8215: $lt_compile\"" >&5)
5784
(eval "$lt_compile" 2>out/conftest.err)
5785
ac_status=$?
5786
cat out/conftest.err >&5
5787
- echo "$as_me:8541: \$? = $ac_status" >&5
5788
+ echo "$as_me:8219: \$? = $ac_status" >&5
5789
if (exit $ac_status) && test -s out/conftest2.$ac_objext
5790
then
5791
# The compiler can only warn and ignore the option if not recognized
5792
@@ -8560,7 +8238,7 @@
5793
$RM conftest*
5794
5795
fi
5796
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
5797
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
5798
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
5799
5800
5801
@@ -8568,9 +8246,9 @@
5802
5803
5804
5805
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
5806
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
5807
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
5808
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
5809
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
5810
$as_echo_n "(cached) " >&6
5811
else
5812
lt_cv_prog_compiler_c_o=no
5813
@@ -8589,11 +8267,11 @@
5814
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
5815
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
5816
-e 's:$: $lt_compiler_flag:'`
5817
- (eval echo "\"\$as_me:8592: $lt_compile\"" >&5)
5818
+ (eval echo "\"\$as_me:8270: $lt_compile\"" >&5)
5819
(eval "$lt_compile" 2>out/conftest.err)
5820
ac_status=$?
5821
cat out/conftest.err >&5
5822
- echo "$as_me:8596: \$? = $ac_status" >&5
5823
+ echo "$as_me:8274: \$? = $ac_status" >&5
5824
if (exit $ac_status) && test -s out/conftest2.$ac_objext
5825
then
5826
# The compiler can only warn and ignore the option if not recognized
5827
@@ -8615,7 +8293,7 @@
5828
$RM conftest*
5829
5830
fi
5831
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
5832
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
5833
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
5834
5835
5836
@@ -8624,7 +8302,7 @@
5837
hard_links="nottested"
5838
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
5839
# do not overwrite the value of need_locks provided by the user
5840
- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
5841
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
5842
$as_echo_n "checking if we can lock with hard links... " >&6; }
5843
hard_links=yes
5844
$RM conftest*
5845
@@ -8632,10 +8310,10 @@
5846
touch conftest.a
5847
ln conftest.a conftest.b 2>&5 || hard_links=no
5848
ln conftest.a conftest.b 2>/dev/null && hard_links=no
5849
- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
5850
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
5851
$as_echo "$hard_links" >&6; }
5852
if test "$hard_links" = no; then
5853
- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
5854
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
5855
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
5856
need_locks=warn
5857
fi
5858
@@ -8648,7 +8326,7 @@
5859
5860
5861
5862
- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
5863
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
5864
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
5865
5866
runpath_var=
5867
@@ -9090,11 +8768,7 @@
5868
allow_undefined_flag='-berok'
5869
# Determine the default libpath from the value encoded in an
5870
# empty executable.
5871
- cat >conftest.$ac_ext <<_ACEOF
5872
-/* confdefs.h. */
5873
-_ACEOF
5874
-cat confdefs.h >>conftest.$ac_ext
5875
-cat >>conftest.$ac_ext <<_ACEOF
5876
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5877
/* end confdefs.h. */
5878
5879
int
5880
@@ -9105,27 +8779,7 @@
5881
return 0;
5882
}
5883
_ACEOF
5884
-rm -f conftest.$ac_objext conftest$ac_exeext
5885
-if { (ac_try="$ac_link"
5886
-case "(($ac_try" in
5887
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5888
- *) ac_try_echo=$ac_try;;
5889
-esac
5890
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5891
-$as_echo "$ac_try_echo") >&5
5892
- (eval "$ac_link") 2>conftest.er1
5893
- ac_status=$?
5894
- grep -v '^ *+' conftest.er1 >conftest.err
5895
- rm -f conftest.er1
5896
- cat conftest.err >&5
5897
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5898
- (exit $ac_status); } && {
5899
- test -z "$ac_c_werror_flag" ||
5900
- test ! -s conftest.err
5901
- } && test -s conftest$ac_exeext && {
5902
- test "$cross_compiling" = yes ||
5903
- $as_test_x conftest$ac_exeext
5904
- }; then
5905
+if ac_fn_c_try_link "$LINENO"; then :
5906
5907
lt_aix_libpath_sed='
5908
/Import File Strings/,/^$/ {
5909
@@ -9139,16 +8793,9 @@
5910
if test -z "$aix_libpath"; then
5911
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
5912
fi
5913
-else
5914
- $as_echo "$as_me: failed program was:" >&5
5915
-sed 's/^/| /' conftest.$ac_ext >&5
5916
-
5917
-
5918
fi
5919
-
5920
-rm -rf conftest.dSYM
5921
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
5922
- conftest$ac_exeext conftest.$ac_ext
5923
+rm -f core conftest.err conftest.$ac_objext \
5924
+ conftest$ac_exeext conftest.$ac_ext
5925
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
5926
5927
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
5928
@@ -9161,11 +8808,7 @@
5929
else
5930
# Determine the default libpath from the value encoded in an
5931
# empty executable.
5932
- cat >conftest.$ac_ext <<_ACEOF
5933
-/* confdefs.h. */
5934
-_ACEOF
5935
-cat confdefs.h >>conftest.$ac_ext
5936
-cat >>conftest.$ac_ext <<_ACEOF
5937
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5938
/* end confdefs.h. */
5939
5940
int
5941
@@ -9176,27 +8819,7 @@
5942
return 0;
5943
}
5944
_ACEOF
5945
-rm -f conftest.$ac_objext conftest$ac_exeext
5946
-if { (ac_try="$ac_link"
5947
-case "(($ac_try" in
5948
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5949
- *) ac_try_echo=$ac_try;;
5950
-esac
5951
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5952
-$as_echo "$ac_try_echo") >&5
5953
- (eval "$ac_link") 2>conftest.er1
5954
- ac_status=$?
5955
- grep -v '^ *+' conftest.er1 >conftest.err
5956
- rm -f conftest.er1
5957
- cat conftest.err >&5
5958
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5959
- (exit $ac_status); } && {
5960
- test -z "$ac_c_werror_flag" ||
5961
- test ! -s conftest.err
5962
- } && test -s conftest$ac_exeext && {
5963
- test "$cross_compiling" = yes ||
5964
- $as_test_x conftest$ac_exeext
5965
- }; then
5966
+if ac_fn_c_try_link "$LINENO"; then :
5967
5968
lt_aix_libpath_sed='
5969
/Import File Strings/,/^$/ {
5970
@@ -9210,16 +8833,9 @@
5971
if test -z "$aix_libpath"; then
5972
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
5973
fi
5974
-else
5975
- $as_echo "$as_me: failed program was:" >&5
5976
-sed 's/^/| /' conftest.$ac_ext >&5
5977
-
5978
-
5979
fi
5980
-
5981
-rm -rf conftest.dSYM
5982
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
5983
- conftest$ac_exeext conftest.$ac_ext
5984
+rm -f core conftest.err conftest.$ac_objext \
5985
+ conftest$ac_exeext conftest.$ac_ext
5986
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
5987
5988
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
5989
@@ -9431,42 +9047,16 @@
5990
# implicitly export all symbols.
5991
save_LDFLAGS="$LDFLAGS"
5992
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
5993
- cat >conftest.$ac_ext <<_ACEOF
5994
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5995
+/* end confdefs.h. */
5996
int foo(void) {}
5997
_ACEOF
5998
-rm -f conftest.$ac_objext conftest$ac_exeext
5999
-if { (ac_try="$ac_link"
6000
-case "(($ac_try" in
6001
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6002
- *) ac_try_echo=$ac_try;;
6003
-esac
6004
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6005
-$as_echo "$ac_try_echo") >&5
6006
- (eval "$ac_link") 2>conftest.er1
6007
- ac_status=$?
6008
- grep -v '^ *+' conftest.er1 >conftest.err
6009
- rm -f conftest.er1
6010
- cat conftest.err >&5
6011
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6012
- (exit $ac_status); } && {
6013
- test -z "$ac_c_werror_flag" ||
6014
- test ! -s conftest.err
6015
- } && test -s conftest$ac_exeext && {
6016
- test "$cross_compiling" = yes ||
6017
- $as_test_x conftest$ac_exeext
6018
- }; then
6019
+if ac_fn_c_try_link "$LINENO"; then :
6020
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
6021
6022
-else
6023
- $as_echo "$as_me: failed program was:" >&5
6024
-sed 's/^/| /' conftest.$ac_ext >&5
6025
-
6026
-
6027
fi
6028
-
6029
-rm -rf conftest.dSYM
6030
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6031
- conftest$ac_exeext conftest.$ac_ext
6032
+rm -f core conftest.err conftest.$ac_objext \
6033
+ conftest$ac_exeext conftest.$ac_ext
6034
LDFLAGS="$save_LDFLAGS"
6035
else
6036
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
6037
@@ -9722,7 +9312,7 @@
6038
fi
6039
fi
6040
6041
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
6042
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
6043
$as_echo "$ld_shlibs" >&6; }
6044
test "$ld_shlibs" = no && can_build_shared=no
6045
6046
@@ -9759,16 +9349,16 @@
6047
# Test whether the compiler implicitly links with -lc since on some
6048
# systems, -lgcc has to come before -lc. If gcc already passes -lc
6049
# to ld, don't add -lc before -lgcc.
6050
- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
6051
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
6052
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
6053
$RM conftest*
6054
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
6055
6056
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6057
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
6058
(eval $ac_compile) 2>&5
6059
ac_status=$?
6060
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6061
- (exit $ac_status); } 2>conftest.err; then
6062
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6063
+ test $ac_status = 0; } 2>conftest.err; then
6064
soname=conftest
6065
lib=conftest
6066
libobjs=conftest.$ac_objext
6067
@@ -9782,11 +9372,11 @@
6068
libname=conftest
6069
lt_save_allow_undefined_flag=$allow_undefined_flag
6070
allow_undefined_flag=
6071
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
6072
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
6073
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
6074
ac_status=$?
6075
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6076
- (exit $ac_status); }
6077
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6078
+ test $ac_status = 0; }
6079
then
6080
archive_cmds_need_lc=no
6081
else
6082
@@ -9797,7 +9387,7 @@
6083
cat conftest.err 1>&5
6084
fi
6085
$RM conftest*
6086
- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
6087
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
6088
$as_echo "$archive_cmds_need_lc" >&6; }
6089
;;
6090
esac
6091
@@ -9961,7 +9551,7 @@
6092
6093
6094
6095
- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
6096
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
6097
$as_echo_n "checking dynamic linker characteristics... " >&6; }
6098
6099
if test "$GCC" = yes; then
6100
@@ -10383,11 +9973,7 @@
6101
save_libdir=$libdir
6102
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
6103
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
6104
- cat >conftest.$ac_ext <<_ACEOF
6105
-/* confdefs.h. */
6106
-_ACEOF
6107
-cat confdefs.h >>conftest.$ac_ext
6108
-cat >>conftest.$ac_ext <<_ACEOF
6109
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6110
/* end confdefs.h. */
6111
6112
int
6113
@@ -10398,41 +9984,13 @@
6114
return 0;
6115
}
6116
_ACEOF
6117
-rm -f conftest.$ac_objext conftest$ac_exeext
6118
-if { (ac_try="$ac_link"
6119
-case "(($ac_try" in
6120
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6121
- *) ac_try_echo=$ac_try;;
6122
-esac
6123
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6124
-$as_echo "$ac_try_echo") >&5
6125
- (eval "$ac_link") 2>conftest.er1
6126
- ac_status=$?
6127
- grep -v '^ *+' conftest.er1 >conftest.err
6128
- rm -f conftest.er1
6129
- cat conftest.err >&5
6130
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6131
- (exit $ac_status); } && {
6132
- test -z "$ac_c_werror_flag" ||
6133
- test ! -s conftest.err
6134
- } && test -s conftest$ac_exeext && {
6135
- test "$cross_compiling" = yes ||
6136
- $as_test_x conftest$ac_exeext
6137
- }; then
6138
- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
6139
+if ac_fn_c_try_link "$LINENO"; then :
6140
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
6141
shlibpath_overrides_runpath=yes
6142
fi
6143
-
6144
-else
6145
- $as_echo "$as_me: failed program was:" >&5
6146
-sed 's/^/| /' conftest.$ac_ext >&5
6147
-
6148
-
6149
fi
6150
-
6151
-rm -rf conftest.dSYM
6152
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6153
- conftest$ac_exeext conftest.$ac_ext
6154
+rm -f core conftest.err conftest.$ac_objext \
6155
+ conftest$ac_exeext conftest.$ac_ext
6156
LDFLAGS=$save_LDFLAGS
6157
libdir=$save_libdir
6158
6159
@@ -10647,7 +10205,7 @@
6160
dynamic_linker=no
6161
;;
6162
esac
6163
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
6164
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
6165
$as_echo "$dynamic_linker" >&6; }
6166
test "$dynamic_linker" = no && can_build_shared=no
6167
6168
@@ -10749,7 +10307,7 @@
6169
6170
6171
6172
- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
6173
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
6174
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
6175
hardcode_action=
6176
if test -n "$hardcode_libdir_flag_spec" ||
6177
@@ -10774,7 +10332,7 @@
6178
# directories.
6179
hardcode_action=unsupported
6180
fi
6181
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
6182
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
6183
$as_echo "$hardcode_action" >&6; }
6184
6185
if test "$hardcode_action" = relink ||
6186
@@ -10819,18 +10377,14 @@
6187
6188
darwin*)
6189
# if libdl is installed we need to link against it
6190
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
6191
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
6192
$as_echo_n "checking for dlopen in -ldl... " >&6; }
6193
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
6194
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
6195
$as_echo_n "(cached) " >&6
6196
else
6197
ac_check_lib_save_LIBS=$LIBS
6198
LIBS="-ldl $LIBS"
6199
-cat >conftest.$ac_ext <<_ACEOF
6200
-/* confdefs.h. */
6201
-_ACEOF
6202
-cat confdefs.h >>conftest.$ac_ext
6203
-cat >>conftest.$ac_ext <<_ACEOF
6204
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6205
/* end confdefs.h. */
6206
6207
/* Override any GCC internal prototype to avoid an error.
6208
@@ -10848,43 +10402,18 @@
6209
return 0;
6210
}
6211
_ACEOF
6212
-rm -f conftest.$ac_objext conftest$ac_exeext
6213
-if { (ac_try="$ac_link"
6214
-case "(($ac_try" in
6215
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6216
- *) ac_try_echo=$ac_try;;
6217
-esac
6218
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6219
-$as_echo "$ac_try_echo") >&5
6220
- (eval "$ac_link") 2>conftest.er1
6221
- ac_status=$?
6222
- grep -v '^ *+' conftest.er1 >conftest.err
6223
- rm -f conftest.er1
6224
- cat conftest.err >&5
6225
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6226
- (exit $ac_status); } && {
6227
- test -z "$ac_c_werror_flag" ||
6228
- test ! -s conftest.err
6229
- } && test -s conftest$ac_exeext && {
6230
- test "$cross_compiling" = yes ||
6231
- $as_test_x conftest$ac_exeext
6232
- }; then
6233
+if ac_fn_c_try_link "$LINENO"; then :
6234
ac_cv_lib_dl_dlopen=yes
6235
else
6236
- $as_echo "$as_me: failed program was:" >&5
6237
-sed 's/^/| /' conftest.$ac_ext >&5
6238
-
6239
- ac_cv_lib_dl_dlopen=no
6240
+ ac_cv_lib_dl_dlopen=no
6241
fi
6242
-
6243
-rm -rf conftest.dSYM
6244
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6245
- conftest$ac_exeext conftest.$ac_ext
6246
+rm -f core conftest.err conftest.$ac_objext \
6247
+ conftest$ac_exeext conftest.$ac_ext
6248
LIBS=$ac_check_lib_save_LIBS
6249
fi
6250
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
6251
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
6252
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
6253
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
6254
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
6255
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
6256
else
6257
6258
@@ -10897,106 +10426,18 @@
6259
;;
6260
6261
*)
6262
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
6263
-$as_echo_n "checking for shl_load... " >&6; }
6264
-if test "${ac_cv_func_shl_load+set}" = set; then
6265
- $as_echo_n "(cached) " >&6
6266
-else
6267
- cat >conftest.$ac_ext <<_ACEOF
6268
-/* confdefs.h. */
6269
-_ACEOF
6270
-cat confdefs.h >>conftest.$ac_ext
6271
-cat >>conftest.$ac_ext <<_ACEOF
6272
-/* end confdefs.h. */
6273
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
6274
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
6275
-#define shl_load innocuous_shl_load
6276
-
6277
-/* System header to define __stub macros and hopefully few prototypes,
6278
- which can conflict with char shl_load (); below.
6279
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
6280
- <limits.h> exists even on freestanding compilers. */
6281
-
6282
-#ifdef __STDC__
6283
-# include <limits.h>
6284
-#else
6285
-# include <assert.h>
6286
-#endif
6287
-
6288
-#undef shl_load
6289
-
6290
-/* Override any GCC internal prototype to avoid an error.
6291
- Use char because int might match the return type of a GCC
6292
- builtin and then its argument prototype would still apply. */
6293
-#ifdef __cplusplus
6294
-extern "C"
6295
-#endif
6296
-char shl_load ();
6297
-/* The GNU C library defines this for functions which it implements
6298
- to always fail with ENOSYS. Some functions are actually named
6299
- something starting with __ and the normal name is an alias. */
6300
-#if defined __stub_shl_load || defined __stub___shl_load
6301
-choke me
6302
-#endif
6303
-
6304
-int
6305
-main ()
6306
-{
6307
-return shl_load ();
6308
- ;
6309
- return 0;
6310
-}
6311
-_ACEOF
6312
-rm -f conftest.$ac_objext conftest$ac_exeext
6313
-if { (ac_try="$ac_link"
6314
-case "(($ac_try" in
6315
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6316
- *) ac_try_echo=$ac_try;;
6317
-esac
6318
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6319
-$as_echo "$ac_try_echo") >&5
6320
- (eval "$ac_link") 2>conftest.er1
6321
- ac_status=$?
6322
- grep -v '^ *+' conftest.er1 >conftest.err
6323
- rm -f conftest.er1
6324
- cat conftest.err >&5
6325
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6326
- (exit $ac_status); } && {
6327
- test -z "$ac_c_werror_flag" ||
6328
- test ! -s conftest.err
6329
- } && test -s conftest$ac_exeext && {
6330
- test "$cross_compiling" = yes ||
6331
- $as_test_x conftest$ac_exeext
6332
- }; then
6333
- ac_cv_func_shl_load=yes
6334
-else
6335
- $as_echo "$as_me: failed program was:" >&5
6336
-sed 's/^/| /' conftest.$ac_ext >&5
6337
-
6338
- ac_cv_func_shl_load=no
6339
-fi
6340
-
6341
-rm -rf conftest.dSYM
6342
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6343
- conftest$ac_exeext conftest.$ac_ext
6344
-fi
6345
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
6346
-$as_echo "$ac_cv_func_shl_load" >&6; }
6347
-if test "x$ac_cv_func_shl_load" = x""yes; then
6348
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
6349
+if test "x$ac_cv_func_shl_load" = x""yes; then :
6350
lt_cv_dlopen="shl_load"
6351
else
6352
- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
6353
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
6354
$as_echo_n "checking for shl_load in -ldld... " >&6; }
6355
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
6356
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
6357
$as_echo_n "(cached) " >&6
6358
else
6359
ac_check_lib_save_LIBS=$LIBS
6360
LIBS="-ldld $LIBS"
6361
-cat >conftest.$ac_ext <<_ACEOF
6362
-/* confdefs.h. */
6363
-_ACEOF
6364
-cat confdefs.h >>conftest.$ac_ext
6365
-cat >>conftest.$ac_ext <<_ACEOF
6366
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6367
/* end confdefs.h. */
6368
6369
/* Override any GCC internal prototype to avoid an error.
6370
@@ -11014,145 +10455,32 @@
6371
return 0;
6372
}
6373
_ACEOF
6374
-rm -f conftest.$ac_objext conftest$ac_exeext
6375
-if { (ac_try="$ac_link"
6376
-case "(($ac_try" in
6377
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6378
- *) ac_try_echo=$ac_try;;
6379
-esac
6380
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6381
-$as_echo "$ac_try_echo") >&5
6382
- (eval "$ac_link") 2>conftest.er1
6383
- ac_status=$?
6384
- grep -v '^ *+' conftest.er1 >conftest.err
6385
- rm -f conftest.er1
6386
- cat conftest.err >&5
6387
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6388
- (exit $ac_status); } && {
6389
- test -z "$ac_c_werror_flag" ||
6390
- test ! -s conftest.err
6391
- } && test -s conftest$ac_exeext && {
6392
- test "$cross_compiling" = yes ||
6393
- $as_test_x conftest$ac_exeext
6394
- }; then
6395
+if ac_fn_c_try_link "$LINENO"; then :
6396
ac_cv_lib_dld_shl_load=yes
6397
else
6398
- $as_echo "$as_me: failed program was:" >&5
6399
-sed 's/^/| /' conftest.$ac_ext >&5
6400
-
6401
- ac_cv_lib_dld_shl_load=no
6402
+ ac_cv_lib_dld_shl_load=no
6403
fi
6404
-
6405
-rm -rf conftest.dSYM
6406
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6407
- conftest$ac_exeext conftest.$ac_ext
6408
+rm -f core conftest.err conftest.$ac_objext \
6409
+ conftest$ac_exeext conftest.$ac_ext
6410
LIBS=$ac_check_lib_save_LIBS
6411
fi
6412
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
6413
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
6414
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
6415
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
6416
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
6417
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
6418
else
6419
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
6420
-$as_echo_n "checking for dlopen... " >&6; }
6421
-if test "${ac_cv_func_dlopen+set}" = set; then
6422
- $as_echo_n "(cached) " >&6
6423
-else
6424
- cat >conftest.$ac_ext <<_ACEOF
6425
-/* confdefs.h. */
6426
-_ACEOF
6427
-cat confdefs.h >>conftest.$ac_ext
6428
-cat >>conftest.$ac_ext <<_ACEOF
6429
-/* end confdefs.h. */
6430
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
6431
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
6432
-#define dlopen innocuous_dlopen
6433
-
6434
-/* System header to define __stub macros and hopefully few prototypes,
6435
- which can conflict with char dlopen (); below.
6436
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
6437
- <limits.h> exists even on freestanding compilers. */
6438
-
6439
-#ifdef __STDC__
6440
-# include <limits.h>
6441
-#else
6442
-# include <assert.h>
6443
-#endif
6444
-
6445
-#undef dlopen
6446
-
6447
-/* Override any GCC internal prototype to avoid an error.
6448
- Use char because int might match the return type of a GCC
6449
- builtin and then its argument prototype would still apply. */
6450
-#ifdef __cplusplus
6451
-extern "C"
6452
-#endif
6453
-char dlopen ();
6454
-/* The GNU C library defines this for functions which it implements
6455
- to always fail with ENOSYS. Some functions are actually named
6456
- something starting with __ and the normal name is an alias. */
6457
-#if defined __stub_dlopen || defined __stub___dlopen
6458
-choke me
6459
-#endif
6460
-
6461
-int
6462
-main ()
6463
-{
6464
-return dlopen ();
6465
- ;
6466
- return 0;
6467
-}
6468
-_ACEOF
6469
-rm -f conftest.$ac_objext conftest$ac_exeext
6470
-if { (ac_try="$ac_link"
6471
-case "(($ac_try" in
6472
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6473
- *) ac_try_echo=$ac_try;;
6474
-esac
6475
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6476
-$as_echo "$ac_try_echo") >&5
6477
- (eval "$ac_link") 2>conftest.er1
6478
- ac_status=$?
6479
- grep -v '^ *+' conftest.er1 >conftest.err
6480
- rm -f conftest.er1
6481
- cat conftest.err >&5
6482
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6483
- (exit $ac_status); } && {
6484
- test -z "$ac_c_werror_flag" ||
6485
- test ! -s conftest.err
6486
- } && test -s conftest$ac_exeext && {
6487
- test "$cross_compiling" = yes ||
6488
- $as_test_x conftest$ac_exeext
6489
- }; then
6490
- ac_cv_func_dlopen=yes
6491
-else
6492
- $as_echo "$as_me: failed program was:" >&5
6493
-sed 's/^/| /' conftest.$ac_ext >&5
6494
-
6495
- ac_cv_func_dlopen=no
6496
-fi
6497
-
6498
-rm -rf conftest.dSYM
6499
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6500
- conftest$ac_exeext conftest.$ac_ext
6501
-fi
6502
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
6503
-$as_echo "$ac_cv_func_dlopen" >&6; }
6504
-if test "x$ac_cv_func_dlopen" = x""yes; then
6505
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
6506
+if test "x$ac_cv_func_dlopen" = x""yes; then :
6507
lt_cv_dlopen="dlopen"
6508
else
6509
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
6510
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
6511
$as_echo_n "checking for dlopen in -ldl... " >&6; }
6512
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
6513
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
6514
$as_echo_n "(cached) " >&6
6515
else
6516
ac_check_lib_save_LIBS=$LIBS
6517
LIBS="-ldl $LIBS"
6518
-cat >conftest.$ac_ext <<_ACEOF
6519
-/* confdefs.h. */
6520
-_ACEOF
6521
-cat confdefs.h >>conftest.$ac_ext
6522
-cat >>conftest.$ac_ext <<_ACEOF
6523
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6524
/* end confdefs.h. */
6525
6526
/* Override any GCC internal prototype to avoid an error.
6527
@@ -11170,57 +10498,28 @@
6528
return 0;
6529
}
6530
_ACEOF
6531
-rm -f conftest.$ac_objext conftest$ac_exeext
6532
-if { (ac_try="$ac_link"
6533
-case "(($ac_try" in
6534
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6535
- *) ac_try_echo=$ac_try;;
6536
-esac
6537
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6538
-$as_echo "$ac_try_echo") >&5
6539
- (eval "$ac_link") 2>conftest.er1
6540
- ac_status=$?
6541
- grep -v '^ *+' conftest.er1 >conftest.err
6542
- rm -f conftest.er1
6543
- cat conftest.err >&5
6544
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6545
- (exit $ac_status); } && {
6546
- test -z "$ac_c_werror_flag" ||
6547
- test ! -s conftest.err
6548
- } && test -s conftest$ac_exeext && {
6549
- test "$cross_compiling" = yes ||
6550
- $as_test_x conftest$ac_exeext
6551
- }; then
6552
+if ac_fn_c_try_link "$LINENO"; then :
6553
ac_cv_lib_dl_dlopen=yes
6554
else
6555
- $as_echo "$as_me: failed program was:" >&5
6556
-sed 's/^/| /' conftest.$ac_ext >&5
6557
-
6558
- ac_cv_lib_dl_dlopen=no
6559
+ ac_cv_lib_dl_dlopen=no
6560
fi
6561
-
6562
-rm -rf conftest.dSYM
6563
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6564
- conftest$ac_exeext conftest.$ac_ext
6565
+rm -f core conftest.err conftest.$ac_objext \
6566
+ conftest$ac_exeext conftest.$ac_ext
6567
LIBS=$ac_check_lib_save_LIBS
6568
fi
6569
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
6570
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
6571
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
6572
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
6573
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
6574
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
6575
else
6576
- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
6577
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
6578
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
6579
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
6580
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
6581
$as_echo_n "(cached) " >&6
6582
else
6583
ac_check_lib_save_LIBS=$LIBS
6584
LIBS="-lsvld $LIBS"
6585
-cat >conftest.$ac_ext <<_ACEOF
6586
-/* confdefs.h. */
6587
-_ACEOF
6588
-cat confdefs.h >>conftest.$ac_ext
6589
-cat >>conftest.$ac_ext <<_ACEOF
6590
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6591
/* end confdefs.h. */
6592
6593
/* Override any GCC internal prototype to avoid an error.
6594
@@ -11238,57 +10537,28 @@
6595
return 0;
6596
}
6597
_ACEOF
6598
-rm -f conftest.$ac_objext conftest$ac_exeext
6599
-if { (ac_try="$ac_link"
6600
-case "(($ac_try" in
6601
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6602
- *) ac_try_echo=$ac_try;;
6603
-esac
6604
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6605
-$as_echo "$ac_try_echo") >&5
6606
- (eval "$ac_link") 2>conftest.er1
6607
- ac_status=$?
6608
- grep -v '^ *+' conftest.er1 >conftest.err
6609
- rm -f conftest.er1
6610
- cat conftest.err >&5
6611
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6612
- (exit $ac_status); } && {
6613
- test -z "$ac_c_werror_flag" ||
6614
- test ! -s conftest.err
6615
- } && test -s conftest$ac_exeext && {
6616
- test "$cross_compiling" = yes ||
6617
- $as_test_x conftest$ac_exeext
6618
- }; then
6619
+if ac_fn_c_try_link "$LINENO"; then :
6620
ac_cv_lib_svld_dlopen=yes
6621
else
6622
- $as_echo "$as_me: failed program was:" >&5
6623
-sed 's/^/| /' conftest.$ac_ext >&5
6624
-
6625
- ac_cv_lib_svld_dlopen=no
6626
+ ac_cv_lib_svld_dlopen=no
6627
fi
6628
-
6629
-rm -rf conftest.dSYM
6630
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6631
- conftest$ac_exeext conftest.$ac_ext
6632
+rm -f core conftest.err conftest.$ac_objext \
6633
+ conftest$ac_exeext conftest.$ac_ext
6634
LIBS=$ac_check_lib_save_LIBS
6635
fi
6636
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
6637
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
6638
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
6639
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
6640
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
6641
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
6642
else
6643
- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
6644
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
6645
$as_echo_n "checking for dld_link in -ldld... " >&6; }
6646
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
6647
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
6648
$as_echo_n "(cached) " >&6
6649
else
6650
ac_check_lib_save_LIBS=$LIBS
6651
LIBS="-ldld $LIBS"
6652
-cat >conftest.$ac_ext <<_ACEOF
6653
-/* confdefs.h. */
6654
-_ACEOF
6655
-cat confdefs.h >>conftest.$ac_ext
6656
-cat >>conftest.$ac_ext <<_ACEOF
6657
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6658
/* end confdefs.h. */
6659
6660
/* Override any GCC internal prototype to avoid an error.
6661
@@ -11306,43 +10576,18 @@
6662
return 0;
6663
}
6664
_ACEOF
6665
-rm -f conftest.$ac_objext conftest$ac_exeext
6666
-if { (ac_try="$ac_link"
6667
-case "(($ac_try" in
6668
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6669
- *) ac_try_echo=$ac_try;;
6670
-esac
6671
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6672
-$as_echo "$ac_try_echo") >&5
6673
- (eval "$ac_link") 2>conftest.er1
6674
- ac_status=$?
6675
- grep -v '^ *+' conftest.er1 >conftest.err
6676
- rm -f conftest.er1
6677
- cat conftest.err >&5
6678
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6679
- (exit $ac_status); } && {
6680
- test -z "$ac_c_werror_flag" ||
6681
- test ! -s conftest.err
6682
- } && test -s conftest$ac_exeext && {
6683
- test "$cross_compiling" = yes ||
6684
- $as_test_x conftest$ac_exeext
6685
- }; then
6686
+if ac_fn_c_try_link "$LINENO"; then :
6687
ac_cv_lib_dld_dld_link=yes
6688
else
6689
- $as_echo "$as_me: failed program was:" >&5
6690
-sed 's/^/| /' conftest.$ac_ext >&5
6691
-
6692
- ac_cv_lib_dld_dld_link=no
6693
+ ac_cv_lib_dld_dld_link=no
6694
fi
6695
-
6696
-rm -rf conftest.dSYM
6697
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6698
- conftest$ac_exeext conftest.$ac_ext
6699
+rm -f core conftest.err conftest.$ac_objext \
6700
+ conftest$ac_exeext conftest.$ac_ext
6701
LIBS=$ac_check_lib_save_LIBS
6702
fi
6703
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
6704
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
6705
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
6706
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
6707
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
6708
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
6709
fi
6710
6711
@@ -11381,9 +10626,9 @@
6712
save_LIBS="$LIBS"
6713
LIBS="$lt_cv_dlopen_libs $LIBS"
6714
6715
- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
6716
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
6717
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
6718
-if test "${lt_cv_dlopen_self+set}" = set; then
6719
+if test "${lt_cv_dlopen_self+set}" = set; then :
6720
$as_echo_n "(cached) " >&6
6721
else
6722
if test "$cross_compiling" = yes; then :
6723
@@ -11392,7 +10637,7 @@
6724
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
6725
lt_status=$lt_dlunknown
6726
cat > conftest.$ac_ext <<_LT_EOF
6727
-#line 11395 "configure"
6728
+#line 10640 "configure"
6729
#include "confdefs.h"
6730
6731
#if HAVE_DLFCN_H
6732
@@ -11451,11 +10696,11 @@
6733
return status;
6734
}
6735
_LT_EOF
6736
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6737
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6738
(eval $ac_link) 2>&5
6739
ac_status=$?
6740
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6741
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
6742
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6743
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
6744
(./conftest; exit; ) >&5 2>/dev/null
6745
lt_status=$?
6746
case x$lt_status in
6747
@@ -11472,14 +10717,14 @@
6748
6749
6750
fi
6751
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
6752
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
6753
$as_echo "$lt_cv_dlopen_self" >&6; }
6754
6755
if test "x$lt_cv_dlopen_self" = xyes; then
6756
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
6757
- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
6758
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
6759
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
6760
-if test "${lt_cv_dlopen_self_static+set}" = set; then
6761
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
6762
$as_echo_n "(cached) " >&6
6763
else
6764
if test "$cross_compiling" = yes; then :
6765
@@ -11488,7 +10733,7 @@
6766
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
6767
lt_status=$lt_dlunknown
6768
cat > conftest.$ac_ext <<_LT_EOF
6769
-#line 11491 "configure"
6770
+#line 10736 "configure"
6771
#include "confdefs.h"
6772
6773
#if HAVE_DLFCN_H
6774
@@ -11547,11 +10792,11 @@
6775
return status;
6776
}
6777
_LT_EOF
6778
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6779
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
6780
(eval $ac_link) 2>&5
6781
ac_status=$?
6782
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6783
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
6784
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6785
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
6786
(./conftest; exit; ) >&5 2>/dev/null
6787
lt_status=$?
6788
case x$lt_status in
6789
@@ -11568,7 +10813,7 @@
6790
6791
6792
fi
6793
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
6794
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
6795
$as_echo "$lt_cv_dlopen_self_static" >&6; }
6796
fi
6797
6798
@@ -11607,12 +10852,12 @@
6799
6800
striplib=
6801
old_striplib=
6802
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
6803
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
6804
$as_echo_n "checking whether stripping libraries is possible... " >&6; }
6805
if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
6806
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
6807
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
6808
- { $as_echo "$as_me:$LINENO: result: yes" >&5
6809
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
6810
$as_echo "yes" >&6; }
6811
else
6812
# FIXME - insert some real tests, host_os isn't really good enough
6813
@@ -11621,15 +10866,15 @@
6814
if test -n "$STRIP" ; then
6815
striplib="$STRIP -x"
6816
old_striplib="$STRIP -S"
6817
- { $as_echo "$as_me:$LINENO: result: yes" >&5
6818
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
6819
$as_echo "yes" >&6; }
6820
else
6821
- { $as_echo "$as_me:$LINENO: result: no" >&5
6822
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6823
$as_echo "no" >&6; }
6824
fi
6825
;;
6826
*)
6827
- { $as_echo "$as_me:$LINENO: result: no" >&5
6828
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6829
$as_echo "no" >&6; }
6830
;;
6831
esac
6832
@@ -11647,12 +10892,12 @@
6833
6834
6835
# Report which library types will actually be built
6836
- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
6837
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
6838
$as_echo_n "checking if libtool supports shared libraries... " >&6; }
6839
- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
6840
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
6841
$as_echo "$can_build_shared" >&6; }
6842
6843
- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
6844
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
6845
$as_echo_n "checking whether to build shared libraries... " >&6; }
6846
test "$can_build_shared" = "no" && enable_shared=no
6847
6848
@@ -11673,14 +10918,14 @@
6849
fi
6850
;;
6851
esac
6852
- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
6853
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
6854
$as_echo "$enable_shared" >&6; }
6855
6856
- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
6857
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
6858
$as_echo_n "checking whether to build static libraries... " >&6; }
6859
# Make sure either enable_shared or enable_static is yes.
6860
test "$enable_shared" = yes || enable_static=yes
6861
- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
6862
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
6863
$as_echo "$enable_static" >&6; }
6864
6865
6866
@@ -11716,16 +10961,16 @@
6867
6868
6869
6870
- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
6871
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
6872
$as_echo_n "checking whether NLS is requested... " >&6; }
6873
# Check whether --enable-nls was given.
6874
-if test "${enable_nls+set}" = set; then
6875
+if test "${enable_nls+set}" = set; then :
6876
enableval=$enable_nls; USE_NLS=$enableval
6877
else
6878
USE_NLS=yes
6879
fi
6880
6881
- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
6882
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
6883
$as_echo "$USE_NLS" >&6; }
6884
6885
6886
@@ -11733,35 +10978,31 @@
6887
6888
case "$am__api_version" in
6889
1.01234)
6890
- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
6891
-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
6892
- { (exit 1); exit 1; }; }
6893
+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
6894
;;
6895
*)
6896
;;
6897
esac
6898
6899
if test -n "0.35.0"; then
6900
- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
6901
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
6902
$as_echo_n "checking for intltool >= 0.35.0... " >&6; }
6903
6904
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
6905
INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
6906
INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
6907
6908
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
6909
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
6910
$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
6911
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
6912
- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
6913
-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
6914
- { (exit 1); exit 1; }; }
6915
+ as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5
6916
fi
6917
6918
# Extract the first word of "intltool-update", so it can be a program name with args.
6919
set dummy intltool-update; ac_word=$2
6920
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6921
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6922
$as_echo_n "checking for $ac_word... " >&6; }
6923
-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
6924
+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
6925
$as_echo_n "(cached) " >&6
6926
else
6927
case $INTLTOOL_UPDATE in
6928
@@ -11774,14 +11015,14 @@
6929
do
6930
IFS=$as_save_IFS
6931
test -z "$as_dir" && as_dir=.
6932
- for ac_exec_ext in '' $ac_executable_extensions; do
6933
+ for ac_exec_ext in '' $ac_executable_extensions; do
6934
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6935
ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
6936
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6937
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6938
break 2
6939
fi
6940
done
6941
-done
6942
+ done
6943
IFS=$as_save_IFS
6944
6945
;;
6946
@@ -11789,19 +11030,19 @@
6947
fi
6948
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
6949
if test -n "$INTLTOOL_UPDATE"; then
6950
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
6951
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
6952
$as_echo "$INTLTOOL_UPDATE" >&6; }
6953
else
6954
- { $as_echo "$as_me:$LINENO: result: no" >&5
6955
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6956
$as_echo "no" >&6; }
6957
fi
6958
6959
6960
# Extract the first word of "intltool-merge", so it can be a program name with args.
6961
set dummy intltool-merge; ac_word=$2
6962
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6963
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6964
$as_echo_n "checking for $ac_word... " >&6; }
6965
-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
6966
+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
6967
$as_echo_n "(cached) " >&6
6968
else
6969
case $INTLTOOL_MERGE in
6970
@@ -11814,14 +11055,14 @@
6971
do
6972
IFS=$as_save_IFS
6973
test -z "$as_dir" && as_dir=.
6974
- for ac_exec_ext in '' $ac_executable_extensions; do
6975
+ for ac_exec_ext in '' $ac_executable_extensions; do
6976
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6977
ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
6978
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6979
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6980
break 2
6981
fi
6982
done
6983
-done
6984
+ done
6985
IFS=$as_save_IFS
6986
6987
;;
6988
@@ -11829,19 +11070,19 @@
6989
fi
6990
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
6991
if test -n "$INTLTOOL_MERGE"; then
6992
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
6993
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
6994
$as_echo "$INTLTOOL_MERGE" >&6; }
6995
else
6996
- { $as_echo "$as_me:$LINENO: result: no" >&5
6997
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6998
$as_echo "no" >&6; }
6999
fi
7000
7001
7002
# Extract the first word of "intltool-extract", so it can be a program name with args.
7003
set dummy intltool-extract; ac_word=$2
7004
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7005
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7006
$as_echo_n "checking for $ac_word... " >&6; }
7007
-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
7008
+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
7009
$as_echo_n "(cached) " >&6
7010
else
7011
case $INTLTOOL_EXTRACT in
7012
@@ -11854,14 +11095,14 @@
7013
do
7014
IFS=$as_save_IFS
7015
test -z "$as_dir" && as_dir=.
7016
- for ac_exec_ext in '' $ac_executable_extensions; do
7017
+ for ac_exec_ext in '' $ac_executable_extensions; do
7018
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7019
ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
7020
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7021
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7022
break 2
7023
fi
7024
done
7025
-done
7026
+ done
7027
IFS=$as_save_IFS
7028
7029
;;
7030
@@ -11869,18 +11110,16 @@
7031
fi
7032
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
7033
if test -n "$INTLTOOL_EXTRACT"; then
7034
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
7035
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
7036
$as_echo "$INTLTOOL_EXTRACT" >&6; }
7037
else
7038
- { $as_echo "$as_me:$LINENO: result: no" >&5
7039
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7040
$as_echo "no" >&6; }
7041
fi
7042
7043
7044
if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
7045
- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
7046
-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
7047
- { (exit 1); exit 1; }; }
7048
+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
7049
fi
7050
7051
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
7052
@@ -12002,9 +11241,9 @@
7053
# Check the gettext tools to make sure they are GNU
7054
# Extract the first word of "xgettext", so it can be a program name with args.
7055
set dummy xgettext; ac_word=$2
7056
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7057
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7058
$as_echo_n "checking for $ac_word... " >&6; }
7059
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
7060
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
7061
$as_echo_n "(cached) " >&6
7062
else
7063
case $XGETTEXT in
7064
@@ -12017,14 +11256,14 @@
7065
do
7066
IFS=$as_save_IFS
7067
test -z "$as_dir" && as_dir=.
7068
- for ac_exec_ext in '' $ac_executable_extensions; do
7069
+ for ac_exec_ext in '' $ac_executable_extensions; do
7070
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7071
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
7072
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7073
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7074
break 2
7075
fi
7076
done
7077
-done
7078
+ done
7079
IFS=$as_save_IFS
7080
7081
;;
7082
@@ -12032,19 +11271,19 @@
7083
fi
7084
XGETTEXT=$ac_cv_path_XGETTEXT
7085
if test -n "$XGETTEXT"; then
7086
- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
7087
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
7088
$as_echo "$XGETTEXT" >&6; }
7089
else
7090
- { $as_echo "$as_me:$LINENO: result: no" >&5
7091
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7092
$as_echo "no" >&6; }
7093
fi
7094
7095
7096
# Extract the first word of "msgmerge", so it can be a program name with args.
7097
set dummy msgmerge; ac_word=$2
7098
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7099
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7100
$as_echo_n "checking for $ac_word... " >&6; }
7101
-if test "${ac_cv_path_MSGMERGE+set}" = set; then
7102
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
7103
$as_echo_n "(cached) " >&6
7104
else
7105
case $MSGMERGE in
7106
@@ -12057,14 +11296,14 @@
7107
do
7108
IFS=$as_save_IFS
7109
test -z "$as_dir" && as_dir=.
7110
- for ac_exec_ext in '' $ac_executable_extensions; do
7111
+ for ac_exec_ext in '' $ac_executable_extensions; do
7112
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7113
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
7114
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7115
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7116
break 2
7117
fi
7118
done
7119
-done
7120
+ done
7121
IFS=$as_save_IFS
7122
7123
;;
7124
@@ -12072,19 +11311,19 @@
7125
fi
7126
MSGMERGE=$ac_cv_path_MSGMERGE
7127
if test -n "$MSGMERGE"; then
7128
- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
7129
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
7130
$as_echo "$MSGMERGE" >&6; }
7131
else
7132
- { $as_echo "$as_me:$LINENO: result: no" >&5
7133
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7134
$as_echo "no" >&6; }
7135
fi
7136
7137
7138
# Extract the first word of "msgfmt", so it can be a program name with args.
7139
set dummy msgfmt; ac_word=$2
7140
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7141
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7142
$as_echo_n "checking for $ac_word... " >&6; }
7143
-if test "${ac_cv_path_MSGFMT+set}" = set; then
7144
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
7145
$as_echo_n "(cached) " >&6
7146
else
7147
case $MSGFMT in
7148
@@ -12097,14 +11336,14 @@
7149
do
7150
IFS=$as_save_IFS
7151
test -z "$as_dir" && as_dir=.
7152
- for ac_exec_ext in '' $ac_executable_extensions; do
7153
+ for ac_exec_ext in '' $ac_executable_extensions; do
7154
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7155
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
7156
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7157
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7158
break 2
7159
fi
7160
done
7161
-done
7162
+ done
7163
IFS=$as_save_IFS
7164
7165
;;
7166
@@ -12112,19 +11351,19 @@
7167
fi
7168
MSGFMT=$ac_cv_path_MSGFMT
7169
if test -n "$MSGFMT"; then
7170
- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
7171
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
7172
$as_echo "$MSGFMT" >&6; }
7173
else
7174
- { $as_echo "$as_me:$LINENO: result: no" >&5
7175
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7176
$as_echo "no" >&6; }
7177
fi
7178
7179
7180
# Extract the first word of "gmsgfmt", so it can be a program name with args.
7181
set dummy gmsgfmt; ac_word=$2
7182
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7183
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7184
$as_echo_n "checking for $ac_word... " >&6; }
7185
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
7186
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
7187
$as_echo_n "(cached) " >&6
7188
else
7189
case $GMSGFMT in
7190
@@ -12137,14 +11376,14 @@
7191
do
7192
IFS=$as_save_IFS
7193
test -z "$as_dir" && as_dir=.
7194
- for ac_exec_ext in '' $ac_executable_extensions; do
7195
+ for ac_exec_ext in '' $ac_executable_extensions; do
7196
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7197
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
7198
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7199
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7200
break 2
7201
fi
7202
done
7203
-done
7204
+ done
7205
IFS=$as_save_IFS
7206
7207
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
7208
@@ -12153,33 +11392,29 @@
7209
fi
7210
GMSGFMT=$ac_cv_path_GMSGFMT
7211
if test -n "$GMSGFMT"; then
7212
- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
7213
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
7214
$as_echo "$GMSGFMT" >&6; }
7215
else
7216
- { $as_echo "$as_me:$LINENO: result: no" >&5
7217
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7218
$as_echo "no" >&6; }
7219
fi
7220
7221
7222
if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
7223
- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
7224
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
7225
- { (exit 1); exit 1; }; }
7226
+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
7227
fi
7228
xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
7229
mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
7230
mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
7231
if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
7232
- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
7233
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
7234
- { (exit 1); exit 1; }; }
7235
+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
7236
fi
7237
7238
# Extract the first word of "perl", so it can be a program name with args.
7239
set dummy perl; ac_word=$2
7240
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7241
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7242
$as_echo_n "checking for $ac_word... " >&6; }
7243
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
7244
+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
7245
$as_echo_n "(cached) " >&6
7246
else
7247
case $INTLTOOL_PERL in
7248
@@ -12192,14 +11427,14 @@
7249
do
7250
IFS=$as_save_IFS
7251
test -z "$as_dir" && as_dir=.
7252
- for ac_exec_ext in '' $ac_executable_extensions; do
7253
+ for ac_exec_ext in '' $ac_executable_extensions; do
7254
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7255
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
7256
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7257
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7258
break 2
7259
fi
7260
done
7261
-done
7262
+ done
7263
IFS=$as_save_IFS
7264
7265
;;
7266
@@ -12207,41 +11442,35 @@
7267
fi
7268
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
7269
if test -n "$INTLTOOL_PERL"; then
7270
- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
7271
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
7272
$as_echo "$INTLTOOL_PERL" >&6; }
7273
else
7274
- { $as_echo "$as_me:$LINENO: result: no" >&5
7275
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7276
$as_echo "no" >&6; }
7277
fi
7278
7279
7280
if test -z "$INTLTOOL_PERL"; then
7281
- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
7282
-$as_echo "$as_me: error: perl not found" >&2;}
7283
- { (exit 1); exit 1; }; }
7284
+ as_fn_error "perl not found" "$LINENO" 5
7285
fi
7286
-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
7287
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
7288
$as_echo_n "checking for perl >= 5.8.1... " >&6; }
7289
$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
7290
if test $? -ne 0; then
7291
- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
7292
-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
7293
- { (exit 1); exit 1; }; }
7294
+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
7295
else
7296
IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
7297
- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
7298
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
7299
$as_echo "$IT_PERL_VERSION" >&6; }
7300
fi
7301
if test "x" != "xno-xml"; then
7302
- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
7303
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
7304
$as_echo_n "checking for XML::Parser... " >&6; }
7305
if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
7306
- { $as_echo "$as_me:$LINENO: result: ok" >&5
7307
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
7308
$as_echo "ok" >&6; }
7309
else
7310
- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
7311
-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
7312
- { (exit 1); exit 1; }; }
7313
+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
7314
fi
7315
fi
7316
7317
@@ -12251,11 +11480,7 @@
7318
# Set DATADIRNAME correctly if it is not set yet
7319
# (copied from glib-gettext.m4)
7320
if test -z "$DATADIRNAME"; then
7321
- cat >conftest.$ac_ext <<_ACEOF
7322
-/* confdefs.h. */
7323
-_ACEOF
7324
-cat confdefs.h >>conftest.$ac_ext
7325
-cat >>conftest.$ac_ext <<_ACEOF
7326
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7327
/* end confdefs.h. */
7328
7329
int
7330
@@ -12267,124 +11492,17 @@
7331
return 0;
7332
}
7333
_ACEOF
7334
-rm -f conftest.$ac_objext conftest$ac_exeext
7335
-if { (ac_try="$ac_link"
7336
-case "(($ac_try" in
7337
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7338
- *) ac_try_echo=$ac_try;;
7339
-esac
7340
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7341
-$as_echo "$ac_try_echo") >&5
7342
- (eval "$ac_link") 2>conftest.er1
7343
- ac_status=$?
7344
- grep -v '^ *+' conftest.er1 >conftest.err
7345
- rm -f conftest.er1
7346
- cat conftest.err >&5
7347
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7348
- (exit $ac_status); } && {
7349
- test -z "$ac_c_werror_flag" ||
7350
- test ! -s conftest.err
7351
- } && test -s conftest$ac_exeext && {
7352
- test "$cross_compiling" = yes ||
7353
- $as_test_x conftest$ac_exeext
7354
- }; then
7355
+if ac_fn_c_try_link "$LINENO"; then :
7356
DATADIRNAME=share
7357
else
7358
- $as_echo "$as_me: failed program was:" >&5
7359
-sed 's/^/| /' conftest.$ac_ext >&5
7360
-
7361
- case $host in
7362
+ case $host in
7363
*-*-solaris*)
7364
- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
7365
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
7366
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
7367
- $as_echo_n "(cached) " >&6
7368
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
7369
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
7370
+ DATADIRNAME=share
7371
else
7372
- cat >conftest.$ac_ext <<_ACEOF
7373
-/* confdefs.h. */
7374
-_ACEOF
7375
-cat confdefs.h >>conftest.$ac_ext
7376
-cat >>conftest.$ac_ext <<_ACEOF
7377
-/* end confdefs.h. */
7378
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
7379
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
7380
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
7381
-
7382
-/* System header to define __stub macros and hopefully few prototypes,
7383
- which can conflict with char bind_textdomain_codeset (); below.
7384
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
7385
- <limits.h> exists even on freestanding compilers. */
7386
-
7387
-#ifdef __STDC__
7388
-# include <limits.h>
7389
-#else
7390
-# include <assert.h>
7391
-#endif
7392
-
7393
-#undef bind_textdomain_codeset
7394
-
7395
-/* Override any GCC internal prototype to avoid an error.
7396
- Use char because int might match the return type of a GCC
7397
- builtin and then its argument prototype would still apply. */
7398
-#ifdef __cplusplus
7399
-extern "C"
7400
-#endif
7401
-char bind_textdomain_codeset ();
7402
-/* The GNU C library defines this for functions which it implements
7403
- to always fail with ENOSYS. Some functions are actually named
7404
- something starting with __ and the normal name is an alias. */
7405
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
7406
-choke me
7407
-#endif
7408
-
7409
-int
7410
-main ()
7411
-{
7412
-return bind_textdomain_codeset ();
7413
- ;
7414
- return 0;
7415
-}
7416
-_ACEOF
7417
-rm -f conftest.$ac_objext conftest$ac_exeext
7418
-if { (ac_try="$ac_link"
7419
-case "(($ac_try" in
7420
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7421
- *) ac_try_echo=$ac_try;;
7422
-esac
7423
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7424
-$as_echo "$ac_try_echo") >&5
7425
- (eval "$ac_link") 2>conftest.er1
7426
- ac_status=$?
7427
- grep -v '^ *+' conftest.er1 >conftest.err
7428
- rm -f conftest.er1
7429
- cat conftest.err >&5
7430
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7431
- (exit $ac_status); } && {
7432
- test -z "$ac_c_werror_flag" ||
7433
- test ! -s conftest.err
7434
- } && test -s conftest$ac_exeext && {
7435
- test "$cross_compiling" = yes ||
7436
- $as_test_x conftest$ac_exeext
7437
- }; then
7438
- ac_cv_func_bind_textdomain_codeset=yes
7439
-else
7440
- $as_echo "$as_me: failed program was:" >&5
7441
-sed 's/^/| /' conftest.$ac_ext >&5
7442
-
7443
- ac_cv_func_bind_textdomain_codeset=no
7444
-fi
7445
-
7446
-rm -rf conftest.dSYM
7447
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7448
- conftest$ac_exeext conftest.$ac_ext
7449
-fi
7450
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
7451
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
7452
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
7453
- DATADIRNAME=share
7454
-else
7455
- DATADIRNAME=lib
7456
-fi
7457
+ DATADIRNAME=lib
7458
+fi
7459
7460
;;
7461
*)
7462
@@ -12392,10 +11510,8 @@
7463
;;
7464
esac
7465
fi
7466
-
7467
-rm -rf conftest.dSYM
7468
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7469
- conftest$ac_exeext conftest.$ac_ext
7470
+rm -f core conftest.err conftest.$ac_objext \
7471
+ conftest$ac_exeext conftest.$ac_ext
7472
fi
7473
7474
7475
@@ -12406,7 +11522,7 @@
7476
7477
7478
# Check whether --enable-compile-warnings was given.
7479
-if test "${enable_compile_warnings+set}" = set; then
7480
+if test "${enable_compile_warnings+set}" = set; then :
7481
enableval=$enable_compile_warnings;
7482
else
7483
enable_compile_warnings="yes"
7484
@@ -12437,13 +11553,9 @@
7485
for option in -Wno-sign-compare; do
7486
SAVE_CFLAGS="$CFLAGS"
7487
CFLAGS="$CFLAGS $option"
7488
- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
7489
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5
7490
$as_echo_n "checking whether gcc understands $option... " >&6; }
7491
- cat >conftest.$ac_ext <<_ACEOF
7492
-/* confdefs.h. */
7493
-_ACEOF
7494
-cat confdefs.h >>conftest.$ac_ext
7495
-cat >>conftest.$ac_ext <<_ACEOF
7496
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7497
/* end confdefs.h. */
7498
7499
int
7500
@@ -12454,35 +11566,14 @@
7501
return 0;
7502
}
7503
_ACEOF
7504
-rm -f conftest.$ac_objext
7505
-if { (ac_try="$ac_compile"
7506
-case "(($ac_try" in
7507
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7508
- *) ac_try_echo=$ac_try;;
7509
-esac
7510
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7511
-$as_echo "$ac_try_echo") >&5
7512
- (eval "$ac_compile") 2>conftest.er1
7513
- ac_status=$?
7514
- grep -v '^ *+' conftest.er1 >conftest.err
7515
- rm -f conftest.er1
7516
- cat conftest.err >&5
7517
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7518
- (exit $ac_status); } && {
7519
- test -z "$ac_c_werror_flag" ||
7520
- test ! -s conftest.err
7521
- } && test -s conftest.$ac_objext; then
7522
+if ac_fn_c_try_compile "$LINENO"; then :
7523
has_option=yes
7524
else
7525
- $as_echo "$as_me: failed program was:" >&5
7526
-sed 's/^/| /' conftest.$ac_ext >&5
7527
-
7528
- has_option=no
7529
+ has_option=no
7530
fi
7531
-
7532
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7533
CFLAGS="$SAVE_CFLAGS"
7534
- { $as_echo "$as_me:$LINENO: result: $has_option" >&5
7535
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
7536
$as_echo "$has_option" >&6; }
7537
if test $has_option = yes; then
7538
warning_flags="$warning_flags $option"
7539
@@ -12496,26 +11587,24 @@
7540
fi
7541
;;
7542
*)
7543
- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
7544
-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
7545
- { (exit 1); exit 1; }; }
7546
+ as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
7547
;;
7548
esac
7549
CFLAGS="$realsave_CFLAGS"
7550
- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
7551
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
7552
$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
7553
- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5
7554
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5
7555
$as_echo "$warning_flags" >&6; }
7556
7557
# Check whether --enable-iso-c was given.
7558
-if test "${enable_iso_c+set}" = set; then
7559
+if test "${enable_iso_c+set}" = set; then :
7560
enableval=$enable_iso_c;
7561
else
7562
enable_iso_c=no
7563
fi
7564
7565
7566
- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
7567
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5
7568
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
7569
complCFLAGS=
7570
if test "x$enable_iso_c" != "xno"; then
7571
@@ -12530,7 +11619,7 @@
7572
esac
7573
fi
7574
fi
7575
- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
7576
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5
7577
$as_echo "$complCFLAGS" >&6; }
7578
7579
WARN_CFLAGS="$warning_flags $complCFLAGS"
7580
@@ -12542,9 +11631,9 @@
7581
if test -n "$ac_tool_prefix"; then
7582
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
7583
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
7584
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7585
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7586
$as_echo_n "checking for $ac_word... " >&6; }
7587
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
7588
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
7589
$as_echo_n "(cached) " >&6
7590
else
7591
case $PKG_CONFIG in
7592
@@ -12557,14 +11646,14 @@
7593
do
7594
IFS=$as_save_IFS
7595
test -z "$as_dir" && as_dir=.
7596
- for ac_exec_ext in '' $ac_executable_extensions; do
7597
+ for ac_exec_ext in '' $ac_executable_extensions; do
7598
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7599
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7600
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7601
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7602
break 2
7603
fi
7604
done
7605
-done
7606
+ done
7607
IFS=$as_save_IFS
7608
7609
;;
7610
@@ -12572,10 +11661,10 @@
7611
fi
7612
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
7613
if test -n "$PKG_CONFIG"; then
7614
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
7615
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
7616
$as_echo "$PKG_CONFIG" >&6; }
7617
else
7618
- { $as_echo "$as_me:$LINENO: result: no" >&5
7619
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7620
$as_echo "no" >&6; }
7621
fi
7622
7623
@@ -12585,9 +11674,9 @@
7624
ac_pt_PKG_CONFIG=$PKG_CONFIG
7625
# Extract the first word of "pkg-config", so it can be a program name with args.
7626
set dummy pkg-config; ac_word=$2
7627
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7628
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7629
$as_echo_n "checking for $ac_word... " >&6; }
7630
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
7631
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
7632
$as_echo_n "(cached) " >&6
7633
else
7634
case $ac_pt_PKG_CONFIG in
7635
@@ -12600,14 +11689,14 @@
7636
do
7637
IFS=$as_save_IFS
7638
test -z "$as_dir" && as_dir=.
7639
- for ac_exec_ext in '' $ac_executable_extensions; do
7640
+ for ac_exec_ext in '' $ac_executable_extensions; do
7641
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7642
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7643
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7644
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7645
break 2
7646
fi
7647
done
7648
-done
7649
+ done
7650
IFS=$as_save_IFS
7651
7652
;;
7653
@@ -12615,10 +11704,10 @@
7654
fi
7655
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
7656
if test -n "$ac_pt_PKG_CONFIG"; then
7657
- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
7658
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
7659
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
7660
else
7661
- { $as_echo "$as_me:$LINENO: result: no" >&5
7662
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7663
$as_echo "no" >&6; }
7664
fi
7665
7666
@@ -12627,7 +11716,7 @@
7667
else
7668
case $cross_compiling:$ac_tool_warned in
7669
yes:)
7670
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
7671
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7672
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7673
ac_tool_warned=yes ;;
7674
esac
7675
@@ -12640,13 +11729,13 @@
7676
fi
7677
if test -n "$PKG_CONFIG"; then
7678
_pkg_min_version=0.9.0
7679
- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
7680
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
7681
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
7682
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
7683
- { $as_echo "$as_me:$LINENO: result: yes" >&5
7684
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7685
$as_echo "yes" >&6; }
7686
else
7687
- { $as_echo "$as_me:$LINENO: result: no" >&5
7688
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7689
$as_echo "no" >&6; }
7690
PKG_CONFIG=""
7691
fi
7692
@@ -12655,35 +11744,33 @@
7693
7694
gdu_cv_version_required=0.3.2
7695
7696
-{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
7697
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
7698
$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
7699
if test -n "$PKG_CONFIG" && \
7700
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
7701
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
7702
($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
7703
ac_status=$?
7704
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7705
- (exit $ac_status); }; then
7706
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7707
+ test $ac_status = 0; }; then
7708
gdu_cv_have_gdu=yes
7709
else
7710
gdu_cv_have_gdu=no
7711
fi
7712
7713
if test "$gdu_cv_have_gdu" = "yes"; then
7714
- { $as_echo "$as_me:$LINENO: result: yes" >&5
7715
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7716
$as_echo "yes" >&6; }
7717
:
7718
else
7719
- { $as_echo "$as_me:$LINENO: result: no" >&5
7720
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7721
$as_echo "no" >&6; }
7722
- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
7723
-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
7724
- { (exit 1); exit 1; }; }
7725
+ as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
7726
fi
7727
7728
7729
7730
# Check whether --with-help-dir was given.
7731
-if test "${with_help_dir+set}" = set; then
7732
+if test "${with_help_dir+set}" = set; then :
7733
withval=$with_help_dir;
7734
else
7735
with_help_dir='${datadir}/gnome/help'
7736
@@ -12694,7 +11781,7 @@
7737
7738
7739
# Check whether --with-omf-dir was given.
7740
-if test "${with_omf_dir+set}" = set; then
7741
+if test "${with_omf_dir+set}" = set; then :
7742
withval=$with_omf_dir;
7743
else
7744
with_omf_dir='${datadir}/omf'
7745
@@ -12705,7 +11792,7 @@
7746
7747
7748
# Check whether --with-help-formats was given.
7749
-if test "${with_help_formats+set}" = set; then
7750
+if test "${with_help_formats+set}" = set; then :
7751
withval=$with_help_formats;
7752
else
7753
with_help_formats=''
7754
@@ -12715,7 +11802,7 @@
7755
7756
7757
# Check whether --enable-scrollkeeper was given.
7758
-if test "${enable_scrollkeeper+set}" = set; then
7759
+if test "${enable_scrollkeeper+set}" = set; then :
7760
enableval=$enable_scrollkeeper;
7761
else
7762
enable_scrollkeeper=yes
7763
@@ -12746,9 +11833,9 @@
7764
7765
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
7766
set dummy glib-genmarshal; ac_word=$2
7767
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7768
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7769
$as_echo_n "checking for $ac_word... " >&6; }
7770
-if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then
7771
+if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then :
7772
$as_echo_n "(cached) " >&6
7773
else
7774
case $GLIB_GENMARSHAL in
7775
@@ -12761,14 +11848,14 @@
7776
do
7777
IFS=$as_save_IFS
7778
test -z "$as_dir" && as_dir=.
7779
- for ac_exec_ext in '' $ac_executable_extensions; do
7780
+ for ac_exec_ext in '' $ac_executable_extensions; do
7781
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7782
ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
7783
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7784
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7785
break 2
7786
fi
7787
done
7788
-done
7789
+ done
7790
IFS=$as_save_IFS
7791
7792
;;
7793
@@ -12776,10 +11863,10 @@
7794
fi
7795
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
7796
if test -n "$GLIB_GENMARSHAL"; then
7797
- { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
7798
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5
7799
$as_echo "$GLIB_GENMARSHAL" >&6; }
7800
else
7801
- { $as_echo "$as_me:$LINENO: result: no" >&5
7802
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7803
$as_echo "no" >&6; }
7804
fi
7805
7806
@@ -12797,7 +11884,7 @@
7807
fi
7808
7809
# Check whether --enable-strict was given.
7810
-if test "${enable_strict+set}" = set; then
7811
+if test "${enable_strict+set}" = set; then :
7812
enableval=$enable_strict; enable_strict=$enableval
7813
else
7814
enable_strict=$default_strict
7815
@@ -12854,152 +11941,16 @@
7816
GETTEXT_PACKAGE=gnome-power-manager
7817
7818
7819
-cat >>confdefs.h <<\_ACEOF
7820
-#define GETTEXT_PACKAGE "gnome-power-manager"
7821
-_ACEOF
7822
-
7823
-
7824
-
7825
-
7826
-for ac_header in locale.h
7827
-do
7828
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
7829
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
7830
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
7831
-$as_echo_n "checking for $ac_header... " >&6; }
7832
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
7833
- $as_echo_n "(cached) " >&6
7834
-fi
7835
-ac_res=`eval 'as_val=${'$as_ac_Header'}
7836
- $as_echo "$as_val"'`
7837
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
7838
-$as_echo "$ac_res" >&6; }
7839
-else
7840
- # Is the header compilable?
7841
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
7842
-$as_echo_n "checking $ac_header usability... " >&6; }
7843
-cat >conftest.$ac_ext <<_ACEOF
7844
-/* confdefs.h. */
7845
-_ACEOF
7846
-cat confdefs.h >>conftest.$ac_ext
7847
-cat >>conftest.$ac_ext <<_ACEOF
7848
-/* end confdefs.h. */
7849
-$ac_includes_default
7850
-#include <$ac_header>
7851
-_ACEOF
7852
-rm -f conftest.$ac_objext
7853
-if { (ac_try="$ac_compile"
7854
-case "(($ac_try" in
7855
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7856
- *) ac_try_echo=$ac_try;;
7857
-esac
7858
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7859
-$as_echo "$ac_try_echo") >&5
7860
- (eval "$ac_compile") 2>conftest.er1
7861
- ac_status=$?
7862
- grep -v '^ *+' conftest.er1 >conftest.err
7863
- rm -f conftest.er1
7864
- cat conftest.err >&5
7865
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7866
- (exit $ac_status); } && {
7867
- test -z "$ac_c_werror_flag" ||
7868
- test ! -s conftest.err
7869
- } && test -s conftest.$ac_objext; then
7870
- ac_header_compiler=yes
7871
-else
7872
- $as_echo "$as_me: failed program was:" >&5
7873
-sed 's/^/| /' conftest.$ac_ext >&5
7874
-
7875
- ac_header_compiler=no
7876
-fi
7877
-
7878
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7879
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
7880
-$as_echo "$ac_header_compiler" >&6; }
7881
-
7882
-# Is the header present?
7883
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
7884
-$as_echo_n "checking $ac_header presence... " >&6; }
7885
-cat >conftest.$ac_ext <<_ACEOF
7886
-/* confdefs.h. */
7887
-_ACEOF
7888
-cat confdefs.h >>conftest.$ac_ext
7889
-cat >>conftest.$ac_ext <<_ACEOF
7890
-/* end confdefs.h. */
7891
-#include <$ac_header>
7892
-_ACEOF
7893
-if { (ac_try="$ac_cpp conftest.$ac_ext"
7894
-case "(($ac_try" in
7895
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7896
- *) ac_try_echo=$ac_try;;
7897
-esac
7898
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7899
-$as_echo "$ac_try_echo") >&5
7900
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
7901
- ac_status=$?
7902
- grep -v '^ *+' conftest.er1 >conftest.err
7903
- rm -f conftest.er1
7904
- cat conftest.err >&5
7905
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7906
- (exit $ac_status); } >/dev/null && {
7907
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
7908
- test ! -s conftest.err
7909
- }; then
7910
- ac_header_preproc=yes
7911
-else
7912
- $as_echo "$as_me: failed program was:" >&5
7913
-sed 's/^/| /' conftest.$ac_ext >&5
7914
-
7915
- ac_header_preproc=no
7916
-fi
7917
-
7918
-rm -f conftest.err conftest.$ac_ext
7919
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
7920
-$as_echo "$ac_header_preproc" >&6; }
7921
+$as_echo "#define GETTEXT_PACKAGE \"gnome-power-manager\"" >>confdefs.h
7922
7923
-# So? What about this header?
7924
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
7925
- yes:no: )
7926
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
7927
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
7928
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
7929
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
7930
- ac_header_preproc=yes
7931
- ;;
7932
- no:yes:* )
7933
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
7934
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
7935
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
7936
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
7937
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
7938
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
7939
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
7940
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
7941
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
7942
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
7943
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
7944
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
7945
7946
- ;;
7947
-esac
7948
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
7949
-$as_echo_n "checking for $ac_header... " >&6; }
7950
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
7951
- $as_echo_n "(cached) " >&6
7952
-else
7953
- eval "$as_ac_Header=\$ac_header_preproc"
7954
-fi
7955
-ac_res=`eval 'as_val=${'$as_ac_Header'}
7956
- $as_echo "$as_val"'`
7957
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
7958
-$as_echo "$ac_res" >&6; }
7959
7960
-fi
7961
-as_val=`eval 'as_val=${'$as_ac_Header'}
7962
- $as_echo "$as_val"'`
7963
- if test "x$as_val" = x""yes; then
7964
+ for ac_header in locale.h
7965
+do :
7966
+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
7967
+if test "x$ac_cv_header_locale_h" = x""yes; then :
7968
cat >>confdefs.h <<_ACEOF
7969
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
7970
+#define HAVE_LOCALE_H 1
7971
_ACEOF
7972
7973
fi
7974
@@ -13007,16 +11958,12 @@
7975
done
7976
7977
if test $ac_cv_header_locale_h = yes; then
7978
- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
7979
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
7980
$as_echo_n "checking for LC_MESSAGES... " >&6; }
7981
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
7982
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
7983
$as_echo_n "(cached) " >&6
7984
else
7985
- cat >conftest.$ac_ext <<_ACEOF
7986
-/* confdefs.h. */
7987
-_ACEOF
7988
-cat confdefs.h >>conftest.$ac_ext
7989
-cat >>conftest.$ac_ext <<_ACEOF
7990
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7991
/* end confdefs.h. */
7992
#include <locale.h>
7993
int
7994
@@ -13027,46 +11974,19 @@
7995
return 0;
7996
}
7997
_ACEOF
7998
-rm -f conftest.$ac_objext conftest$ac_exeext
7999
-if { (ac_try="$ac_link"
8000
-case "(($ac_try" in
8001
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8002
- *) ac_try_echo=$ac_try;;
8003
-esac
8004
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8005
-$as_echo "$ac_try_echo") >&5
8006
- (eval "$ac_link") 2>conftest.er1
8007
- ac_status=$?
8008
- grep -v '^ *+' conftest.er1 >conftest.err
8009
- rm -f conftest.er1
8010
- cat conftest.err >&5
8011
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8012
- (exit $ac_status); } && {
8013
- test -z "$ac_c_werror_flag" ||
8014
- test ! -s conftest.err
8015
- } && test -s conftest$ac_exeext && {
8016
- test "$cross_compiling" = yes ||
8017
- $as_test_x conftest$ac_exeext
8018
- }; then
8019
+if ac_fn_c_try_link "$LINENO"; then :
8020
am_cv_val_LC_MESSAGES=yes
8021
else
8022
- $as_echo "$as_me: failed program was:" >&5
8023
-sed 's/^/| /' conftest.$ac_ext >&5
8024
-
8025
- am_cv_val_LC_MESSAGES=no
8026
+ am_cv_val_LC_MESSAGES=no
8027
fi
8028
-
8029
-rm -rf conftest.dSYM
8030
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8031
- conftest$ac_exeext conftest.$ac_ext
8032
+rm -f core conftest.err conftest.$ac_objext \
8033
+ conftest$ac_exeext conftest.$ac_ext
8034
fi
8035
-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
8036
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
8037
$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
8038
if test $am_cv_val_LC_MESSAGES = yes; then
8039
8040
-cat >>confdefs.h <<\_ACEOF
8041
-#define HAVE_LC_MESSAGES 1
8042
-_ACEOF
8043
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
8044
8045
fi
8046
fi
8047
@@ -13079,150 +11999,20 @@
8048
XGETTEXT=:
8049
INTLLIBS=
8050
8051
- if test "${ac_cv_header_libintl_h+set}" = set; then
8052
- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
8053
-$as_echo_n "checking for libintl.h... " >&6; }
8054
-if test "${ac_cv_header_libintl_h+set}" = set; then
8055
- $as_echo_n "(cached) " >&6
8056
-fi
8057
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
8058
-$as_echo "$ac_cv_header_libintl_h" >&6; }
8059
-else
8060
- # Is the header compilable?
8061
-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
8062
-$as_echo_n "checking libintl.h usability... " >&6; }
8063
-cat >conftest.$ac_ext <<_ACEOF
8064
-/* confdefs.h. */
8065
-_ACEOF
8066
-cat confdefs.h >>conftest.$ac_ext
8067
-cat >>conftest.$ac_ext <<_ACEOF
8068
-/* end confdefs.h. */
8069
-$ac_includes_default
8070
-#include <libintl.h>
8071
-_ACEOF
8072
-rm -f conftest.$ac_objext
8073
-if { (ac_try="$ac_compile"
8074
-case "(($ac_try" in
8075
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8076
- *) ac_try_echo=$ac_try;;
8077
-esac
8078
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8079
-$as_echo "$ac_try_echo") >&5
8080
- (eval "$ac_compile") 2>conftest.er1
8081
- ac_status=$?
8082
- grep -v '^ *+' conftest.er1 >conftest.err
8083
- rm -f conftest.er1
8084
- cat conftest.err >&5
8085
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8086
- (exit $ac_status); } && {
8087
- test -z "$ac_c_werror_flag" ||
8088
- test ! -s conftest.err
8089
- } && test -s conftest.$ac_objext; then
8090
- ac_header_compiler=yes
8091
-else
8092
- $as_echo "$as_me: failed program was:" >&5
8093
-sed 's/^/| /' conftest.$ac_ext >&5
8094
-
8095
- ac_header_compiler=no
8096
-fi
8097
-
8098
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8099
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
8100
-$as_echo "$ac_header_compiler" >&6; }
8101
-
8102
-# Is the header present?
8103
-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
8104
-$as_echo_n "checking libintl.h presence... " >&6; }
8105
-cat >conftest.$ac_ext <<_ACEOF
8106
-/* confdefs.h. */
8107
-_ACEOF
8108
-cat confdefs.h >>conftest.$ac_ext
8109
-cat >>conftest.$ac_ext <<_ACEOF
8110
-/* end confdefs.h. */
8111
-#include <libintl.h>
8112
-_ACEOF
8113
-if { (ac_try="$ac_cpp conftest.$ac_ext"
8114
-case "(($ac_try" in
8115
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8116
- *) ac_try_echo=$ac_try;;
8117
-esac
8118
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8119
-$as_echo "$ac_try_echo") >&5
8120
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
8121
- ac_status=$?
8122
- grep -v '^ *+' conftest.er1 >conftest.err
8123
- rm -f conftest.er1
8124
- cat conftest.err >&5
8125
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8126
- (exit $ac_status); } >/dev/null && {
8127
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
8128
- test ! -s conftest.err
8129
- }; then
8130
- ac_header_preproc=yes
8131
-else
8132
- $as_echo "$as_me: failed program was:" >&5
8133
-sed 's/^/| /' conftest.$ac_ext >&5
8134
-
8135
- ac_header_preproc=no
8136
-fi
8137
-
8138
-rm -f conftest.err conftest.$ac_ext
8139
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
8140
-$as_echo "$ac_header_preproc" >&6; }
8141
-
8142
-# So? What about this header?
8143
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
8144
- yes:no: )
8145
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
8146
-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
8147
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
8148
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
8149
- ac_header_preproc=yes
8150
- ;;
8151
- no:yes:* )
8152
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
8153
-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
8154
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
8155
-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
8156
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
8157
-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
8158
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
8159
-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
8160
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
8161
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
8162
- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
8163
-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
8164
-
8165
- ;;
8166
-esac
8167
-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
8168
-$as_echo_n "checking for libintl.h... " >&6; }
8169
-if test "${ac_cv_header_libintl_h+set}" = set; then
8170
- $as_echo_n "(cached) " >&6
8171
-else
8172
- ac_cv_header_libintl_h=$ac_header_preproc
8173
-fi
8174
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
8175
-$as_echo "$ac_cv_header_libintl_h" >&6; }
8176
-
8177
-fi
8178
-if test "x$ac_cv_header_libintl_h" = x""yes; then
8179
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
8180
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
8181
gt_cv_func_dgettext_libintl="no"
8182
libintl_extra_libs=""
8183
8184
#
8185
# First check in libc
8186
#
8187
- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
8188
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
8189
$as_echo_n "checking for ngettext in libc... " >&6; }
8190
-if test "${gt_cv_func_ngettext_libc+set}" = set; then
8191
+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
8192
$as_echo_n "(cached) " >&6
8193
else
8194
- cat >conftest.$ac_ext <<_ACEOF
8195
-/* confdefs.h. */
8196
-_ACEOF
8197
-cat confdefs.h >>conftest.$ac_ext
8198
-cat >>conftest.$ac_ext <<_ACEOF
8199
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8200
/* end confdefs.h. */
8201
8202
#include <libintl.h>
8203
@@ -13235,54 +12025,25 @@
8204
return 0;
8205
}
8206
_ACEOF
8207
-rm -f conftest.$ac_objext conftest$ac_exeext
8208
-if { (ac_try="$ac_link"
8209
-case "(($ac_try" in
8210
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8211
- *) ac_try_echo=$ac_try;;
8212
-esac
8213
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8214
-$as_echo "$ac_try_echo") >&5
8215
- (eval "$ac_link") 2>conftest.er1
8216
- ac_status=$?
8217
- grep -v '^ *+' conftest.er1 >conftest.err
8218
- rm -f conftest.er1
8219
- cat conftest.err >&5
8220
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8221
- (exit $ac_status); } && {
8222
- test -z "$ac_c_werror_flag" ||
8223
- test ! -s conftest.err
8224
- } && test -s conftest$ac_exeext && {
8225
- test "$cross_compiling" = yes ||
8226
- $as_test_x conftest$ac_exeext
8227
- }; then
8228
+if ac_fn_c_try_link "$LINENO"; then :
8229
gt_cv_func_ngettext_libc=yes
8230
else
8231
- $as_echo "$as_me: failed program was:" >&5
8232
-sed 's/^/| /' conftest.$ac_ext >&5
8233
-
8234
- gt_cv_func_ngettext_libc=no
8235
+ gt_cv_func_ngettext_libc=no
8236
fi
8237
-
8238
-rm -rf conftest.dSYM
8239
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8240
- conftest$ac_exeext conftest.$ac_ext
8241
+rm -f core conftest.err conftest.$ac_objext \
8242
+ conftest$ac_exeext conftest.$ac_ext
8243
8244
fi
8245
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
8246
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
8247
$as_echo "$gt_cv_func_ngettext_libc" >&6; }
8248
8249
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
8250
- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
8251
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
8252
$as_echo_n "checking for dgettext in libc... " >&6; }
8253
-if test "${gt_cv_func_dgettext_libc+set}" = set; then
8254
+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
8255
$as_echo_n "(cached) " >&6
8256
else
8257
- cat >conftest.$ac_ext <<_ACEOF
8258
-/* confdefs.h. */
8259
-_ACEOF
8260
-cat confdefs.h >>conftest.$ac_ext
8261
-cat >>conftest.$ac_ext <<_ACEOF
8262
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8263
/* end confdefs.h. */
8264
8265
#include <libintl.h>
8266
@@ -13295,141 +12056,26 @@
8267
return 0;
8268
}
8269
_ACEOF
8270
-rm -f conftest.$ac_objext conftest$ac_exeext
8271
-if { (ac_try="$ac_link"
8272
-case "(($ac_try" in
8273
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8274
- *) ac_try_echo=$ac_try;;
8275
-esac
8276
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8277
-$as_echo "$ac_try_echo") >&5
8278
- (eval "$ac_link") 2>conftest.er1
8279
- ac_status=$?
8280
- grep -v '^ *+' conftest.er1 >conftest.err
8281
- rm -f conftest.er1
8282
- cat conftest.err >&5
8283
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8284
- (exit $ac_status); } && {
8285
- test -z "$ac_c_werror_flag" ||
8286
- test ! -s conftest.err
8287
- } && test -s conftest$ac_exeext && {
8288
- test "$cross_compiling" = yes ||
8289
- $as_test_x conftest$ac_exeext
8290
- }; then
8291
+if ac_fn_c_try_link "$LINENO"; then :
8292
gt_cv_func_dgettext_libc=yes
8293
else
8294
- $as_echo "$as_me: failed program was:" >&5
8295
-sed 's/^/| /' conftest.$ac_ext >&5
8296
-
8297
- gt_cv_func_dgettext_libc=no
8298
+ gt_cv_func_dgettext_libc=no
8299
fi
8300
-
8301
-rm -rf conftest.dSYM
8302
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8303
- conftest$ac_exeext conftest.$ac_ext
8304
+rm -f core conftest.err conftest.$ac_objext \
8305
+ conftest$ac_exeext conftest.$ac_ext
8306
8307
fi
8308
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
8309
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
8310
$as_echo "$gt_cv_func_dgettext_libc" >&6; }
8311
fi
8312
8313
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
8314
-
8315
-for ac_func in bind_textdomain_codeset
8316
-do
8317
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
8318
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
8319
-$as_echo_n "checking for $ac_func... " >&6; }
8320
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
8321
- $as_echo_n "(cached) " >&6
8322
-else
8323
- cat >conftest.$ac_ext <<_ACEOF
8324
-/* confdefs.h. */
8325
-_ACEOF
8326
-cat confdefs.h >>conftest.$ac_ext
8327
-cat >>conftest.$ac_ext <<_ACEOF
8328
-/* end confdefs.h. */
8329
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
8330
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
8331
-#define $ac_func innocuous_$ac_func
8332
-
8333
-/* System header to define __stub macros and hopefully few prototypes,
8334
- which can conflict with char $ac_func (); below.
8335
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
8336
- <limits.h> exists even on freestanding compilers. */
8337
-
8338
-#ifdef __STDC__
8339
-# include <limits.h>
8340
-#else
8341
-# include <assert.h>
8342
-#endif
8343
-
8344
-#undef $ac_func
8345
-
8346
-/* Override any GCC internal prototype to avoid an error.
8347
- Use char because int might match the return type of a GCC
8348
- builtin and then its argument prototype would still apply. */
8349
-#ifdef __cplusplus
8350
-extern "C"
8351
-#endif
8352
-char $ac_func ();
8353
-/* The GNU C library defines this for functions which it implements
8354
- to always fail with ENOSYS. Some functions are actually named
8355
- something starting with __ and the normal name is an alias. */
8356
-#if defined __stub_$ac_func || defined __stub___$ac_func
8357
-choke me
8358
-#endif
8359
-
8360
-int
8361
-main ()
8362
-{
8363
-return $ac_func ();
8364
- ;
8365
- return 0;
8366
-}
8367
-_ACEOF
8368
-rm -f conftest.$ac_objext conftest$ac_exeext
8369
-if { (ac_try="$ac_link"
8370
-case "(($ac_try" in
8371
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8372
- *) ac_try_echo=$ac_try;;
8373
-esac
8374
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8375
-$as_echo "$ac_try_echo") >&5
8376
- (eval "$ac_link") 2>conftest.er1
8377
- ac_status=$?
8378
- grep -v '^ *+' conftest.er1 >conftest.err
8379
- rm -f conftest.er1
8380
- cat conftest.err >&5
8381
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8382
- (exit $ac_status); } && {
8383
- test -z "$ac_c_werror_flag" ||
8384
- test ! -s conftest.err
8385
- } && test -s conftest$ac_exeext && {
8386
- test "$cross_compiling" = yes ||
8387
- $as_test_x conftest$ac_exeext
8388
- }; then
8389
- eval "$as_ac_var=yes"
8390
-else
8391
- $as_echo "$as_me: failed program was:" >&5
8392
-sed 's/^/| /' conftest.$ac_ext >&5
8393
-
8394
- eval "$as_ac_var=no"
8395
-fi
8396
-
8397
-rm -rf conftest.dSYM
8398
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8399
- conftest$ac_exeext conftest.$ac_ext
8400
-fi
8401
-ac_res=`eval 'as_val=${'$as_ac_var'}
8402
- $as_echo "$as_val"'`
8403
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
8404
-$as_echo "$ac_res" >&6; }
8405
-as_val=`eval 'as_val=${'$as_ac_var'}
8406
- $as_echo "$as_val"'`
8407
- if test "x$as_val" = x""yes; then
8408
- cat >>confdefs.h <<_ACEOF
8409
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
8410
+ for ac_func in bind_textdomain_codeset
8411
+do :
8412
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
8413
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
8414
+ cat >>confdefs.h <<_ACEOF
8415
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
8416
_ACEOF
8417
8418
fi
8419
@@ -13444,18 +12090,14 @@
8420
|| test "$gt_cv_func_ngettext_libc" != "yes" \
8421
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
8422
8423
- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
8424
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
8425
$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
8426
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
8427
+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
8428
$as_echo_n "(cached) " >&6
8429
else
8430
ac_check_lib_save_LIBS=$LIBS
8431
LIBS="-lintl $LIBS"
8432
-cat >conftest.$ac_ext <<_ACEOF
8433
-/* confdefs.h. */
8434
-_ACEOF
8435
-cat confdefs.h >>conftest.$ac_ext
8436
-cat >>conftest.$ac_ext <<_ACEOF
8437
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8438
/* end confdefs.h. */
8439
8440
/* Override any GCC internal prototype to avoid an error.
8441
@@ -13473,55 +12115,26 @@
8442
return 0;
8443
}
8444
_ACEOF
8445
-rm -f conftest.$ac_objext conftest$ac_exeext
8446
-if { (ac_try="$ac_link"
8447
-case "(($ac_try" in
8448
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8449
- *) ac_try_echo=$ac_try;;
8450
-esac
8451
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8452
-$as_echo "$ac_try_echo") >&5
8453
- (eval "$ac_link") 2>conftest.er1
8454
- ac_status=$?
8455
- grep -v '^ *+' conftest.er1 >conftest.err
8456
- rm -f conftest.er1
8457
- cat conftest.err >&5
8458
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8459
- (exit $ac_status); } && {
8460
- test -z "$ac_c_werror_flag" ||
8461
- test ! -s conftest.err
8462
- } && test -s conftest$ac_exeext && {
8463
- test "$cross_compiling" = yes ||
8464
- $as_test_x conftest$ac_exeext
8465
- }; then
8466
+if ac_fn_c_try_link "$LINENO"; then :
8467
ac_cv_lib_intl_bindtextdomain=yes
8468
else
8469
- $as_echo "$as_me: failed program was:" >&5
8470
-sed 's/^/| /' conftest.$ac_ext >&5
8471
-
8472
- ac_cv_lib_intl_bindtextdomain=no
8473
+ ac_cv_lib_intl_bindtextdomain=no
8474
fi
8475
-
8476
-rm -rf conftest.dSYM
8477
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8478
- conftest$ac_exeext conftest.$ac_ext
8479
+rm -f core conftest.err conftest.$ac_objext \
8480
+ conftest$ac_exeext conftest.$ac_ext
8481
LIBS=$ac_check_lib_save_LIBS
8482
fi
8483
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
8484
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
8485
$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
8486
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
8487
- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
8488
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
8489
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
8490
$as_echo_n "checking for ngettext in -lintl... " >&6; }
8491
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
8492
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
8493
$as_echo_n "(cached) " >&6
8494
else
8495
ac_check_lib_save_LIBS=$LIBS
8496
LIBS="-lintl $LIBS"
8497
-cat >conftest.$ac_ext <<_ACEOF
8498
-/* confdefs.h. */
8499
-_ACEOF
8500
-cat confdefs.h >>conftest.$ac_ext
8501
-cat >>conftest.$ac_ext <<_ACEOF
8502
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8503
/* end confdefs.h. */
8504
8505
/* Override any GCC internal prototype to avoid an error.
8506
@@ -13539,55 +12152,26 @@
8507
return 0;
8508
}
8509
_ACEOF
8510
-rm -f conftest.$ac_objext conftest$ac_exeext
8511
-if { (ac_try="$ac_link"
8512
-case "(($ac_try" in
8513
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8514
- *) ac_try_echo=$ac_try;;
8515
-esac
8516
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8517
-$as_echo "$ac_try_echo") >&5
8518
- (eval "$ac_link") 2>conftest.er1
8519
- ac_status=$?
8520
- grep -v '^ *+' conftest.er1 >conftest.err
8521
- rm -f conftest.er1
8522
- cat conftest.err >&5
8523
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8524
- (exit $ac_status); } && {
8525
- test -z "$ac_c_werror_flag" ||
8526
- test ! -s conftest.err
8527
- } && test -s conftest$ac_exeext && {
8528
- test "$cross_compiling" = yes ||
8529
- $as_test_x conftest$ac_exeext
8530
- }; then
8531
+if ac_fn_c_try_link "$LINENO"; then :
8532
ac_cv_lib_intl_ngettext=yes
8533
else
8534
- $as_echo "$as_me: failed program was:" >&5
8535
-sed 's/^/| /' conftest.$ac_ext >&5
8536
-
8537
- ac_cv_lib_intl_ngettext=no
8538
+ ac_cv_lib_intl_ngettext=no
8539
fi
8540
-
8541
-rm -rf conftest.dSYM
8542
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8543
- conftest$ac_exeext conftest.$ac_ext
8544
+rm -f core conftest.err conftest.$ac_objext \
8545
+ conftest$ac_exeext conftest.$ac_ext
8546
LIBS=$ac_check_lib_save_LIBS
8547
fi
8548
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
8549
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
8550
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
8551
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
8552
- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
8553
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
8554
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
8555
$as_echo_n "checking for dgettext in -lintl... " >&6; }
8556
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
8557
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
8558
$as_echo_n "(cached) " >&6
8559
else
8560
ac_check_lib_save_LIBS=$LIBS
8561
LIBS="-lintl $LIBS"
8562
-cat >conftest.$ac_ext <<_ACEOF
8563
-/* confdefs.h. */
8564
-_ACEOF
8565
-cat confdefs.h >>conftest.$ac_ext
8566
-cat >>conftest.$ac_ext <<_ACEOF
8567
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8568
/* end confdefs.h. */
8569
8570
/* Override any GCC internal prototype to avoid an error.
8571
@@ -13605,43 +12189,18 @@
8572
return 0;
8573
}
8574
_ACEOF
8575
-rm -f conftest.$ac_objext conftest$ac_exeext
8576
-if { (ac_try="$ac_link"
8577
-case "(($ac_try" in
8578
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8579
- *) ac_try_echo=$ac_try;;
8580
-esac
8581
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8582
-$as_echo "$ac_try_echo") >&5
8583
- (eval "$ac_link") 2>conftest.er1
8584
- ac_status=$?
8585
- grep -v '^ *+' conftest.er1 >conftest.err
8586
- rm -f conftest.er1
8587
- cat conftest.err >&5
8588
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8589
- (exit $ac_status); } && {
8590
- test -z "$ac_c_werror_flag" ||
8591
- test ! -s conftest.err
8592
- } && test -s conftest$ac_exeext && {
8593
- test "$cross_compiling" = yes ||
8594
- $as_test_x conftest$ac_exeext
8595
- }; then
8596
+if ac_fn_c_try_link "$LINENO"; then :
8597
ac_cv_lib_intl_dgettext=yes
8598
else
8599
- $as_echo "$as_me: failed program was:" >&5
8600
-sed 's/^/| /' conftest.$ac_ext >&5
8601
-
8602
- ac_cv_lib_intl_dgettext=no
8603
+ ac_cv_lib_intl_dgettext=no
8604
fi
8605
-
8606
-rm -rf conftest.dSYM
8607
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8608
- conftest$ac_exeext conftest.$ac_ext
8609
+rm -f core conftest.err conftest.$ac_objext \
8610
+ conftest$ac_exeext conftest.$ac_ext
8611
LIBS=$ac_check_lib_save_LIBS
8612
fi
8613
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
8614
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
8615
$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
8616
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
8617
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
8618
gt_cv_func_dgettext_libintl=yes
8619
fi
8620
8621
@@ -13651,22 +12210,18 @@
8622
8623
8624
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
8625
- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
8626
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
8627
$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
8628
- { $as_echo "$as_me:$LINENO: result: " >&5
8629
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
8630
$as_echo "" >&6; }
8631
- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
8632
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
8633
$as_echo_n "checking for ngettext in -lintl... " >&6; }
8634
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
8635
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
8636
$as_echo_n "(cached) " >&6
8637
else
8638
ac_check_lib_save_LIBS=$LIBS
8639
LIBS="-lintl -liconv $LIBS"
8640
-cat >conftest.$ac_ext <<_ACEOF
8641
-/* confdefs.h. */
8642
-_ACEOF
8643
-cat confdefs.h >>conftest.$ac_ext
8644
-cat >>conftest.$ac_ext <<_ACEOF
8645
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8646
/* end confdefs.h. */
8647
8648
/* Override any GCC internal prototype to avoid an error.
8649
@@ -13684,55 +12239,26 @@
8650
return 0;
8651
}
8652
_ACEOF
8653
-rm -f conftest.$ac_objext conftest$ac_exeext
8654
-if { (ac_try="$ac_link"
8655
-case "(($ac_try" in
8656
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8657
- *) ac_try_echo=$ac_try;;
8658
-esac
8659
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8660
-$as_echo "$ac_try_echo") >&5
8661
- (eval "$ac_link") 2>conftest.er1
8662
- ac_status=$?
8663
- grep -v '^ *+' conftest.er1 >conftest.err
8664
- rm -f conftest.er1
8665
- cat conftest.err >&5
8666
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8667
- (exit $ac_status); } && {
8668
- test -z "$ac_c_werror_flag" ||
8669
- test ! -s conftest.err
8670
- } && test -s conftest$ac_exeext && {
8671
- test "$cross_compiling" = yes ||
8672
- $as_test_x conftest$ac_exeext
8673
- }; then
8674
+if ac_fn_c_try_link "$LINENO"; then :
8675
ac_cv_lib_intl_ngettext=yes
8676
else
8677
- $as_echo "$as_me: failed program was:" >&5
8678
-sed 's/^/| /' conftest.$ac_ext >&5
8679
-
8680
- ac_cv_lib_intl_ngettext=no
8681
+ ac_cv_lib_intl_ngettext=no
8682
fi
8683
-
8684
-rm -rf conftest.dSYM
8685
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8686
- conftest$ac_exeext conftest.$ac_ext
8687
+rm -f core conftest.err conftest.$ac_objext \
8688
+ conftest$ac_exeext conftest.$ac_ext
8689
LIBS=$ac_check_lib_save_LIBS
8690
fi
8691
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
8692
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
8693
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
8694
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
8695
- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
8696
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
8697
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
8698
$as_echo_n "checking for dcgettext in -lintl... " >&6; }
8699
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
8700
+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
8701
$as_echo_n "(cached) " >&6
8702
else
8703
ac_check_lib_save_LIBS=$LIBS
8704
LIBS="-lintl -liconv $LIBS"
8705
-cat >conftest.$ac_ext <<_ACEOF
8706
-/* confdefs.h. */
8707
-_ACEOF
8708
-cat confdefs.h >>conftest.$ac_ext
8709
-cat >>conftest.$ac_ext <<_ACEOF
8710
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8711
/* end confdefs.h. */
8712
8713
/* Override any GCC internal prototype to avoid an error.
8714
@@ -13750,43 +12276,18 @@
8715
return 0;
8716
}
8717
_ACEOF
8718
-rm -f conftest.$ac_objext conftest$ac_exeext
8719
-if { (ac_try="$ac_link"
8720
-case "(($ac_try" in
8721
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8722
- *) ac_try_echo=$ac_try;;
8723
-esac
8724
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8725
-$as_echo "$ac_try_echo") >&5
8726
- (eval "$ac_link") 2>conftest.er1
8727
- ac_status=$?
8728
- grep -v '^ *+' conftest.er1 >conftest.err
8729
- rm -f conftest.er1
8730
- cat conftest.err >&5
8731
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8732
- (exit $ac_status); } && {
8733
- test -z "$ac_c_werror_flag" ||
8734
- test ! -s conftest.err
8735
- } && test -s conftest$ac_exeext && {
8736
- test "$cross_compiling" = yes ||
8737
- $as_test_x conftest$ac_exeext
8738
- }; then
8739
+if ac_fn_c_try_link "$LINENO"; then :
8740
ac_cv_lib_intl_dcgettext=yes
8741
else
8742
- $as_echo "$as_me: failed program was:" >&5
8743
-sed 's/^/| /' conftest.$ac_ext >&5
8744
-
8745
- ac_cv_lib_intl_dcgettext=no
8746
+ ac_cv_lib_intl_dcgettext=no
8747
fi
8748
-
8749
-rm -rf conftest.dSYM
8750
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8751
- conftest$ac_exeext conftest.$ac_ext
8752
+rm -f core conftest.err conftest.$ac_objext \
8753
+ conftest$ac_exeext conftest.$ac_ext
8754
LIBS=$ac_check_lib_save_LIBS
8755
fi
8756
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
8757
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
8758
$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
8759
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
8760
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
8761
gt_cv_func_dgettext_libintl=yes
8762
libintl_extra_libs=-liconv
8763
else
8764
@@ -13808,102 +12309,12 @@
8765
glib_save_LIBS="$LIBS"
8766
LIBS="$LIBS -lintl $libintl_extra_libs"
8767
unset ac_cv_func_bind_textdomain_codeset
8768
-
8769
-for ac_func in bind_textdomain_codeset
8770
-do
8771
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
8772
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
8773
-$as_echo_n "checking for $ac_func... " >&6; }
8774
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
8775
- $as_echo_n "(cached) " >&6
8776
-else
8777
- cat >conftest.$ac_ext <<_ACEOF
8778
-/* confdefs.h. */
8779
-_ACEOF
8780
-cat confdefs.h >>conftest.$ac_ext
8781
-cat >>conftest.$ac_ext <<_ACEOF
8782
-/* end confdefs.h. */
8783
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
8784
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
8785
-#define $ac_func innocuous_$ac_func
8786
-
8787
-/* System header to define __stub macros and hopefully few prototypes,
8788
- which can conflict with char $ac_func (); below.
8789
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
8790
- <limits.h> exists even on freestanding compilers. */
8791
-
8792
-#ifdef __STDC__
8793
-# include <limits.h>
8794
-#else
8795
-# include <assert.h>
8796
-#endif
8797
-
8798
-#undef $ac_func
8799
-
8800
-/* Override any GCC internal prototype to avoid an error.
8801
- Use char because int might match the return type of a GCC
8802
- builtin and then its argument prototype would still apply. */
8803
-#ifdef __cplusplus
8804
-extern "C"
8805
-#endif
8806
-char $ac_func ();
8807
-/* The GNU C library defines this for functions which it implements
8808
- to always fail with ENOSYS. Some functions are actually named
8809
- something starting with __ and the normal name is an alias. */
8810
-#if defined __stub_$ac_func || defined __stub___$ac_func
8811
-choke me
8812
-#endif
8813
-
8814
-int
8815
-main ()
8816
-{
8817
-return $ac_func ();
8818
- ;
8819
- return 0;
8820
-}
8821
-_ACEOF
8822
-rm -f conftest.$ac_objext conftest$ac_exeext
8823
-if { (ac_try="$ac_link"
8824
-case "(($ac_try" in
8825
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8826
- *) ac_try_echo=$ac_try;;
8827
-esac
8828
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8829
-$as_echo "$ac_try_echo") >&5
8830
- (eval "$ac_link") 2>conftest.er1
8831
- ac_status=$?
8832
- grep -v '^ *+' conftest.er1 >conftest.err
8833
- rm -f conftest.er1
8834
- cat conftest.err >&5
8835
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8836
- (exit $ac_status); } && {
8837
- test -z "$ac_c_werror_flag" ||
8838
- test ! -s conftest.err
8839
- } && test -s conftest$ac_exeext && {
8840
- test "$cross_compiling" = yes ||
8841
- $as_test_x conftest$ac_exeext
8842
- }; then
8843
- eval "$as_ac_var=yes"
8844
-else
8845
- $as_echo "$as_me: failed program was:" >&5
8846
-sed 's/^/| /' conftest.$ac_ext >&5
8847
-
8848
- eval "$as_ac_var=no"
8849
-fi
8850
-
8851
-rm -rf conftest.dSYM
8852
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8853
- conftest$ac_exeext conftest.$ac_ext
8854
-fi
8855
-ac_res=`eval 'as_val=${'$as_ac_var'}
8856
- $as_echo "$as_val"'`
8857
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
8858
-$as_echo "$ac_res" >&6; }
8859
-as_val=`eval 'as_val=${'$as_ac_var'}
8860
- $as_echo "$as_val"'`
8861
- if test "x$as_val" = x""yes; then
8862
+ for ac_func in bind_textdomain_codeset
8863
+do :
8864
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
8865
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
8866
cat >>confdefs.h <<_ACEOF
8867
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
8868
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
8869
_ACEOF
8870
8871
fi
8872
@@ -13933,15 +12344,13 @@
8873
8874
if test "$gt_cv_have_gettext" = "yes"; then
8875
8876
-cat >>confdefs.h <<\_ACEOF
8877
-#define HAVE_GETTEXT 1
8878
-_ACEOF
8879
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
8880
8881
# Extract the first word of "msgfmt", so it can be a program name with args.
8882
set dummy msgfmt; ac_word=$2
8883
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8884
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8885
$as_echo_n "checking for $ac_word... " >&6; }
8886
-if test "${ac_cv_path_MSGFMT+set}" = set; then
8887
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
8888
$as_echo_n "(cached) " >&6
8889
else
8890
case "$MSGFMT" in
8891
@@ -13966,118 +12375,28 @@
8892
fi
8893
MSGFMT="$ac_cv_path_MSGFMT"
8894
if test "$MSGFMT" != "no"; then
8895
- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
8896
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
8897
$as_echo "$MSGFMT" >&6; }
8898
else
8899
- { $as_echo "$as_me:$LINENO: result: no" >&5
8900
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8901
$as_echo "no" >&6; }
8902
fi
8903
if test "$MSGFMT" != "no"; then
8904
glib_save_LIBS="$LIBS"
8905
LIBS="$LIBS $INTLLIBS"
8906
-
8907
-for ac_func in dcgettext
8908
-do
8909
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
8910
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
8911
-$as_echo_n "checking for $ac_func... " >&6; }
8912
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
8913
- $as_echo_n "(cached) " >&6
8914
-else
8915
- cat >conftest.$ac_ext <<_ACEOF
8916
-/* confdefs.h. */
8917
-_ACEOF
8918
-cat confdefs.h >>conftest.$ac_ext
8919
-cat >>conftest.$ac_ext <<_ACEOF
8920
-/* end confdefs.h. */
8921
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
8922
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
8923
-#define $ac_func innocuous_$ac_func
8924
-
8925
-/* System header to define __stub macros and hopefully few prototypes,
8926
- which can conflict with char $ac_func (); below.
8927
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
8928
- <limits.h> exists even on freestanding compilers. */
8929
-
8930
-#ifdef __STDC__
8931
-# include <limits.h>
8932
-#else
8933
-# include <assert.h>
8934
-#endif
8935
-
8936
-#undef $ac_func
8937
-
8938
-/* Override any GCC internal prototype to avoid an error.
8939
- Use char because int might match the return type of a GCC
8940
- builtin and then its argument prototype would still apply. */
8941
-#ifdef __cplusplus
8942
-extern "C"
8943
-#endif
8944
-char $ac_func ();
8945
-/* The GNU C library defines this for functions which it implements
8946
- to always fail with ENOSYS. Some functions are actually named
8947
- something starting with __ and the normal name is an alias. */
8948
-#if defined __stub_$ac_func || defined __stub___$ac_func
8949
-choke me
8950
-#endif
8951
-
8952
-int
8953
-main ()
8954
-{
8955
-return $ac_func ();
8956
- ;
8957
- return 0;
8958
-}
8959
-_ACEOF
8960
-rm -f conftest.$ac_objext conftest$ac_exeext
8961
-if { (ac_try="$ac_link"
8962
-case "(($ac_try" in
8963
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8964
- *) ac_try_echo=$ac_try;;
8965
-esac
8966
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8967
-$as_echo "$ac_try_echo") >&5
8968
- (eval "$ac_link") 2>conftest.er1
8969
- ac_status=$?
8970
- grep -v '^ *+' conftest.er1 >conftest.err
8971
- rm -f conftest.er1
8972
- cat conftest.err >&5
8973
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8974
- (exit $ac_status); } && {
8975
- test -z "$ac_c_werror_flag" ||
8976
- test ! -s conftest.err
8977
- } && test -s conftest$ac_exeext && {
8978
- test "$cross_compiling" = yes ||
8979
- $as_test_x conftest$ac_exeext
8980
- }; then
8981
- eval "$as_ac_var=yes"
8982
-else
8983
- $as_echo "$as_me: failed program was:" >&5
8984
-sed 's/^/| /' conftest.$ac_ext >&5
8985
-
8986
- eval "$as_ac_var=no"
8987
-fi
8988
-
8989
-rm -rf conftest.dSYM
8990
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8991
- conftest$ac_exeext conftest.$ac_ext
8992
-fi
8993
-ac_res=`eval 'as_val=${'$as_ac_var'}
8994
- $as_echo "$as_val"'`
8995
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
8996
-$as_echo "$ac_res" >&6; }
8997
-as_val=`eval 'as_val=${'$as_ac_var'}
8998
- $as_echo "$as_val"'`
8999
- if test "x$as_val" = x""yes; then
9000
+ for ac_func in dcgettext
9001
+do :
9002
+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
9003
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
9004
cat >>confdefs.h <<_ACEOF
9005
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
9006
+#define HAVE_DCGETTEXT 1
9007
_ACEOF
9008
9009
fi
9010
done
9011
9012
MSGFMT_OPTS=
9013
- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
9014
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
9015
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
9016
cat >conftest.foo <<_ACEOF
9017
9018
@@ -14092,14 +12411,14 @@
9019
"Content-Transfer-Encoding: 8bit\n"
9020
9021
_ACEOF
9022
-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
9023
+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
9024
($MSGFMT -c -o /dev/null conftest.foo) 2>&5
9025
ac_status=$?
9026
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9027
- (exit $ac_status); }; then
9028
- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
9029
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9030
+ test $ac_status = 0; }; then
9031
+ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9032
$as_echo "yes" >&6; }
9033
-else { $as_echo "$as_me:$LINENO: result: no" >&5
9034
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9035
$as_echo "no" >&6; }
9036
echo "$as_me: failed input was:" >&5
9037
sed 's/^/| /' conftest.foo >&5
9038
@@ -14107,9 +12426,9 @@
9039
9040
# Extract the first word of "gmsgfmt", so it can be a program name with args.
9041
set dummy gmsgfmt; ac_word=$2
9042
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9043
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9044
$as_echo_n "checking for $ac_word... " >&6; }
9045
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
9046
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
9047
$as_echo_n "(cached) " >&6
9048
else
9049
case $GMSGFMT in
9050
@@ -14122,14 +12441,14 @@
9051
do
9052
IFS=$as_save_IFS
9053
test -z "$as_dir" && as_dir=.
9054
- for ac_exec_ext in '' $ac_executable_extensions; do
9055
+ for ac_exec_ext in '' $ac_executable_extensions; do
9056
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9057
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
9058
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9059
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9060
break 2
9061
fi
9062
done
9063
-done
9064
+ done
9065
IFS=$as_save_IFS
9066
9067
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
9068
@@ -14138,19 +12457,19 @@
9069
fi
9070
GMSGFMT=$ac_cv_path_GMSGFMT
9071
if test -n "$GMSGFMT"; then
9072
- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
9073
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
9074
$as_echo "$GMSGFMT" >&6; }
9075
else
9076
- { $as_echo "$as_me:$LINENO: result: no" >&5
9077
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9078
$as_echo "no" >&6; }
9079
fi
9080
9081
9082
# Extract the first word of "xgettext", so it can be a program name with args.
9083
set dummy xgettext; ac_word=$2
9084
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9085
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9086
$as_echo_n "checking for $ac_word... " >&6; }
9087
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
9088
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
9089
$as_echo_n "(cached) " >&6
9090
else
9091
case "$XGETTEXT" in
9092
@@ -14175,18 +12494,14 @@
9093
fi
9094
XGETTEXT="$ac_cv_path_XGETTEXT"
9095
if test "$XGETTEXT" != ":"; then
9096
- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
9097
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
9098
$as_echo "$XGETTEXT" >&6; }
9099
else
9100
- { $as_echo "$as_me:$LINENO: result: no" >&5
9101
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9102
$as_echo "no" >&6; }
9103
fi
9104
9105
- cat >conftest.$ac_ext <<_ACEOF
9106
-/* confdefs.h. */
9107
-_ACEOF
9108
-cat confdefs.h >>conftest.$ac_ext
9109
-cat >>conftest.$ac_ext <<_ACEOF
9110
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9111
/* end confdefs.h. */
9112
9113
int
9114
@@ -14198,121 +12513,14 @@
9115
return 0;
9116
}
9117
_ACEOF
9118
-rm -f conftest.$ac_objext conftest$ac_exeext
9119
-if { (ac_try="$ac_link"
9120
-case "(($ac_try" in
9121
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9122
- *) ac_try_echo=$ac_try;;
9123
-esac
9124
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9125
-$as_echo "$ac_try_echo") >&5
9126
- (eval "$ac_link") 2>conftest.er1
9127
- ac_status=$?
9128
- grep -v '^ *+' conftest.er1 >conftest.err
9129
- rm -f conftest.er1
9130
- cat conftest.err >&5
9131
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9132
- (exit $ac_status); } && {
9133
- test -z "$ac_c_werror_flag" ||
9134
- test ! -s conftest.err
9135
- } && test -s conftest$ac_exeext && {
9136
- test "$cross_compiling" = yes ||
9137
- $as_test_x conftest$ac_exeext
9138
- }; then
9139
+if ac_fn_c_try_link "$LINENO"; then :
9140
CATOBJEXT=.gmo
9141
DATADIRNAME=share
9142
else
9143
- $as_echo "$as_me: failed program was:" >&5
9144
-sed 's/^/| /' conftest.$ac_ext >&5
9145
-
9146
- case $host in
9147
+ case $host in
9148
*-*-solaris*)
9149
- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
9150
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
9151
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
9152
- $as_echo_n "(cached) " >&6
9153
-else
9154
- cat >conftest.$ac_ext <<_ACEOF
9155
-/* confdefs.h. */
9156
-_ACEOF
9157
-cat confdefs.h >>conftest.$ac_ext
9158
-cat >>conftest.$ac_ext <<_ACEOF
9159
-/* end confdefs.h. */
9160
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
9161
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
9162
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
9163
-
9164
-/* System header to define __stub macros and hopefully few prototypes,
9165
- which can conflict with char bind_textdomain_codeset (); below.
9166
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
9167
- <limits.h> exists even on freestanding compilers. */
9168
-
9169
-#ifdef __STDC__
9170
-# include <limits.h>
9171
-#else
9172
-# include <assert.h>
9173
-#endif
9174
-
9175
-#undef bind_textdomain_codeset
9176
-
9177
-/* Override any GCC internal prototype to avoid an error.
9178
- Use char because int might match the return type of a GCC
9179
- builtin and then its argument prototype would still apply. */
9180
-#ifdef __cplusplus
9181
-extern "C"
9182
-#endif
9183
-char bind_textdomain_codeset ();
9184
-/* The GNU C library defines this for functions which it implements
9185
- to always fail with ENOSYS. Some functions are actually named
9186
- something starting with __ and the normal name is an alias. */
9187
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
9188
-choke me
9189
-#endif
9190
-
9191
-int
9192
-main ()
9193
-{
9194
-return bind_textdomain_codeset ();
9195
- ;
9196
- return 0;
9197
-}
9198
-_ACEOF
9199
-rm -f conftest.$ac_objext conftest$ac_exeext
9200
-if { (ac_try="$ac_link"
9201
-case "(($ac_try" in
9202
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9203
- *) ac_try_echo=$ac_try;;
9204
-esac
9205
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9206
-$as_echo "$ac_try_echo") >&5
9207
- (eval "$ac_link") 2>conftest.er1
9208
- ac_status=$?
9209
- grep -v '^ *+' conftest.er1 >conftest.err
9210
- rm -f conftest.er1
9211
- cat conftest.err >&5
9212
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9213
- (exit $ac_status); } && {
9214
- test -z "$ac_c_werror_flag" ||
9215
- test ! -s conftest.err
9216
- } && test -s conftest$ac_exeext && {
9217
- test "$cross_compiling" = yes ||
9218
- $as_test_x conftest$ac_exeext
9219
- }; then
9220
- ac_cv_func_bind_textdomain_codeset=yes
9221
-else
9222
- $as_echo "$as_me: failed program was:" >&5
9223
-sed 's/^/| /' conftest.$ac_ext >&5
9224
-
9225
- ac_cv_func_bind_textdomain_codeset=no
9226
-fi
9227
-
9228
-rm -rf conftest.dSYM
9229
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9230
- conftest$ac_exeext conftest.$ac_ext
9231
-fi
9232
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
9233
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
9234
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
9235
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
9236
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
9237
CATOBJEXT=.gmo
9238
DATADIRNAME=share
9239
else
9240
@@ -14327,10 +12535,8 @@
9241
;;
9242
esac
9243
fi
9244
-
9245
-rm -rf conftest.dSYM
9246
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9247
- conftest$ac_exeext conftest.$ac_ext
9248
+rm -f core conftest.err conftest.$ac_objext \
9249
+ conftest$ac_exeext conftest.$ac_ext
9250
LIBS="$glib_save_LIBS"
9251
INSTOBJEXT=.mo
9252
else
9253
@@ -14344,9 +12550,7 @@
9254
9255
if test "$gt_cv_have_gettext" = "yes" ; then
9256
9257
-cat >>confdefs.h <<\_ACEOF
9258
-#define ENABLE_NLS 1
9259
-_ACEOF
9260
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
9261
9262
fi
9263
9264
@@ -14354,7 +12558,7 @@
9265
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
9266
: ;
9267
else
9268
- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
9269
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
9270
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
9271
XGETTEXT=":"
9272
fi
9273
@@ -14387,7 +12591,7 @@
9274
if test "x$ALL_LINGUAS" = "x"; then
9275
LINGUAS=
9276
else
9277
- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
9278
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
9279
$as_echo_n "checking for catalogs to be installed... " >&6; }
9280
NEW_LINGUAS=
9281
for presentlang in $ALL_LINGUAS; do
9282
@@ -14412,7 +12616,7 @@
9283
fi
9284
done
9285
LINGUAS=$NEW_LINGUAS
9286
- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
9287
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
9288
$as_echo "$LINGUAS" >&6; }
9289
fi
9290
9291
@@ -14475,40 +12679,44 @@
9292
9293
9294
pkg_failed=no
9295
-{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5
9296
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
322
# Configuration validation subroutine script.
323
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
324
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
325
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
326
# Free Software Foundation, Inc.
327
328
-timestamp='2009-04-17'
329
+timestamp='2009-06-11'
330
331
# This file is (in principle) common to ALL GNU software.
332
# The presence of a machine in this file suggests that SOME GNU software
333
@@ -153,6 +153,9 @@
334
os=
335
basic_machine=$1
336
;;
337
+ -bluegene*)
338
+ os=-cnk
339
+ ;;
340
-sim | -cisco | -oki | -wec | -winbond)
341
os=
342
basic_machine=$1
343
@@ -467,6 +470,10 @@
344
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
345
os=-linux
346
;;
347
+ bluegene*)
348
+ basic_machine=powerpc-ibm
349
+ os=-cnk
350
+ ;;
351
c90)
352
basic_machine=c90-cray
353
os=-unicos
354
@@ -1260,7 +1267,7 @@
355
# Each alternative MUST END IN A *, to match a version number.
356
# -sysv* is not here because it comes later, after sysvr4.
357
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
358
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
359
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
360
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
361
| -kopensolaris* \
362
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
363
@@ -1613,7 +1620,7 @@
364
-sunos*)
365
vendor=sun
366
;;
367
- -aix*)
368
+ -cnk*|-aix*)
369
vendor=ibm
370
;;
371
-beos*)
372
diff -Nur gnome-power-manager-2.29.2/configure gnome-power-manager-2.29.2.new/configure
373
--- gnome-power-manager-2.29.2/configure 2010-01-27 12:28:49.000000000 -0800
374
+++ gnome-power-manager-2.29.2.new/configure 2010-02-05 13:12:57.000000000 -0800
375
@@ -4387,8 +4387,8 @@
376
377
378
379
-macro_version='2.2.6'
380
-macro_revision='1.3012'
381
+macro_version='2.2.6b'
382
+macro_revision='1.3017'
383
384
385
386
@@ -5531,11 +5531,11 @@
387
;;
388
389
# This must be Linux ELF.
390
-linux* | k*bsd*-gnu)
391
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
392
lt_cv_deplibs_check_method=pass_all
393
;;
394
395
-netbsd*)
396
+netbsd* | netbsdelf*-gnu)
397
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
398
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
399
else
400
@@ -7970,7 +7970,7 @@
401
lt_prog_compiler_static='-non_shared'
402
;;
403
404
- linux* | k*bsd*-gnu)
405
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
406
case $cc_basename in
407
# old Intel for x86_64 which still supported -KPIC.
408
ecc*)
409
@@ -8419,6 +8419,9 @@
410
openbsd*)
411
with_gnu_ld=no
412
;;
413
+ linux* | k*bsd*-gnu)
414
+ link_all_deplibs=no
415
+ ;;
416
esac
417
418
ld_shlibs=yes
419
@@ -8440,6 +8443,7 @@
420
fi
421
supports_anon_versioning=no
422
case `$LD -v 2>&1` in
423
+ *GNU\ gold*) supports_anon_versioning=yes ;;
424
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
425
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
426
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
427
@@ -8531,7 +8535,7 @@
428
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'
429
;;
430
431
- gnu* | linux* | tpf* | k*bsd*-gnu)
432
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
433
tmp_diet=no
434
if test "$host_os" = linux-dietlibc; then
435
case $cc_basename in
436
@@ -8601,7 +8605,7 @@
437
fi
438
;;
439
440
- netbsd*)
441
+ netbsd* | netbsdelf*-gnu)
442
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
443
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
444
wlarc=
445
@@ -8776,6 +8780,7 @@
446
if test "$aix_use_runtimelinking" = yes; then
447
shared_flag="$shared_flag "'${wl}-G'
448
fi
449
+ link_all_deplibs=no
450
else
451
# not using gcc
452
if test "$host_cpu" = ia64; then
453
@@ -9102,7 +9107,7 @@
454
link_all_deplibs=yes
455
;;
456
457
- netbsd*)
458
+ netbsd* | netbsdelf*-gnu)
459
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
460
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
461
else
462
@@ -9992,7 +9997,7 @@
463
;;
464
465
# This must be Linux ELF.
466
-linux* | k*bsd*-gnu)
467
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
468
version_type=linux
469
need_lib_prefix=no
470
need_version=no
471
@@ -10032,13 +10037,10 @@
472
# before this can be enabled.
473
hardcode_into_libs=yes
474
475
- # Add ABI-specific directories to the system library path.
476
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
477
-
478
# Append ld.so.conf contents to the search path
479
if test -f /etc/ld.so.conf; then
480
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
481
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
482
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
483
fi
484
485
# We used to test for /lib/ld.so.1 and disable shared libraries on
486
@@ -10050,6 +10052,18 @@
487
dynamic_linker='GNU/Linux ld.so'
488
;;
489
490
+netbsdelf*-gnu)
491
+ version_type=linux
492
+ need_lib_prefix=no
493
+ need_version=no
494
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
495
+ soname_spec='${libname}${release}${shared_ext}$major'
496
+ shlibpath_var=LD_LIBRARY_PATH
497
+ shlibpath_overrides_runpath=no
498
+ hardcode_into_libs=yes
499
+ dynamic_linker='NetBSD ld.elf_so'
500
+ ;;
501
+
502
netbsd*)
503
version_type=sunos
504
need_lib_prefix=no
505
@@ -10670,7 +10684,7 @@
506
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
507
lt_status=$lt_dlunknown
508
cat > conftest.$ac_ext <<_LT_EOF
509
-#line 10673 "configure"
510
+#line 10687 "configure"
511
#include "confdefs.h"
512
513
#if HAVE_DLFCN_H
514
@@ -10766,7 +10780,7 @@
515
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
516
lt_status=$lt_dlunknown
517
cat > conftest.$ac_ext <<_LT_EOF
518
-#line 10769 "configure"
519
+#line 10783 "configure"
520
#include "confdefs.h"
521
522
#if HAVE_DLFCN_H
523
@@ -12715,10 +12729,11 @@
524
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
9297
525
$as_echo_n "checking for GLIB... " >&6; }
9298
526
9299
527
-if test -n "$GLIB_CFLAGS"; then
9300
528
- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
9301
529
- elif test -n "$PKG_CONFIG"; then
9302
530
- if test -n "$PKG_CONFIG" && \
9303
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\"") >&5
9304
531
+if test -n "$PKG_CONFIG"; then
9305
532
+ if test -n "$GLIB_CFLAGS"; then
9306
533
+ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
9307
534
+ else
9308
535
+ if test -n "$PKG_CONFIG" && \
9309
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\""; } >&5
536
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\""; } >&5
9310
537
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0") 2>&5
9311
538
ac_status=$?
9312
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9313
- (exit $ac_status); }; then
9314
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9315
+ test $ac_status = 0; }; then
9316
pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gobject-2.0" 2>/dev/null`
539
@@ -12728,13 +12743,15 @@
9317
540
else
9318
541
pkg_failed=yes
9319
542
fi
9327
550
- pkg_cv_GLIB_LIBS="$GLIB_LIBS"
9328
551
- elif test -n "$PKG_CONFIG"; then
9329
552
- if test -n "$PKG_CONFIG" && \
9330
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\"") >&5
9331
553
+if test -n "$PKG_CONFIG"; then
9332
554
+ if test -n "$GLIB_LIBS"; then
9333
555
+ pkg_cv_GLIB_LIBS="$GLIB_LIBS"
9334
556
+ else
9335
557
+ if test -n "$PKG_CONFIG" && \
9336
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\""; } >&5
558
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\""; } >&5
9337
559
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0") 2>&5
9338
560
ac_status=$?
9339
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9340
- (exit $ac_status); }; then
9341
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9342
+ test $ac_status = 0; }; then
9343
pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0" 2>/dev/null`
561
@@ -12744,8 +12761,9 @@
9344
562
else
9345
563
pkg_failed=yes
9346
564
fi
9352
570
fi
9353
571
9354
572
9355
@@ -14521,25 +12729,14 @@
573
@@ -12758,9 +12776,9 @@
9356
574
_pkg_short_errors_supported=no
9357
575
fi
9358
576
if test $_pkg_short_errors_supported = yes; then
9364
582
fi
9365
583
# Put the nasty error message in config.log where it belongs
9366
584
echo "$GLIB_PKG_ERRORS" >&5
9367
9368
- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0) were not met:
9369
-
9370
-$GLIB_PKG_ERRORS
9371
-
9372
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
9373
-installed software in a non-standard prefix.
9374
-
9375
-Alternatively, you may set the environment variables GLIB_CFLAGS
9376
-and GLIB_LIBS to avoid the need to call pkg-config.
9377
-See the pkg-config man page for more details.
9378
-" >&5
9379
-$as_echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0) were not met:
9380
+ as_fn_error "Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0) were not met:
9381
9382
$GLIB_PKG_ERRORS
9383
9384
@@ -14549,22 +12746,11 @@
9385
Alternatively, you may set the environment variables GLIB_CFLAGS
9386
and GLIB_LIBS to avoid the need to call pkg-config.
9387
See the pkg-config man page for more details.
9388
-" >&2;}
9389
- { (exit 1); exit 1; }; }
9390
+" "$LINENO" 5
9391
elif test $pkg_failed = untried; then
9392
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
9393
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
9394
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
9395
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
9396
-is in your PATH or set the PKG_CONFIG environment variable to the full
9397
-path to pkg-config.
9398
-
9399
-Alternatively, you may set the environment variables GLIB_CFLAGS
9400
-and GLIB_LIBS to avoid the need to call pkg-config.
9401
-See the pkg-config man page for more details.
9402
-
9403
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
9404
-See \`config.log' for more details." >&5
9405
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
9406
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
9407
is in your PATH or set the PKG_CONFIG environment variable to the full
9408
path to pkg-config.
9409
9410
@@ -14573,12 +12759,11 @@
9411
See the pkg-config man page for more details.
9412
9413
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
9414
-See \`config.log' for more details." >&2;}
9415
- { (exit 1); exit 1; }; }; }
9416
+See \`config.log' for more details." "$LINENO" 5; }
9417
else
9418
GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
9419
GLIB_LIBS=$pkg_cv_GLIB_LIBS
9420
- { $as_echo "$as_me:$LINENO: result: yes" >&5
9421
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9422
$as_echo "yes" >&6; }
9423
:
9424
fi
9425
@@ -14587,40 +12772,44 @@
9426
9427
9428
pkg_failed=no
9429
-{ $as_echo "$as_me:$LINENO: checking for CANBERRA" >&5
9430
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANBERRA" >&5
585
@@ -12804,10 +12822,11 @@
586
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANBERRA" >&5
9431
587
$as_echo_n "checking for CANBERRA... " >&6; }
9432
588
9433
589
-if test -n "$CANBERRA_CFLAGS"; then
9434
590
- pkg_cv_CANBERRA_CFLAGS="$CANBERRA_CFLAGS"
9435
591
- elif test -n "$PKG_CONFIG"; then
9436
592
- if test -n "$PKG_CONFIG" && \
9437
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$CANBERRA_REQUIRED\"") >&5
9438
593
+if test -n "$PKG_CONFIG"; then
9439
594
+ if test -n "$CANBERRA_CFLAGS"; then
9440
595
+ pkg_cv_CANBERRA_CFLAGS="$CANBERRA_CFLAGS"
9441
596
+ else
9442
597
+ if test -n "$PKG_CONFIG" && \
9443
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$CANBERRA_REQUIRED\""; } >&5
598
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$CANBERRA_REQUIRED\""; } >&5
9444
599
($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= $CANBERRA_REQUIRED") 2>&5
9445
600
ac_status=$?
9446
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9447
- (exit $ac_status); }; then
9448
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9449
+ test $ac_status = 0; }; then
9450
pkg_cv_CANBERRA_CFLAGS=`$PKG_CONFIG --cflags "libcanberra-gtk >= $CANBERRA_REQUIRED" 2>/dev/null`
601
@@ -12817,13 +12836,15 @@
9451
602
else
9452
603
pkg_failed=yes
9453
604
fi
9461
612
- pkg_cv_CANBERRA_LIBS="$CANBERRA_LIBS"
9462
613
- elif test -n "$PKG_CONFIG"; then
9463
614
- if test -n "$PKG_CONFIG" && \
9464
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$CANBERRA_REQUIRED\"") >&5
9465
615
+if test -n "$PKG_CONFIG"; then
9466
616
+ if test -n "$CANBERRA_LIBS"; then
9467
617
+ pkg_cv_CANBERRA_LIBS="$CANBERRA_LIBS"
9468
618
+ else
9469
619
+ if test -n "$PKG_CONFIG" && \
9470
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$CANBERRA_REQUIRED\""; } >&5
620
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$CANBERRA_REQUIRED\""; } >&5
9471
621
($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= $CANBERRA_REQUIRED") 2>&5
9472
622
ac_status=$?
9473
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9474
- (exit $ac_status); }; then
9475
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9476
+ test $ac_status = 0; }; then
9477
pkg_cv_CANBERRA_LIBS=`$PKG_CONFIG --libs "libcanberra-gtk >= $CANBERRA_REQUIRED" 2>/dev/null`
623
@@ -12833,8 +12854,9 @@
9478
624
else
9479
625
pkg_failed=yes
9480
626
fi
9486
632
fi
9487
633
9488
634
9489
@@ -14633,25 +12822,14 @@
635
@@ -12847,9 +12869,9 @@
9490
636
_pkg_short_errors_supported=no
9491
637
fi
9492
638
if test $_pkg_short_errors_supported = yes; then
9498
644
fi
9499
645
# Put the nasty error message in config.log where it belongs
9500
646
echo "$CANBERRA_PKG_ERRORS" >&5
9501
9502
- { { $as_echo "$as_me:$LINENO: error: Package requirements (libcanberra-gtk >= $CANBERRA_REQUIRED) were not met:
9503
-
9504
-$CANBERRA_PKG_ERRORS
9505
-
9506
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
9507
-installed software in a non-standard prefix.
9508
-
9509
-Alternatively, you may set the environment variables CANBERRA_CFLAGS
9510
-and CANBERRA_LIBS to avoid the need to call pkg-config.
9511
-See the pkg-config man page for more details.
9512
-" >&5
9513
-$as_echo "$as_me: error: Package requirements (libcanberra-gtk >= $CANBERRA_REQUIRED) were not met:
9514
+ as_fn_error "Package requirements (libcanberra-gtk >= $CANBERRA_REQUIRED) were not met:
9515
9516
$CANBERRA_PKG_ERRORS
9517
9518
@@ -14661,22 +12839,11 @@
9519
Alternatively, you may set the environment variables CANBERRA_CFLAGS
9520
and CANBERRA_LIBS to avoid the need to call pkg-config.
9521
See the pkg-config man page for more details.
9522
-" >&2;}
9523
- { (exit 1); exit 1; }; }
9524
+" "$LINENO" 5
9525
elif test $pkg_failed = untried; then
9526
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
9527
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
9528
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
9529
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
9530
-is in your PATH or set the PKG_CONFIG environment variable to the full
9531
-path to pkg-config.
9532
-
9533
-Alternatively, you may set the environment variables CANBERRA_CFLAGS
9534
-and CANBERRA_LIBS to avoid the need to call pkg-config.
9535
-See the pkg-config man page for more details.
9536
-
9537
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
9538
-See \`config.log' for more details." >&5
9539
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
9540
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
9541
is in your PATH or set the PKG_CONFIG environment variable to the full
9542
path to pkg-config.
9543
9544
@@ -14685,12 +12852,11 @@
9545
See the pkg-config man page for more details.
9546
9547
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
9548
-See \`config.log' for more details." >&2;}
9549
- { (exit 1); exit 1; }; }; }
9550
+See \`config.log' for more details." "$LINENO" 5; }
9551
else
9552
CANBERRA_CFLAGS=$pkg_cv_CANBERRA_CFLAGS
9553
CANBERRA_LIBS=$pkg_cv_CANBERRA_LIBS
9554
- { $as_echo "$as_me:$LINENO: result: yes" >&5
9555
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9556
$as_echo "yes" >&6; }
9557
:
9558
fi
9559
@@ -14699,24 +12865,25 @@
9560
9561
9562
pkg_failed=no
9563
-{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
9564
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
647
@@ -12893,10 +12915,11 @@
648
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
9565
649
$as_echo_n "checking for DBUS... " >&6; }
9566
650
9567
651
-if test -n "$DBUS_CFLAGS"; then
9568
652
- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
9569
653
- elif test -n "$PKG_CONFIG"; then
9570
654
- if test -n "$PKG_CONFIG" && \
9571
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
9572
655
+if test -n "$PKG_CONFIG"; then
9573
656
+ if test -n "$DBUS_CFLAGS"; then
9574
657
+ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
9575
658
+ else
9576
659
+ if test -n "$PKG_CONFIG" && \
9577
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
660
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
9578
661
dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
9579
662
dbus-1 >= \$DBUS_REQUIRED
9580
- gthread-2.0\"") >&5
9581
+ gthread-2.0\""; } >&5
9582
($PKG_CONFIG --exists --print-errors "
9583
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
9584
dbus-1 >= $DBUS_REQUIRED
9585
gthread-2.0") 2>&5
9586
ac_status=$?
9587
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9588
- (exit $ac_status); }; then
9589
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9590
+ test $ac_status = 0; }; then
9591
pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "
9592
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
9593
dbus-1 >= $DBUS_REQUIRED
9594
@@ -14724,24 +12891,26 @@
663
@@ -12915,13 +12938,15 @@
9595
664
else
9596
665
pkg_failed=yes
9597
666
fi
9605
674
- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
9606
675
- elif test -n "$PKG_CONFIG"; then
9607
676
- if test -n "$PKG_CONFIG" && \
9608
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
9609
677
+if test -n "$PKG_CONFIG"; then
9610
678
+ if test -n "$DBUS_LIBS"; then
9611
679
+ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
9612
680
+ else
9613
681
+ if test -n "$PKG_CONFIG" && \
9614
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
682
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
9615
683
dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
9616
684
dbus-1 >= \$DBUS_REQUIRED
9617
- gthread-2.0\"") >&5
9618
+ gthread-2.0\""; } >&5
9619
($PKG_CONFIG --exists --print-errors "
9620
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
9621
dbus-1 >= $DBUS_REQUIRED
9622
gthread-2.0") 2>&5
9623
ac_status=$?
9624
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9625
- (exit $ac_status); }; then
9626
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9627
+ test $ac_status = 0; }; then
9628
pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "
9629
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
9630
dbus-1 >= $DBUS_REQUIRED
9631
@@ -14749,8 +12918,9 @@
685
@@ -12940,8 +12965,9 @@
9632
686
else
9633
687
pkg_failed=yes
9634
688
fi
9640
694
fi
9641
695
9642
696
9643
@@ -14763,34 +12933,20 @@
697
@@ -12954,15 +12980,15 @@
9644
698
_pkg_short_errors_supported=no
9645
699
fi
9646
700
if test $_pkg_short_errors_supported = yes; then
9660
714
fi
9661
715
# Put the nasty error message in config.log where it belongs
9662
716
echo "$DBUS_PKG_ERRORS" >&5
9663
9664
- { { $as_echo "$as_me:$LINENO: error: Package requirements (
9665
- dbus-glib-1 >= $DBUS_GLIB_REQUIRED
9666
- dbus-1 >= $DBUS_REQUIRED
9667
- gthread-2.0) were not met:
9668
-
9669
-$DBUS_PKG_ERRORS
9670
-
9671
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
9672
-installed software in a non-standard prefix.
9673
-
9674
-Alternatively, you may set the environment variables DBUS_CFLAGS
9675
-and DBUS_LIBS to avoid the need to call pkg-config.
9676
-See the pkg-config man page for more details.
9677
-" >&5
9678
-$as_echo "$as_me: error: Package requirements (
9679
+ as_fn_error "Package requirements (
9680
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
9681
dbus-1 >= $DBUS_REQUIRED
9682
gthread-2.0) were not met:
9683
@@ -14803,22 +12959,11 @@
9684
Alternatively, you may set the environment variables DBUS_CFLAGS
9685
and DBUS_LIBS to avoid the need to call pkg-config.
9686
See the pkg-config man page for more details.
9687
-" >&2;}
9688
- { (exit 1); exit 1; }; }
9689
+" "$LINENO" 5
9690
elif test $pkg_failed = untried; then
9691
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
9692
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
9693
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
9694
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
9695
-is in your PATH or set the PKG_CONFIG environment variable to the full
9696
-path to pkg-config.
9697
-
9698
-Alternatively, you may set the environment variables DBUS_CFLAGS
9699
-and DBUS_LIBS to avoid the need to call pkg-config.
9700
-See the pkg-config man page for more details.
9701
-
9702
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
9703
-See \`config.log' for more details." >&5
9704
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
9705
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
9706
is in your PATH or set the PKG_CONFIG environment variable to the full
9707
path to pkg-config.
9708
9709
@@ -14827,12 +12972,11 @@
9710
See the pkg-config man page for more details.
9711
9712
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
9713
-See \`config.log' for more details." >&2;}
9714
- { (exit 1); exit 1; }; }; }
9715
+See \`config.log' for more details." "$LINENO" 5; }
9716
else
9717
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
9718
DBUS_LIBS=$pkg_cv_DBUS_LIBS
9719
- { $as_echo "$as_me:$LINENO: result: yes" >&5
9720
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9721
$as_echo "yes" >&6; }
9722
:
9723
fi
9724
@@ -14841,19 +12985,20 @@
9725
9726
9727
pkg_failed=no
9728
-{ $as_echo "$as_me:$LINENO: checking for GNOME" >&5
9729
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME" >&5
717
@@ -13009,10 +13035,11 @@
718
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME" >&5
9730
719
$as_echo_n "checking for GNOME... " >&6; }
9731
720
9732
721
-if test -n "$GNOME_CFLAGS"; then
9733
722
- pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
9734
723
- elif test -n "$PKG_CONFIG"; then
9735
724
- if test -n "$PKG_CONFIG" && \
9736
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
9737
725
+if test -n "$PKG_CONFIG"; then
9738
726
+ if test -n "$GNOME_CFLAGS"; then
9739
727
+ pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
9740
728
+ else
9741
729
+ if test -n "$PKG_CONFIG" && \
9742
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
730
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
9743
731
libwnck-1.0 >= \$LIBWNCK_REQUIRED
9744
732
gtk+-2.0 >= \$GTK_REQUIRED
9745
gconf-2.0 >= \$GCONF_REQUIRED
9746
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
9747
- cairo >= \$CAIRO_REQUIRED\"") >&5
9748
+ cairo >= \$CAIRO_REQUIRED\""; } >&5
9749
($PKG_CONFIG --exists --print-errors "
9750
libwnck-1.0 >= $LIBWNCK_REQUIRED
9751
gtk+-2.0 >= $GTK_REQUIRED
9752
@@ -14861,8 +13006,8 @@
9753
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
9754
cairo >= $CAIRO_REQUIRED") 2>&5
9755
ac_status=$?
9756
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9757
- (exit $ac_status); }; then
9758
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9759
+ test $ac_status = 0; }; then
9760
pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "
9761
libwnck-1.0 >= $LIBWNCK_REQUIRED
9762
gtk+-2.0 >= $GTK_REQUIRED
9763
@@ -14872,19 +13017,21 @@
733
@@ -13037,13 +13064,15 @@
9764
734
else
9765
735
pkg_failed=yes
9766
736
fi
9774
744
- pkg_cv_GNOME_LIBS="$GNOME_LIBS"
9775
745
- elif test -n "$PKG_CONFIG"; then
9776
746
- if test -n "$PKG_CONFIG" && \
9777
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
9778
747
+if test -n "$PKG_CONFIG"; then
9779
748
+ if test -n "$GNOME_LIBS"; then
9780
749
+ pkg_cv_GNOME_LIBS="$GNOME_LIBS"
9781
750
+ else
9782
751
+ if test -n "$PKG_CONFIG" && \
9783
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
752
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
9784
753
libwnck-1.0 >= \$LIBWNCK_REQUIRED
9785
754
gtk+-2.0 >= \$GTK_REQUIRED
9786
gconf-2.0 >= \$GCONF_REQUIRED
9787
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
9788
- cairo >= \$CAIRO_REQUIRED\"") >&5
9789
+ cairo >= \$CAIRO_REQUIRED\""; } >&5
9790
($PKG_CONFIG --exists --print-errors "
9791
libwnck-1.0 >= $LIBWNCK_REQUIRED
9792
gtk+-2.0 >= $GTK_REQUIRED
9793
@@ -14892,8 +13039,8 @@
9794
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
9795
cairo >= $CAIRO_REQUIRED") 2>&5
9796
ac_status=$?
9797
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9798
- (exit $ac_status); }; then
9799
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9800
+ test $ac_status = 0; }; then
9801
pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "
9802
libwnck-1.0 >= $LIBWNCK_REQUIRED
9803
gtk+-2.0 >= $GTK_REQUIRED
9804
@@ -14903,8 +13050,9 @@
755
@@ -13068,8 +13097,9 @@
9805
756
else
9806
757
pkg_failed=yes
9807
758
fi
9813
764
fi
9814
765
9815
766
9816
@@ -14917,40 +13065,24 @@
767
@@ -13082,19 +13112,19 @@
9817
768
_pkg_short_errors_supported=no
9818
769
fi
9819
770
if test $_pkg_short_errors_supported = yes; then
9837
788
fi
9838
789
# Put the nasty error message in config.log where it belongs
9839
790
echo "$GNOME_PKG_ERRORS" >&5
9840
9841
- { { $as_echo "$as_me:$LINENO: error: Package requirements (
9842
- libwnck-1.0 >= $LIBWNCK_REQUIRED
9843
- gtk+-2.0 >= $GTK_REQUIRED
9844
- gconf-2.0 >= $GCONF_REQUIRED
9845
- gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
9846
- cairo >= $CAIRO_REQUIRED) were not met:
9847
-
9848
-$GNOME_PKG_ERRORS
9849
-
9850
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
9851
-installed software in a non-standard prefix.
9852
-
9853
-Alternatively, you may set the environment variables GNOME_CFLAGS
9854
-and GNOME_LIBS to avoid the need to call pkg-config.
9855
-See the pkg-config man page for more details.
9856
-" >&5
9857
-$as_echo "$as_me: error: Package requirements (
9858
+ as_fn_error "Package requirements (
9859
libwnck-1.0 >= $LIBWNCK_REQUIRED
9860
gtk+-2.0 >= $GTK_REQUIRED
9861
gconf-2.0 >= $GCONF_REQUIRED
9862
@@ -14965,22 +13097,11 @@
9863
Alternatively, you may set the environment variables GNOME_CFLAGS
9864
and GNOME_LIBS to avoid the need to call pkg-config.
9865
See the pkg-config man page for more details.
9866
-" >&2;}
9867
- { (exit 1); exit 1; }; }
9868
+" "$LINENO" 5
9869
elif test $pkg_failed = untried; then
9870
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
9871
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
9872
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
9873
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
9874
-is in your PATH or set the PKG_CONFIG environment variable to the full
9875
-path to pkg-config.
9876
-
9877
-Alternatively, you may set the environment variables GNOME_CFLAGS
9878
-and GNOME_LIBS to avoid the need to call pkg-config.
9879
-See the pkg-config man page for more details.
9880
-
9881
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
9882
-See \`config.log' for more details." >&5
9883
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
9884
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
9885
is in your PATH or set the PKG_CONFIG environment variable to the full
9886
path to pkg-config.
9887
9888
@@ -14989,12 +13110,11 @@
9889
See the pkg-config man page for more details.
9890
9891
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
9892
-See \`config.log' for more details." >&2;}
9893
- { (exit 1); exit 1; }; }; }
9894
+See \`config.log' for more details." "$LINENO" 5; }
9895
else
9896
GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS
9897
GNOME_LIBS=$pkg_cv_GNOME_LIBS
9898
- { $as_echo "$as_me:$LINENO: result: yes" >&5
9899
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9900
$as_echo "yes" >&6; }
9901
:
9902
fi
9903
@@ -15003,46 +13123,50 @@
9904
9905
9906
pkg_failed=no
9907
-{ $as_echo "$as_me:$LINENO: checking for PANEL" >&5
9908
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANEL" >&5
791
@@ -13143,10 +13173,11 @@
792
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANEL" >&5
9909
793
$as_echo_n "checking for PANEL... " >&6; }
9910
794
9911
795
-if test -n "$PANEL_CFLAGS"; then
9912
796
- pkg_cv_PANEL_CFLAGS="$PANEL_CFLAGS"
9913
797
- elif test -n "$PKG_CONFIG"; then
9914
798
- if test -n "$PKG_CONFIG" && \
9915
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
9916
- libpanelapplet-2.0 >= \$LIBPANEL_REQUIRED\"") >&5
9917
799
+if test -n "$PKG_CONFIG"; then
9918
800
+ if test -n "$PANEL_CFLAGS"; then
9919
801
+ pkg_cv_PANEL_CFLAGS="$PANEL_CFLAGS"
9920
802
+ else
9921
803
+ if test -n "$PKG_CONFIG" && \
9922
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
9923
+ libpanelapplet-2.0 >= \$LIBPANEL_REQUIRED\""; } >&5
804
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
805
libpanelapplet-2.0 >= \$LIBPANEL_REQUIRED\""; } >&5
9924
806
($PKG_CONFIG --exists --print-errors "
9925
libpanelapplet-2.0 >= $LIBPANEL_REQUIRED") 2>&5
9926
ac_status=$?
9927
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9928
- (exit $ac_status); }; then
9929
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9930
+ test $ac_status = 0; }; then
9931
pkg_cv_PANEL_CFLAGS=`$PKG_CONFIG --cflags "
9932
libpanelapplet-2.0 >= $LIBPANEL_REQUIRED" 2>/dev/null`
807
@@ -13159,13 +13190,15 @@
9933
808
else
9934
809
pkg_failed=yes
9935
810
fi
9943
818
- pkg_cv_PANEL_LIBS="$PANEL_LIBS"
9944
819
- elif test -n "$PKG_CONFIG"; then
9945
820
- if test -n "$PKG_CONFIG" && \
9946
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
9947
- libpanelapplet-2.0 >= \$LIBPANEL_REQUIRED\"") >&5
9948
821
+if test -n "$PKG_CONFIG"; then
9949
822
+ if test -n "$PANEL_LIBS"; then
9950
823
+ pkg_cv_PANEL_LIBS="$PANEL_LIBS"
9951
824
+ else
9952
825
+ if test -n "$PKG_CONFIG" && \
9953
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
9954
+ libpanelapplet-2.0 >= \$LIBPANEL_REQUIRED\""; } >&5
826
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
827
libpanelapplet-2.0 >= \$LIBPANEL_REQUIRED\""; } >&5
9955
828
($PKG_CONFIG --exists --print-errors "
9956
libpanelapplet-2.0 >= $LIBPANEL_REQUIRED") 2>&5
9957
ac_status=$?
9958
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9959
- (exit $ac_status); }; then
9960
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9961
+ test $ac_status = 0; }; then
9962
pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "
9963
libpanelapplet-2.0 >= $LIBPANEL_REQUIRED" 2>/dev/null`
829
@@ -13178,8 +13211,9 @@
9964
830
else
9965
831
pkg_failed=yes
9966
832
fi
9972
838
fi
9973
839
9974
840
9975
@@ -15055,28 +13179,16 @@
841
@@ -13192,11 +13226,11 @@
9976
842
_pkg_short_errors_supported=no
9977
843
fi
9978
844
if test $_pkg_short_errors_supported = yes; then
9988
854
fi
9989
855
# Put the nasty error message in config.log where it belongs
9990
856
echo "$PANEL_PKG_ERRORS" >&5
9991
9992
- { { $as_echo "$as_me:$LINENO: error: Package requirements (
9993
- libpanelapplet-2.0 >= $LIBPANEL_REQUIRED) were not met:
9994
-
9995
-$PANEL_PKG_ERRORS
9996
-
9997
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
9998
-installed software in a non-standard prefix.
9999
-
10000
-Alternatively, you may set the environment variables PANEL_CFLAGS
10001
-and PANEL_LIBS to avoid the need to call pkg-config.
10002
-See the pkg-config man page for more details.
10003
-" >&5
10004
-$as_echo "$as_me: error: Package requirements (
10005
+ as_fn_error "Package requirements (
10006
libpanelapplet-2.0 >= $LIBPANEL_REQUIRED) were not met:
10007
10008
$PANEL_PKG_ERRORS
10009
@@ -15087,12 +13199,11 @@
10010
Alternatively, you may set the environment variables PANEL_CFLAGS
10011
and PANEL_LIBS to avoid the need to call pkg-config.
10012
See the pkg-config man page for more details.
10013
-" >&2;}
10014
- { (exit 1); exit 1; }; }
10015
+" "$LINENO" 5
10016
elif test $pkg_failed = untried; then
10017
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10018
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10019
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10020
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10021
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10022
is in your PATH or set the PKG_CONFIG environment variable to the full
10023
path to pkg-config.
10024
10025
@@ -15101,22 +13212,11 @@
10026
See the pkg-config man page for more details.
10027
10028
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10029
-See \`config.log' for more details." >&5
10030
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10031
-is in your PATH or set the PKG_CONFIG environment variable to the full
10032
-path to pkg-config.
10033
-
10034
-Alternatively, you may set the environment variables PANEL_CFLAGS
10035
-and PANEL_LIBS to avoid the need to call pkg-config.
10036
-See the pkg-config man page for more details.
10037
-
10038
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10039
-See \`config.log' for more details." >&2;}
10040
- { (exit 1); exit 1; }; }; }
10041
+See \`config.log' for more details." "$LINENO" 5; }
10042
else
10043
PANEL_CFLAGS=$pkg_cv_PANEL_CFLAGS
10044
PANEL_LIBS=$pkg_cv_PANEL_LIBS
10045
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10046
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10047
$as_echo "yes" >&6; }
10048
:
10049
fi
10050
@@ -15126,52 +13226,56 @@
10051
10052
10053
pkg_failed=no
10054
-{ $as_echo "$as_me:$LINENO: checking for GDK" >&5
10055
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK" >&5
857
@@ -13242,10 +13276,11 @@
858
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK" >&5
10056
859
$as_echo_n "checking for GDK... " >&6; }
10057
860
10058
861
-if test -n "$GDK_CFLAGS"; then
10059
862
- pkg_cv_GDK_CFLAGS="$GDK_CFLAGS"
10060
863
- elif test -n "$PKG_CONFIG"; then
10061
864
- if test -n "$PKG_CONFIG" && \
10062
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
10063
865
+if test -n "$PKG_CONFIG"; then
10064
866
+ if test -n "$GDK_CFLAGS"; then
10065
867
+ pkg_cv_GDK_CFLAGS="$GDK_CFLAGS"
10066
868
+ else
10067
869
+ if test -n "$PKG_CONFIG" && \
10068
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
870
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
10069
871
gdk-2.0 >= \$GDK_REQUIRED
10070
- gdk-x11-2.0 >= \$GDK_REQUIRED\"") >&5
10071
+ gdk-x11-2.0 >= \$GDK_REQUIRED\""; } >&5
10072
($PKG_CONFIG --exists --print-errors "
10073
gdk-2.0 >= $GDK_REQUIRED
10074
gdk-x11-2.0 >= $GDK_REQUIRED") 2>&5
10075
ac_status=$?
10076
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10077
- (exit $ac_status); }; then
10078
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10079
+ test $ac_status = 0; }; then
10080
pkg_cv_GDK_CFLAGS=`$PKG_CONFIG --cflags "
10081
gdk-2.0 >= $GDK_REQUIRED
10082
gdk-x11-2.0 >= $GDK_REQUIRED" 2>/dev/null`
872
gdk-x11-2.0 >= \$GDK_REQUIRED\""; } >&5
873
@@ -13261,13 +13296,15 @@
10083
874
else
10084
875
pkg_failed=yes
10085
876
fi
10093
884
- pkg_cv_GDK_LIBS="$GDK_LIBS"
10094
885
- elif test -n "$PKG_CONFIG"; then
10095
886
- if test -n "$PKG_CONFIG" && \
10096
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
10097
887
+if test -n "$PKG_CONFIG"; then
10098
888
+ if test -n "$GDK_LIBS"; then
10099
889
+ pkg_cv_GDK_LIBS="$GDK_LIBS"
10100
890
+ else
10101
891
+ if test -n "$PKG_CONFIG" && \
10102
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
892
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
10103
893
gdk-2.0 >= \$GDK_REQUIRED
10104
- gdk-x11-2.0 >= \$GDK_REQUIRED\"") >&5
10105
+ gdk-x11-2.0 >= \$GDK_REQUIRED\""; } >&5
10106
($PKG_CONFIG --exists --print-errors "
10107
gdk-2.0 >= $GDK_REQUIRED
10108
gdk-x11-2.0 >= $GDK_REQUIRED") 2>&5
10109
ac_status=$?
10110
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10111
- (exit $ac_status); }; then
10112
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10113
+ test $ac_status = 0; }; then
10114
pkg_cv_GDK_LIBS=`$PKG_CONFIG --libs "
10115
gdk-2.0 >= $GDK_REQUIRED
10116
gdk-x11-2.0 >= $GDK_REQUIRED" 2>/dev/null`
894
gdk-x11-2.0 >= \$GDK_REQUIRED\""; } >&5
895
@@ -13283,8 +13320,9 @@
10117
896
else
10118
897
pkg_failed=yes
10119
898
fi
10125
904
fi
10126
905
10127
906
10128
@@ -15184,18 +13288,18 @@
907
@@ -13297,13 +13335,13 @@
10129
908
_pkg_short_errors_supported=no
10130
909
fi
10131
910
if test $_pkg_short_errors_supported = yes; then
10143
922
fi
10144
923
# Put the nasty error message in config.log where it belongs
10145
924
echo "$GDK_PKG_ERRORS" >&5
10146
10147
- { { $as_echo "$as_me:$LINENO: error: Package requirements (
10148
+ as_fn_error "Package requirements (
10149
gdk-2.0 >= $GDK_REQUIRED
10150
gdk-x11-2.0 >= $GDK_REQUIRED) were not met:
10151
10152
@@ -15207,35 +13311,11 @@
10153
Alternatively, you may set the environment variables GDK_CFLAGS
10154
and GDK_LIBS to avoid the need to call pkg-config.
10155
See the pkg-config man page for more details.
10156
-" >&5
10157
-$as_echo "$as_me: error: Package requirements (
10158
- gdk-2.0 >= $GDK_REQUIRED
10159
- gdk-x11-2.0 >= $GDK_REQUIRED) were not met:
10160
-
10161
-$GDK_PKG_ERRORS
10162
-
10163
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10164
-installed software in a non-standard prefix.
10165
-
10166
-Alternatively, you may set the environment variables GDK_CFLAGS
10167
-and GDK_LIBS to avoid the need to call pkg-config.
10168
-See the pkg-config man page for more details.
10169
-" >&2;}
10170
- { (exit 1); exit 1; }; }
10171
+" "$LINENO" 5
10172
elif test $pkg_failed = untried; then
10173
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10174
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10175
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10176
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10177
-is in your PATH or set the PKG_CONFIG environment variable to the full
10178
-path to pkg-config.
10179
-
10180
-Alternatively, you may set the environment variables GDK_CFLAGS
10181
-and GDK_LIBS to avoid the need to call pkg-config.
10182
-See the pkg-config man page for more details.
10183
-
10184
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10185
-See \`config.log' for more details." >&5
10186
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10187
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10188
is in your PATH or set the PKG_CONFIG environment variable to the full
10189
path to pkg-config.
10190
10191
@@ -15244,12 +13324,11 @@
10192
See the pkg-config man page for more details.
10193
10194
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10195
-See \`config.log' for more details." >&2;}
10196
- { (exit 1); exit 1; }; }; }
10197
+See \`config.log' for more details." "$LINENO" 5; }
10198
else
10199
GDK_CFLAGS=$pkg_cv_GDK_CFLAGS
10200
GDK_LIBS=$pkg_cv_GDK_LIBS
10201
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10202
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10203
$as_echo "yes" >&6; }
10204
:
10205
fi
10206
@@ -15258,52 +13337,56 @@
10207
10208
10209
pkg_failed=no
10210
-{ $as_echo "$as_me:$LINENO: checking for XRANDR" >&5
10211
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRANDR" >&5
925
@@ -13349,10 +13387,11 @@
926
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRANDR" >&5
10212
927
$as_echo_n "checking for XRANDR... " >&6; }
10213
928
10214
929
-if test -n "$XRANDR_CFLAGS"; then
10215
930
- pkg_cv_XRANDR_CFLAGS="$XRANDR_CFLAGS"
10216
931
- elif test -n "$PKG_CONFIG"; then
10217
932
- if test -n "$PKG_CONFIG" && \
10218
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
10219
933
+if test -n "$PKG_CONFIG"; then
10220
934
+ if test -n "$XRANDR_CFLAGS"; then
10221
935
+ pkg_cv_XRANDR_CFLAGS="$XRANDR_CFLAGS"
10222
936
+ else
10223
937
+ if test -n "$PKG_CONFIG" && \
10224
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
10225
xrandr >= \$XRANDR_REQUIRED
10226
- xrender x11\"") >&5
10227
+ xrender x11\""; } >&5
938
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
939
xrandr >= \$XRANDR_REQUIRED\""; } >&5
10228
940
($PKG_CONFIG --exists --print-errors "
10229
xrandr >= $XRANDR_REQUIRED
10230
xrender x11") 2>&5
10231
ac_status=$?
10232
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10233
- (exit $ac_status); }; then
10234
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10235
+ test $ac_status = 0; }; then
10236
pkg_cv_XRANDR_CFLAGS=`$PKG_CONFIG --cflags "
10237
xrandr >= $XRANDR_REQUIRED
10238
xrender x11" 2>/dev/null`
941
@@ -13365,13 +13404,15 @@
10239
942
else
10240
943
pkg_failed=yes
10241
944
fi
10249
952
- pkg_cv_XRANDR_LIBS="$XRANDR_LIBS"
10250
953
- elif test -n "$PKG_CONFIG"; then
10251
954
- if test -n "$PKG_CONFIG" && \
10252
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
10253
955
+if test -n "$PKG_CONFIG"; then
10254
956
+ if test -n "$XRANDR_LIBS"; then
10255
957
+ pkg_cv_XRANDR_LIBS="$XRANDR_LIBS"
10256
958
+ else
10257
959
+ if test -n "$PKG_CONFIG" && \
10258
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
10259
xrandr >= \$XRANDR_REQUIRED
10260
- xrender x11\"") >&5
10261
+ xrender x11\""; } >&5
960
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
961
xrandr >= \$XRANDR_REQUIRED\""; } >&5
10262
962
($PKG_CONFIG --exists --print-errors "
10263
xrandr >= $XRANDR_REQUIRED
10264
xrender x11") 2>&5
10265
ac_status=$?
10266
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10267
- (exit $ac_status); }; then
10268
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10269
+ test $ac_status = 0; }; then
10270
pkg_cv_XRANDR_LIBS=`$PKG_CONFIG --libs "
10271
xrandr >= $XRANDR_REQUIRED
10272
xrender x11" 2>/dev/null`
963
@@ -13384,8 +13425,9 @@
10273
964
else
10274
965
pkg_failed=yes
10275
966
fi
10281
972
fi
10282
973
10283
974
10284
@@ -15316,31 +13399,18 @@
975
@@ -13398,11 +13440,11 @@
10285
976
_pkg_short_errors_supported=no
10286
977
fi
10287
978
if test $_pkg_short_errors_supported = yes; then
10288
979
- XRANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
980
- xrandr >= $XRANDR_REQUIRED" 2>&1`
10289
981
+ XRANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
10290
xrandr >= $XRANDR_REQUIRED
10291
- xrender x11" 2>&1`
10292
+ xrender x11"`
982
+ xrandr >= $XRANDR_REQUIRED"`
10293
983
else
10294
984
- XRANDR_PKG_ERRORS=`$PKG_CONFIG --print-errors "
985
- xrandr >= $XRANDR_REQUIRED" 2>&1`
10295
986
+ XRANDR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
10296
xrandr >= $XRANDR_REQUIRED
10297
- xrender x11" 2>&1`
10298
+ xrender x11"`
987
+ xrandr >= $XRANDR_REQUIRED"`
10299
988
fi
10300
989
# Put the nasty error message in config.log where it belongs
10301
990
echo "$XRANDR_PKG_ERRORS" >&5
10302
10303
- { { $as_echo "$as_me:$LINENO: error: Package requirements (
10304
- xrandr >= $XRANDR_REQUIRED
10305
- xrender x11) were not met:
10306
-
10307
-$XRANDR_PKG_ERRORS
10308
-
10309
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10310
-installed software in a non-standard prefix.
10311
-
10312
-Alternatively, you may set the environment variables XRANDR_CFLAGS
10313
-and XRANDR_LIBS to avoid the need to call pkg-config.
10314
-See the pkg-config man page for more details.
10315
-" >&5
10316
-$as_echo "$as_me: error: Package requirements (
10317
+ as_fn_error "Package requirements (
10318
xrandr >= $XRANDR_REQUIRED
10319
xrender x11) were not met:
10320
10321
@@ -15352,22 +13422,11 @@
10322
Alternatively, you may set the environment variables XRANDR_CFLAGS
10323
and XRANDR_LIBS to avoid the need to call pkg-config.
10324
See the pkg-config man page for more details.
10325
-" >&2;}
10326
- { (exit 1); exit 1; }; }
10327
+" "$LINENO" 5
10328
elif test $pkg_failed = untried; then
10329
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10330
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10331
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10332
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10333
-is in your PATH or set the PKG_CONFIG environment variable to the full
10334
-path to pkg-config.
10335
-
10336
-Alternatively, you may set the environment variables XRANDR_CFLAGS
10337
-and XRANDR_LIBS to avoid the need to call pkg-config.
10338
-See the pkg-config man page for more details.
10339
-
10340
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10341
-See \`config.log' for more details." >&5
10342
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10343
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10344
is in your PATH or set the PKG_CONFIG environment variable to the full
10345
path to pkg-config.
10346
10347
@@ -15376,12 +13435,11 @@
10348
See the pkg-config man page for more details.
10349
10350
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10351
-See \`config.log' for more details." >&2;}
10352
- { (exit 1); exit 1; }; }; }
10353
+See \`config.log' for more details." "$LINENO" 5; }
10354
else
10355
XRANDR_CFLAGS=$pkg_cv_XRANDR_CFLAGS
10356
XRANDR_LIBS=$pkg_cv_XRANDR_LIBS
10357
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10358
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10359
$as_echo "yes" >&6; }
10360
:
10361
fi
10362
@@ -15390,40 +13448,44 @@
10363
10364
10365
pkg_failed=no
10366
-{ $as_echo "$as_me:$LINENO: checking for LIBNOTIFY" >&5
10367
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5
991
@@ -13447,10 +13489,11 @@
992
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
993
$as_echo_n "checking for X11... " >&6; }
994
995
-if test -n "$X11_CFLAGS"; then
996
- pkg_cv_X11_CFLAGS="$X11_CFLAGS"
997
- elif test -n "$PKG_CONFIG"; then
998
- if test -n "$PKG_CONFIG" && \
999
+if test -n "$PKG_CONFIG"; then
1000
+ if test -n "$X11_CFLAGS"; then
1001
+ pkg_cv_X11_CFLAGS="$X11_CFLAGS"
1002
+ else
1003
+ if test -n "$PKG_CONFIG" && \
1004
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xrender\""; } >&5
1005
($PKG_CONFIG --exists --print-errors "x11 xrender") 2>&5
1006
ac_status=$?
1007
@@ -13460,13 +13503,15 @@
1008
else
1009
pkg_failed=yes
1010
fi
1011
- else
1012
- pkg_failed=untried
1013
+ fi
1014
+else
1015
+ pkg_failed=untried
1016
fi
1017
-if test -n "$X11_LIBS"; then
1018
- pkg_cv_X11_LIBS="$X11_LIBS"
1019
- elif test -n "$PKG_CONFIG"; then
1020
- if test -n "$PKG_CONFIG" && \
1021
+if test -n "$PKG_CONFIG"; then
1022
+ if test -n "$X11_LIBS"; then
1023
+ pkg_cv_X11_LIBS="$X11_LIBS"
1024
+ else
1025
+ if test -n "$PKG_CONFIG" && \
1026
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xrender\""; } >&5
1027
($PKG_CONFIG --exists --print-errors "x11 xrender") 2>&5
1028
ac_status=$?
1029
@@ -13476,8 +13521,9 @@
1030
else
1031
pkg_failed=yes
1032
fi
1033
- else
1034
- pkg_failed=untried
1035
+ fi
1036
+else
1037
+ pkg_failed=untried
1038
fi
1039
1040
1041
@@ -13490,9 +13536,9 @@
1042
_pkg_short_errors_supported=no
1043
fi
1044
if test $_pkg_short_errors_supported = yes; then
1045
- X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xrender" 2>&1`
1046
+ X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xrender"`
1047
else
1048
- X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xrender" 2>&1`
1049
+ X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xrender"`
1050
fi
1051
# Put the nasty error message in config.log where it belongs
1052
echo "$X11_PKG_ERRORS" >&5
1053
@@ -13536,10 +13582,11 @@
1054
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5
10368
1055
$as_echo_n "checking for LIBNOTIFY... " >&6; }
10369
1056
10370
1057
-if test -n "$LIBNOTIFY_CFLAGS"; then
10371
1058
- pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
10372
1059
- elif test -n "$PKG_CONFIG"; then
10373
1060
- if test -n "$PKG_CONFIG" && \
10374
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5
10375
1061
+if test -n "$PKG_CONFIG"; then
10376
1062
+ if test -n "$LIBNOTIFY_CFLAGS"; then
10377
1063
+ pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
10378
1064
+ else
10379
1065
+ if test -n "$PKG_CONFIG" && \
10380
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5
1066
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5
10381
1067
($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5
10382
1068
ac_status=$?
10383
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10384
- (exit $ac_status); }; then
10385
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10386
+ test $ac_status = 0; }; then
10387
pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null`
1069
@@ -13549,13 +13596,15 @@
10388
1070
else
10389
1071
pkg_failed=yes
10390
1072
fi
10398
1080
- pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
10399
1081
- elif test -n "$PKG_CONFIG"; then
10400
1082
- if test -n "$PKG_CONFIG" && \
10401
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5
10402
1083
+if test -n "$PKG_CONFIG"; then
10403
1084
+ if test -n "$LIBNOTIFY_LIBS"; then
10404
1085
+ pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
10405
1086
+ else
10406
1087
+ if test -n "$PKG_CONFIG" && \
10407
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5
1088
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5
10408
1089
($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5
10409
1090
ac_status=$?
10410
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10411
- (exit $ac_status); }; then
10412
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10413
+ test $ac_status = 0; }; then
10414
pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null`
1091
@@ -13565,8 +13614,9 @@
10415
1092
else
10416
1093
pkg_failed=yes
10417
1094
fi
10423
1100
fi
10424
1101
10425
1102
10426
@@ -15436,25 +13498,14 @@
1103
@@ -13579,9 +13629,9 @@
10427
1104
_pkg_short_errors_supported=no
10428
1105
fi
10429
1106
if test $_pkg_short_errors_supported = yes; then
10435
1112
fi
10436
1113
# Put the nasty error message in config.log where it belongs
10437
1114
echo "$LIBNOTIFY_PKG_ERRORS" >&5
10438
10439
- { { $as_echo "$as_me:$LINENO: error: Package requirements (libnotify >= $LIBNOTIFY_REQUIRED) were not met:
10440
-
10441
-$LIBNOTIFY_PKG_ERRORS
10442
-
10443
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10444
-installed software in a non-standard prefix.
10445
-
10446
-Alternatively, you may set the environment variables LIBNOTIFY_CFLAGS
10447
-and LIBNOTIFY_LIBS to avoid the need to call pkg-config.
10448
-See the pkg-config man page for more details.
10449
-" >&5
10450
-$as_echo "$as_me: error: Package requirements (libnotify >= $LIBNOTIFY_REQUIRED) were not met:
10451
+ as_fn_error "Package requirements (libnotify >= $LIBNOTIFY_REQUIRED) were not met:
10452
10453
$LIBNOTIFY_PKG_ERRORS
10454
10455
@@ -15464,22 +13515,11 @@
10456
Alternatively, you may set the environment variables LIBNOTIFY_CFLAGS
10457
and LIBNOTIFY_LIBS to avoid the need to call pkg-config.
10458
See the pkg-config man page for more details.
10459
-" >&2;}
10460
- { (exit 1); exit 1; }; }
10461
+" "$LINENO" 5
10462
elif test $pkg_failed = untried; then
10463
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10464
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10465
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10466
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10467
-is in your PATH or set the PKG_CONFIG environment variable to the full
10468
-path to pkg-config.
10469
-
10470
-Alternatively, you may set the environment variables LIBNOTIFY_CFLAGS
10471
-and LIBNOTIFY_LIBS to avoid the need to call pkg-config.
10472
-See the pkg-config man page for more details.
10473
-
10474
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10475
-See \`config.log' for more details." >&5
10476
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10477
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10478
is in your PATH or set the PKG_CONFIG environment variable to the full
10479
path to pkg-config.
10480
10481
@@ -15488,12 +13528,11 @@
10482
See the pkg-config man page for more details.
10483
10484
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10485
-See \`config.log' for more details." >&2;}
10486
- { (exit 1); exit 1; }; }; }
10487
+See \`config.log' for more details." "$LINENO" 5; }
10488
else
10489
LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
10490
LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS
10491
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10492
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10493
$as_echo "yes" >&6; }
10494
:
10495
fi
10496
@@ -15502,40 +13541,44 @@
10497
10498
10499
pkg_failed=no
10500
-{ $as_echo "$as_me:$LINENO: checking for UNIQUE" >&5
10501
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIQUE" >&5
1115
@@ -13625,10 +13675,11 @@
1116
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIQUE" >&5
10502
1117
$as_echo_n "checking for UNIQUE... " >&6; }
10503
1118
10504
1119
-if test -n "$UNIQUE_CFLAGS"; then
10505
1120
- pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS"
10506
1121
- elif test -n "$PKG_CONFIG"; then
10507
1122
- if test -n "$PKG_CONFIG" && \
10508
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\"") >&5
10509
1123
+if test -n "$PKG_CONFIG"; then
10510
1124
+ if test -n "$UNIQUE_CFLAGS"; then
10511
1125
+ pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS"
10512
1126
+ else
10513
1127
+ if test -n "$PKG_CONFIG" && \
10514
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\""; } >&5
1128
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\""; } >&5
10515
1129
($PKG_CONFIG --exists --print-errors "unique-1.0 >= $UNIQUE_REQUIRED") 2>&5
10516
1130
ac_status=$?
10517
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10518
- (exit $ac_status); }; then
10519
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10520
+ test $ac_status = 0; }; then
10521
pkg_cv_UNIQUE_CFLAGS=`$PKG_CONFIG --cflags "unique-1.0 >= $UNIQUE_REQUIRED" 2>/dev/null`
1131
@@ -13638,13 +13689,15 @@
10522
1132
else
10523
1133
pkg_failed=yes
10524
1134
fi
10532
1142
- pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS"
10533
1143
- elif test -n "$PKG_CONFIG"; then
10534
1144
- if test -n "$PKG_CONFIG" && \
10535
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\"") >&5
10536
1145
+if test -n "$PKG_CONFIG"; then
10537
1146
+ if test -n "$UNIQUE_LIBS"; then
10538
1147
+ pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS"
10539
1148
+ else
10540
1149
+ if test -n "$PKG_CONFIG" && \
10541
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\""; } >&5
1150
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\""; } >&5
10542
1151
($PKG_CONFIG --exists --print-errors "unique-1.0 >= $UNIQUE_REQUIRED") 2>&5
10543
1152
ac_status=$?
10544
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10545
- (exit $ac_status); }; then
10546
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10547
+ test $ac_status = 0; }; then
10548
pkg_cv_UNIQUE_LIBS=`$PKG_CONFIG --libs "unique-1.0 >= $UNIQUE_REQUIRED" 2>/dev/null`
1153
@@ -13654,8 +13707,9 @@
10549
1154
else
10550
1155
pkg_failed=yes
10551
1156
fi
10557
1162
fi
10558
1163
10559
1164
10560
@@ -15548,25 +13591,14 @@
1165
@@ -13668,9 +13722,9 @@
10561
1166
_pkg_short_errors_supported=no
10562
1167
fi
10563
1168
if test $_pkg_short_errors_supported = yes; then
10569
1174
fi
10570
1175
# Put the nasty error message in config.log where it belongs
10571
1176
echo "$UNIQUE_PKG_ERRORS" >&5
10572
10573
- { { $as_echo "$as_me:$LINENO: error: Package requirements (unique-1.0 >= $UNIQUE_REQUIRED) were not met:
10574
-
10575
-$UNIQUE_PKG_ERRORS
10576
-
10577
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10578
-installed software in a non-standard prefix.
10579
-
10580
-Alternatively, you may set the environment variables UNIQUE_CFLAGS
10581
-and UNIQUE_LIBS to avoid the need to call pkg-config.
10582
-See the pkg-config man page for more details.
10583
-" >&5
10584
-$as_echo "$as_me: error: Package requirements (unique-1.0 >= $UNIQUE_REQUIRED) were not met:
10585
+ as_fn_error "Package requirements (unique-1.0 >= $UNIQUE_REQUIRED) were not met:
10586
10587
$UNIQUE_PKG_ERRORS
10588
10589
@@ -15576,12 +13608,11 @@
10590
Alternatively, you may set the environment variables UNIQUE_CFLAGS
10591
and UNIQUE_LIBS to avoid the need to call pkg-config.
10592
See the pkg-config man page for more details.
10593
-" >&2;}
10594
- { (exit 1); exit 1; }; }
10595
+" "$LINENO" 5
10596
elif test $pkg_failed = untried; then
10597
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10598
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10599
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10600
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10601
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10602
is in your PATH or set the PKG_CONFIG environment variable to the full
10603
path to pkg-config.
10604
10605
@@ -15590,22 +13621,11 @@
10606
See the pkg-config man page for more details.
10607
10608
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10609
-See \`config.log' for more details." >&5
10610
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10611
-is in your PATH or set the PKG_CONFIG environment variable to the full
10612
-path to pkg-config.
10613
-
10614
-Alternatively, you may set the environment variables UNIQUE_CFLAGS
10615
-and UNIQUE_LIBS to avoid the need to call pkg-config.
10616
-See the pkg-config man page for more details.
10617
-
10618
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10619
-See \`config.log' for more details." >&2;}
10620
- { (exit 1); exit 1; }; }; }
10621
+See \`config.log' for more details." "$LINENO" 5; }
10622
else
10623
UNIQUE_CFLAGS=$pkg_cv_UNIQUE_CFLAGS
10624
UNIQUE_LIBS=$pkg_cv_UNIQUE_LIBS
10625
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10626
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10627
$as_echo "yes" >&6; }
10628
:
10629
fi
10630
@@ -15614,46 +13634,50 @@
10631
10632
10633
pkg_failed=no
10634
-{ $as_echo "$as_me:$LINENO: checking for DEVKIT" >&5
10635
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEVKIT" >&5
1177
@@ -13714,10 +13768,11 @@
1178
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEVKIT" >&5
10636
1179
$as_echo_n "checking for DEVKIT... " >&6; }
10637
1180
10638
1181
-if test -n "$DEVKIT_CFLAGS"; then
10639
1182
- pkg_cv_DEVKIT_CFLAGS="$DEVKIT_CFLAGS"
10640
1183
- elif test -n "$PKG_CONFIG"; then
10641
1184
- if test -n "$PKG_CONFIG" && \
10642
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
10643
- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\"") >&5
10644
1185
+if test -n "$PKG_CONFIG"; then
10645
1186
+ if test -n "$DEVKIT_CFLAGS"; then
10646
1187
+ pkg_cv_DEVKIT_CFLAGS="$DEVKIT_CFLAGS"
10647
1188
+ else
10648
1189
+ if test -n "$PKG_CONFIG" && \
10649
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
10650
+ devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\""; } >&5
1190
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
1191
devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\""; } >&5
10651
1192
($PKG_CONFIG --exists --print-errors "
10652
devkit-power-gobject >= $DEVKIT_POWER_REQUIRED") 2>&5
10653
ac_status=$?
10654
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10655
- (exit $ac_status); }; then
10656
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10657
+ test $ac_status = 0; }; then
10658
pkg_cv_DEVKIT_CFLAGS=`$PKG_CONFIG --cflags "
10659
devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>/dev/null`
1193
@@ -13730,13 +13785,15 @@
10660
1194
else
10661
1195
pkg_failed=yes
10662
1196
fi
10670
1204
- pkg_cv_DEVKIT_LIBS="$DEVKIT_LIBS"
10671
1205
- elif test -n "$PKG_CONFIG"; then
10672
1206
- if test -n "$PKG_CONFIG" && \
10673
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
10674
- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\"") >&5
10675
1207
+if test -n "$PKG_CONFIG"; then
10676
1208
+ if test -n "$DEVKIT_LIBS"; then
10677
1209
+ pkg_cv_DEVKIT_LIBS="$DEVKIT_LIBS"
10678
1210
+ else
10679
1211
+ if test -n "$PKG_CONFIG" && \
10680
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
10681
+ devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\""; } >&5
1212
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
1213
devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\""; } >&5
10682
1214
($PKG_CONFIG --exists --print-errors "
10683
devkit-power-gobject >= $DEVKIT_POWER_REQUIRED") 2>&5
10684
ac_status=$?
10685
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10686
- (exit $ac_status); }; then
10687
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10688
+ test $ac_status = 0; }; then
10689
pkg_cv_DEVKIT_LIBS=`$PKG_CONFIG --libs "
10690
devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>/dev/null`
1215
@@ -13749,8 +13806,9 @@
10691
1216
else
10692
1217
pkg_failed=yes
10693
1218
fi
10699
1224
fi
10700
1225
10701
1226
10702
@@ -15666,28 +13690,16 @@
1227
@@ -13763,11 +13821,11 @@
10703
1228
_pkg_short_errors_supported=no
10704
1229
fi
10705
1230
if test $_pkg_short_errors_supported = yes; then
10715
1240
fi
10716
1241
# Put the nasty error message in config.log where it belongs
10717
1242
echo "$DEVKIT_PKG_ERRORS" >&5
10718
10719
- { { $as_echo "$as_me:$LINENO: error: Package requirements (
10720
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED) were not met:
10721
-
10722
-$DEVKIT_PKG_ERRORS
10723
-
10724
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
10725
-installed software in a non-standard prefix.
10726
-
10727
-Alternatively, you may set the environment variables DEVKIT_CFLAGS
10728
-and DEVKIT_LIBS to avoid the need to call pkg-config.
10729
-See the pkg-config man page for more details.
10730
-" >&5
10731
-$as_echo "$as_me: error: Package requirements (
10732
+ as_fn_error "Package requirements (
10733
devkit-power-gobject >= $DEVKIT_POWER_REQUIRED) were not met:
10734
10735
$DEVKIT_PKG_ERRORS
10736
@@ -15698,22 +13710,11 @@
10737
Alternatively, you may set the environment variables DEVKIT_CFLAGS
10738
and DEVKIT_LIBS to avoid the need to call pkg-config.
10739
See the pkg-config man page for more details.
10740
-" >&2;}
10741
- { (exit 1); exit 1; }; }
10742
+" "$LINENO" 5
10743
elif test $pkg_failed = untried; then
10744
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10745
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10746
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10747
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
10748
-is in your PATH or set the PKG_CONFIG environment variable to the full
10749
-path to pkg-config.
10750
-
10751
-Alternatively, you may set the environment variables DEVKIT_CFLAGS
10752
-and DEVKIT_LIBS to avoid the need to call pkg-config.
10753
-See the pkg-config man page for more details.
10754
-
10755
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10756
-See \`config.log' for more details." >&5
10757
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
10758
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
10759
is in your PATH or set the PKG_CONFIG environment variable to the full
10760
path to pkg-config.
10761
10762
@@ -15722,12 +13723,11 @@
10763
See the pkg-config man page for more details.
10764
10765
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
10766
-See \`config.log' for more details." >&2;}
10767
- { (exit 1); exit 1; }; }; }
10768
+See \`config.log' for more details." "$LINENO" 5; }
10769
else
10770
DEVKIT_CFLAGS=$pkg_cv_DEVKIT_CFLAGS
10771
DEVKIT_LIBS=$pkg_cv_DEVKIT_LIBS
10772
- { $as_echo "$as_me:$LINENO: result: yes" >&5
10773
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10774
$as_echo "yes" >&6; }
10775
:
10776
fi
10777
@@ -15736,9 +13736,9 @@
10778
10779
# Extract the first word of "gconftool-2", so it can be a program name with args.
10780
set dummy gconftool-2; ac_word=$2
10781
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10782
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10783
$as_echo_n "checking for $ac_word... " >&6; }
10784
-if test "${ac_cv_path_GCONFTOOL+set}" = set; then
10785
+if test "${ac_cv_path_GCONFTOOL+set}" = set; then :
10786
$as_echo_n "(cached) " >&6
10787
else
10788
case $GCONFTOOL in
10789
@@ -15751,14 +13751,14 @@
10790
do
10791
IFS=$as_save_IFS
10792
test -z "$as_dir" && as_dir=.
10793
- for ac_exec_ext in '' $ac_executable_extensions; do
10794
+ for ac_exec_ext in '' $ac_executable_extensions; do
10795
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10796
ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
10797
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10798
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10799
break 2
10800
fi
10801
done
10802
-done
10803
+ done
10804
IFS=$as_save_IFS
10805
10806
;;
10807
@@ -15766,10 +13766,10 @@
10808
fi
10809
GCONFTOOL=$ac_cv_path_GCONFTOOL
10810
if test -n "$GCONFTOOL"; then
10811
- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
10812
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
10813
$as_echo "$GCONFTOOL" >&6; }
10814
else
10815
- { $as_echo "$as_me:$LINENO: result: no" >&5
10816
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10817
$as_echo "no" >&6; }
10818
fi
10819
10820
@@ -15783,13 +13783,13 @@
10821
10822
10823
# Check whether --with-gconf-source was given.
10824
-if test "${with_gconf_source+set}" = set; then
10825
+if test "${with_gconf_source+set}" = set; then :
10826
withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
10827
fi
10828
10829
10830
10831
- { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
10832
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
10833
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
10834
10835
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
10836
@@ -15798,22 +13798,20 @@
10837
10838
10839
# Check whether --with-gconf-schema-file-dir was given.
10840
-if test "${with_gconf_schema_file_dir+set}" = set; then
10841
+if test "${with_gconf_schema_file_dir+set}" = set; then :
10842
withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
10843
fi
10844
10845
10846
10847
- { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
10848
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
10849
$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
10850
10851
# Check whether --enable-schemas-install was given.
10852
-if test "${enable_schemas_install+set}" = set; then
10853
+if test "${enable_schemas_install+set}" = set; then :
10854
enableval=$enable_schemas_install; case ${enableval} in
10855
yes|no) ;;
10856
- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
10857
-$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
10858
- { (exit 1); exit 1; }; } ;;
10859
+ *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
10860
esac
10861
fi
10862
10863
@@ -15827,12 +13825,12 @@
10864
10865
10866
10867
-{ $as_echo "$as_me:$LINENO: checking for X" >&5
10868
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
10869
$as_echo_n "checking for X... " >&6; }
10870
10871
10872
# Check whether --with-x was given.
10873
-if test "${with_x+set}" = set; then
10874
+if test "${with_x+set}" = set; then :
10875
withval=$with_x;
10876
fi
10877
10878
@@ -15842,10 +13840,8 @@
10879
have_x=disabled
10880
else
10881
case $x_includes,$x_libraries in #(
10882
- *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
10883
-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
10884
- { (exit 1); exit 1; }; };; #(
10885
- *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
10886
+ *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
10887
+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
10888
$as_echo_n "(cached) " >&6
10889
else
10890
# One or both of the vars are not set, and there is no cached value.
10891
@@ -15893,21 +13889,25 @@
10892
# Check X11 before X11Rn because it is often a symlink to the current release.
10893
ac_x_header_dirs='
10894
/usr/X11/include
10895
+/usr/X11R7/include
10896
/usr/X11R6/include
10897
/usr/X11R5/include
10898
/usr/X11R4/include
10899
10900
/usr/include/X11
10901
+/usr/include/X11R7
10902
/usr/include/X11R6
10903
/usr/include/X11R5
10904
/usr/include/X11R4
10905
10906
/usr/local/X11/include
10907
+/usr/local/X11R7/include
10908
/usr/local/X11R6/include
10909
/usr/local/X11R5/include
10910
/usr/local/X11R4/include
10911
10912
/usr/local/include/X11
10913
+/usr/local/include/X11R7
10914
/usr/local/include/X11R6
10915
/usr/local/include/X11R5
10916
/usr/local/include/X11R4
10917
@@ -15929,37 +13929,14 @@
10918
if test "$ac_x_includes" = no; then
10919
# Guess where to find include files, by looking for Xlib.h.
10920
# First, try using that file with no special directory specified.
10921
- cat >conftest.$ac_ext <<_ACEOF
10922
-/* confdefs.h. */
10923
-_ACEOF
10924
-cat confdefs.h >>conftest.$ac_ext
10925
-cat >>conftest.$ac_ext <<_ACEOF
10926
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10927
/* end confdefs.h. */
10928
#include <X11/Xlib.h>
10929
_ACEOF
10930
-if { (ac_try="$ac_cpp conftest.$ac_ext"
10931
-case "(($ac_try" in
10932
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10933
- *) ac_try_echo=$ac_try;;
10934
-esac
10935
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10936
-$as_echo "$ac_try_echo") >&5
10937
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
10938
- ac_status=$?
10939
- grep -v '^ *+' conftest.er1 >conftest.err
10940
- rm -f conftest.er1
10941
- cat conftest.err >&5
10942
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10943
- (exit $ac_status); } >/dev/null && {
10944
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
10945
- test ! -s conftest.err
10946
- }; then
10947
+if ac_fn_c_try_cpp "$LINENO"; then :
10948
# We can compile using X headers with no special include directory.
10949
ac_x_includes=
10950
else
10951
- $as_echo "$as_me: failed program was:" >&5
10952
-sed 's/^/| /' conftest.$ac_ext >&5
10953
-
10954
for ac_dir in $ac_x_header_dirs; do
10955
if test -r "$ac_dir/X11/Xlib.h"; then
10956
ac_x_includes=$ac_dir
10957
@@ -15967,7 +13944,6 @@
10958
fi
10959
done
10960
fi
10961
-
10962
rm -f conftest.err conftest.$ac_ext
10963
fi # $ac_x_includes = no
10964
10965
@@ -15977,11 +13953,7 @@
10966
# Don't add to $LIBS permanently.
10967
ac_save_LIBS=$LIBS
10968
LIBS="-lX11 $LIBS"
10969
- cat >conftest.$ac_ext <<_ACEOF
10970
-/* confdefs.h. */
10971
-_ACEOF
10972
-cat confdefs.h >>conftest.$ac_ext
10973
-cat >>conftest.$ac_ext <<_ACEOF
10974
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10975
/* end confdefs.h. */
10976
#include <X11/Xlib.h>
10977
int
10978
@@ -15992,35 +13964,12 @@
10979
return 0;
10980
}
10981
_ACEOF
10982
-rm -f conftest.$ac_objext conftest$ac_exeext
10983
-if { (ac_try="$ac_link"
10984
-case "(($ac_try" in
10985
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10986
- *) ac_try_echo=$ac_try;;
10987
-esac
10988
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10989
-$as_echo "$ac_try_echo") >&5
10990
- (eval "$ac_link") 2>conftest.er1
10991
- ac_status=$?
10992
- grep -v '^ *+' conftest.er1 >conftest.err
10993
- rm -f conftest.er1
10994
- cat conftest.err >&5
10995
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10996
- (exit $ac_status); } && {
10997
- test -z "$ac_c_werror_flag" ||
10998
- test ! -s conftest.err
10999
- } && test -s conftest$ac_exeext && {
11000
- test "$cross_compiling" = yes ||
11001
- $as_test_x conftest$ac_exeext
11002
- }; then
11003
+if ac_fn_c_try_link "$LINENO"; then :
11004
LIBS=$ac_save_LIBS
11005
# We can link X programs with no special library path.
11006
ac_x_libraries=
11007
else
11008
- $as_echo "$as_me: failed program was:" >&5
11009
-sed 's/^/| /' conftest.$ac_ext >&5
11010
-
11011
- LIBS=$ac_save_LIBS
11012
+ LIBS=$ac_save_LIBS
11013
for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
11014
do
11015
# Don't even attempt the hair of trying to link an X program!
11016
@@ -16032,10 +13981,8 @@
11017
done
11018
done
11019
fi
11020
-
11021
-rm -rf conftest.dSYM
11022
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11023
- conftest$ac_exeext conftest.$ac_ext
11024
+rm -f core conftest.err conftest.$ac_objext \
11025
+ conftest$ac_exeext conftest.$ac_ext
11026
fi # $ac_x_libraries = no
11027
11028
case $ac_x_includes,$ac_x_libraries in #(
11029
@@ -16056,7 +14003,7 @@
11030
fi # $with_x != no
11031
11032
if test "$have_x" != yes; then
11033
- { $as_echo "$as_me:$LINENO: result: $have_x" >&5
11034
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
11035
$as_echo "$have_x" >&6; }
11036
no_x=yes
11037
else
11038
@@ -16067,16 +14014,14 @@
11039
ac_cv_have_x="have_x=yes\
11040
ac_x_includes='$x_includes'\
11041
ac_x_libraries='$x_libraries'"
11042
- { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
11043
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
11044
$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
11045
fi
11046
11047
if test "$no_x" = yes; then
11048
# Not all programs may use this symbol, but it does not hurt to define it.
11049
11050
-cat >>confdefs.h <<\_ACEOF
11051
-#define X_DISPLAY_MISSING 1
11052
-_ACEOF
11053
+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
11054
11055
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
11056
else
11057
@@ -16089,16 +14034,12 @@
11058
X_LIBS="$X_LIBS -L$x_libraries"
11059
# For Solaris; some versions of Sun CC require a space after -R and
11060
# others require no space. Words are not sufficient . . . .
11061
- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
11062
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
11063
$as_echo_n "checking whether -R must be followed by a space... " >&6; }
11064
ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
11065
ac_xsave_c_werror_flag=$ac_c_werror_flag
11066
ac_c_werror_flag=yes
11067
- cat >conftest.$ac_ext <<_ACEOF
11068
-/* confdefs.h. */
11069
-_ACEOF
11070
-cat confdefs.h >>conftest.$ac_ext
11071
-cat >>conftest.$ac_ext <<_ACEOF
11072
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11073
/* end confdefs.h. */
11074
11075
int
11076
@@ -16109,40 +14050,13 @@
11077
return 0;
11078
}
11079
_ACEOF
11080
-rm -f conftest.$ac_objext conftest$ac_exeext
11081
-if { (ac_try="$ac_link"
11082
-case "(($ac_try" in
11083
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11084
- *) ac_try_echo=$ac_try;;
11085
-esac
11086
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11087
-$as_echo "$ac_try_echo") >&5
11088
- (eval "$ac_link") 2>conftest.er1
11089
- ac_status=$?
11090
- grep -v '^ *+' conftest.er1 >conftest.err
11091
- rm -f conftest.er1
11092
- cat conftest.err >&5
11093
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11094
- (exit $ac_status); } && {
11095
- test -z "$ac_c_werror_flag" ||
11096
- test ! -s conftest.err
11097
- } && test -s conftest$ac_exeext && {
11098
- test "$cross_compiling" = yes ||
11099
- $as_test_x conftest$ac_exeext
11100
- }; then
11101
- { $as_echo "$as_me:$LINENO: result: no" >&5
11102
+if ac_fn_c_try_link "$LINENO"; then :
11103
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11104
$as_echo "no" >&6; }
11105
X_LIBS="$X_LIBS -R$x_libraries"
11106
else
11107
- $as_echo "$as_me: failed program was:" >&5
11108
-sed 's/^/| /' conftest.$ac_ext >&5
11109
-
11110
- LIBS="$ac_xsave_LIBS -R $x_libraries"
11111
- cat >conftest.$ac_ext <<_ACEOF
11112
-/* confdefs.h. */
11113
-_ACEOF
11114
-cat confdefs.h >>conftest.$ac_ext
11115
-cat >>conftest.$ac_ext <<_ACEOF
11116
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
11117
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11118
/* end confdefs.h. */
11119
11120
int
11121
@@ -16153,46 +14067,19 @@
11122
return 0;
11123
}
11124
_ACEOF
11125
-rm -f conftest.$ac_objext conftest$ac_exeext
11126
-if { (ac_try="$ac_link"
11127
-case "(($ac_try" in
11128
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11129
- *) ac_try_echo=$ac_try;;
11130
-esac
11131
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11132
-$as_echo "$ac_try_echo") >&5
11133
- (eval "$ac_link") 2>conftest.er1
11134
- ac_status=$?
11135
- grep -v '^ *+' conftest.er1 >conftest.err
11136
- rm -f conftest.er1
11137
- cat conftest.err >&5
11138
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11139
- (exit $ac_status); } && {
11140
- test -z "$ac_c_werror_flag" ||
11141
- test ! -s conftest.err
11142
- } && test -s conftest$ac_exeext && {
11143
- test "$cross_compiling" = yes ||
11144
- $as_test_x conftest$ac_exeext
11145
- }; then
11146
- { $as_echo "$as_me:$LINENO: result: yes" >&5
11147
+if ac_fn_c_try_link "$LINENO"; then :
11148
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11149
$as_echo "yes" >&6; }
11150
X_LIBS="$X_LIBS -R $x_libraries"
11151
else
11152
- $as_echo "$as_me: failed program was:" >&5
11153
-sed 's/^/| /' conftest.$ac_ext >&5
11154
-
11155
- { $as_echo "$as_me:$LINENO: result: neither works" >&5
11156
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
11157
$as_echo "neither works" >&6; }
11158
fi
11159
-
11160
-rm -rf conftest.dSYM
11161
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11162
- conftest$ac_exeext conftest.$ac_ext
11163
+rm -f core conftest.err conftest.$ac_objext \
11164
+ conftest$ac_exeext conftest.$ac_ext
11165
fi
11166
-
11167
-rm -rf conftest.dSYM
11168
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11169
- conftest$ac_exeext conftest.$ac_ext
11170
+rm -f core conftest.err conftest.$ac_objext \
11171
+ conftest$ac_exeext conftest.$ac_ext
11172
ac_c_werror_flag=$ac_xsave_c_werror_flag
11173
LIBS=$ac_xsave_LIBS
11174
fi
11175
@@ -16208,11 +14095,7 @@
11176
# libraries were built with DECnet support. And Karl Berry says
11177
# the Alpha needs dnet_stub (dnet does not exist).
11178
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
11179
- cat >conftest.$ac_ext <<_ACEOF
11180
-/* confdefs.h. */
11181
-_ACEOF
11182
-cat confdefs.h >>conftest.$ac_ext
11183
-cat >>conftest.$ac_ext <<_ACEOF
11184
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11185
/* end confdefs.h. */
11186
11187
/* Override any GCC internal prototype to avoid an error.
11188
@@ -16230,44 +14113,17 @@
11189
return 0;
11190
}
11191
_ACEOF
11192
-rm -f conftest.$ac_objext conftest$ac_exeext
11193
-if { (ac_try="$ac_link"
11194
-case "(($ac_try" in
11195
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11196
- *) ac_try_echo=$ac_try;;
11197
-esac
11198
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11199
-$as_echo "$ac_try_echo") >&5
11200
- (eval "$ac_link") 2>conftest.er1
11201
- ac_status=$?
11202
- grep -v '^ *+' conftest.er1 >conftest.err
11203
- rm -f conftest.er1
11204
- cat conftest.err >&5
11205
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11206
- (exit $ac_status); } && {
11207
- test -z "$ac_c_werror_flag" ||
11208
- test ! -s conftest.err
11209
- } && test -s conftest$ac_exeext && {
11210
- test "$cross_compiling" = yes ||
11211
- $as_test_x conftest$ac_exeext
11212
- }; then
11213
- :
11214
-else
11215
- $as_echo "$as_me: failed program was:" >&5
11216
-sed 's/^/| /' conftest.$ac_ext >&5
11217
+if ac_fn_c_try_link "$LINENO"; then :
11218
11219
- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
11220
+else
11221
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
11222
$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
11223
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
11224
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
11225
$as_echo_n "(cached) " >&6
11226
else
11227
ac_check_lib_save_LIBS=$LIBS
11228
LIBS="-ldnet $LIBS"
11229
-cat >conftest.$ac_ext <<_ACEOF
11230
-/* confdefs.h. */
11231
-_ACEOF
11232
-cat confdefs.h >>conftest.$ac_ext
11233
-cat >>conftest.$ac_ext <<_ACEOF
11234
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11235
/* end confdefs.h. */
11236
11237
/* Override any GCC internal prototype to avoid an error.
11238
@@ -16285,59 +14141,30 @@
11239
return 0;
11240
}
11241
_ACEOF
11242
-rm -f conftest.$ac_objext conftest$ac_exeext
11243
-if { (ac_try="$ac_link"
11244
-case "(($ac_try" in
11245
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11246
- *) ac_try_echo=$ac_try;;
11247
-esac
11248
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11249
-$as_echo "$ac_try_echo") >&5
11250
- (eval "$ac_link") 2>conftest.er1
11251
- ac_status=$?
11252
- grep -v '^ *+' conftest.er1 >conftest.err
11253
- rm -f conftest.er1
11254
- cat conftest.err >&5
11255
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11256
- (exit $ac_status); } && {
11257
- test -z "$ac_c_werror_flag" ||
11258
- test ! -s conftest.err
11259
- } && test -s conftest$ac_exeext && {
11260
- test "$cross_compiling" = yes ||
11261
- $as_test_x conftest$ac_exeext
11262
- }; then
11263
+if ac_fn_c_try_link "$LINENO"; then :
11264
ac_cv_lib_dnet_dnet_ntoa=yes
11265
else
11266
- $as_echo "$as_me: failed program was:" >&5
11267
-sed 's/^/| /' conftest.$ac_ext >&5
11268
-
11269
- ac_cv_lib_dnet_dnet_ntoa=no
11270
+ ac_cv_lib_dnet_dnet_ntoa=no
11271
fi
11272
-
11273
-rm -rf conftest.dSYM
11274
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11275
- conftest$ac_exeext conftest.$ac_ext
11276
+rm -f core conftest.err conftest.$ac_objext \
11277
+ conftest$ac_exeext conftest.$ac_ext
11278
LIBS=$ac_check_lib_save_LIBS
11279
fi
11280
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
11281
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
11282
$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
11283
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
11284
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
11285
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
11286
fi
11287
11288
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
11289
- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
11290
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
11291
$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
11292
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
11293
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
11294
$as_echo_n "(cached) " >&6
11295
else
11296
ac_check_lib_save_LIBS=$LIBS
11297
LIBS="-ldnet_stub $LIBS"
11298
-cat >conftest.$ac_ext <<_ACEOF
11299
-/* confdefs.h. */
11300
-_ACEOF
11301
-cat confdefs.h >>conftest.$ac_ext
11302
-cat >>conftest.$ac_ext <<_ACEOF
11303
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11304
/* end confdefs.h. */
11305
11306
/* Override any GCC internal prototype to avoid an error.
11307
@@ -16355,52 +14182,25 @@
11308
return 0;
11309
}
11310
_ACEOF
11311
-rm -f conftest.$ac_objext conftest$ac_exeext
11312
-if { (ac_try="$ac_link"
11313
-case "(($ac_try" in
11314
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11315
- *) ac_try_echo=$ac_try;;
11316
-esac
11317
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11318
-$as_echo "$ac_try_echo") >&5
11319
- (eval "$ac_link") 2>conftest.er1
11320
- ac_status=$?
11321
- grep -v '^ *+' conftest.er1 >conftest.err
11322
- rm -f conftest.er1
11323
- cat conftest.err >&5
11324
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11325
- (exit $ac_status); } && {
11326
- test -z "$ac_c_werror_flag" ||
11327
- test ! -s conftest.err
11328
- } && test -s conftest$ac_exeext && {
11329
- test "$cross_compiling" = yes ||
11330
- $as_test_x conftest$ac_exeext
11331
- }; then
11332
+if ac_fn_c_try_link "$LINENO"; then :
11333
ac_cv_lib_dnet_stub_dnet_ntoa=yes
11334
else
11335
- $as_echo "$as_me: failed program was:" >&5
11336
-sed 's/^/| /' conftest.$ac_ext >&5
11337
-
11338
- ac_cv_lib_dnet_stub_dnet_ntoa=no
11339
+ ac_cv_lib_dnet_stub_dnet_ntoa=no
11340
fi
11341
-
11342
-rm -rf conftest.dSYM
11343
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11344
- conftest$ac_exeext conftest.$ac_ext
11345
+rm -f core conftest.err conftest.$ac_objext \
11346
+ conftest$ac_exeext conftest.$ac_ext
11347
LIBS=$ac_check_lib_save_LIBS
11348
fi
11349
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
11350
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
11351
$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
11352
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
11353
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
11354
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
11355
fi
11356
11357
fi
11358
fi
11359
-
11360
-rm -rf conftest.dSYM
11361
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11362
- conftest$ac_exeext conftest.$ac_ext
11363
+rm -f core conftest.err conftest.$ac_objext \
11364
+ conftest$ac_exeext conftest.$ac_ext
11365
LIBS="$ac_xsave_LIBS"
11366
11367
# msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
11368
@@ -16411,105 +14211,20 @@
11369
# on Irix 5.2, according to T.E. Dickey.
11370
# The functions gethostbyname, getservbyname, and inet_addr are
11371
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
11372
- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
11373
-$as_echo_n "checking for gethostbyname... " >&6; }
11374
-if test "${ac_cv_func_gethostbyname+set}" = set; then
11375
- $as_echo_n "(cached) " >&6
11376
-else
11377
- cat >conftest.$ac_ext <<_ACEOF
11378
-/* confdefs.h. */
11379
-_ACEOF
11380
-cat confdefs.h >>conftest.$ac_ext
11381
-cat >>conftest.$ac_ext <<_ACEOF
11382
-/* end confdefs.h. */
11383
-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
11384
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
11385
-#define gethostbyname innocuous_gethostbyname
11386
-
11387
-/* System header to define __stub macros and hopefully few prototypes,
11388
- which can conflict with char gethostbyname (); below.
11389
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
11390
- <limits.h> exists even on freestanding compilers. */
11391
-
11392
-#ifdef __STDC__
11393
-# include <limits.h>
11394
-#else
11395
-# include <assert.h>
11396
-#endif
11397
-
11398
-#undef gethostbyname
11399
-
11400
-/* Override any GCC internal prototype to avoid an error.
11401
- Use char because int might match the return type of a GCC
11402
- builtin and then its argument prototype would still apply. */
11403
-#ifdef __cplusplus
11404
-extern "C"
11405
-#endif
11406
-char gethostbyname ();
11407
-/* The GNU C library defines this for functions which it implements
11408
- to always fail with ENOSYS. Some functions are actually named
11409
- something starting with __ and the normal name is an alias. */
11410
-#if defined __stub_gethostbyname || defined __stub___gethostbyname
11411
-choke me
11412
-#endif
11413
-
11414
-int
11415
-main ()
11416
-{
11417
-return gethostbyname ();
11418
- ;
11419
- return 0;
11420
-}
11421
-_ACEOF
11422
-rm -f conftest.$ac_objext conftest$ac_exeext
11423
-if { (ac_try="$ac_link"
11424
-case "(($ac_try" in
11425
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11426
- *) ac_try_echo=$ac_try;;
11427
-esac
11428
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11429
-$as_echo "$ac_try_echo") >&5
11430
- (eval "$ac_link") 2>conftest.er1
11431
- ac_status=$?
11432
- grep -v '^ *+' conftest.er1 >conftest.err
11433
- rm -f conftest.er1
11434
- cat conftest.err >&5
11435
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11436
- (exit $ac_status); } && {
11437
- test -z "$ac_c_werror_flag" ||
11438
- test ! -s conftest.err
11439
- } && test -s conftest$ac_exeext && {
11440
- test "$cross_compiling" = yes ||
11441
- $as_test_x conftest$ac_exeext
11442
- }; then
11443
- ac_cv_func_gethostbyname=yes
11444
-else
11445
- $as_echo "$as_me: failed program was:" >&5
11446
-sed 's/^/| /' conftest.$ac_ext >&5
11447
-
11448
- ac_cv_func_gethostbyname=no
11449
-fi
11450
+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
11451
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
11452
11453
-rm -rf conftest.dSYM
11454
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11455
- conftest$ac_exeext conftest.$ac_ext
11456
fi
11457
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
11458
-$as_echo "$ac_cv_func_gethostbyname" >&6; }
11459
11460
if test $ac_cv_func_gethostbyname = no; then
11461
- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
11462
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
11463
$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
11464
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
11465
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
11466
$as_echo_n "(cached) " >&6
11467
else
11468
ac_check_lib_save_LIBS=$LIBS
11469
LIBS="-lnsl $LIBS"
11470
-cat >conftest.$ac_ext <<_ACEOF
11471
-/* confdefs.h. */
11472
-_ACEOF
11473
-cat confdefs.h >>conftest.$ac_ext
11474
-cat >>conftest.$ac_ext <<_ACEOF
11475
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11476
/* end confdefs.h. */
11477
11478
/* Override any GCC internal prototype to avoid an error.
11479
@@ -16527,59 +14242,30 @@
11480
return 0;
11481
}
11482
_ACEOF
11483
-rm -f conftest.$ac_objext conftest$ac_exeext
11484
-if { (ac_try="$ac_link"
11485
-case "(($ac_try" in
11486
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11487
- *) ac_try_echo=$ac_try;;
11488
-esac
11489
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11490
-$as_echo "$ac_try_echo") >&5
11491
- (eval "$ac_link") 2>conftest.er1
11492
- ac_status=$?
11493
- grep -v '^ *+' conftest.er1 >conftest.err
11494
- rm -f conftest.er1
11495
- cat conftest.err >&5
11496
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11497
- (exit $ac_status); } && {
11498
- test -z "$ac_c_werror_flag" ||
11499
- test ! -s conftest.err
11500
- } && test -s conftest$ac_exeext && {
11501
- test "$cross_compiling" = yes ||
11502
- $as_test_x conftest$ac_exeext
11503
- }; then
11504
+if ac_fn_c_try_link "$LINENO"; then :
11505
ac_cv_lib_nsl_gethostbyname=yes
11506
else
11507
- $as_echo "$as_me: failed program was:" >&5
11508
-sed 's/^/| /' conftest.$ac_ext >&5
11509
-
11510
- ac_cv_lib_nsl_gethostbyname=no
11511
+ ac_cv_lib_nsl_gethostbyname=no
11512
fi
11513
-
11514
-rm -rf conftest.dSYM
11515
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11516
- conftest$ac_exeext conftest.$ac_ext
11517
+rm -f core conftest.err conftest.$ac_objext \
11518
+ conftest$ac_exeext conftest.$ac_ext
11519
LIBS=$ac_check_lib_save_LIBS
11520
fi
11521
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
11522
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
11523
$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
11524
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
11525
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
11526
X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
11527
fi
11528
11529
if test $ac_cv_lib_nsl_gethostbyname = no; then
11530
- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
11531
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
11532
$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
11533
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
11534
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
11535
$as_echo_n "(cached) " >&6
11536
else
11537
ac_check_lib_save_LIBS=$LIBS
11538
LIBS="-lbsd $LIBS"
11539
-cat >conftest.$ac_ext <<_ACEOF
11540
-/* confdefs.h. */
11541
-_ACEOF
11542
-cat confdefs.h >>conftest.$ac_ext
11543
-cat >>conftest.$ac_ext <<_ACEOF
11544
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11545
/* end confdefs.h. */
11546
11547
/* Override any GCC internal prototype to avoid an error.
11548
@@ -16597,43 +14283,18 @@
11549
return 0;
11550
}
11551
_ACEOF
11552
-rm -f conftest.$ac_objext conftest$ac_exeext
11553
-if { (ac_try="$ac_link"
11554
-case "(($ac_try" in
11555
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11556
- *) ac_try_echo=$ac_try;;
11557
-esac
11558
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11559
-$as_echo "$ac_try_echo") >&5
11560
- (eval "$ac_link") 2>conftest.er1
11561
- ac_status=$?
11562
- grep -v '^ *+' conftest.er1 >conftest.err
11563
- rm -f conftest.er1
11564
- cat conftest.err >&5
11565
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11566
- (exit $ac_status); } && {
11567
- test -z "$ac_c_werror_flag" ||
11568
- test ! -s conftest.err
11569
- } && test -s conftest$ac_exeext && {
11570
- test "$cross_compiling" = yes ||
11571
- $as_test_x conftest$ac_exeext
11572
- }; then
11573
+if ac_fn_c_try_link "$LINENO"; then :
11574
ac_cv_lib_bsd_gethostbyname=yes
11575
else
11576
- $as_echo "$as_me: failed program was:" >&5
11577
-sed 's/^/| /' conftest.$ac_ext >&5
11578
-
11579
- ac_cv_lib_bsd_gethostbyname=no
11580
+ ac_cv_lib_bsd_gethostbyname=no
11581
fi
11582
-
11583
-rm -rf conftest.dSYM
11584
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11585
- conftest$ac_exeext conftest.$ac_ext
11586
+rm -f core conftest.err conftest.$ac_objext \
11587
+ conftest$ac_exeext conftest.$ac_ext
11588
LIBS=$ac_check_lib_save_LIBS
11589
fi
11590
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
11591
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
11592
$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
11593
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
11594
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
11595
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
11596
fi
11597
11598
@@ -16647,264 +14308,20 @@
11599
# variants that don't use the name server (or something). -lsocket
11600
# must be given before -lnsl if both are needed. We assume that
11601
# if connect needs -lnsl, so does gethostbyname.
11602
- { $as_echo "$as_me:$LINENO: checking for connect" >&5
11603
-$as_echo_n "checking for connect... " >&6; }
11604
-if test "${ac_cv_func_connect+set}" = set; then
11605
- $as_echo_n "(cached) " >&6
11606
-else
11607
- cat >conftest.$ac_ext <<_ACEOF
11608
-/* confdefs.h. */
11609
-_ACEOF
11610
-cat confdefs.h >>conftest.$ac_ext
11611
-cat >>conftest.$ac_ext <<_ACEOF
11612
-/* end confdefs.h. */
11613
-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
11614
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
11615
-#define connect innocuous_connect
11616
-
11617
-/* System header to define __stub macros and hopefully few prototypes,
11618
- which can conflict with char connect (); below.
11619
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
11620
- <limits.h> exists even on freestanding compilers. */
11621
-
11622
-#ifdef __STDC__
11623
-# include <limits.h>
11624
-#else
11625
-# include <assert.h>
11626
-#endif
11627
-
11628
-#undef connect
11629
-
11630
-/* Override any GCC internal prototype to avoid an error.
11631
- Use char because int might match the return type of a GCC
11632
- builtin and then its argument prototype would still apply. */
11633
-#ifdef __cplusplus
11634
-extern "C"
11635
-#endif
11636
-char connect ();
11637
-/* The GNU C library defines this for functions which it implements
11638
- to always fail with ENOSYS. Some functions are actually named
11639
- something starting with __ and the normal name is an alias. */
11640
-#if defined __stub_connect || defined __stub___connect
11641
-choke me
11642
-#endif
11643
-
11644
-int
11645
-main ()
11646
-{
11647
-return connect ();
11648
- ;
11649
- return 0;
11650
-}
11651
-_ACEOF
11652
-rm -f conftest.$ac_objext conftest$ac_exeext
11653
-if { (ac_try="$ac_link"
11654
-case "(($ac_try" in
11655
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11656
- *) ac_try_echo=$ac_try;;
11657
-esac
11658
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11659
-$as_echo "$ac_try_echo") >&5
11660
- (eval "$ac_link") 2>conftest.er1
11661
- ac_status=$?
11662
- grep -v '^ *+' conftest.er1 >conftest.err
11663
- rm -f conftest.er1
11664
- cat conftest.err >&5
11665
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11666
- (exit $ac_status); } && {
11667
- test -z "$ac_c_werror_flag" ||
11668
- test ! -s conftest.err
11669
- } && test -s conftest$ac_exeext && {
11670
- test "$cross_compiling" = yes ||
11671
- $as_test_x conftest$ac_exeext
11672
- }; then
11673
- ac_cv_func_connect=yes
11674
-else
11675
- $as_echo "$as_me: failed program was:" >&5
11676
-sed 's/^/| /' conftest.$ac_ext >&5
11677
-
11678
- ac_cv_func_connect=no
11679
-fi
11680
+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
11681
+if test "x$ac_cv_func_connect" = x""yes; then :
11682
11683
-rm -rf conftest.dSYM
11684
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11685
- conftest$ac_exeext conftest.$ac_ext
11686
fi
11687
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
11688
-$as_echo "$ac_cv_func_connect" >&6; }
11689
11690
if test $ac_cv_func_connect = no; then
11691
- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
11692
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
11693
$as_echo_n "checking for connect in -lsocket... " >&6; }
11694
-if test "${ac_cv_lib_socket_connect+set}" = set; then
11695
+if test "${ac_cv_lib_socket_connect+set}" = set; then :
11696
$as_echo_n "(cached) " >&6
11697
else
11698
ac_check_lib_save_LIBS=$LIBS
11699
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
11700
-cat >conftest.$ac_ext <<_ACEOF
11701
-/* confdefs.h. */
11702
-_ACEOF
11703
-cat confdefs.h >>conftest.$ac_ext
11704
-cat >>conftest.$ac_ext <<_ACEOF
11705
-/* end confdefs.h. */
11706
-
11707
-/* Override any GCC internal prototype to avoid an error.
11708
- Use char because int might match the return type of a GCC
11709
- builtin and then its argument prototype would still apply. */
11710
-#ifdef __cplusplus
11711
-extern "C"
11712
-#endif
11713
-char connect ();
11714
-int
11715
-main ()
11716
-{
11717
-return connect ();
11718
- ;
11719
- return 0;
11720
-}
11721
-_ACEOF
11722
-rm -f conftest.$ac_objext conftest$ac_exeext
11723
-if { (ac_try="$ac_link"
11724
-case "(($ac_try" in
11725
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11726
- *) ac_try_echo=$ac_try;;
11727
-esac
11728
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11729
-$as_echo "$ac_try_echo") >&5
11730
- (eval "$ac_link") 2>conftest.er1
11731
- ac_status=$?
11732
- grep -v '^ *+' conftest.er1 >conftest.err
11733
- rm -f conftest.er1
11734
- cat conftest.err >&5
11735
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11736
- (exit $ac_status); } && {
11737
- test -z "$ac_c_werror_flag" ||
11738
- test ! -s conftest.err
11739
- } && test -s conftest$ac_exeext && {
11740
- test "$cross_compiling" = yes ||
11741
- $as_test_x conftest$ac_exeext
11742
- }; then
11743
- ac_cv_lib_socket_connect=yes
11744
-else
11745
- $as_echo "$as_me: failed program was:" >&5
11746
-sed 's/^/| /' conftest.$ac_ext >&5
11747
-
11748
- ac_cv_lib_socket_connect=no
11749
-fi
11750
-
11751
-rm -rf conftest.dSYM
11752
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11753
- conftest$ac_exeext conftest.$ac_ext
11754
-LIBS=$ac_check_lib_save_LIBS
11755
-fi
11756
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
11757
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
11758
-if test "x$ac_cv_lib_socket_connect" = x""yes; then
11759
- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
11760
-fi
11761
-
11762
- fi
11763
-
11764
- # Guillermo Gomez says -lposix is necessary on A/UX.
11765
- { $as_echo "$as_me:$LINENO: checking for remove" >&5
11766
-$as_echo_n "checking for remove... " >&6; }
11767
-if test "${ac_cv_func_remove+set}" = set; then
11768
- $as_echo_n "(cached) " >&6
11769
-else
11770
- cat >conftest.$ac_ext <<_ACEOF
11771
-/* confdefs.h. */
11772
-_ACEOF
11773
-cat confdefs.h >>conftest.$ac_ext
11774
-cat >>conftest.$ac_ext <<_ACEOF
11775
-/* end confdefs.h. */
11776
-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
11777
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
11778
-#define remove innocuous_remove
11779
-
11780
-/* System header to define __stub macros and hopefully few prototypes,
11781
- which can conflict with char remove (); below.
11782
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
11783
- <limits.h> exists even on freestanding compilers. */
11784
-
11785
-#ifdef __STDC__
11786
-# include <limits.h>
11787
-#else
11788
-# include <assert.h>
11789
-#endif
11790
-
11791
-#undef remove
11792
-
11793
-/* Override any GCC internal prototype to avoid an error.
11794
- Use char because int might match the return type of a GCC
11795
- builtin and then its argument prototype would still apply. */
11796
-#ifdef __cplusplus
11797
-extern "C"
11798
-#endif
11799
-char remove ();
11800
-/* The GNU C library defines this for functions which it implements
11801
- to always fail with ENOSYS. Some functions are actually named
11802
- something starting with __ and the normal name is an alias. */
11803
-#if defined __stub_remove || defined __stub___remove
11804
-choke me
11805
-#endif
11806
-
11807
-int
11808
-main ()
11809
-{
11810
-return remove ();
11811
- ;
11812
- return 0;
11813
-}
11814
-_ACEOF
11815
-rm -f conftest.$ac_objext conftest$ac_exeext
11816
-if { (ac_try="$ac_link"
11817
-case "(($ac_try" in
11818
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11819
- *) ac_try_echo=$ac_try;;
11820
-esac
11821
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11822
-$as_echo "$ac_try_echo") >&5
11823
- (eval "$ac_link") 2>conftest.er1
11824
- ac_status=$?
11825
- grep -v '^ *+' conftest.er1 >conftest.err
11826
- rm -f conftest.er1
11827
- cat conftest.err >&5
11828
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11829
- (exit $ac_status); } && {
11830
- test -z "$ac_c_werror_flag" ||
11831
- test ! -s conftest.err
11832
- } && test -s conftest$ac_exeext && {
11833
- test "$cross_compiling" = yes ||
11834
- $as_test_x conftest$ac_exeext
11835
- }; then
11836
- ac_cv_func_remove=yes
11837
-else
11838
- $as_echo "$as_me: failed program was:" >&5
11839
-sed 's/^/| /' conftest.$ac_ext >&5
11840
-
11841
- ac_cv_func_remove=no
11842
-fi
11843
-
11844
-rm -rf conftest.dSYM
11845
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11846
- conftest$ac_exeext conftest.$ac_ext
11847
-fi
11848
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
11849
-$as_echo "$ac_cv_func_remove" >&6; }
11850
-
11851
- if test $ac_cv_func_remove = no; then
11852
- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
11853
-$as_echo_n "checking for remove in -lposix... " >&6; }
11854
-if test "${ac_cv_lib_posix_remove+set}" = set; then
11855
- $as_echo_n "(cached) " >&6
11856
-else
11857
- ac_check_lib_save_LIBS=$LIBS
11858
-LIBS="-lposix $LIBS"
11859
-cat >conftest.$ac_ext <<_ACEOF
11860
-/* confdefs.h. */
11861
-_ACEOF
11862
-cat confdefs.h >>conftest.$ac_ext
11863
-cat >>conftest.$ac_ext <<_ACEOF
11864
+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
11865
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11866
/* end confdefs.h. */
11867
11868
/* Override any GCC internal prototype to avoid an error.
11869
@@ -16913,85 +14330,48 @@
11870
#ifdef __cplusplus
11871
extern "C"
11872
#endif
11873
-char remove ();
11874
+char connect ();
11875
int
11876
main ()
11877
{
11878
-return remove ();
11879
+return connect ();
11880
;
11881
return 0;
11882
}
11883
_ACEOF
11884
-rm -f conftest.$ac_objext conftest$ac_exeext
11885
-if { (ac_try="$ac_link"
11886
-case "(($ac_try" in
11887
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11888
- *) ac_try_echo=$ac_try;;
11889
-esac
11890
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11891
-$as_echo "$ac_try_echo") >&5
11892
- (eval "$ac_link") 2>conftest.er1
11893
- ac_status=$?
11894
- grep -v '^ *+' conftest.er1 >conftest.err
11895
- rm -f conftest.er1
11896
- cat conftest.err >&5
11897
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11898
- (exit $ac_status); } && {
11899
- test -z "$ac_c_werror_flag" ||
11900
- test ! -s conftest.err
11901
- } && test -s conftest$ac_exeext && {
11902
- test "$cross_compiling" = yes ||
11903
- $as_test_x conftest$ac_exeext
11904
- }; then
11905
- ac_cv_lib_posix_remove=yes
11906
+if ac_fn_c_try_link "$LINENO"; then :
11907
+ ac_cv_lib_socket_connect=yes
11908
else
11909
- $as_echo "$as_me: failed program was:" >&5
11910
-sed 's/^/| /' conftest.$ac_ext >&5
11911
-
11912
- ac_cv_lib_posix_remove=no
11913
+ ac_cv_lib_socket_connect=no
11914
fi
11915
-
11916
-rm -rf conftest.dSYM
11917
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11918
- conftest$ac_exeext conftest.$ac_ext
11919
+rm -f core conftest.err conftest.$ac_objext \
11920
+ conftest$ac_exeext conftest.$ac_ext
11921
LIBS=$ac_check_lib_save_LIBS
11922
fi
11923
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
11924
-$as_echo "$ac_cv_lib_posix_remove" >&6; }
11925
-if test "x$ac_cv_lib_posix_remove" = x""yes; then
11926
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
11927
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
11928
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
11929
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
11930
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
11931
fi
11932
11933
fi
11934
11935
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
11936
- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
11937
-$as_echo_n "checking for shmat... " >&6; }
11938
-if test "${ac_cv_func_shmat+set}" = set; then
11939
+ # Guillermo Gomez says -lposix is necessary on A/UX.
11940
+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
11941
+if test "x$ac_cv_func_remove" = x""yes; then :
11942
+
11943
+fi
11944
+
11945
+ if test $ac_cv_func_remove = no; then
11946
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
11947
+$as_echo_n "checking for remove in -lposix... " >&6; }
11948
+if test "${ac_cv_lib_posix_remove+set}" = set; then :
11949
$as_echo_n "(cached) " >&6
11950
else
11951
- cat >conftest.$ac_ext <<_ACEOF
11952
-/* confdefs.h. */
11953
-_ACEOF
11954
-cat confdefs.h >>conftest.$ac_ext
11955
-cat >>conftest.$ac_ext <<_ACEOF
11956
+ ac_check_lib_save_LIBS=$LIBS
11957
+LIBS="-lposix $LIBS"
11958
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11959
/* end confdefs.h. */
11960
-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
11961
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
11962
-#define shmat innocuous_shmat
11963
-
11964
-/* System header to define __stub macros and hopefully few prototypes,
11965
- which can conflict with char shmat (); below.
11966
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
11967
- <limits.h> exists even on freestanding compilers. */
11968
-
11969
-#ifdef __STDC__
11970
-# include <limits.h>
11971
-#else
11972
-# include <assert.h>
11973
-#endif
11974
-
11975
-#undef shmat
11976
11977
/* Override any GCC internal prototype to avoid an error.
11978
Use char because int might match the return type of a GCC
11979
@@ -16999,71 +14379,47 @@
11980
#ifdef __cplusplus
11981
extern "C"
11982
#endif
11983
-char shmat ();
11984
-/* The GNU C library defines this for functions which it implements
11985
- to always fail with ENOSYS. Some functions are actually named
11986
- something starting with __ and the normal name is an alias. */
11987
-#if defined __stub_shmat || defined __stub___shmat
11988
-choke me
11989
-#endif
11990
-
11991
+char remove ();
11992
int
11993
main ()
11994
{
11995
-return shmat ();
11996
+return remove ();
11997
;
11998
return 0;
11999
}
12000
_ACEOF
12001
-rm -f conftest.$ac_objext conftest$ac_exeext
12002
-if { (ac_try="$ac_link"
12003
-case "(($ac_try" in
12004
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12005
- *) ac_try_echo=$ac_try;;
12006
-esac
12007
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12008
-$as_echo "$ac_try_echo") >&5
12009
- (eval "$ac_link") 2>conftest.er1
12010
- ac_status=$?
12011
- grep -v '^ *+' conftest.er1 >conftest.err
12012
- rm -f conftest.er1
12013
- cat conftest.err >&5
12014
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12015
- (exit $ac_status); } && {
12016
- test -z "$ac_c_werror_flag" ||
12017
- test ! -s conftest.err
12018
- } && test -s conftest$ac_exeext && {
12019
- test "$cross_compiling" = yes ||
12020
- $as_test_x conftest$ac_exeext
12021
- }; then
12022
- ac_cv_func_shmat=yes
12023
+if ac_fn_c_try_link "$LINENO"; then :
12024
+ ac_cv_lib_posix_remove=yes
12025
else
12026
- $as_echo "$as_me: failed program was:" >&5
12027
-sed 's/^/| /' conftest.$ac_ext >&5
12028
-
12029
- ac_cv_func_shmat=no
12030
+ ac_cv_lib_posix_remove=no
12031
+fi
12032
+rm -f core conftest.err conftest.$ac_objext \
12033
+ conftest$ac_exeext conftest.$ac_ext
12034
+LIBS=$ac_check_lib_save_LIBS
12035
+fi
12036
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
12037
+$as_echo "$ac_cv_lib_posix_remove" >&6; }
12038
+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
12039
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
12040
fi
12041
12042
-rm -rf conftest.dSYM
12043
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12044
- conftest$ac_exeext conftest.$ac_ext
12045
+ fi
12046
+
12047
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
12048
+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
12049
+if test "x$ac_cv_func_shmat" = x""yes; then :
12050
+
12051
fi
12052
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
12053
-$as_echo "$ac_cv_func_shmat" >&6; }
12054
12055
if test $ac_cv_func_shmat = no; then
12056
- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
12057
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
12058
$as_echo_n "checking for shmat in -lipc... " >&6; }
12059
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
12060
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
12061
$as_echo_n "(cached) " >&6
12062
else
12063
ac_check_lib_save_LIBS=$LIBS
12064
LIBS="-lipc $LIBS"
12065
-cat >conftest.$ac_ext <<_ACEOF
12066
-/* confdefs.h. */
12067
-_ACEOF
12068
-cat confdefs.h >>conftest.$ac_ext
12069
-cat >>conftest.$ac_ext <<_ACEOF
12070
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12071
/* end confdefs.h. */
12072
12073
/* Override any GCC internal prototype to avoid an error.
12074
@@ -17081,43 +14437,18 @@
12075
return 0;
12076
}
12077
_ACEOF
12078
-rm -f conftest.$ac_objext conftest$ac_exeext
12079
-if { (ac_try="$ac_link"
12080
-case "(($ac_try" in
12081
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12082
- *) ac_try_echo=$ac_try;;
12083
-esac
12084
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12085
-$as_echo "$ac_try_echo") >&5
12086
- (eval "$ac_link") 2>conftest.er1
12087
- ac_status=$?
12088
- grep -v '^ *+' conftest.er1 >conftest.err
12089
- rm -f conftest.er1
12090
- cat conftest.err >&5
12091
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12092
- (exit $ac_status); } && {
12093
- test -z "$ac_c_werror_flag" ||
12094
- test ! -s conftest.err
12095
- } && test -s conftest$ac_exeext && {
12096
- test "$cross_compiling" = yes ||
12097
- $as_test_x conftest$ac_exeext
12098
- }; then
12099
+if ac_fn_c_try_link "$LINENO"; then :
12100
ac_cv_lib_ipc_shmat=yes
12101
else
12102
- $as_echo "$as_me: failed program was:" >&5
12103
-sed 's/^/| /' conftest.$ac_ext >&5
12104
-
12105
- ac_cv_lib_ipc_shmat=no
12106
+ ac_cv_lib_ipc_shmat=no
12107
fi
12108
-
12109
-rm -rf conftest.dSYM
12110
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12111
- conftest$ac_exeext conftest.$ac_ext
12112
+rm -f core conftest.err conftest.$ac_objext \
12113
+ conftest$ac_exeext conftest.$ac_ext
12114
LIBS=$ac_check_lib_save_LIBS
12115
fi
12116
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
12117
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
12118
$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
12119
-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
12120
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
12121
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
12122
fi
12123
12124
@@ -17133,18 +14464,14 @@
12125
# These have to be linked with before -lX11, unlike the other
12126
# libraries we check for below, so use a different variable.
12127
# John Interrante, Karl Berry
12128
- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
12129
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
12130
$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
12131
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
12132
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
12133
$as_echo_n "(cached) " >&6
12134
else
12135
ac_check_lib_save_LIBS=$LIBS
12136
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
12137
-cat >conftest.$ac_ext <<_ACEOF
12138
-/* confdefs.h. */
12139
-_ACEOF
12140
-cat confdefs.h >>conftest.$ac_ext
12141
-cat >>conftest.$ac_ext <<_ACEOF
12142
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12143
/* end confdefs.h. */
12144
12145
/* Override any GCC internal prototype to avoid an error.
12146
@@ -17162,43 +14489,18 @@
12147
return 0;
12148
}
12149
_ACEOF
12150
-rm -f conftest.$ac_objext conftest$ac_exeext
12151
-if { (ac_try="$ac_link"
12152
-case "(($ac_try" in
12153
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12154
- *) ac_try_echo=$ac_try;;
12155
-esac
12156
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12157
-$as_echo "$ac_try_echo") >&5
12158
- (eval "$ac_link") 2>conftest.er1
12159
- ac_status=$?
12160
- grep -v '^ *+' conftest.er1 >conftest.err
12161
- rm -f conftest.er1
12162
- cat conftest.err >&5
12163
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12164
- (exit $ac_status); } && {
12165
- test -z "$ac_c_werror_flag" ||
12166
- test ! -s conftest.err
12167
- } && test -s conftest$ac_exeext && {
12168
- test "$cross_compiling" = yes ||
12169
- $as_test_x conftest$ac_exeext
12170
- }; then
12171
+if ac_fn_c_try_link "$LINENO"; then :
12172
ac_cv_lib_ICE_IceConnectionNumber=yes
12173
else
12174
- $as_echo "$as_me: failed program was:" >&5
12175
-sed 's/^/| /' conftest.$ac_ext >&5
12176
-
12177
- ac_cv_lib_ICE_IceConnectionNumber=no
12178
+ ac_cv_lib_ICE_IceConnectionNumber=no
12179
fi
12180
-
12181
-rm -rf conftest.dSYM
12182
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12183
- conftest$ac_exeext conftest.$ac_ext
12184
+rm -f core conftest.err conftest.$ac_objext \
12185
+ conftest$ac_exeext conftest.$ac_ext
12186
LIBS=$ac_check_lib_save_LIBS
12187
fi
12188
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
12189
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
12190
$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
12191
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
12192
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
12193
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
12194
fi
12195
12196
@@ -17207,61 +14509,9 @@
12197
fi
12198
12199
12200
-{ $as_echo "$as_me:$LINENO: checking whether XF86XK_Battery is declared" >&5
12201
-$as_echo_n "checking whether XF86XK_Battery is declared... " >&6; }
12202
-if test "${ac_cv_have_decl_XF86XK_Battery+set}" = set; then
12203
- $as_echo_n "(cached) " >&6
12204
-else
12205
- cat >conftest.$ac_ext <<_ACEOF
12206
-/* confdefs.h. */
12207
-_ACEOF
12208
-cat confdefs.h >>conftest.$ac_ext
12209
-cat >>conftest.$ac_ext <<_ACEOF
12210
-/* end confdefs.h. */
12211
-#include <X11/XF86keysym.h>
12212
-
12213
-int
12214
-main ()
12215
-{
12216
-#ifndef XF86XK_Battery
12217
- (void) XF86XK_Battery;
12218
-#endif
12219
-
12220
- ;
12221
- return 0;
12222
-}
12223
-_ACEOF
12224
-rm -f conftest.$ac_objext
12225
-if { (ac_try="$ac_compile"
12226
-case "(($ac_try" in
12227
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12228
- *) ac_try_echo=$ac_try;;
12229
-esac
12230
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12231
-$as_echo "$ac_try_echo") >&5
12232
- (eval "$ac_compile") 2>conftest.er1
12233
- ac_status=$?
12234
- grep -v '^ *+' conftest.er1 >conftest.err
12235
- rm -f conftest.er1
12236
- cat conftest.err >&5
12237
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12238
- (exit $ac_status); } && {
12239
- test -z "$ac_c_werror_flag" ||
12240
- test ! -s conftest.err
12241
- } && test -s conftest.$ac_objext; then
12242
- ac_cv_have_decl_XF86XK_Battery=yes
12243
-else
12244
- $as_echo "$as_me: failed program was:" >&5
12245
-sed 's/^/| /' conftest.$ac_ext >&5
12246
-
12247
- ac_cv_have_decl_XF86XK_Battery=no
12248
-fi
12249
-
12250
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12251
-fi
12252
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_XF86XK_Battery" >&5
12253
-$as_echo "$ac_cv_have_decl_XF86XK_Battery" >&6; }
12254
-if test "x$ac_cv_have_decl_XF86XK_Battery" = x""yes; then
12255
+ac_fn_c_check_decl "$LINENO" "XF86XK_Battery" "ac_cv_have_decl_XF86XK_Battery" "#include <X11/XF86keysym.h>
12256
+"
12257
+if test "x$ac_cv_have_decl_XF86XK_Battery" = x""yes; then :
12258
have_XF86XK_Battery=1
12259
else
12260
have_XF86XK_Battery=0
12261
@@ -17269,66 +14519,12 @@
12262
12263
if test "x${ac_cv_have_decl_XF86XK_Battery}" != "xno"; then
12264
12265
-cat >>confdefs.h <<\_ACEOF
12266
-#define HAVE_XF86XK_BATTERY 1
12267
-_ACEOF
12268
-
12269
-fi
12270
-{ $as_echo "$as_me:$LINENO: checking whether XF86XK_Suspend is declared" >&5
12271
-$as_echo_n "checking whether XF86XK_Suspend is declared... " >&6; }
12272
-if test "${ac_cv_have_decl_XF86XK_Suspend+set}" = set; then
12273
- $as_echo_n "(cached) " >&6
12274
-else
12275
- cat >conftest.$ac_ext <<_ACEOF
12276
-/* confdefs.h. */
12277
-_ACEOF
12278
-cat confdefs.h >>conftest.$ac_ext
12279
-cat >>conftest.$ac_ext <<_ACEOF
12280
-/* end confdefs.h. */
12281
-#include <X11/XF86keysym.h>
12282
-
12283
-int
12284
-main ()
12285
-{
12286
-#ifndef XF86XK_Suspend
12287
- (void) XF86XK_Suspend;
12288
-#endif
12289
-
12290
- ;
12291
- return 0;
12292
-}
12293
-_ACEOF
12294
-rm -f conftest.$ac_objext
12295
-if { (ac_try="$ac_compile"
12296
-case "(($ac_try" in
12297
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12298
- *) ac_try_echo=$ac_try;;
12299
-esac
12300
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12301
-$as_echo "$ac_try_echo") >&5
12302
- (eval "$ac_compile") 2>conftest.er1
12303
- ac_status=$?
12304
- grep -v '^ *+' conftest.er1 >conftest.err
12305
- rm -f conftest.er1
12306
- cat conftest.err >&5
12307
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12308
- (exit $ac_status); } && {
12309
- test -z "$ac_c_werror_flag" ||
12310
- test ! -s conftest.err
12311
- } && test -s conftest.$ac_objext; then
12312
- ac_cv_have_decl_XF86XK_Suspend=yes
12313
-else
12314
- $as_echo "$as_me: failed program was:" >&5
12315
-sed 's/^/| /' conftest.$ac_ext >&5
12316
-
12317
- ac_cv_have_decl_XF86XK_Suspend=no
12318
-fi
12319
+$as_echo "#define HAVE_XF86XK_BATTERY 1" >>confdefs.h
12320
12321
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12322
fi
12323
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_XF86XK_Suspend" >&5
12324
-$as_echo "$ac_cv_have_decl_XF86XK_Suspend" >&6; }
12325
-if test "x$ac_cv_have_decl_XF86XK_Suspend" = x""yes; then
12326
+ac_fn_c_check_decl "$LINENO" "XF86XK_Suspend" "ac_cv_have_decl_XF86XK_Suspend" "#include <X11/XF86keysym.h>
12327
+"
12328
+if test "x$ac_cv_have_decl_XF86XK_Suspend" = x""yes; then :
12329
have_XF86XK_Suspend=1
12330
else
12331
have_XF86XK_Suspend=0
12332
@@ -17336,66 +14532,12 @@
12333
12334
if test "x${ac_cv_have_decl_XF86XK_Suspend}" != "xno"; then
12335
12336
-cat >>confdefs.h <<\_ACEOF
12337
-#define HAVE_XF86XK_SUSPEND 1
12338
-_ACEOF
12339
-
12340
-fi
12341
-{ $as_echo "$as_me:$LINENO: checking whether XF86XK_Hibernate is declared" >&5
12342
-$as_echo_n "checking whether XF86XK_Hibernate is declared... " >&6; }
12343
-if test "${ac_cv_have_decl_XF86XK_Hibernate+set}" = set; then
12344
- $as_echo_n "(cached) " >&6
12345
-else
12346
- cat >conftest.$ac_ext <<_ACEOF
12347
-/* confdefs.h. */
12348
-_ACEOF
12349
-cat confdefs.h >>conftest.$ac_ext
12350
-cat >>conftest.$ac_ext <<_ACEOF
12351
-/* end confdefs.h. */
12352
-#include <X11/XF86keysym.h>
12353
-
12354
-int
12355
-main ()
12356
-{
12357
-#ifndef XF86XK_Hibernate
12358
- (void) XF86XK_Hibernate;
12359
-#endif
12360
-
12361
- ;
12362
- return 0;
12363
-}
12364
-_ACEOF
12365
-rm -f conftest.$ac_objext
12366
-if { (ac_try="$ac_compile"
12367
-case "(($ac_try" in
12368
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12369
- *) ac_try_echo=$ac_try;;
12370
-esac
12371
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12372
-$as_echo "$ac_try_echo") >&5
12373
- (eval "$ac_compile") 2>conftest.er1
12374
- ac_status=$?
12375
- grep -v '^ *+' conftest.er1 >conftest.err
12376
- rm -f conftest.er1
12377
- cat conftest.err >&5
12378
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12379
- (exit $ac_status); } && {
12380
- test -z "$ac_c_werror_flag" ||
12381
- test ! -s conftest.err
12382
- } && test -s conftest.$ac_objext; then
12383
- ac_cv_have_decl_XF86XK_Hibernate=yes
12384
-else
12385
- $as_echo "$as_me: failed program was:" >&5
12386
-sed 's/^/| /' conftest.$ac_ext >&5
12387
-
12388
- ac_cv_have_decl_XF86XK_Hibernate=no
12389
-fi
12390
+$as_echo "#define HAVE_XF86XK_SUSPEND 1" >>confdefs.h
12391
12392
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12393
fi
12394
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_XF86XK_Hibernate" >&5
12395
-$as_echo "$ac_cv_have_decl_XF86XK_Hibernate" >&6; }
12396
-if test "x$ac_cv_have_decl_XF86XK_Hibernate" = x""yes; then
12397
+ac_fn_c_check_decl "$LINENO" "XF86XK_Hibernate" "ac_cv_have_decl_XF86XK_Hibernate" "#include <X11/XF86keysym.h>
12398
+"
12399
+if test "x$ac_cv_have_decl_XF86XK_Hibernate" = x""yes; then :
12400
have_XF86XK_Hibernate=1
12401
else
12402
have_XF86XK_Hibernate=0
12403
@@ -17403,9 +14545,7 @@
12404
12405
if test "x${ac_cv_have_decl_XF86XK_Hibernate}" != "xno"; then
12406
12407
-cat >>confdefs.h <<\_ACEOF
12408
-#define HAVE_XF86XK_HIBERNATE 1
12409
-_ACEOF
12410
+$as_echo "#define HAVE_XF86XK_HIBERNATE 1" >>confdefs.h
12411
12412
fi
12413
12414
@@ -17422,7 +14562,7 @@
12415
12416
12417
# Check whether --with-doc-dir was given.
12418
-if test "${with_doc_dir+set}" = set; then
12419
+if test "${with_doc_dir+set}" = set; then :
12420
withval=$with_doc_dir;
12421
fi
12422
12423
@@ -17435,7 +14575,7 @@
12424
12425
12426
# Check whether --enable-hal was given.
12427
-if test "${enable_hal+set}" = set; then
12428
+if test "${enable_hal+set}" = set; then :
12429
enableval=$enable_hal; enable_hal=$enableval
12430
else
12431
enable_hal=no
12432
@@ -17443,9 +14583,7 @@
12433
12434
if test x$enable_hal = xyes; then
12435
12436
-cat >>confdefs.h <<\_ACEOF
12437
-#define HAVE_HAL 1
12438
-_ACEOF
12439
+$as_echo "#define HAVE_HAL 1" >>confdefs.h
12440
12441
fi
12442
if test $enable_hal = yes; then
12443
@@ -17458,27 +14596,25 @@
12444
12445
12446
# Check whether --enable-tests was given.
12447
-if test "${enable_tests+set}" = set; then
12448
+if test "${enable_tests+set}" = set; then :
12449
enableval=$enable_tests; enable_tests=$enableval
12450
else
12451
enable_tests=no
12452
fi
12453
12454
12455
-{ $as_echo "$as_me:$LINENO: checking whether to support tests" >&5
12456
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support tests" >&5
12457
$as_echo_n "checking whether to support tests... " >&6; }
12458
have_tests=no
12459
if test x$enable_tests = xyes ; then
12460
have_tests=yes
12461
12462
-cat >>confdefs.h <<\_ACEOF
12463
-#define HAVE_TESTS 1
12464
-_ACEOF
12465
+$as_echo "#define HAVE_TESTS 1" >>confdefs.h
12466
12467
- { $as_echo "$as_me:$LINENO: result: yes" >&5
12468
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12469
$as_echo "yes" >&6; }
12470
else
12471
- { $as_echo "$as_me:$LINENO: result: no" >&5
12472
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12473
$as_echo "no" >&6; }
12474
fi
12475
if test $have_tests = yes; then
12476
@@ -17491,25 +14627,23 @@
12477
12478
12479
# Check whether --enable-gconf-defaults was given.
12480
-if test "${enable_gconf_defaults+set}" = set; then
12481
+if test "${enable_gconf_defaults+set}" = set; then :
12482
enableval=$enable_gconf_defaults; have_gconfdefaults=$enableval
12483
else
12484
have_gconfdefaults=yes
12485
fi
12486
12487
12488
-{ $as_echo "$as_me:$LINENO: checking whether to support gconf defaults" >&5
12489
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support gconf defaults" >&5
12490
$as_echo_n "checking whether to support gconf defaults... " >&6; }
12491
if test x$have_gconfdefaults = xyes ; then
12492
12493
-cat >>confdefs.h <<\_ACEOF
12494
-#define HAVE_GCONF_DEFAULTS 1
12495
-_ACEOF
12496
+$as_echo "#define HAVE_GCONF_DEFAULTS 1" >>confdefs.h
12497
12498
- { $as_echo "$as_me:$LINENO: result: yes" >&5
12499
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12500
$as_echo "yes" >&6; }
12501
else
12502
- { $as_echo "$as_me:$LINENO: result: no" >&5
12503
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12504
$as_echo "no" >&6; }
12505
fi
12506
if test $have_gconfdefaults = yes; then
12507
@@ -17522,27 +14656,25 @@
12508
12509
12510
# Check whether --enable-applets was given.
12511
-if test "${enable_applets+set}" = set; then
12512
+if test "${enable_applets+set}" = set; then :
12513
enableval=$enable_applets; enable_applets=$enableval
12514
else
12515
enable_applets=yes
12516
fi
12517
12518
12519
-{ $as_echo "$as_me:$LINENO: checking whether to build applet support" >&5
12520
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build applet support" >&5
12521
$as_echo_n "checking whether to build applet support... " >&6; }
12522
have_applets=no
12523
if test x$enable_applets = xyes ; then
12524
have_applets=yes
12525
12526
-cat >>confdefs.h <<\_ACEOF
12527
-#define HAVE_APPLETS 1
12528
-_ACEOF
12529
+$as_echo "#define HAVE_APPLETS 1" >>confdefs.h
12530
12531
- { $as_echo "$as_me:$LINENO: result: yes" >&5
12532
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12533
$as_echo "yes" >&6; }
12534
else
12535
- { $as_echo "$as_me:$LINENO: result: no" >&5
12536
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12537
$as_echo "no" >&6; }
12538
fi
12539
if test $have_applets = yes; then
12540
@@ -17555,7 +14687,7 @@
12541
12542
12543
# Check whether --enable-docbook-docs was given.
12544
-if test "${enable_docbook_docs+set}" = set; then
12545
+if test "${enable_docbook_docs+set}" = set; then :
12546
enableval=$enable_docbook_docs; enable_docbook_docs=$enableval
12547
else
12548
enable_docbook_docs=auto
12549
@@ -17564,9 +14696,9 @@
12550
12551
# Extract the first word of "xmlto", so it can be a program name with args.
12552
set dummy xmlto; ac_word=$2
12553
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
12554
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
12555
$as_echo_n "checking for $ac_word... " >&6; }
12556
-if test "${ac_cv_path_XMLTO+set}" = set; then
12557
+if test "${ac_cv_path_XMLTO+set}" = set; then :
12558
$as_echo_n "(cached) " >&6
12559
else
12560
case $XMLTO in
12561
@@ -17579,14 +14711,14 @@
12562
do
12563
IFS=$as_save_IFS
12564
test -z "$as_dir" && as_dir=.
12565
- for ac_exec_ext in '' $ac_executable_extensions; do
12566
+ for ac_exec_ext in '' $ac_executable_extensions; do
12567
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
12568
ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext"
12569
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
12570
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12571
break 2
12572
fi
12573
done
12574
-done
12575
+ done
12576
IFS=$as_save_IFS
12577
12578
test -z "$ac_cv_path_XMLTO" && ac_cv_path_XMLTO="no"
12579
@@ -17595,15 +14727,15 @@
12580
fi
12581
XMLTO=$ac_cv_path_XMLTO
12582
if test -n "$XMLTO"; then
12583
- { $as_echo "$as_me:$LINENO: result: $XMLTO" >&5
12584
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5
12585
$as_echo "$XMLTO" >&6; }
12586
else
12587
- { $as_echo "$as_me:$LINENO: result: no" >&5
12588
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12589
$as_echo "no" >&6; }
12590
fi
12591
12592
12593
-{ $as_echo "$as_me:$LINENO: checking whether to build DocBook documentation" >&5
12594
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build DocBook documentation" >&5
12595
$as_echo_n "checking whether to build DocBook documentation... " >&6; }
12596
if test x$XMLTO = xno ; then
12597
have_docbook=no
12598
@@ -17619,9 +14751,7 @@
12599
fi
12600
if test x$enable_docbook_docs = xyes; then
12601
if test x$have_docbook = xno; then
12602
- { { $as_echo "$as_me:$LINENO: error: Building DocBook docs explicitly required, but DocBook not found" >&5
12603
-$as_echo "$as_me: error: Building DocBook docs explicitly required, but DocBook not found" >&2;}
12604
- { (exit 1); exit 1; }; }
12605
+ as_fn_error "Building DocBook docs explicitly required, but DocBook not found" "$LINENO" 5
12606
fi
12607
fi
12608
if test x$enable_docbook_docs = xyes; then
12609
@@ -17632,12 +14762,12 @@
12610
DOCBOOK_DOCS_ENABLED_FALSE=
12611
fi
12612
12613
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
12614
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12615
$as_echo "yes" >&6; }
12616
12617
12618
# Check whether --with-dbus-services was given.
12619
-if test "${with_dbus_services+set}" = set; then
12620
+if test "${with_dbus_services+set}" = set; then :
12621
withval=$with_dbus_services;
12622
fi
12623
12624
@@ -17691,7 +14821,7 @@
12625
12626
12627
# Check whether --with-dpms-ext was given.
12628
-if test "${with_dpms_ext+set}" = set; then
12629
+if test "${with_dpms_ext+set}" = set; then :
12630
withval=$with_dpms_ext; with_dpms="$withval"; with_dpms_req="$withval"
12631
else
12632
with_dpms=yes
12633
@@ -17704,27 +14834,27 @@
12634
no) ;;
12635
12636
/*)
12637
- { $as_echo "$as_me:$LINENO: checking for DPMS headers" >&5
12638
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPMS headers" >&5
12639
$as_echo_n "checking for DPMS headers... " >&6; }
12640
d=$with_dpms/include
12641
if test -d $d; then
12642
X_CFLAGS="-I$d $X_CFLAGS"
12643
- { $as_echo "$as_me:$LINENO: result: $d" >&5
12644
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5
12645
$as_echo "$d" >&6; }
12646
else
12647
- { $as_echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5
12648
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5
12649
$as_echo "not found ($d: no such directory)" >&6; }
12650
fi
12651
12652
- { $as_echo "$as_me:$LINENO: checking for DPMS libs" >&5
12653
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPMS libs" >&5
12654
$as_echo_n "checking for DPMS libs... " >&6; }
12655
d=$with_dpms/lib
12656
if test -d $d; then
12657
X_LIBS="-L$d $X_LIBS"
12658
- { $as_echo "$as_me:$LINENO: result: $d" >&5
12659
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5
12660
$as_echo "$d" >&6; }
12661
else
12662
- { $as_echo "$as_me:$LINENO: result: not found ($d: no such directory)" >&5
12663
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5
12664
$as_echo "not found ($d: no such directory)" >&6; }
12665
fi
12666
12667
@@ -17752,53 +14882,10 @@
12668
CPPFLAGS="$CPPFLAGS -I$includedir"
12669
fi
12670
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
12671
- { $as_echo "$as_me:$LINENO: checking for X11/extensions/dpms.h" >&5
12672
-$as_echo_n "checking for X11/extensions/dpms.h... " >&6; }
12673
-if test "${ac_cv_header_X11_extensions_dpms_h+set}" = set; then
12674
- $as_echo_n "(cached) " >&6
12675
-else
12676
- cat >conftest.$ac_ext <<_ACEOF
12677
-/* confdefs.h. */
12678
-_ACEOF
12679
-cat confdefs.h >>conftest.$ac_ext
12680
-cat >>conftest.$ac_ext <<_ACEOF
12681
-/* end confdefs.h. */
12682
-#include <X11/Xlib.h>
12683
+ ac_fn_c_check_header_compile "$LINENO" "X11/extensions/dpms.h" "ac_cv_header_X11_extensions_dpms_h" "#include <X11/Xlib.h>
12684
#include <X11/Xmd.h>
12685
-
12686
-#include <X11/extensions/dpms.h>
12687
-_ACEOF
12688
-rm -f conftest.$ac_objext
12689
-if { (ac_try="$ac_compile"
12690
-case "(($ac_try" in
12691
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12692
- *) ac_try_echo=$ac_try;;
12693
-esac
12694
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12695
-$as_echo "$ac_try_echo") >&5
12696
- (eval "$ac_compile") 2>conftest.er1
12697
- ac_status=$?
12698
- grep -v '^ *+' conftest.er1 >conftest.err
12699
- rm -f conftest.er1
12700
- cat conftest.err >&5
12701
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12702
- (exit $ac_status); } && {
12703
- test -z "$ac_c_werror_flag" ||
12704
- test ! -s conftest.err
12705
- } && test -s conftest.$ac_objext; then
12706
- ac_cv_header_X11_extensions_dpms_h=yes
12707
-else
12708
- $as_echo "$as_me: failed program was:" >&5
12709
-sed 's/^/| /' conftest.$ac_ext >&5
12710
-
12711
- ac_cv_header_X11_extensions_dpms_h=no
12712
-fi
12713
-
12714
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12715
-fi
12716
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_dpms_h" >&5
12717
-$as_echo "$ac_cv_header_X11_extensions_dpms_h" >&6; }
12718
-if test "x$ac_cv_header_X11_extensions_dpms_h" = x""yes; then
12719
+"
12720
+if test "x$ac_cv_header_X11_extensions_dpms_h" = x""yes; then :
12721
have_dpms=yes
12722
fi
12723
12724
@@ -17827,18 +14914,14 @@
12725
# note: $X_LIBS includes $x_libraries
12726
LDFLAGS="$LDFLAGS $ALL_X_LIBS"
12727
12728
- { $as_echo "$as_me:$LINENO: checking for DPMSInfo in -lXext" >&5
12729
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPMSInfo in -lXext" >&5
12730
$as_echo_n "checking for DPMSInfo in -lXext... " >&6; }
12731
-if test "${ac_cv_lib_Xext_DPMSInfo+set}" = set; then
12732
+if test "${ac_cv_lib_Xext_DPMSInfo+set}" = set; then :
12733
$as_echo_n "(cached) " >&6
12734
else
12735
ac_check_lib_save_LIBS=$LIBS
12736
LIBS="-lXext -lXext -lX11 $LIBS"
12737
-cat >conftest.$ac_ext <<_ACEOF
12738
-/* confdefs.h. */
12739
-_ACEOF
12740
-cat confdefs.h >>conftest.$ac_ext
12741
-cat >>conftest.$ac_ext <<_ACEOF
12742
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12743
/* end confdefs.h. */
12744
12745
/* Override any GCC internal prototype to avoid an error.
12746
@@ -17853,46 +14936,21 @@
12747
{
12748
return DPMSInfo ();
12749
;
12750
- return 0;
12751
-}
12752
-_ACEOF
12753
-rm -f conftest.$ac_objext conftest$ac_exeext
12754
-if { (ac_try="$ac_link"
12755
-case "(($ac_try" in
12756
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12757
- *) ac_try_echo=$ac_try;;
12758
-esac
12759
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12760
-$as_echo "$ac_try_echo") >&5
12761
- (eval "$ac_link") 2>conftest.er1
12762
- ac_status=$?
12763
- grep -v '^ *+' conftest.er1 >conftest.err
12764
- rm -f conftest.er1
12765
- cat conftest.err >&5
12766
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12767
- (exit $ac_status); } && {
12768
- test -z "$ac_c_werror_flag" ||
12769
- test ! -s conftest.err
12770
- } && test -s conftest$ac_exeext && {
12771
- test "$cross_compiling" = yes ||
12772
- $as_test_x conftest$ac_exeext
12773
- }; then
12774
+ return 0;
12775
+}
12776
+_ACEOF
12777
+if ac_fn_c_try_link "$LINENO"; then :
12778
ac_cv_lib_Xext_DPMSInfo=yes
12779
else
12780
- $as_echo "$as_me: failed program was:" >&5
12781
-sed 's/^/| /' conftest.$ac_ext >&5
12782
-
12783
- ac_cv_lib_Xext_DPMSInfo=no
12784
+ ac_cv_lib_Xext_DPMSInfo=no
12785
fi
12786
-
12787
-rm -rf conftest.dSYM
12788
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12789
- conftest$ac_exeext conftest.$ac_ext
12790
+rm -f core conftest.err conftest.$ac_objext \
12791
+ conftest$ac_exeext conftest.$ac_ext
12792
LIBS=$ac_check_lib_save_LIBS
12793
fi
12794
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_DPMSInfo" >&5
12795
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_DPMSInfo" >&5
12796
$as_echo "$ac_cv_lib_Xext_DPMSInfo" >&6; }
12797
-if test "x$ac_cv_lib_Xext_DPMSInfo" = x""yes; then
12798
+if test "x$ac_cv_lib_Xext_DPMSInfo" = x""yes; then :
12799
have_dpms=yes
12800
else
12801
true
12802
@@ -17922,18 +14980,14 @@
12803
# note: $X_LIBS includes $x_libraries
12804
LDFLAGS="$LDFLAGS $ALL_X_LIBS"
12805
12806
- { $as_echo "$as_me:$LINENO: checking for DPMSInfo in -lXdpms" >&5
12807
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPMSInfo in -lXdpms" >&5
12808
$as_echo_n "checking for DPMSInfo in -lXdpms... " >&6; }
12809
-if test "${ac_cv_lib_Xdpms_DPMSInfo+set}" = set; then
12810
+if test "${ac_cv_lib_Xdpms_DPMSInfo+set}" = set; then :
12811
$as_echo_n "(cached) " >&6
12812
else
12813
ac_check_lib_save_LIBS=$LIBS
12814
LIBS="-lXdpms -lXext -lX11 $LIBS"
12815
-cat >conftest.$ac_ext <<_ACEOF
12816
-/* confdefs.h. */
12817
-_ACEOF
12818
-cat confdefs.h >>conftest.$ac_ext
12819
-cat >>conftest.$ac_ext <<_ACEOF
12820
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12821
/* end confdefs.h. */
12822
12823
/* Override any GCC internal prototype to avoid an error.
12824
@@ -17951,43 +15005,18 @@
12825
return 0;
12826
}
12827
_ACEOF
12828
-rm -f conftest.$ac_objext conftest$ac_exeext
12829
-if { (ac_try="$ac_link"
12830
-case "(($ac_try" in
12831
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12832
- *) ac_try_echo=$ac_try;;
12833
-esac
12834
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12835
-$as_echo "$ac_try_echo") >&5
12836
- (eval "$ac_link") 2>conftest.er1
12837
- ac_status=$?
12838
- grep -v '^ *+' conftest.er1 >conftest.err
12839
- rm -f conftest.er1
12840
- cat conftest.err >&5
12841
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12842
- (exit $ac_status); } && {
12843
- test -z "$ac_c_werror_flag" ||
12844
- test ! -s conftest.err
12845
- } && test -s conftest$ac_exeext && {
12846
- test "$cross_compiling" = yes ||
12847
- $as_test_x conftest$ac_exeext
12848
- }; then
12849
+if ac_fn_c_try_link "$LINENO"; then :
12850
ac_cv_lib_Xdpms_DPMSInfo=yes
12851
else
12852
- $as_echo "$as_me: failed program was:" >&5
12853
-sed 's/^/| /' conftest.$ac_ext >&5
12854
-
12855
- ac_cv_lib_Xdpms_DPMSInfo=no
12856
+ ac_cv_lib_Xdpms_DPMSInfo=no
12857
fi
12858
-
12859
-rm -rf conftest.dSYM
12860
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12861
- conftest$ac_exeext conftest.$ac_ext
12862
+rm -f core conftest.err conftest.$ac_objext \
12863
+ conftest$ac_exeext conftest.$ac_ext
12864
LIBS=$ac_check_lib_save_LIBS
12865
fi
12866
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdpms_DPMSInfo" >&5
12867
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdpms_DPMSInfo" >&5
12868
$as_echo "$ac_cv_lib_Xdpms_DPMSInfo" >&6; }
12869
-if test "x$ac_cv_lib_Xdpms_DPMSInfo" = x""yes; then
12870
+if test "x$ac_cv_lib_Xdpms_DPMSInfo" = x""yes; then :
12871
have_dpms=yes; XDPMS_LIBS="-lXdpms"
12872
else
12873
true
12874
@@ -18004,9 +15033,7 @@
12875
# if that succeeded, then we've really got it.
12876
if test "$have_dpms" = yes; then
12877
12878
-cat >>confdefs.h <<\_ACEOF
12879
-#define HAVE_DPMS_EXTENSION 1
12880
-_ACEOF
12881
+$as_echo "#define HAVE_DPMS_EXTENSION 1" >>confdefs.h
12882
12883
GPM_EXTRA_LIBS="$GPM_EXTRA_LIBS -lXext"
12884
fi
12885
@@ -18016,20 +15043,16 @@
12886
exit 1
12887
fi
12888
12889
-{ $as_echo "$as_me:$LINENO: checking for Solaris kstat" >&5
12890
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris kstat" >&5
12891
$as_echo_n "checking for Solaris kstat... " >&6; }
12892
-{ $as_echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5
12893
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5
12894
$as_echo_n "checking for kstat_open in -lkstat... " >&6; }
12895
-if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then
12896
+if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then :
12897
$as_echo_n "(cached) " >&6
12898
else
12899
ac_check_lib_save_LIBS=$LIBS
12900
LIBS="-lkstat $LIBS"
12901
-cat >conftest.$ac_ext <<_ACEOF
12902
-/* confdefs.h. */
12903
-_ACEOF
12904
-cat confdefs.h >>conftest.$ac_ext
12905
-cat >>conftest.$ac_ext <<_ACEOF
12906
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12907
/* end confdefs.h. */
12908
12909
/* Override any GCC internal prototype to avoid an error.
12910
@@ -18047,48 +15070,21 @@
12911
return 0;
12912
}
12913
_ACEOF
12914
-rm -f conftest.$ac_objext conftest$ac_exeext
12915
-if { (ac_try="$ac_link"
12916
-case "(($ac_try" in
12917
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12918
- *) ac_try_echo=$ac_try;;
12919
-esac
12920
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12921
-$as_echo "$ac_try_echo") >&5
12922
- (eval "$ac_link") 2>conftest.er1
12923
- ac_status=$?
12924
- grep -v '^ *+' conftest.er1 >conftest.err
12925
- rm -f conftest.er1
12926
- cat conftest.err >&5
12927
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12928
- (exit $ac_status); } && {
12929
- test -z "$ac_c_werror_flag" ||
12930
- test ! -s conftest.err
12931
- } && test -s conftest$ac_exeext && {
12932
- test "$cross_compiling" = yes ||
12933
- $as_test_x conftest$ac_exeext
12934
- }; then
12935
+if ac_fn_c_try_link "$LINENO"; then :
12936
ac_cv_lib_kstat_kstat_open=yes
12937
else
12938
- $as_echo "$as_me: failed program was:" >&5
12939
-sed 's/^/| /' conftest.$ac_ext >&5
12940
-
12941
- ac_cv_lib_kstat_kstat_open=no
12942
+ ac_cv_lib_kstat_kstat_open=no
12943
fi
12944
-
12945
-rm -rf conftest.dSYM
12946
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12947
- conftest$ac_exeext conftest.$ac_ext
12948
+rm -f core conftest.err conftest.$ac_objext \
12949
+ conftest$ac_exeext conftest.$ac_ext
12950
LIBS=$ac_check_lib_save_LIBS
12951
fi
12952
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5
12953
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5
12954
$as_echo "$ac_cv_lib_kstat_kstat_open" >&6; }
12955
-if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then
12956
+if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then :
12957
12958
12959
-cat >>confdefs.h <<\_ACEOF
12960
-#define HAVE_KSTAT 1
12961
-_ACEOF
12962
+$as_echo "#define HAVE_KSTAT 1" >>confdefs.h
12963
12964
GPM_EXTRA_LIBS="$GPM_EXTRA_LIBS -lkstat"
12965
12966
@@ -18098,9 +15094,9 @@
12967
12968
# Extract the first word of "docbook2man", so it can be a program name with args.
12969
set dummy docbook2man; ac_word=$2
12970
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
12971
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
12972
$as_echo_n "checking for $ac_word... " >&6; }
12973
-if test "${ac_cv_path_DOCBOOK2MAN+set}" = set; then
12974
+if test "${ac_cv_path_DOCBOOK2MAN+set}" = set; then :
12975
$as_echo_n "(cached) " >&6
12976
else
12977
case $DOCBOOK2MAN in
12978
@@ -18113,14 +15109,14 @@
12979
do
12980
IFS=$as_save_IFS
12981
test -z "$as_dir" && as_dir=.
12982
- for ac_exec_ext in '' $ac_executable_extensions; do
12983
+ for ac_exec_ext in '' $ac_executable_extensions; do
12984
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
12985
ac_cv_path_DOCBOOK2MAN="$as_dir/$ac_word$ac_exec_ext"
12986
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
12987
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12988
break 2
12989
fi
12990
done
12991
-done
12992
+ done
12993
IFS=$as_save_IFS
12994
12995
test -z "$ac_cv_path_DOCBOOK2MAN" && ac_cv_path_DOCBOOK2MAN="no"
12996
@@ -18129,16 +15125,16 @@
12997
fi
12998
DOCBOOK2MAN=$ac_cv_path_DOCBOOK2MAN
12999
if test -n "$DOCBOOK2MAN"; then
13000
- { $as_echo "$as_me:$LINENO: result: $DOCBOOK2MAN" >&5
13001
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOCBOOK2MAN" >&5
13002
$as_echo "$DOCBOOK2MAN" >&6; }
13003
else
13004
- { $as_echo "$as_me:$LINENO: result: no" >&5
13005
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13006
$as_echo "no" >&6; }
13007
fi
13008
13009
13010
if test "$DOCBOOK2MAN" = "no" ; then
13011
- { $as_echo "$as_me:$LINENO: WARNING: docbook2man not found, will not be able to build man documentation" >&5
13012
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: docbook2man not found, will not be able to build man documentation" >&5
13013
$as_echo "$as_me: WARNING: docbook2man not found, will not be able to build man documentation" >&2;}
13014
fi
13015
if test "$DOCBOOK2MAN" != "no"; then
13016
@@ -18180,13 +15176,13 @@
13017
case $ac_val in #(
13018
*${as_nl}*)
13019
case $ac_var in #(
13020
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
13021
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
13022
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
13023
esac
13024
case $ac_var in #(
13025
_ | IFS | as_nl) ;; #(
13026
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
13027
- *) $as_unset $ac_var ;;
13028
+ *) { eval $ac_var=; unset $ac_var;} ;;
13029
esac ;;
13030
esac
13031
done
13032
@@ -18194,8 +15190,8 @@
13033
(set) 2>&1 |
13034
case $as_nl`(ac_space=' '; set) 2>&1` in #(
13035
*${as_nl}ac_space=\ *)
13036
- # `set' does not quote correctly, so add quotes (double-quote
13037
- # substitution turns \\\\ into \\, and sed turns \\ into \).
13038
+ # `set' does not quote correctly, so add quotes: double-quote
13039
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
13040
sed -n \
13041
"s/'/'\\\\''/g;
13042
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
13043
@@ -18218,11 +15214,11 @@
13044
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
13045
if test -w "$cache_file"; then
13046
test "x$cache_file" != "x/dev/null" &&
13047
- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
13048
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
13049
$as_echo "$as_me: updating cache $cache_file" >&6;}
13050
cat confcache >$cache_file
13051
else
13052
- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
13053
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
13054
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
13055
fi
13056
fi
13057
@@ -18242,8 +15238,8 @@
13058
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
13059
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
13060
# will be set to the directory where LIBOBJS objects are built.
13061
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
13062
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
13063
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
13064
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
13065
done
13066
LIBOBJS=$ac_libobjs
13067
13068
@@ -18267,101 +15263,66 @@
13069
fi
13070
13071
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
13072
- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
13073
-Usually this means the macro was only invoked conditionally." >&5
13074
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
13075
-Usually this means the macro was only invoked conditionally." >&2;}
13076
- { (exit 1); exit 1; }; }
13077
+ as_fn_error "conditional \"AMDEP\" was never defined.
13078
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
13079
fi
13080
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
13081
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
13082
-Usually this means the macro was only invoked conditionally." >&5
13083
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
13084
-Usually this means the macro was only invoked conditionally." >&2;}
13085
- { (exit 1); exit 1; }; }
13086
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
13087
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
13088
fi
13089
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
13090
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
13091
-Usually this means the macro was only invoked conditionally." >&5
13092
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
13093
-Usually this means the macro was only invoked conditionally." >&2;}
13094
- { (exit 1); exit 1; }; }
13095
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
13096
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
13097
fi
13098
13099
ac_config_commands="$ac_config_commands po/stamp-it"
13100
13101
13102
if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
13103
- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
13104
-Usually this means the macro was only invoked conditionally." >&5
13105
-$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
13106
-Usually this means the macro was only invoked conditionally." >&2;}
13107
- { (exit 1); exit 1; }; }
13108
+ as_fn_error "conditional \"ENABLE_SK\" was never defined.
13109
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
13110
fi
13111
if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
13112
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
13113
-Usually this means the macro was only invoked conditionally." >&5
13114
-$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
13115
-Usually this means the macro was only invoked conditionally." >&2;}
13116
- { (exit 1); exit 1; }; }
13117
+ as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
13118
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
13119
fi
13120
if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
13121
- { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
13122
-Usually this means the macro was only invoked conditionally." >&5
13123
-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
13124
-Usually this means the macro was only invoked conditionally." >&2;}
13125
- { (exit 1); exit 1; }; }
13126
+ as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
13127
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
13128
fi
13129
if test -z "${HAVE_HAL_TRUE}" && test -z "${HAVE_HAL_FALSE}"; then
13130
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_HAL\" was never defined.
13131
-Usually this means the macro was only invoked conditionally." >&5
13132
-$as_echo "$as_me: error: conditional \"HAVE_HAL\" was never defined.
13133
-Usually this means the macro was only invoked conditionally." >&2;}
13134
- { (exit 1); exit 1; }; }
13135
+ as_fn_error "conditional \"HAVE_HAL\" was never defined.
13136
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
13137
fi
13138
if test -z "${HAVE_TESTS_TRUE}" && test -z "${HAVE_TESTS_FALSE}"; then
13139
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TESTS\" was never defined.
13140
-Usually this means the macro was only invoked conditionally." >&5
13141
-$as_echo "$as_me: error: conditional \"HAVE_TESTS\" was never defined.
13142
-Usually this means the macro was only invoked conditionally." >&2;}
13143
- { (exit 1); exit 1; }; }
13144
+ as_fn_error "conditional \"HAVE_TESTS\" was never defined.
13145
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
13146
fi
13147
if test -z "${HAVE_GCONF_DEFAULTS_TRUE}" && test -z "${HAVE_GCONF_DEFAULTS_FALSE}"; then
13148
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GCONF_DEFAULTS\" was never defined.
13149
-Usually this means the macro was only invoked conditionally." >&5
13150
-$as_echo "$as_me: error: conditional \"HAVE_GCONF_DEFAULTS\" was never defined.
13151
-Usually this means the macro was only invoked conditionally." >&2;}
13152
- { (exit 1); exit 1; }; }
13153
+ as_fn_error "conditional \"HAVE_GCONF_DEFAULTS\" was never defined.
13154
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
13155
fi
13156
if test -z "${HAVE_APPLETS_TRUE}" && test -z "${HAVE_APPLETS_FALSE}"; then
13157
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_APPLETS\" was never defined.
13158
-Usually this means the macro was only invoked conditionally." >&5
13159
-$as_echo "$as_me: error: conditional \"HAVE_APPLETS\" was never defined.
13160
-Usually this means the macro was only invoked conditionally." >&2;}
13161
- { (exit 1); exit 1; }; }
13162
+ as_fn_error "conditional \"HAVE_APPLETS\" was never defined.
13163
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
13164
fi
13165
if test -z "${DOCBOOK_DOCS_ENABLED_TRUE}" && test -z "${DOCBOOK_DOCS_ENABLED_FALSE}"; then
13166
- { { $as_echo "$as_me:$LINENO: error: conditional \"DOCBOOK_DOCS_ENABLED\" was never defined.
13167
-Usually this means the macro was only invoked conditionally." >&5
13168
-$as_echo "$as_me: error: conditional \"DOCBOOK_DOCS_ENABLED\" was never defined.
13169
-Usually this means the macro was only invoked conditionally." >&2;}
13170
- { (exit 1); exit 1; }; }
13171
+ as_fn_error "conditional \"DOCBOOK_DOCS_ENABLED\" was never defined.
13172
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
13173
fi
13174
if test -z "${HAVE_DOCBOOK2MAN_TRUE}" && test -z "${HAVE_DOCBOOK2MAN_FALSE}"; then
13175
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK2MAN\" was never defined.
13176
-Usually this means the macro was only invoked conditionally." >&5
13177
-$as_echo "$as_me: error: conditional \"HAVE_DOCBOOK2MAN\" was never defined.
13178
-Usually this means the macro was only invoked conditionally." >&2;}
13179
- { (exit 1); exit 1; }; }
13180
+ as_fn_error "conditional \"HAVE_DOCBOOK2MAN\" was never defined.
13181
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
13182
fi
13183
13184
: ${CONFIG_STATUS=./config.status}
13185
ac_write_fail=0
13186
ac_clean_files_save=$ac_clean_files
13187
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
13188
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
13189
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
13190
$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
13191
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
13192
+as_write_fail=0
13193
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
13194
#! $SHELL
13195
# Generated by $as_me.
13196
# Run this file to recreate the current configuration.
13197
@@ -18371,17 +15332,18 @@
13198
debug=false
13199
ac_cs_recheck=false
13200
ac_cs_silent=false
13201
-SHELL=\${CONFIG_SHELL-$SHELL}
13202
-_ACEOF
13203
13204
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
13205
-## --------------------- ##
13206
-## M4sh Initialization. ##
13207
-## --------------------- ##
13208
+SHELL=\${CONFIG_SHELL-$SHELL}
13209
+export SHELL
13210
+_ASEOF
13211
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
13212
+## -------------------- ##
13213
+## M4sh Initialization. ##
13214
+## -------------------- ##
13215
13216
# Be more Bourne compatible
13217
DUALCASE=1; export DUALCASE # for MKS sh
13218
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
13219
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
13220
emulate sh
13221
NULLCMD=:
13222
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
13223
@@ -18389,23 +15351,15 @@
13224
alias -g '${1+"$@"}'='"$@"'
13225
setopt NO_GLOB_SUBST
13226
else
13227
- case `(set -o) 2>/dev/null` in
13228
- *posix*) set -o posix ;;
13229
+ case `(set -o) 2>/dev/null` in #(
13230
+ *posix*) :
13231
+ set -o posix ;; #(
13232
+ *) :
13233
+ ;;
13234
esac
13235
-
13236
fi
13237
13238
13239
-
13240
-
13241
-# PATH needs CR
13242
-# Avoid depending upon Character Ranges.
13243
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
13244
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
13245
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
13246
-as_cr_digits='0123456789'
13247
-as_cr_alnum=$as_cr_Letters$as_cr_digits
13248
-
13249
as_nl='
13250
'
13251
export as_nl
13252
@@ -18413,7 +15367,13 @@
13253
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
13254
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
13255
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
13256
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
13257
+# Prefer a ksh shell builtin over an external printf program on Solaris,
13258
+# but without wasting forks for bash or zsh.
13259
+if test -z "$BASH_VERSION$ZSH_VERSION" \
13260
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
13261
+ as_echo='print -r --'
13262
+ as_echo_n='print -rn --'
13263
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
13264
as_echo='printf %s\n'
13265
as_echo_n='printf %s'
13266
else
13267
@@ -18424,7 +15384,7 @@
13268
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
13269
as_echo_n_body='eval
13270
arg=$1;
13271
- case $arg in
13272
+ case $arg in #(
13273
*"$as_nl"*)
13274
expr "X$arg" : "X\\(.*\\)$as_nl";
13275
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
13276
@@ -18447,13 +15407,6 @@
13277
}
13278
fi
13279
13280
-# Support unset when possible.
13281
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
13282
- as_unset=unset
13283
-else
13284
- as_unset=false
13285
-fi
13286
-
13287
13288
# IFS
13289
# We need space, tab and new line, in precisely that order. Quoting is
13290
@@ -18463,15 +15416,15 @@
13291
IFS=" "" $as_nl"
13292
13293
# Find who we are. Look in the path if we contain no directory separator.
13294
-case $0 in
13295
+case $0 in #((
13296
*[\\/]* ) as_myself=$0 ;;
13297
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13298
for as_dir in $PATH
13299
do
13300
IFS=$as_save_IFS
13301
test -z "$as_dir" && as_dir=.
13302
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
13303
-done
13304
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
13305
+ done
13306
IFS=$as_save_IFS
13307
13308
;;
13309
@@ -18483,12 +15436,16 @@
13310
fi
13311
if test ! -f "$as_myself"; then
13312
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
13313
- { (exit 1); exit 1; }
13314
+ exit 1
13315
fi
13316
13317
-# Work around bugs in pre-3.0 UWIN ksh.
13318
-for as_var in ENV MAIL MAILPATH
13319
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
13320
+# Unset variables that we do not need and which cause bugs (e.g. in
13321
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
13322
+# suppresses any "Segmentation fault" message there. '((' could
13323
+# trigger a bug in pdksh 5.2.14.
13324
+for as_var in BASH_ENV ENV MAIL MAILPATH
13325
+do eval test x\${$as_var+set} = xset \
13326
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
13327
done
13328
PS1='$ '
13329
PS2='> '
13330
@@ -18500,7 +15457,89 @@
13331
LANGUAGE=C
13332
export LANGUAGE
13333
13334
-# Required to use basename.
13335
+# CDPATH.
13336
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
13337
+
13338
+
13339
+# as_fn_error ERROR [LINENO LOG_FD]
13340
+# ---------------------------------
13341
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
13342
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
13343
+# script with status $?, using 1 if that was 0.
13344
+as_fn_error ()
13345
+{
13346
+ as_status=$?; test $as_status -eq 0 && as_status=1
13347
+ if test "$3"; then
13348
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
13349
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
13350
+ fi
13351
+ $as_echo "$as_me: error: $1" >&2
13352
+ as_fn_exit $as_status
13353
+} # as_fn_error
13354
+
13355
+
13356
+# as_fn_set_status STATUS
13357
+# -----------------------
13358
+# Set $? to STATUS, without forking.
13359
+as_fn_set_status ()
13360
+{
13361
+ return $1
13362
+} # as_fn_set_status
13363
+
13364
+# as_fn_exit STATUS
13365
+# -----------------
13366
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
13367
+as_fn_exit ()
13368
+{
13369
+ set +e
13370
+ as_fn_set_status $1
13371
+ exit $1
13372
+} # as_fn_exit
13373
+
13374
+# as_fn_unset VAR
13375
+# ---------------
13376
+# Portably unset VAR.
13377
+as_fn_unset ()
13378
+{
13379
+ { eval $1=; unset $1;}
13380
+}
13381
+as_unset=as_fn_unset
13382
+# as_fn_append VAR VALUE
13383
+# ----------------------
13384
+# Append the text in VALUE to the end of the definition contained in VAR. Take
13385
+# advantage of any shell optimizations that allow amortized linear growth over
13386
+# repeated appends, instead of the typical quadratic growth present in naive
13387
+# implementations.
13388
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
13389
+ eval 'as_fn_append ()
13390
+ {
13391
+ eval $1+=\$2
13392
+ }'
13393
+else
13394
+ as_fn_append ()
13395
+ {
13396
+ eval $1=\$$1\$2
13397
+ }
13398
+fi # as_fn_append
13399
+
13400
+# as_fn_arith ARG...
13401
+# ------------------
13402
+# Perform arithmetic evaluation on the ARGs, and store the result in the
13403
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
13404
+# must be portable across $(()) and expr.
13405
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
13406
+ eval 'as_fn_arith ()
13407
+ {
13408
+ as_val=$(( $* ))
13409
+ }'
13410
+else
13411
+ as_fn_arith ()
13412
+ {
13413
+ as_val=`expr "$@" || test $? -eq 1`
13414
+ }
13415
+fi # as_fn_arith
13416
+
13417
+
13418
if expr a : '\(a\)' >/dev/null 2>&1 &&
13419
test "X`expr 00001 : '.*\(...\)'`" = X001; then
13420
as_expr=expr
13421
@@ -18514,8 +15553,12 @@
13422
as_basename=false
13423
fi
13424
13425
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
13426
+ as_dirname=dirname
13427
+else
13428
+ as_dirname=false
13429
+fi
13430
13431
-# Name of the executable.
13432
as_me=`$as_basename -- "$0" ||
13433
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
13434
X"$0" : 'X\(//\)$' \| \
13435
@@ -18535,76 +15578,25 @@
13436
}
13437
s/.*/./; q'`
13438
13439
-# CDPATH.
13440
-$as_unset CDPATH
13441
-
13442
-
13443
-
13444
- as_lineno_1=$LINENO
13445
- as_lineno_2=$LINENO
13446
- test "x$as_lineno_1" != "x$as_lineno_2" &&
13447
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
13448
-
13449
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
13450
- # uniformly replaced by the line number. The first 'sed' inserts a
13451
- # line-number line after each line using $LINENO; the second 'sed'
13452
- # does the real work. The second script uses 'N' to pair each
13453
- # line-number line with the line containing $LINENO, and appends
13454
- # trailing '-' during substitution so that $LINENO is not a special
13455
- # case at line end.
13456
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
13457
- # scripts with optimization help from Paolo Bonzini. Blame Lee
13458
- # E. McMahon (1931-1989) for sed's syntax. :-)
13459
- sed -n '
13460
- p
13461
- /[$]LINENO/=
13462
- ' <$as_myself |
13463
- sed '
13464
- s/[$]LINENO.*/&-/
13465
- t lineno
13466
- b
13467
- :lineno
13468
- N
13469
- :loop
13470
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
13471
- t loop
13472
- s/-\n.*//
13473
- ' >$as_me.lineno &&
13474
- chmod +x "$as_me.lineno" ||
13475
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
13476
- { (exit 1); exit 1; }; }
13477
-
13478
- # Don't try to exec as it changes $[0], causing all sort of problems
13479
- # (the dirname of $[0] is not the place where we might find the
13480
- # original and so on. Autoconf is especially sensitive to this).
13481
- . "./$as_me.lineno"
13482
- # Exit status is that of the last command.
13483
- exit
13484
-}
13485
-
13486
-
13487
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
13488
- as_dirname=dirname
13489
-else
13490
- as_dirname=false
13491
-fi
13492
+# Avoid depending upon Character Ranges.
13493
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
13494
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
13495
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
13496
+as_cr_digits='0123456789'
13497
+as_cr_alnum=$as_cr_Letters$as_cr_digits
13498
13499
ECHO_C= ECHO_N= ECHO_T=
13500
-case `echo -n x` in
13501
+case `echo -n x` in #(((((
13502
-n*)
13503
- case `echo 'x\c'` in
13504
+ case `echo 'xy\c'` in
13505
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
13506
- *) ECHO_C='\c';;
13507
+ xy) ECHO_C='\c';;
13508
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
13509
+ ECHO_T=' ';;
13510
esac;;
13511
*)
13512
ECHO_N='-n';;
13513
esac
13514
-if expr a : '\(a\)' >/dev/null 2>&1 &&
13515
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
13516
- as_expr=expr
13517
-else
13518
- as_expr=false
13519
-fi
13520
13521
rm -f conf$$ conf$$.exe conf$$.file
13522
if test -d conf$$.dir; then
13523
@@ -18633,8 +15625,56 @@
13524
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
13525
rmdir conf$$.dir 2>/dev/null
13526
13527
+
13528
+# as_fn_mkdir_p
13529
+# -------------
13530
+# Create "$as_dir" as a directory, including parents if necessary.
13531
+as_fn_mkdir_p ()
13532
+{
13533
+
13534
+ case $as_dir in #(
13535
+ -*) as_dir=./$as_dir;;
13536
+ esac
13537
+ test -d "$as_dir" || eval $as_mkdir_p || {
13538
+ as_dirs=
13539
+ while :; do
13540
+ case $as_dir in #(
13541
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
13542
+ *) as_qdir=$as_dir;;
13543
+ esac
13544
+ as_dirs="'$as_qdir' $as_dirs"
13545
+ as_dir=`$as_dirname -- "$as_dir" ||
13546
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
13547
+ X"$as_dir" : 'X\(//\)[^/]' \| \
13548
+ X"$as_dir" : 'X\(//\)$' \| \
13549
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
13550
+$as_echo X"$as_dir" |
13551
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
13552
+ s//\1/
13553
+ q
13554
+ }
13555
+ /^X\(\/\/\)[^/].*/{
13556
+ s//\1/
13557
+ q
13558
+ }
13559
+ /^X\(\/\/\)$/{
13560
+ s//\1/
13561
+ q
13562
+ }
13563
+ /^X\(\/\).*/{
13564
+ s//\1/
13565
+ q
13566
+ }
13567
+ s/.*/./; q'`
13568
+ test -d "$as_dir" && break
13569
+ done
13570
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
13571
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
13572
+
13573
+
13574
+} # as_fn_mkdir_p
13575
if mkdir -p . 2>/dev/null; then
13576
- as_mkdir_p=:
13577
+ as_mkdir_p='mkdir -p "$as_dir"'
13578
else
13579
test -d ./-p && rmdir ./-p
13580
as_mkdir_p=false
13581
@@ -18653,10 +15693,10 @@
13582
if test -d "$1"; then
13583
test -d "$1/.";
13584
else
13585
- case $1 in
13586
+ case $1 in #(
13587
-*)set "./$1";;
13588
esac;
13589
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
13590
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
13591
???[sx]*):;;*)false;;esac;fi
13592
'\'' sh
13593
'
13594
@@ -18671,13 +15711,19 @@
13595
13596
13597
exec 6>&1
13598
+## ----------------------------------- ##
13599
+## Main body of $CONFIG_STATUS script. ##
13600
+## ----------------------------------- ##
13601
+_ASEOF
13602
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
13603
13604
-# Save the log message, to keep $[0] and so on meaningful, and to
13605
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
13606
+# Save the log message, to keep $0 and so on meaningful, and to
13607
# report actual input values of CONFIG_FILES etc. instead of their
13608
# values after options handling.
13609
ac_log="
13610
This file was extended by gnome-power-manager $as_me 2.29.1, which was
13611
-generated by GNU Autoconf 2.63. Invocation command line was
13612
+generated by GNU Autoconf 2.64. Invocation command line was
13613
13614
CONFIG_FILES = $CONFIG_FILES
13615
CONFIG_HEADERS = $CONFIG_HEADERS
13616
@@ -18709,10 +15755,11 @@
13617
13618
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
13619
ac_cs_usage="\
13620
-\`$as_me' instantiates files from templates according to the
13621
-current configuration.
13622
+\`$as_me' instantiates files and other configuration actions
13623
+from templates according to the current configuration. Unless the files
13624
+and actions are specified as TAGs, all are instantiated by default.
13625
13626
-Usage: $0 [OPTION]... [FILE]...
13627
+Usage: $0 [OPTION]... [TAG]...
13628
13629
-h, --help print this help, then exit
13630
-V, --version print version number and configuration settings, then exit
13631
@@ -18734,16 +15781,16 @@
13632
Configuration commands:
13633
$config_commands
13634
13635
-Report bugs to <bug-autoconf@gnu.org>."
13636
+Report bugs to the package provider."
13637
13638
_ACEOF
13639
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
13640
ac_cs_version="\\
13641
gnome-power-manager config.status 2.29.1
13642
-configured by $0, generated by GNU Autoconf 2.63,
13643
+configured by $0, generated by GNU Autoconf 2.64,
13644
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
13645
13646
-Copyright (C) 2008 Free Software Foundation, Inc.
13647
+Copyright (C) 2009 Free Software Foundation, Inc.
13648
This config.status script is free software; the Free Software Foundation
13649
gives unlimited permission to copy, distribute and modify it."
13650
13651
@@ -18786,20 +15833,19 @@
13652
case $ac_optarg in
13653
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
13654
esac
13655
- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
13656
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
13657
ac_need_defaults=false;;
13658
--header | --heade | --head | --hea )
13659
$ac_shift
13660
case $ac_optarg in
13661
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
13662
esac
13663
- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
13664
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
13665
ac_need_defaults=false;;
13666
--he | --h)
13667
# Conflict between --help and --header
13668
- { $as_echo "$as_me: error: ambiguous option: $1
13669
-Try \`$0 --help' for more information." >&2
13670
- { (exit 1); exit 1; }; };;
13671
+ as_fn_error "ambiguous option: \`$1'
13672
+Try \`$0 --help' for more information.";;
13673
--help | --hel | -h )
13674
$as_echo "$ac_cs_usage"; exit ;;
13675
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
13676
@@ -18807,11 +15853,10 @@
13677
ac_cs_silent=: ;;
13678
13679
# This is an error.
13680
- -*) { $as_echo "$as_me: error: unrecognized option: $1
13681
-Try \`$0 --help' for more information." >&2
13682
- { (exit 1); exit 1; }; } ;;
13683
+ -*) as_fn_error "unrecognized option: \`$1'
13684
+Try \`$0 --help' for more information." ;;
13685
13686
- *) ac_config_targets="$ac_config_targets $1"
13687
+ *) as_fn_append ac_config_targets " $1"
13688
ac_need_defaults=false ;;
13689
13690
esac
13691
@@ -19164,9 +16209,7 @@
13692
"data/icons/scalable/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/status/Makefile" ;;
13693
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
13694
13695
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
13696
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
13697
- { (exit 1); exit 1; }; };;
13698
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
13699
esac
13700
done
13701
13702
@@ -19193,7 +16236,7 @@
13703
trap 'exit_status=$?
13704
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
13705
' 0
13706
- trap '{ (exit 1); exit 1; }' 1 2 13 15
13707
+ trap 'as_fn_exit 1' 1 2 13 15
13708
}
13709
# Create a (secure) tmp directory for tmp files.
13710
13711
@@ -19204,11 +16247,7 @@
13712
{
13713
tmp=./conf$$-$RANDOM
13714
(umask 077 && mkdir "$tmp")
13715
-} ||
13716
-{
13717
- $as_echo "$as_me: cannot create a temporary directory in ." >&2
13718
- { (exit 1); exit 1; }
13719
-}
13720
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
13721
13722
# Set up the scripts for CONFIG_FILES section.
13723
# No need to generate them if there are no CONFIG_FILES.
13724
@@ -19216,10 +16255,16 @@
13725
if test -n "$CONFIG_FILES"; then
13726
13727
13728
-ac_cr='
b"'"
13729
+ac_cr=`echo X | tr X '\015'`
13730
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
13731
+# But we know of no other shell where ac_cr would be empty at this
13732
+# point, so we can use a bashism as a fallback.
13733
+if test "x$ac_cr" = x; then
13734
+ eval ac_cr=\$\'\\r\'
13735
+fi
13736
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
13737
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
13738
- ac_cs_awk_cr='\\r'
13739
+ ac_cs_awk_cr='\r'
13740
else
13741
ac_cs_awk_cr=$ac_cr
13742
fi
13743
@@ -19233,24 +16278,18 @@
13744
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
13745
echo "_ACEOF"
13746
} >conf$$subs.sh ||
13747
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
13748
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
13749
- { (exit 1); exit 1; }; }
13750
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
13751
ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
13752
ac_delim='%!_!# '
13753
for ac_last_try in false false false false false :; do
13754
. ./conf$$subs.sh ||
13755
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
13756
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
13757
- { (exit 1); exit 1; }; }
13758
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
13759
13760
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
13761
if test $ac_delim_n = $ac_delim_num; then
13762
break
13763
elif $ac_last_try; then
13764
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
13765
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
13766
- { (exit 1); exit 1; }; }
13767
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
13768
else
13769
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
13770
fi
13771
@@ -19339,9 +16378,7 @@
13772
else
13773
cat
13774
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
13775
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
13776
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
13777
- { (exit 1); exit 1; }; }
13778
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
13779
_ACEOF
13780
13781
# VPATH may cause trouble with some makes, so we remove $(srcdir),
13782
@@ -19382,9 +16419,7 @@
13783
if test -z "$ac_t"; then
13784
break
13785
elif $ac_last_try; then
13786
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
13787
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
13788
- { (exit 1); exit 1; }; }
13789
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
13790
else
13791
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
13792
fi
13793
@@ -19469,9 +16504,7 @@
13794
_ACAWK
13795
_ACEOF
13796
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
13797
- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
13798
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
13799
- { (exit 1); exit 1; }; }
13800
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
13801
fi # test -n "$CONFIG_HEADERS"
13802
13803
13804
@@ -19484,9 +16517,7 @@
13805
esac
13806
case $ac_mode$ac_tag in
13807
:[FHL]*:*);;
13808
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
13809
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
13810
- { (exit 1); exit 1; }; };;
13811
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
13812
:[FH]-) ac_tag=-:-;;
13813
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
13814
esac
13815
@@ -19514,12 +16545,10 @@
13816
[\\/$]*) false;;
13817
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
13818
esac ||
13819
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
13820
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
13821
- { (exit 1); exit 1; }; };;
13822
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
13823
esac
13824
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
13825
- ac_file_inputs="$ac_file_inputs '$ac_f'"
13826
+ as_fn_append ac_file_inputs " '$ac_f'"
13827
done
13828
13829
# Let's still pretend it is `configure' which instantiates (i.e., don't
13830
@@ -19530,7 +16559,7 @@
13831
`' by configure.'
13832
if test x"$ac_file" != x-; then
13833
configure_input="$ac_file. $configure_input"
13834
- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
13835
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
13836
$as_echo "$as_me: creating $ac_file" >&6;}
13837
fi
13838
# Neutralize special characters interpreted by sed in replacement strings.
13839
@@ -19543,9 +16572,7 @@
13840
13841
case $ac_tag in
13842
*:-:* | *:-) cat >"$tmp/stdin" \
13843
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
13844
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
13845
- { (exit 1); exit 1; }; } ;;
13846
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
13847
esac
1243
diff -Nur gnome-power-manager-2.29.2/ltmain.sh gnome-power-manager-2.29.2.new/ltmain.sh
1244
--- gnome-power-manager-2.29.2/ltmain.sh 2010-01-27 08:25:00.000000000 -0800
1245
+++ gnome-power-manager-2.29.2.new/ltmain.sh 2010-02-05 13:12:49.000000000 -0800
1246
@@ -1,6 +1,6 @@
1247
# Generated from ltmain.m4sh.
1248
1249
-# ltmain.sh (GNU libtool) 2.2.6
1250
+# ltmain.sh (GNU libtool) 2.2.6b
1251
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
1252
1253
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
1254
@@ -65,7 +65,7 @@
1255
# compiler: $LTCC
1256
# compiler flags: $LTCFLAGS
1257
# linker: $LD (gnu? $with_gnu_ld)
1258
-# $progname: (GNU libtool) 2.2.6
1259
+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
1260
# automake: $automake_version
1261
# autoconf: $autoconf_version
1262
#
1263
@@ -73,9 +73,9 @@
1264
1265
PROGRAM=ltmain.sh
1266
PACKAGE=libtool
1267
-VERSION=2.2.6
1268
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
1269
TIMESTAMP=""
1270
-package_revision=1.3012
1271
+package_revision=1.3017
1272
1273
# Be Bourne compatible
1274
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1275
@@ -5033,7 +5033,10 @@
1276
case $pass in
1277
dlopen) libs="$dlfiles" ;;
1278
dlpreopen) libs="$dlprefiles" ;;
1279
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
1280
+ link)
1281
+ libs="$deplibs %DEPLIBS%"
1282
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
1283
+ ;;
1284
esac
1285
fi
1286
if test "$linkmode,$pass" = "lib,dlpreopen"; then
1287
@@ -5344,19 +5347,19 @@
1288
# It is a libtool convenience library, so add in its objects.
1289
convenience="$convenience $ladir/$objdir/$old_library"
1290
old_convenience="$old_convenience $ladir/$objdir/$old_library"
1291
+ tmp_libs=
1292
+ for deplib in $dependency_libs; do
1293
+ deplibs="$deplib $deplibs"
1294
+ if $opt_duplicate_deps ; then
1295
+ case "$tmp_libs " in
1296
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
1297
+ esac
1298
+ fi
1299
+ tmp_libs="$tmp_libs $deplib"
1300
+ done
1301
elif test "$linkmode" != prog && test "$linkmode" != lib; then
1302
func_fatal_error "\`$lib' is not a convenience library"
1303
fi
1304
- tmp_libs=
1305
- for deplib in $dependency_libs; do
1306
- deplibs="$deplib $deplibs"
1307
- if $opt_duplicate_deps ; then
1308
- case "$tmp_libs " in
1309
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
1310
- esac
1311
- fi
1312
- tmp_libs="$tmp_libs $deplib"
1313
- done
1314
continue
1315
fi # $pass = conv
1316
1317
@@ -5893,6 +5896,7 @@
1318
if test "$link_all_deplibs" != no; then
1319
# Add the search paths of all dependency libraries
1320
for deplib in $dependency_libs; do
1321
+ path=
1322
case $deplib in
1323
-L*) path="$deplib" ;;
1324
*.la)
1325
@@ -6206,6 +6210,9 @@
1326
revision="$number_minor"
1327
lt_irix_increment=no
1328
;;
1329
+ *)
1330
+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
1331
+ ;;
1332
esac
1333
;;
1334
no)
1335
diff -Nur gnome-power-manager-2.29.2/m4/libtool.m4 gnome-power-manager-2.29.2.new/m4/libtool.m4
1336
--- gnome-power-manager-2.29.2/m4/libtool.m4 2010-01-27 08:24:51.000000000 -0800
1337
+++ gnome-power-manager-2.29.2.new/m4/libtool.m4 2010-02-05 13:12:49.000000000 -0800
1338
@@ -2445,7 +2445,7 @@
1339
;;
1340
1341
# This must be Linux ELF.
1342
-linux* | k*bsd*-gnu)
1343
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
1344
version_type=linux
1345
need_lib_prefix=no
1346
need_version=no
1347
@@ -2470,13 +2470,10 @@
1348
# before this can be enabled.
1349
hardcode_into_libs=yes
1350
1351
- # Add ABI-specific directories to the system library path.
1352
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
1353
-
1354
# Append ld.so.conf contents to the search path
1355
if test -f /etc/ld.so.conf; then
1356
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
1357
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
1358
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
1359
fi
1360
1361
# We used to test for /lib/ld.so.1 and disable shared libraries on
1362
@@ -2488,6 +2485,18 @@
1363
dynamic_linker='GNU/Linux ld.so'
1364
;;
1365
1366
+netbsdelf*-gnu)
1367
+ version_type=linux
1368
+ need_lib_prefix=no
1369
+ need_version=no
1370
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
1371
+ soname_spec='${libname}${release}${shared_ext}$major'
1372
+ shlibpath_var=LD_LIBRARY_PATH
1373
+ shlibpath_overrides_runpath=no
1374
+ hardcode_into_libs=yes
1375
+ dynamic_linker='NetBSD ld.elf_so'
1376
+ ;;
1377
+
1378
netbsd*)
1379
version_type=sunos
1380
need_lib_prefix=no
1381
@@ -3075,11 +3084,11 @@
1382
;;
1383
1384
# This must be Linux ELF.
1385
-linux* | k*bsd*-gnu)
1386
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
1387
lt_cv_deplibs_check_method=pass_all
1388
;;
1389
1390
-netbsd*)
1391
+netbsd* | netbsdelf*-gnu)
1392
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
1393
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
1394
else
1395
@@ -3696,7 +3705,7 @@
1396
;;
1397
esac
1398
;;
1399
- linux* | k*bsd*-gnu)
1400
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
1401
case $cc_basename in
1402
KCC*)
1403
# KAI C++ Compiler
1404
@@ -3760,7 +3769,7 @@
1405
;;
1406
esac
1407
;;
1408
- netbsd*)
1409
+ netbsd* | netbsdelf*-gnu)
1410
;;
1411
*qnx* | *nto*)
1412
# QNX uses GNU C++, but need to define -shared option too, otherwise
1413
@@ -3980,7 +3989,7 @@
1414
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
1415
;;
1416
1417
- linux* | k*bsd*-gnu)
1418
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
1419
case $cc_basename in
1420
# old Intel for x86_64 which still supported -KPIC.
1421
ecc*)
1422
@@ -4185,6 +4194,9 @@
1423
cygwin* | mingw* | cegcc*)
1424
_LT_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'
1425
;;
1426
+ linux* | k*bsd*-gnu)
1427
+ _LT_TAGVAR(link_all_deplibs, $1)=no
1428
+ ;;
1429
*)
1430
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
1431
;;
1432
@@ -4249,6 +4261,9 @@
1433
openbsd*)
1434
with_gnu_ld=no
13848
1435
;;
13849
esac
13850
@@ -19573,47 +16600,7 @@
13851
q
13852
}
13853
s/.*/./; q'`
13854
- { as_dir="$ac_dir"
13855
- case $as_dir in #(
13856
- -*) as_dir=./$as_dir;;
13857
- esac
13858
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
13859
- as_dirs=
13860
- while :; do
13861
- case $as_dir in #(
13862
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
13863
- *) as_qdir=$as_dir;;
13864
- esac
13865
- as_dirs="'$as_qdir' $as_dirs"
13866
- as_dir=`$as_dirname -- "$as_dir" ||
13867
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
13868
- X"$as_dir" : 'X\(//\)[^/]' \| \
13869
- X"$as_dir" : 'X\(//\)$' \| \
13870
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
13871
-$as_echo X"$as_dir" |
13872
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
13873
- s//\1/
13874
- q
13875
- }
13876
- /^X\(\/\/\)[^/].*/{
13877
- s//\1/
13878
- q
13879
- }
13880
- /^X\(\/\/\)$/{
13881
- s//\1/
13882
- q
13883
- }
13884
- /^X\(\/\).*/{
13885
- s//\1/
13886
- q
13887
- }
13888
- s/.*/./; q'`
13889
- test -d "$as_dir" && break
13890
- done
13891
- test -z "$as_dirs" || eval "mkdir $as_dirs"
13892
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
13893
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
13894
- { (exit 1); exit 1; }; }; }
13895
+ as_dir="$ac_dir"; as_fn_mkdir_p
13896
ac_builddir=.
13897
13898
case "$ac_dir" in
13899
@@ -19670,7 +16657,6 @@
13900
# If the template does not know about datarootdir, expand it.
13901
# FIXME: This hack should be removed a few years after 2.60.
13902
ac_datarootdir_hack=; ac_datarootdir_seen=
13903
-
13904
ac_sed_dataroot='
13905
/datarootdir/ {
13906
p
13907
@@ -19680,12 +16666,11 @@
13908
/@docdir@/p
13909
/@infodir@/p
13910
/@localedir@/p
13911
-/@mandir@/p
13912
-'
13913
+/@mandir@/p'
13914
case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
13915
*datarootdir*) ac_datarootdir_seen=yes;;
13916
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
13917
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
13918
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
13919
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
13920
_ACEOF
13921
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
13922
@@ -19695,7 +16680,7 @@
13923
s&@infodir@&$infodir&g
13924
s&@localedir@&$localedir&g
13925
s&@mandir@&$mandir&g
13926
- s&\\\${datarootdir}&$datarootdir&g' ;;
13927
+ s&\\\${datarootdir}&$datarootdir&g' ;;
13928
esac
13929
_ACEOF
13930
13931
@@ -19724,14 +16709,12 @@
13932
$ac_datarootdir_hack
13933
"
13934
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
13935
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
13936
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
13937
- { (exit 1); exit 1; }; }
13938
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
13939
13940
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
13941
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
13942
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
13943
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
13944
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
13945
which seems to be undefined. Please make sure it is defined." >&5
13946
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
13947
which seems to be undefined. Please make sure it is defined." >&2;}
13948
@@ -19741,9 +16724,7 @@
13949
-) cat "$tmp/out" && rm -f "$tmp/out";;
13950
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
13951
esac \
13952
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
13953
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
13954
- { (exit 1); exit 1; }; }
13955
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
13956
;;
13957
:H)
13958
#
13959
@@ -19754,25 +16735,19 @@
13960
$as_echo "/* $configure_input */" \
13961
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
13962
} >"$tmp/config.h" \
13963
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
13964
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
13965
- { (exit 1); exit 1; }; }
13966
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
13967
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
13968
- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
13969
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
13970
$as_echo "$as_me: $ac_file is unchanged" >&6;}
13971
else
13972
rm -f "$ac_file"
13973
mv "$tmp/config.h" "$ac_file" \
13974
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
13975
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
13976
- { (exit 1); exit 1; }; }
13977
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
13978
fi
13979
else
13980
$as_echo "/* $configure_input */" \
13981
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
13982
- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
13983
-$as_echo "$as_me: error: could not create -" >&2;}
13984
- { (exit 1); exit 1; }; }
13985
+ || as_fn_error "could not create -" "$LINENO" 5
13986
fi
13987
# Compute "$ac_file"'s index in $config_headers.
13988
_am_arg="$ac_file"
13989
@@ -19810,7 +16785,7 @@
13990
s/.*/./; q'`/stamp-h$_am_stamp_count
13991
;;
13992
13993
- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
13994
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
13995
$as_echo "$as_me: executing $ac_file commands" >&6;}
13996
;;
13997
esac
13998
@@ -19905,47 +16880,7 @@
13999
q
14000
}
14001
s/.*/./; q'`
14002
- { as_dir=$dirpart/$fdir
14003
- case $as_dir in #(
14004
- -*) as_dir=./$as_dir;;
14005
- esac
14006
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
14007
- as_dirs=
14008
- while :; do
14009
- case $as_dir in #(
14010
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
14011
- *) as_qdir=$as_dir;;
14012
- esac
14013
- as_dirs="'$as_qdir' $as_dirs"
14014
- as_dir=`$as_dirname -- "$as_dir" ||
14015
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
14016
- X"$as_dir" : 'X\(//\)[^/]' \| \
14017
- X"$as_dir" : 'X\(//\)$' \| \
14018
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
14019
-$as_echo X"$as_dir" |
14020
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
14021
- s//\1/
14022
- q
14023
- }
14024
- /^X\(\/\/\)[^/].*/{
14025
- s//\1/
14026
- q
14027
- }
14028
- /^X\(\/\/\)$/{
14029
- s//\1/
14030
- q
14031
- }
14032
- /^X\(\/\).*/{
14033
- s//\1/
14034
- q
14035
- }
14036
- s/.*/./; q'`
14037
- test -d "$as_dir" && break
14038
- done
14039
- test -z "$as_dirs" || eval "mkdir $as_dirs"
14040
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
14041
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
14042
- { (exit 1); exit 1; }; }; }
14043
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
14044
# echo "creating $dirpart/$file"
14045
echo '# dummy' > "$dirpart/$file"
14046
done
14047
@@ -20592,9 +17527,7 @@
14048
esac ;;
14049
"po/stamp-it":C)
14050
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
14051
- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
14052
-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
14053
- { (exit 1); exit 1; }; }
14054
+ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
14055
fi
14056
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
14057
>"po/stamp-it.tmp"
14058
@@ -20617,15 +17550,12 @@
14059
done # for ac_tag
14060
14061
14062
-{ (exit 0); exit 0; }
14063
+as_fn_exit 0
14064
_ACEOF
14065
-chmod +x $CONFIG_STATUS
14066
ac_clean_files=$ac_clean_files_save
14067
14068
test $ac_write_fail = 0 ||
14069
- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
14070
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
14071
- { (exit 1); exit 1; }; }
14072
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
14073
14074
14075
# configure is writing to config.log, and then calls config.status.
14076
@@ -20646,10 +17576,10 @@
14077
exec 5>>config.log
14078
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
14079
# would make configure fail if this is the last instruction.
14080
- $ac_cs_success || { (exit 1); exit 1; }
14081
+ $ac_cs_success || as_fn_exit $?
14082
fi
14083
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
14084
- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
14085
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
14086
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
14087
fi
14088
14089
Index: gnome-power-manager-2.29.1/data/icons/16x16/actions/Makefile.in
14090
===================================================================
14091
--- gnome-power-manager-2.29.1.orig/data/icons/16x16/actions/Makefile.in 2009-11-02 13:05:47.000000000 +0000
14092
+++ gnome-power-manager-2.29.1/data/icons/16x16/actions/Makefile.in 2010-01-19 00:29:09.000000000 +0000
14093
@@ -185,6 +185,7 @@
14094
PACKAGE_NAME = @PACKAGE_NAME@
14095
PACKAGE_STRING = @PACKAGE_STRING@
14096
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14097
+PACKAGE_URL = @PACKAGE_URL@
14098
PACKAGE_VERSION = @PACKAGE_VERSION@
14099
PANEL_CFLAGS = @PANEL_CFLAGS@
14100
PANEL_LIBS = @PANEL_LIBS@
14101
Index: gnome-power-manager-2.29.1/data/icons/16x16/apps/Makefile.in
14102
===================================================================
14103
--- gnome-power-manager-2.29.1.orig/data/icons/16x16/apps/Makefile.in 2009-10-22 09:10:30.000000000 +0100
14104
+++ gnome-power-manager-2.29.1/data/icons/16x16/apps/Makefile.in 2010-01-19 00:29:09.000000000 +0000
14105
@@ -142,8 +142,6 @@
14106
GPM_EXTRA_LIBS = @GPM_EXTRA_LIBS@
14107
GREP = @GREP@
14108
GTK_REQUIRED = @GTK_REQUIRED@
14109
-HAL_CFLAGS = @HAL_CFLAGS@
14110
-HAL_LIBS = @HAL_LIBS@
14111
HELP_DIR = @HELP_DIR@
14112
INSTALL = @INSTALL@
14113
INSTALL_DATA = @INSTALL_DATA@
14114
@@ -187,6 +185,7 @@
14115
PACKAGE_NAME = @PACKAGE_NAME@
14116
PACKAGE_STRING = @PACKAGE_STRING@
14117
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14118
+PACKAGE_URL = @PACKAGE_URL@
14119
PACKAGE_VERSION = @PACKAGE_VERSION@
14120
PANEL_CFLAGS = @PANEL_CFLAGS@
14121
PANEL_LIBS = @PANEL_LIBS@
14122
Index: gnome-power-manager-2.29.1/data/icons/16x16/Makefile.in
14123
===================================================================
14124
--- gnome-power-manager-2.29.1.orig/data/icons/16x16/Makefile.in 2009-11-02 13:05:47.000000000 +0000
14125
+++ gnome-power-manager-2.29.1/data/icons/16x16/Makefile.in 2010-01-19 00:29:09.000000000 +0000
14126
@@ -201,6 +201,7 @@
14127
PACKAGE_NAME = @PACKAGE_NAME@
14128
PACKAGE_STRING = @PACKAGE_STRING@
14129
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14130
+PACKAGE_URL = @PACKAGE_URL@
14131
PACKAGE_VERSION = @PACKAGE_VERSION@
14132
PANEL_CFLAGS = @PANEL_CFLAGS@
14133
PANEL_LIBS = @PANEL_LIBS@
14134
Index: gnome-power-manager-2.29.1/data/icons/16x16/status/Makefile.in
14135
===================================================================
14136
--- gnome-power-manager-2.29.1.orig/data/icons/16x16/status/Makefile.in 2009-11-02 13:05:47.000000000 +0000
14137
+++ gnome-power-manager-2.29.1/data/icons/16x16/status/Makefile.in 2010-01-19 00:29:09.000000000 +0000
14138
@@ -185,6 +185,7 @@
14139
PACKAGE_NAME = @PACKAGE_NAME@
14140
PACKAGE_STRING = @PACKAGE_STRING@
14141
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14142
+PACKAGE_URL = @PACKAGE_URL@
14143
PACKAGE_VERSION = @PACKAGE_VERSION@
14144
PANEL_CFLAGS = @PANEL_CFLAGS@
14145
PANEL_LIBS = @PANEL_LIBS@
14146
Index: gnome-power-manager-2.29.1/data/icons/22x22/actions/Makefile.in
14147
===================================================================
14148
--- gnome-power-manager-2.29.1.orig/data/icons/22x22/actions/Makefile.in 2009-11-02 13:05:47.000000000 +0000
14149
+++ gnome-power-manager-2.29.1/data/icons/22x22/actions/Makefile.in 2010-01-19 00:29:09.000000000 +0000
14150
@@ -185,6 +185,7 @@
14151
PACKAGE_NAME = @PACKAGE_NAME@
14152
PACKAGE_STRING = @PACKAGE_STRING@
14153
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14154
+PACKAGE_URL = @PACKAGE_URL@
14155
PACKAGE_VERSION = @PACKAGE_VERSION@
14156
PANEL_CFLAGS = @PANEL_CFLAGS@
14157
PANEL_LIBS = @PANEL_LIBS@
14158
Index: gnome-power-manager-2.29.1/data/icons/22x22/apps/Makefile.in
14159
===================================================================
14160
--- gnome-power-manager-2.29.1.orig/data/icons/22x22/apps/Makefile.in 2009-10-22 09:10:30.000000000 +0100
14161
+++ gnome-power-manager-2.29.1/data/icons/22x22/apps/Makefile.in 2010-01-19 00:29:09.000000000 +0000
14162
@@ -142,8 +142,6 @@
14163
GPM_EXTRA_LIBS = @GPM_EXTRA_LIBS@
14164
GREP = @GREP@
14165
GTK_REQUIRED = @GTK_REQUIRED@
14166
-HAL_CFLAGS = @HAL_CFLAGS@
14167
-HAL_LIBS = @HAL_LIBS@
14168
HELP_DIR = @HELP_DIR@
14169
INSTALL = @INSTALL@
14170
INSTALL_DATA = @INSTALL_DATA@
14171
@@ -187,6 +185,7 @@
14172
PACKAGE_NAME = @PACKAGE_NAME@
14173
PACKAGE_STRING = @PACKAGE_STRING@
14174
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14175
+PACKAGE_URL = @PACKAGE_URL@
14176
PACKAGE_VERSION = @PACKAGE_VERSION@
14177
PANEL_CFLAGS = @PANEL_CFLAGS@
14178
PANEL_LIBS = @PANEL_LIBS@
14179
Index: gnome-power-manager-2.29.1/data/icons/22x22/Makefile.in
14180
===================================================================
14181
--- gnome-power-manager-2.29.1.orig/data/icons/22x22/Makefile.in 2009-11-02 13:05:47.000000000 +0000
14182
+++ gnome-power-manager-2.29.1/data/icons/22x22/Makefile.in 2010-01-19 00:29:09.000000000 +0000
14183
@@ -201,6 +201,7 @@
14184
PACKAGE_NAME = @PACKAGE_NAME@
14185
PACKAGE_STRING = @PACKAGE_STRING@
14186
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14187
+PACKAGE_URL = @PACKAGE_URL@
14188
PACKAGE_VERSION = @PACKAGE_VERSION@
14189
PANEL_CFLAGS = @PANEL_CFLAGS@
14190
PANEL_LIBS = @PANEL_LIBS@
14191
Index: gnome-power-manager-2.29.1/data/icons/22x22/status/Makefile.in
14192
===================================================================
14193
--- gnome-power-manager-2.29.1.orig/data/icons/22x22/status/Makefile.in 2009-11-02 13:05:47.000000000 +0000
14194
+++ gnome-power-manager-2.29.1/data/icons/22x22/status/Makefile.in 2010-01-19 00:29:09.000000000 +0000
14195
@@ -185,6 +185,7 @@
14196
PACKAGE_NAME = @PACKAGE_NAME@
14197
PACKAGE_STRING = @PACKAGE_STRING@
14198
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14199
+PACKAGE_URL = @PACKAGE_URL@
14200
PACKAGE_VERSION = @PACKAGE_VERSION@
14201
PANEL_CFLAGS = @PANEL_CFLAGS@
14202
PANEL_LIBS = @PANEL_LIBS@
14203
Index: gnome-power-manager-2.29.1/data/icons/24x24/actions/Makefile.in
14204
===================================================================
14205
--- gnome-power-manager-2.29.1.orig/data/icons/24x24/actions/Makefile.in 2009-11-02 13:05:48.000000000 +0000
14206
+++ gnome-power-manager-2.29.1/data/icons/24x24/actions/Makefile.in 2010-01-19 00:29:10.000000000 +0000
14207
@@ -185,6 +185,7 @@
14208
PACKAGE_NAME = @PACKAGE_NAME@
14209
PACKAGE_STRING = @PACKAGE_STRING@
14210
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14211
+PACKAGE_URL = @PACKAGE_URL@
14212
PACKAGE_VERSION = @PACKAGE_VERSION@
14213
PANEL_CFLAGS = @PANEL_CFLAGS@
14214
PANEL_LIBS = @PANEL_LIBS@
14215
Index: gnome-power-manager-2.29.1/data/icons/24x24/apps/Makefile.in
14216
===================================================================
14217
--- gnome-power-manager-2.29.1.orig/data/icons/24x24/apps/Makefile.in 2009-10-22 09:10:31.000000000 +0100
14218
+++ gnome-power-manager-2.29.1/data/icons/24x24/apps/Makefile.in 2010-01-19 00:29:10.000000000 +0000
14219
@@ -142,8 +142,6 @@
14220
GPM_EXTRA_LIBS = @GPM_EXTRA_LIBS@
14221
GREP = @GREP@
14222
GTK_REQUIRED = @GTK_REQUIRED@
14223
-HAL_CFLAGS = @HAL_CFLAGS@
14224
-HAL_LIBS = @HAL_LIBS@
14225
HELP_DIR = @HELP_DIR@
14226
INSTALL = @INSTALL@
14227
INSTALL_DATA = @INSTALL_DATA@
14228
@@ -187,6 +185,7 @@
14229
PACKAGE_NAME = @PACKAGE_NAME@
14230
PACKAGE_STRING = @PACKAGE_STRING@
14231
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14232
+PACKAGE_URL = @PACKAGE_URL@
14233
PACKAGE_VERSION = @PACKAGE_VERSION@
14234
PANEL_CFLAGS = @PANEL_CFLAGS@
14235
PANEL_LIBS = @PANEL_LIBS@
14236
Index: gnome-power-manager-2.29.1/data/icons/24x24/Makefile.in
14237
===================================================================
14238
--- gnome-power-manager-2.29.1.orig/data/icons/24x24/Makefile.in 2009-11-02 13:05:47.000000000 +0000
14239
+++ gnome-power-manager-2.29.1/data/icons/24x24/Makefile.in 2010-01-19 00:29:10.000000000 +0000
14240
@@ -201,6 +201,7 @@
14241
PACKAGE_NAME = @PACKAGE_NAME@
14242
PACKAGE_STRING = @PACKAGE_STRING@
14243
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14244
+PACKAGE_URL = @PACKAGE_URL@
14245
PACKAGE_VERSION = @PACKAGE_VERSION@
14246
PANEL_CFLAGS = @PANEL_CFLAGS@
14247
PANEL_LIBS = @PANEL_LIBS@
14248
Index: gnome-power-manager-2.29.1/data/icons/24x24/status/Makefile.in
14249
===================================================================
14250
--- gnome-power-manager-2.29.1.orig/data/icons/24x24/status/Makefile.in 2009-11-02 13:05:48.000000000 +0000
14251
+++ gnome-power-manager-2.29.1/data/icons/24x24/status/Makefile.in 2010-01-19 00:29:10.000000000 +0000
14252
@@ -185,6 +185,7 @@
14253
PACKAGE_NAME = @PACKAGE_NAME@
14254
PACKAGE_STRING = @PACKAGE_STRING@
14255
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14256
+PACKAGE_URL = @PACKAGE_URL@
14257
PACKAGE_VERSION = @PACKAGE_VERSION@
14258
PANEL_CFLAGS = @PANEL_CFLAGS@
14259
PANEL_LIBS = @PANEL_LIBS@
14260
Index: gnome-power-manager-2.29.1/data/icons/32x32/actions/Makefile.in
14261
===================================================================
14262
--- gnome-power-manager-2.29.1.orig/data/icons/32x32/actions/Makefile.in 2009-11-02 13:05:48.000000000 +0000
14263
+++ gnome-power-manager-2.29.1/data/icons/32x32/actions/Makefile.in 2010-01-19 00:29:10.000000000 +0000
14264
@@ -185,6 +185,7 @@
14265
PACKAGE_NAME = @PACKAGE_NAME@
14266
PACKAGE_STRING = @PACKAGE_STRING@
14267
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14268
+PACKAGE_URL = @PACKAGE_URL@
14269
PACKAGE_VERSION = @PACKAGE_VERSION@
14270
PANEL_CFLAGS = @PANEL_CFLAGS@
14271
PANEL_LIBS = @PANEL_LIBS@
14272
Index: gnome-power-manager-2.29.1/data/icons/32x32/apps/Makefile.in
14273
===================================================================
14274
--- gnome-power-manager-2.29.1.orig/data/icons/32x32/apps/Makefile.in 2009-10-22 09:10:31.000000000 +0100
14275
+++ gnome-power-manager-2.29.1/data/icons/32x32/apps/Makefile.in 2010-01-19 00:29:10.000000000 +0000
14276
@@ -142,8 +142,6 @@
14277
GPM_EXTRA_LIBS = @GPM_EXTRA_LIBS@
14278
GREP = @GREP@
14279
GTK_REQUIRED = @GTK_REQUIRED@
14280
-HAL_CFLAGS = @HAL_CFLAGS@
14281
-HAL_LIBS = @HAL_LIBS@
14282
HELP_DIR = @HELP_DIR@
14283
INSTALL = @INSTALL@
14284
INSTALL_DATA = @INSTALL_DATA@
14285
@@ -187,6 +185,7 @@
14286
PACKAGE_NAME = @PACKAGE_NAME@
14287
PACKAGE_STRING = @PACKAGE_STRING@
14288
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14289
+PACKAGE_URL = @PACKAGE_URL@
14290
PACKAGE_VERSION = @PACKAGE_VERSION@
14291
PANEL_CFLAGS = @PANEL_CFLAGS@
14292
PANEL_LIBS = @PANEL_LIBS@
14293
Index: gnome-power-manager-2.29.1/data/icons/32x32/Makefile.in
14294
===================================================================
14295
--- gnome-power-manager-2.29.1.orig/data/icons/32x32/Makefile.in 2009-11-02 13:05:48.000000000 +0000
14296
+++ gnome-power-manager-2.29.1/data/icons/32x32/Makefile.in 2010-01-19 00:29:10.000000000 +0000
14297
@@ -201,6 +201,7 @@
14298
PACKAGE_NAME = @PACKAGE_NAME@
14299
PACKAGE_STRING = @PACKAGE_STRING@
14300
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14301
+PACKAGE_URL = @PACKAGE_URL@
14302
PACKAGE_VERSION = @PACKAGE_VERSION@
14303
PANEL_CFLAGS = @PANEL_CFLAGS@
14304
PANEL_LIBS = @PANEL_LIBS@
14305
Index: gnome-power-manager-2.29.1/data/icons/32x32/status/Makefile.in
14306
===================================================================
14307
--- gnome-power-manager-2.29.1.orig/data/icons/32x32/status/Makefile.in 2009-11-02 13:05:48.000000000 +0000
14308
+++ gnome-power-manager-2.29.1/data/icons/32x32/status/Makefile.in 2010-01-19 00:29:10.000000000 +0000
14309
@@ -185,6 +185,7 @@
14310
PACKAGE_NAME = @PACKAGE_NAME@
14311
PACKAGE_STRING = @PACKAGE_STRING@
14312
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14313
+PACKAGE_URL = @PACKAGE_URL@
14314
PACKAGE_VERSION = @PACKAGE_VERSION@
14315
PANEL_CFLAGS = @PANEL_CFLAGS@
14316
PANEL_LIBS = @PANEL_LIBS@
14317
Index: gnome-power-manager-2.29.1/data/icons/48x48/actions/Makefile.in
14318
===================================================================
14319
--- gnome-power-manager-2.29.1.orig/data/icons/48x48/actions/Makefile.in 2009-11-02 13:05:48.000000000 +0000
14320
+++ gnome-power-manager-2.29.1/data/icons/48x48/actions/Makefile.in 2010-01-19 00:29:10.000000000 +0000
14321
@@ -185,6 +185,7 @@
14322
PACKAGE_NAME = @PACKAGE_NAME@
14323
PACKAGE_STRING = @PACKAGE_STRING@
14324
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14325
+PACKAGE_URL = @PACKAGE_URL@
14326
PACKAGE_VERSION = @PACKAGE_VERSION@
14327
PANEL_CFLAGS = @PANEL_CFLAGS@
14328
PANEL_LIBS = @PANEL_LIBS@
14329
Index: gnome-power-manager-2.29.1/data/icons/48x48/apps/Makefile.in
14330
===================================================================
14331
--- gnome-power-manager-2.29.1.orig/data/icons/48x48/apps/Makefile.in 2009-10-22 09:10:32.000000000 +0100
14332
+++ gnome-power-manager-2.29.1/data/icons/48x48/apps/Makefile.in 2010-01-19 00:29:10.000000000 +0000
14333
@@ -142,8 +142,6 @@
14334
GPM_EXTRA_LIBS = @GPM_EXTRA_LIBS@
14335
GREP = @GREP@
14336
GTK_REQUIRED = @GTK_REQUIRED@
14337
-HAL_CFLAGS = @HAL_CFLAGS@
14338
-HAL_LIBS = @HAL_LIBS@
14339
HELP_DIR = @HELP_DIR@
14340
INSTALL = @INSTALL@
14341
INSTALL_DATA = @INSTALL_DATA@
14342
@@ -187,6 +185,7 @@
14343
PACKAGE_NAME = @PACKAGE_NAME@
14344
PACKAGE_STRING = @PACKAGE_STRING@
14345
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14346
+PACKAGE_URL = @PACKAGE_URL@
14347
PACKAGE_VERSION = @PACKAGE_VERSION@
14348
PANEL_CFLAGS = @PANEL_CFLAGS@
14349
PANEL_LIBS = @PANEL_LIBS@
14350
Index: gnome-power-manager-2.29.1/data/icons/48x48/Makefile.in
14351
===================================================================
14352
--- gnome-power-manager-2.29.1.orig/data/icons/48x48/Makefile.in 2009-11-02 13:05:48.000000000 +0000
14353
+++ gnome-power-manager-2.29.1/data/icons/48x48/Makefile.in 2010-01-19 00:29:10.000000000 +0000
14354
@@ -201,6 +201,7 @@
14355
PACKAGE_NAME = @PACKAGE_NAME@
14356
PACKAGE_STRING = @PACKAGE_STRING@
14357
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14358
+PACKAGE_URL = @PACKAGE_URL@
14359
PACKAGE_VERSION = @PACKAGE_VERSION@
14360
PANEL_CFLAGS = @PANEL_CFLAGS@
14361
PANEL_LIBS = @PANEL_LIBS@
14362
Index: gnome-power-manager-2.29.1/data/icons/48x48/status/Makefile.in
14363
===================================================================
14364
--- gnome-power-manager-2.29.1.orig/data/icons/48x48/status/Makefile.in 2009-11-02 13:05:48.000000000 +0000
14365
+++ gnome-power-manager-2.29.1/data/icons/48x48/status/Makefile.in 2010-01-19 00:29:10.000000000 +0000
14366
@@ -185,6 +185,7 @@
14367
PACKAGE_NAME = @PACKAGE_NAME@
14368
PACKAGE_STRING = @PACKAGE_STRING@
14369
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14370
+PACKAGE_URL = @PACKAGE_URL@
14371
PACKAGE_VERSION = @PACKAGE_VERSION@
14372
PANEL_CFLAGS = @PANEL_CFLAGS@
14373
PANEL_LIBS = @PANEL_LIBS@
14374
Index: gnome-power-manager-2.29.1/data/icons/Makefile.in
14375
===================================================================
14376
--- gnome-power-manager-2.29.1.orig/data/icons/Makefile.in 2009-11-02 13:05:48.000000000 +0000
14377
+++ gnome-power-manager-2.29.1/data/icons/Makefile.in 2010-01-19 00:29:11.000000000 +0000
14378
@@ -201,6 +201,7 @@
14379
PACKAGE_NAME = @PACKAGE_NAME@
14380
PACKAGE_STRING = @PACKAGE_STRING@
14381
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14382
+PACKAGE_URL = @PACKAGE_URL@
14383
PACKAGE_VERSION = @PACKAGE_VERSION@
14384
PANEL_CFLAGS = @PANEL_CFLAGS@
14385
PANEL_LIBS = @PANEL_LIBS@
14386
Index: gnome-power-manager-2.29.1/data/icons/scalable/actions/Makefile.in
14387
===================================================================
14388
--- gnome-power-manager-2.29.1.orig/data/icons/scalable/actions/Makefile.in 2009-11-02 13:05:49.000000000 +0000
14389
+++ gnome-power-manager-2.29.1/data/icons/scalable/actions/Makefile.in 2010-01-19 00:29:11.000000000 +0000
14390
@@ -185,6 +185,7 @@
14391
PACKAGE_NAME = @PACKAGE_NAME@
14392
PACKAGE_STRING = @PACKAGE_STRING@
14393
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14394
+PACKAGE_URL = @PACKAGE_URL@
14395
PACKAGE_VERSION = @PACKAGE_VERSION@
14396
PANEL_CFLAGS = @PANEL_CFLAGS@
14397
PANEL_LIBS = @PANEL_LIBS@
14398
Index: gnome-power-manager-2.29.1/data/icons/scalable/apps/Makefile.in
14399
===================================================================
14400
--- gnome-power-manager-2.29.1.orig/data/icons/scalable/apps/Makefile.in 2009-11-02 13:05:49.000000000 +0000
14401
+++ gnome-power-manager-2.29.1/data/icons/scalable/apps/Makefile.in 2010-01-19 00:29:11.000000000 +0000
14402
@@ -185,6 +185,7 @@
14403
PACKAGE_NAME = @PACKAGE_NAME@
14404
PACKAGE_STRING = @PACKAGE_STRING@
14405
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14406
+PACKAGE_URL = @PACKAGE_URL@
14407
PACKAGE_VERSION = @PACKAGE_VERSION@
14408
PANEL_CFLAGS = @PANEL_CFLAGS@
14409
PANEL_LIBS = @PANEL_LIBS@
14410
Index: gnome-power-manager-2.29.1/data/icons/scalable/Makefile.in
14411
===================================================================
14412
--- gnome-power-manager-2.29.1.orig/data/icons/scalable/Makefile.in 2009-11-02 13:05:48.000000000 +0000
14413
+++ gnome-power-manager-2.29.1/data/icons/scalable/Makefile.in 2010-01-19 00:29:11.000000000 +0000
14414
@@ -201,6 +201,7 @@
14415
PACKAGE_NAME = @PACKAGE_NAME@
14416
PACKAGE_STRING = @PACKAGE_STRING@
14417
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14418
+PACKAGE_URL = @PACKAGE_URL@
14419
PACKAGE_VERSION = @PACKAGE_VERSION@
14420
PANEL_CFLAGS = @PANEL_CFLAGS@
14421
PANEL_LIBS = @PANEL_LIBS@
14422
Index: gnome-power-manager-2.29.1/data/icons/scalable/status/Makefile.in
14423
===================================================================
14424
--- gnome-power-manager-2.29.1.orig/data/icons/scalable/status/Makefile.in 2009-11-02 13:05:49.000000000 +0000
14425
+++ gnome-power-manager-2.29.1/data/icons/scalable/status/Makefile.in 2010-01-19 00:29:11.000000000 +0000
14426
@@ -185,6 +185,7 @@
14427
PACKAGE_NAME = @PACKAGE_NAME@
14428
PACKAGE_STRING = @PACKAGE_STRING@
14429
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14430
+PACKAGE_URL = @PACKAGE_URL@
14431
PACKAGE_VERSION = @PACKAGE_VERSION@
14432
PANEL_CFLAGS = @PANEL_CFLAGS@
14433
PANEL_LIBS = @PANEL_LIBS@
14434
Index: gnome-power-manager-2.29.1/data/Makefile.in
14435
===================================================================
14436
--- gnome-power-manager-2.29.1.orig/data/Makefile.in 2009-11-18 08:42:19.000000000 +0000
14437
+++ gnome-power-manager-2.29.1/data/Makefile.in 2010-01-19 00:29:09.000000000 +0000
14438
@@ -233,6 +233,7 @@
14439
PACKAGE_NAME = @PACKAGE_NAME@
14440
PACKAGE_STRING = @PACKAGE_STRING@
14441
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14442
+PACKAGE_URL = @PACKAGE_URL@
14443
PACKAGE_VERSION = @PACKAGE_VERSION@
14444
PANEL_CFLAGS = @PANEL_CFLAGS@
14445
PANEL_LIBS = @PANEL_LIBS@
14446
Index: gnome-power-manager-2.29.1/docs/Makefile.in
14447
===================================================================
14448
--- gnome-power-manager-2.29.1.orig/docs/Makefile.in 2009-11-02 13:05:49.000000000 +0000
14449
+++ gnome-power-manager-2.29.1/docs/Makefile.in 2010-01-19 00:29:11.000000000 +0000
14450
@@ -161,6 +161,7 @@
14451
PACKAGE_NAME = @PACKAGE_NAME@
14452
PACKAGE_STRING = @PACKAGE_STRING@
14453
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14454
+PACKAGE_URL = @PACKAGE_URL@
14455
PACKAGE_VERSION = @PACKAGE_VERSION@
14456
PANEL_CFLAGS = @PANEL_CFLAGS@
14457
PANEL_LIBS = @PANEL_LIBS@
14458
Index: gnome-power-manager-2.29.1/help/Makefile.in
14459
===================================================================
14460
--- gnome-power-manager-2.29.1.orig/help/Makefile.in 2009-11-23 14:26:37.000000000 +0000
14461
+++ gnome-power-manager-2.29.1/help/Makefile.in 2010-01-19 00:29:11.000000000 +0000
14462
@@ -186,6 +186,7 @@
14463
PACKAGE_NAME = @PACKAGE_NAME@
14464
PACKAGE_STRING = @PACKAGE_STRING@
14465
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14466
+PACKAGE_URL = @PACKAGE_URL@
14467
PACKAGE_VERSION = @PACKAGE_VERSION@
14468
PANEL_CFLAGS = @PANEL_CFLAGS@
14469
PANEL_LIBS = @PANEL_LIBS@
14470
Index: gnome-power-manager-2.29.1/libhal-glib/Makefile.in
14471
===================================================================
14472
--- gnome-power-manager-2.29.1.orig/libhal-glib/Makefile.in 2009-11-02 13:05:49.000000000 +0000
14473
+++ gnome-power-manager-2.29.1/libhal-glib/Makefile.in 2010-01-19 00:29:11.000000000 +0000
14474
@@ -194,6 +194,7 @@
14475
PACKAGE_NAME = @PACKAGE_NAME@
14476
PACKAGE_STRING = @PACKAGE_STRING@
14477
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14478
+PACKAGE_URL = @PACKAGE_URL@
14479
PACKAGE_VERSION = @PACKAGE_VERSION@
14480
PANEL_CFLAGS = @PANEL_CFLAGS@
14481
PANEL_LIBS = @PANEL_LIBS@
14482
Index: gnome-power-manager-2.29.1/Makefile.in
14483
===================================================================
14484
--- gnome-power-manager-2.29.1.orig/Makefile.in 2009-11-02 13:05:50.000000000 +0000
14485
+++ gnome-power-manager-2.29.1/Makefile.in 2010-01-19 00:29:12.000000000 +0000
14486
@@ -41,14 +41,9 @@
14487
subdir = .
14488
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
14489
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
14490
- $(top_srcdir)/configure \
14491
- $(top_srcdir)/data/icons/16x16/apps/Makefile.in \
14492
- $(top_srcdir)/data/icons/22x22/apps/Makefile.in \
14493
- $(top_srcdir)/data/icons/24x24/apps/Makefile.in \
14494
- $(top_srcdir)/data/icons/32x32/apps/Makefile.in \
14495
- $(top_srcdir)/data/icons/48x48/apps/Makefile.in AUTHORS \
14496
- COPYING ChangeLog INSTALL NEWS TODO compile config.guess \
14497
- config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
14498
+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
14499
+ TODO compile config.guess config.sub depcomp install-sh \
14500
+ ltmain.sh missing mkinstalldirs
14501
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
14502
am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
14503
$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
14504
@@ -61,9 +56,7 @@
14505
configure.lineno config.status.lineno
14506
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14507
CONFIG_HEADER = config.h
14508
-CONFIG_CLEAN_FILES = data/icons/16x16/apps/Makefile \
14509
- data/icons/22x22/apps/Makefile data/icons/24x24/apps/Makefile \
14510
- data/icons/32x32/apps/Makefile data/icons/48x48/apps/Makefile
14511
+CONFIG_CLEAN_FILES =
14512
CONFIG_CLEAN_VPATH_FILES =
14513
AM_V_GEN = $(am__v_GEN_$(V))
14514
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
14515
@@ -234,6 +227,7 @@
14516
PACKAGE_NAME = @PACKAGE_NAME@
14517
PACKAGE_STRING = @PACKAGE_STRING@
14518
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14519
+PACKAGE_URL = @PACKAGE_URL@
14520
PACKAGE_VERSION = @PACKAGE_VERSION@
14521
PANEL_CFLAGS = @PANEL_CFLAGS@
14522
PANEL_LIBS = @PANEL_LIBS@
14523
@@ -393,16 +387,6 @@
14524
14525
distclean-hdr:
14526
-rm -f config.h stamp-h1
14527
-data/icons/16x16/apps/Makefile: $(top_builddir)/config.status $(top_srcdir)/data/icons/16x16/apps/Makefile.in
14528
- cd $(top_builddir) && $(SHELL) ./config.status $@
14529
-data/icons/22x22/apps/Makefile: $(top_builddir)/config.status $(top_srcdir)/data/icons/22x22/apps/Makefile.in
14530
- cd $(top_builddir) && $(SHELL) ./config.status $@
14531
-data/icons/24x24/apps/Makefile: $(top_builddir)/config.status $(top_srcdir)/data/icons/24x24/apps/Makefile.in
14532
- cd $(top_builddir) && $(SHELL) ./config.status $@
14533
-data/icons/32x32/apps/Makefile: $(top_builddir)/config.status $(top_srcdir)/data/icons/32x32/apps/Makefile.in
14534
- cd $(top_builddir) && $(SHELL) ./config.status $@
14535
-data/icons/48x48/apps/Makefile: $(top_builddir)/config.status $(top_srcdir)/data/icons/48x48/apps/Makefile.in
14536
- cd $(top_builddir) && $(SHELL) ./config.status $@
14537
14538
mostlyclean-libtool:
14539
-rm -f *.lo
14540
Index: gnome-power-manager-2.29.1/man/Makefile.in
14541
===================================================================
14542
--- gnome-power-manager-2.29.1.orig/man/Makefile.in 2009-11-02 13:05:49.000000000 +0000
14543
+++ gnome-power-manager-2.29.1/man/Makefile.in 2010-01-19 00:29:11.000000000 +0000
14544
@@ -186,6 +186,7 @@
14545
PACKAGE_NAME = @PACKAGE_NAME@
14546
PACKAGE_STRING = @PACKAGE_STRING@
14547
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14548
+PACKAGE_URL = @PACKAGE_URL@
14549
PACKAGE_VERSION = @PACKAGE_VERSION@
14550
PANEL_CFLAGS = @PANEL_CFLAGS@
14551
PANEL_LIBS = @PANEL_LIBS@
14552
Index: gnome-power-manager-2.29.1/src/Makefile.in
14553
===================================================================
14554
--- gnome-power-manager-2.29.1.orig/src/Makefile.in 2009-11-18 08:41:15.000000000 +0000
14555
+++ gnome-power-manager-2.29.1/src/Makefile.in 2010-01-19 00:29:12.000000000 +0000
1436
+ linux* | k*bsd*-gnu)
1437
+ _LT_TAGVAR(link_all_deplibs, $1)=no
1438
+ ;;
1439
esac
1440
1441
_LT_TAGVAR(ld_shlibs, $1)=yes
1442
@@ -4270,6 +4285,7 @@
1443
fi
1444
supports_anon_versioning=no
1445
case `$LD -v 2>&1` in
1446
+ *GNU\ gold*) supports_anon_versioning=yes ;;
1447
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
1448
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
1449
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
1450
@@ -4361,7 +4377,7 @@
1451
_LT_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'
1452
;;
1453
1454
- gnu* | linux* | tpf* | k*bsd*-gnu)
1455
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
1456
tmp_diet=no
1457
if test "$host_os" = linux-dietlibc; then
1458
case $cc_basename in
1459
@@ -4431,7 +4447,7 @@
1460
fi
1461
;;
1462
1463
- netbsd*)
1464
+ netbsd* | netbsdelf*-gnu)
1465
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
1466
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
1467
wlarc=
1468
@@ -4606,6 +4622,7 @@
1469
if test "$aix_use_runtimelinking" = yes; then
1470
shared_flag="$shared_flag "'${wl}-G'
1471
fi
1472
+ _LT_TAGVAR(link_all_deplibs, $1)=no
1473
else
1474
# not using gcc
1475
if test "$host_cpu" = ia64; then
1476
@@ -4844,7 +4861,7 @@
1477
_LT_TAGVAR(link_all_deplibs, $1)=yes
1478
;;
1479
1480
- netbsd*)
1481
+ netbsd* | netbsdelf*-gnu)
1482
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
1483
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
1484
else
1485
@@ -5844,7 +5861,7 @@
1486
_LT_TAGVAR(inherit_rpath, $1)=yes
1487
;;
1488
1489
- linux* | k*bsd*-gnu)
1490
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
1491
case $cc_basename in
1492
KCC*)
1493
# Kuck and Associates, Inc. (KAI) C++ Compiler
1494
diff -Nur gnome-power-manager-2.29.2/m4/ltversion.m4 gnome-power-manager-2.29.2.new/m4/ltversion.m4
1495
--- gnome-power-manager-2.29.2/m4/ltversion.m4 2010-01-27 08:26:29.000000000 -0800
1496
+++ gnome-power-manager-2.29.2.new/m4/ltversion.m4 2010-02-05 13:12:50.000000000 -0800
1497
@@ -9,15 +9,15 @@
1498
1499
# Generated from ltversion.in.
1500
1501
-# serial 3012 ltversion.m4
1502
+# serial 3017 ltversion.m4
1503
# This file is part of GNU Libtool
1504
1505
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
1506
-m4_define([LT_PACKAGE_REVISION], [1.3012])
1507
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
1508
+m4_define([LT_PACKAGE_REVISION], [1.3017])
1509
1510
AC_DEFUN([LTVERSION_VERSION],
1511
-[macro_version='2.2.6'
1512
-macro_revision='1.3012'
1513
+[macro_version='2.2.6b'
1514
+macro_revision='1.3017'
1515
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
1516
_LT_DECL(, macro_revision, 0)
1517
])
1518
diff -Nur gnome-power-manager-2.29.2/src/Makefile.in gnome-power-manager-2.29.2.new/src/Makefile.in
1519
--- gnome-power-manager-2.29.2/src/Makefile.in 2010-01-27 12:28:48.000000000 -0800
1520
+++ gnome-power-manager-2.29.2.new/src/Makefile.in 2010-02-05 13:13:04.000000000 -0800
14556
1521
@@ -95,7 +95,9 @@
14557
1522
gpm-screensaver.c gpm-session.h gpm-session.c \
14558
1523
gpm-networkmanager.h gpm-networkmanager.c gpm-stock-icons.h \
14577
1542
gnome_power_manager_OBJECTS = $(am_gnome_power_manager_OBJECTS)
14578
1543
am__DEPENDENCIES_1 =
14579
1544
gnome_power_manager_DEPENDENCIES = libgpmshared.a \
14580
@@ -340,6 +344,7 @@
14581
PACKAGE_NAME = @PACKAGE_NAME@
14582
PACKAGE_STRING = @PACKAGE_STRING@
14583
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14584
+PACKAGE_URL = @PACKAGE_URL@
14585
PACKAGE_VERSION = @PACKAGE_VERSION@
14586
PANEL_CFLAGS = @PANEL_CFLAGS@
14587
PANEL_LIBS = @PANEL_LIBS@
14588
@@ -451,6 +456,7 @@
1545
@@ -454,6 +458,7 @@
14589
1546
-DSYSCONFDIR=\""$(sysconfdir)"\" \
14590
1547
-DLIBDIR=\""$(libdir)"\" \
14591
1548
-DVERSION="\"$(VERSION)\"" \
14593
1550
-DGPM_DATA=\"$(pkgdatadir)\" \
14594
1551
-DGTKBUILDERDIR=\"$(pkgdatadir)\" \
14595
1552
-DDKP_DISABLE_DEPRECATED \
14596
@@ -539,7 +545,9 @@
1553
@@ -543,7 +548,9 @@
14597
1554
gpm-screensaver.h gpm-screensaver.c gpm-session.h \
14598
1555
gpm-session.c gpm-networkmanager.h gpm-networkmanager.c \
14599
1556
gpm-stock-icons.h gsd-media-keys-window.h \
14602
1559
+ gpm-osd-notification.h gpm-osd-notification.c \
14603
1560
+ gsd-osd-notification.h gsd-osd-notification.c $(NULL) \
14604
1561
$(am__append_2)
14605
gnome_power_manager_LDADD = libgpmshared.a $(GLIB_LIBS) \
1562
gnome_power_manager_LDADD = libgpmshared.a $(GLIB_LIBS) $(X11_LIBS) \
14606
1563
$(GSTREAMER_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(XRANDR_LIBS) \
14607
@@ -755,12 +763,14 @@
1564
@@ -759,12 +766,14 @@
14608
1565
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_manager-gpm-main.Po@am__quote@
14609
1566
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_manager-gpm-manager.Po@am__quote@
14610
1567
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_manager-gpm-networkmanager.Po@am__quote@
14619
1576
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_preferences-gpm-prefs-core.Po@am__quote@
14620
1577
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_preferences-gpm-prefs.Po@am__quote@
14621
1578
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_self_test-egg-array-float.Po@am__quote@
14622
@@ -1123,6 +1133,38 @@
1579
@@ -1127,6 +1136,38 @@
14623
1580
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
14624
1581
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_manager_CFLAGS) $(CFLAGS) -c -o gnome_power_manager-gpm-engine.obj `if test -f 'gpm-engine.c'; then $(CYGPATH_W) 'gpm-engine.c'; else $(CYGPATH_W) '$(srcdir)/gpm-engine.c'; fi`
14625
1582
14658
1615
gnome_power_manager-gpm-brightness-hal.o: gpm-brightness-hal.c
14659
1616
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_manager_CFLAGS) $(CFLAGS) -MT gnome_power_manager-gpm-brightness-hal.o -MD -MP -MF $(DEPDIR)/gnome_power_manager-gpm-brightness-hal.Tpo -c -o gnome_power_manager-gpm-brightness-hal.o `test -f 'gpm-brightness-hal.c' || echo '$(srcdir)/'`gpm-brightness-hal.c
14660
1617
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_manager-gpm-brightness-hal.Tpo $(DEPDIR)/gnome_power_manager-gpm-brightness-hal.Po
14661
Index: gnome-power-manager-2.29.1/tools/Makefile.in
14662
===================================================================
14663
--- gnome-power-manager-2.29.1.orig/tools/Makefile.in 2009-11-02 13:05:50.000000000 +0000
14664
+++ gnome-power-manager-2.29.1/tools/Makefile.in 2010-01-19 00:29:12.000000000 +0000
14665
@@ -185,6 +185,7 @@
14666
PACKAGE_NAME = @PACKAGE_NAME@
14667
PACKAGE_STRING = @PACKAGE_STRING@
14668
PACKAGE_TARNAME = @PACKAGE_TARNAME@
14669
+PACKAGE_URL = @PACKAGE_URL@
14670
PACKAGE_VERSION = @PACKAGE_VERSION@
14671
PANEL_CFLAGS = @PANEL_CFLAGS@
14672
PANEL_LIBS = @PANEL_LIBS@
Loggerhead is a web-based interface for Breezy
Version: 2.0.1