diff options
-rw-r--r-- | INSTALL | 69 | ||||
-rw-r--r-- | TODO | 6 | ||||
-rw-r--r-- | libltdl/Makefile.in | 67 | ||||
-rw-r--r-- | libltdl/aclocal.m4 | 644 | ||||
-rwxr-xr-x | libltdl/config.guess | 63 | ||||
-rwxr-xr-x | libltdl/config.sub | 87 | ||||
-rwxr-xr-x | libltdl/configure | 8571 | ||||
-rwxr-xr-x | libltdl/install-sh | 102 | ||||
-rw-r--r-- | libltdl/ltmain.sh | 12 | ||||
-rwxr-xr-x | libltdl/missing | 92 | ||||
-rw-r--r-- | ltmain.sh | 12 | ||||
-rw-r--r-- | mkinstalldirs | 26 | ||||
-rw-r--r-- | src/plugins/fs/collection.c | 44 | ||||
-rw-r--r-- | src/plugins/fs/collection.h | 5 | ||||
-rw-r--r-- | src/plugins/fs/download.c | 144 | ||||
-rw-r--r-- | src/plugins/fs/download.h | 3 | ||||
-rw-r--r-- | src/plugins/fs/fs.c | 88 | ||||
-rw-r--r-- | src/plugins/fs/fs.h | 1 | ||||
-rw-r--r-- | src/plugins/fs/meta.c | 2 | ||||
-rw-r--r-- | src/plugins/fs/namespace.c | 128 | ||||
-rw-r--r-- | src/plugins/fs/namespace.h | 5 | ||||
-rw-r--r-- | src/plugins/fs/search.c | 90 | ||||
-rw-r--r-- | src/plugins/fs/search.h | 8 | ||||
-rw-r--r-- | src/plugins/fs/upload.c | 230 | ||||
-rw-r--r-- | src/plugins/fs/upload.h | 7 |
25 files changed, 4537 insertions, 5969 deletions
@@ -1,13 +1,16 @@ | |||
1 | Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software | 1 | Installation Instructions |
2 | Foundation, Inc. | 2 | ************************* |
3 | 3 | ||
4 | This file is free documentation; the Free Software Foundation gives | 4 | Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free |
5 | Software Foundation, Inc. | ||
6 | |||
7 | This file is free documentation; the Free Software Foundation gives | ||
5 | unlimited permission to copy, distribute and modify it. | 8 | unlimited permission to copy, distribute and modify it. |
6 | 9 | ||
7 | Basic Installation | 10 | Basic Installation |
8 | ================== | 11 | ================== |
9 | 12 | ||
10 | These are generic installation instructions. | 13 | These are generic installation instructions. |
11 | 14 | ||
12 | The `configure' shell script attempts to guess correct values for | 15 | The `configure' shell script attempts to guess correct values for |
13 | various system-dependent variables used during compilation. It uses | 16 | various system-dependent variables used during compilation. It uses |
@@ -67,9 +70,9 @@ The simplest way to compile this package is: | |||
67 | Compilers and Options | 70 | Compilers and Options |
68 | ===================== | 71 | ===================== |
69 | 72 | ||
70 | Some systems require unusual options for compilation or linking that | 73 | Some systems require unusual options for compilation or linking that the |
71 | the `configure' script does not know about. Run `./configure --help' | 74 | `configure' script does not know about. Run `./configure --help' for |
72 | for details on some of the pertinent environment variables. | 75 | details on some of the pertinent environment variables. |
73 | 76 | ||
74 | You can give `configure' initial values for configuration parameters | 77 | You can give `configure' initial values for configuration parameters |
75 | by setting variables in the command line or in the environment. Here | 78 | by setting variables in the command line or in the environment. Here |
@@ -82,7 +85,7 @@ is an example: | |||
82 | Compiling For Multiple Architectures | 85 | Compiling For Multiple Architectures |
83 | ==================================== | 86 | ==================================== |
84 | 87 | ||
85 | You can compile the package for more than one kind of computer at the | 88 | You can compile the package for more than one kind of computer at the |
86 | same time, by placing the object files for each architecture in their | 89 | same time, by placing the object files for each architecture in their |
87 | own directory. To do this, you must use a version of `make' that | 90 | own directory. To do this, you must use a version of `make' that |
88 | supports the `VPATH' variable, such as GNU `make'. `cd' to the | 91 | supports the `VPATH' variable, such as GNU `make'. `cd' to the |
@@ -99,19 +102,19 @@ for another architecture. | |||
99 | Installation Names | 102 | Installation Names |
100 | ================== | 103 | ================== |
101 | 104 | ||
102 | By default, `make install' will install the package's files in | 105 | By default, `make install' installs the package's commands under |
103 | `/usr/local/bin', `/usr/local/man', etc. You can specify an | 106 | `/usr/local/bin', include files under `/usr/local/include', etc. You |
104 | installation prefix other than `/usr/local' by giving `configure' the | 107 | can specify an installation prefix other than `/usr/local' by giving |
105 | option `--prefix=PATH'. | 108 | `configure' the option `--prefix=PREFIX'. |
106 | 109 | ||
107 | You can specify separate installation prefixes for | 110 | You can specify separate installation prefixes for |
108 | architecture-specific files and architecture-independent files. If you | 111 | architecture-specific files and architecture-independent files. If you |
109 | give `configure' the option `--exec-prefix=PATH', the package will use | 112 | pass the option `--exec-prefix=PREFIX' to `configure', the package uses |
110 | PATH as the prefix for installing programs and libraries. | 113 | PREFIX as the prefix for installing programs and libraries. |
111 | Documentation and other data files will still use the regular prefix. | 114 | Documentation and other data files still use the regular prefix. |
112 | 115 | ||
113 | In addition, if you use an unusual directory layout you can give | 116 | In addition, if you use an unusual directory layout you can give |
114 | options like `--bindir=PATH' to specify different values for particular | 117 | options like `--bindir=DIR' to specify different values for particular |
115 | kinds of files. Run `configure --help' for a list of the directories | 118 | kinds of files. Run `configure --help' for a list of the directories |
116 | you can set and what kinds of files go in them. | 119 | you can set and what kinds of files go in them. |
117 | 120 | ||
@@ -122,7 +125,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. | |||
122 | Optional Features | 125 | Optional Features |
123 | ================= | 126 | ================= |
124 | 127 | ||
125 | Some packages pay attention to `--enable-FEATURE' options to | 128 | Some packages pay attention to `--enable-FEATURE' options to |
126 | `configure', where FEATURE indicates an optional part of the package. | 129 | `configure', where FEATURE indicates an optional part of the package. |
127 | They may also pay attention to `--with-PACKAGE' options, where PACKAGE | 130 | They may also pay attention to `--with-PACKAGE' options, where PACKAGE |
128 | is something like `gnu-as' or `x' (for the X Window System). The | 131 | is something like `gnu-as' or `x' (for the X Window System). The |
@@ -137,11 +140,11 @@ you can use the `configure' options `--x-includes=DIR' and | |||
137 | Specifying the System Type | 140 | Specifying the System Type |
138 | ========================== | 141 | ========================== |
139 | 142 | ||
140 | There may be some features `configure' cannot figure out | 143 | There may be some features `configure' cannot figure out automatically, |
141 | automatically, but needs to determine by the type of machine the package | 144 | but needs to determine by the type of machine the package will run on. |
142 | will run on. Usually, assuming the package is built to be run on the | 145 | Usually, assuming the package is built to be run on the _same_ |
143 | _same_ architectures, `configure' can figure that out, but if it prints | 146 | architectures, `configure' can figure that out, but if it prints a |
144 | a message saying it cannot guess the machine type, give it the | 147 | message saying it cannot guess the machine type, give it the |
145 | `--build=TYPE' option. TYPE can either be a short name for the system | 148 | `--build=TYPE' option. TYPE can either be a short name for the system |
146 | type, such as `sun4', or a canonical name which has the form: | 149 | type, such as `sun4', or a canonical name which has the form: |
147 | 150 | ||
@@ -156,7 +159,7 @@ where SYSTEM can have one of these forms: | |||
156 | need to know the machine type. | 159 | need to know the machine type. |
157 | 160 | ||
158 | If you are _building_ compiler tools for cross-compiling, you should | 161 | If you are _building_ compiler tools for cross-compiling, you should |
159 | use the `--target=TYPE' option to select the type of system they will | 162 | use the option `--target=TYPE' to select the type of system they will |
160 | produce code for. | 163 | produce code for. |
161 | 164 | ||
162 | If you want to _use_ a cross compiler, that generates code for a | 165 | If you want to _use_ a cross compiler, that generates code for a |
@@ -167,9 +170,9 @@ eventually be run) with `--host=TYPE'. | |||
167 | Sharing Defaults | 170 | Sharing Defaults |
168 | ================ | 171 | ================ |
169 | 172 | ||
170 | If you want to set default values for `configure' scripts to share, | 173 | If you want to set default values for `configure' scripts to share, you |
171 | you can create a site shell script called `config.site' that gives | 174 | can create a site shell script called `config.site' that gives default |
172 | default values for variables like `CC', `cache_file', and `prefix'. | 175 | values for variables like `CC', `cache_file', and `prefix'. |
173 | `configure' looks for `PREFIX/share/config.site' if it exists, then | 176 | `configure' looks for `PREFIX/share/config.site' if it exists, then |
174 | `PREFIX/etc/config.site' if it exists. Or, you can set the | 177 | `PREFIX/etc/config.site' if it exists. Or, you can set the |
175 | `CONFIG_SITE' environment variable to the location of the site script. | 178 | `CONFIG_SITE' environment variable to the location of the site script. |
@@ -178,7 +181,7 @@ A warning: not all `configure' scripts look for a site script. | |||
178 | Defining Variables | 181 | Defining Variables |
179 | ================== | 182 | ================== |
180 | 183 | ||
181 | Variables not defined in a site shell script can be set in the | 184 | Variables not defined in a site shell script can be set in the |
182 | environment passed to `configure'. However, some packages may run | 185 | environment passed to `configure'. However, some packages may run |
183 | configure again during the build, and the customized values of these | 186 | configure again during the build, and the customized values of these |
184 | variables may be lost. In order to avoid this problem, you should set | 187 | variables may be lost. In order to avoid this problem, you should set |
@@ -186,14 +189,18 @@ them in the `configure' command line, using `VAR=value'. For example: | |||
186 | 189 | ||
187 | ./configure CC=/usr/local2/bin/gcc | 190 | ./configure CC=/usr/local2/bin/gcc |
188 | 191 | ||
189 | will cause the specified gcc to be used as the C compiler (unless it is | 192 | causes the specified `gcc' to be used as the C compiler (unless it is |
190 | overridden in the site shell script). | 193 | overridden in the site shell script). Here is a another example: |
194 | |||
195 | /bin/bash ./configure CONFIG_SHELL=/bin/bash | ||
196 | |||
197 | Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent | ||
198 | configuration-related scripts to be executed by `/bin/bash'. | ||
191 | 199 | ||
192 | `configure' Invocation | 200 | `configure' Invocation |
193 | ====================== | 201 | ====================== |
194 | 202 | ||
195 | `configure' recognizes the following options to control how it | 203 | `configure' recognizes the following options to control how it operates. |
196 | operates. | ||
197 | 204 | ||
198 | `--help' | 205 | `--help' |
199 | `-h' | 206 | `-h' |
@@ -1,6 +1,8 @@ | |||
1 | 0.7.1: | 1 | 0.7.1:; |
2 | - support abort of search (without killing it) | ||
3 | - support new FSUI apis | 2 | - support new FSUI apis |
3 | - namespace content list: | ||
4 | avoid repeatedly calling slow gnunet-gtk iterator (see drupal) | ||
5 | - support abort of search (without killing it) | ||
4 | - fix custom gtk logger (via memory logger?) | 6 | - fix custom gtk logger (via memory logger?) |
5 | - create directory from known file IDs [ medium ] | 7 | - create directory from known file IDs [ medium ] |
6 | in Assemble Directory's Files Available/Selected | 8 | in Assemble Directory's Files Available/Selected |
diff --git a/libltdl/Makefile.in b/libltdl/Makefile.in index 228b7ce8..3a2edf5b 100644 --- a/libltdl/Makefile.in +++ b/libltdl/Makefile.in | |||
@@ -1,8 +1,8 @@ | |||
1 | # Makefile.in generated by automake 1.8.5 from Makefile.am. | 1 | # Makefile.in generated by automake 1.9.6 from Makefile.am. |
2 | # @configure_input@ | 2 | # @configure_input@ |
3 | 3 | ||
4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
5 | # 2003, 2004 Free Software Foundation, Inc. | 5 | # 2003, 2004, 2005 Free Software Foundation, Inc. |
6 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
7 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
8 | # with or without modifications, as long as this notice is preserved. | 8 | # with or without modifications, as long as this notice is preserved. |
@@ -15,8 +15,6 @@ | |||
15 | @SET_MAKE@ | 15 | @SET_MAKE@ |
16 | 16 | ||
17 | 17 | ||
18 | SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES) | ||
19 | |||
20 | srcdir = @srcdir@ | 18 | srcdir = @srcdir@ |
21 | top_srcdir = @top_srcdir@ | 19 | top_srcdir = @top_srcdir@ |
22 | VPATH = @srcdir@ | 20 | VPATH = @srcdir@ |
@@ -37,6 +35,7 @@ POST_INSTALL = : | |||
37 | NORMAL_UNINSTALL = : | 35 | NORMAL_UNINSTALL = : |
38 | PRE_UNINSTALL = : | 36 | PRE_UNINSTALL = : |
39 | POST_UNINSTALL = : | 37 | POST_UNINSTALL = : |
38 | build_triplet = @build@ | ||
40 | host_triplet = @host@ | 39 | host_triplet = @host@ |
41 | DIST_COMMON = README $(am__configure_deps) $(am__include_HEADERS_DIST) \ | 40 | DIST_COMMON = README $(am__configure_deps) $(am__include_HEADERS_DIST) \ |
42 | $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \ | 41 | $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \ |
@@ -50,9 +49,15 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | |||
50 | $(ACLOCAL_M4) | 49 | $(ACLOCAL_M4) |
51 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ | 50 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
52 | configure.lineno configure.status.lineno | 51 | configure.lineno configure.status.lineno |
53 | mkinstalldirs = $(mkdir_p) | 52 | mkinstalldirs = $(install_sh) -d |
54 | CONFIG_HEADER = config.h | 53 | CONFIG_HEADER = config.h |
55 | CONFIG_CLEAN_FILES = | 54 | CONFIG_CLEAN_FILES = |
55 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | ||
56 | am__vpath_adj = case $$p in \ | ||
57 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
58 | *) f=$$p;; \ | ||
59 | esac; | ||
60 | am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; | ||
56 | am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" | 61 | am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" |
57 | libLTLIBRARIES_INSTALL = $(INSTALL) | 62 | libLTLIBRARIES_INSTALL = $(INSTALL) |
58 | LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) | 63 | LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) |
@@ -60,19 +65,21 @@ am__DEPENDENCIES_1 = | |||
60 | libltdl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) | 65 | libltdl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) |
61 | am_libltdl_la_OBJECTS = ltdl.lo | 66 | am_libltdl_la_OBJECTS = ltdl.lo |
62 | libltdl_la_OBJECTS = $(am_libltdl_la_OBJECTS) | 67 | libltdl_la_OBJECTS = $(am_libltdl_la_OBJECTS) |
68 | @INSTALL_LTDL_TRUE@am_libltdl_la_rpath = -rpath $(libdir) | ||
63 | libltdlc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) | 69 | libltdlc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) |
64 | am_libltdlc_la_OBJECTS = ltdl.lo | 70 | am_libltdlc_la_OBJECTS = ltdl.lo |
65 | libltdlc_la_OBJECTS = $(am_libltdlc_la_OBJECTS) | 71 | libltdlc_la_OBJECTS = $(am_libltdlc_la_OBJECTS) |
72 | @CONVENIENCE_LTDL_TRUE@am_libltdlc_la_rpath = | ||
66 | DEFAULT_INCLUDES = -I. -I$(srcdir) -I. | 73 | DEFAULT_INCLUDES = -I. -I$(srcdir) -I. |
67 | depcomp = | 74 | depcomp = |
68 | am__depfiles_maybe = | 75 | am__depfiles_maybe = |
69 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | 76 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
70 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | 77 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
71 | LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ | 78 | LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ |
72 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | 79 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ |
73 | $(AM_CFLAGS) $(CFLAGS) | 80 | $(AM_CFLAGS) $(CFLAGS) |
74 | CCLD = $(CC) | 81 | CCLD = $(CC) |
75 | LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | 82 | LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
76 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | 83 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
77 | SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES) | 84 | SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES) |
78 | DIST_SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES) | 85 | DIST_SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES) |
@@ -126,7 +133,6 @@ EGREP = @EGREP@ | |||
126 | EXEEXT = @EXEEXT@ | 133 | EXEEXT = @EXEEXT@ |
127 | F77 = @F77@ | 134 | F77 = @F77@ |
128 | FFLAGS = @FFLAGS@ | 135 | FFLAGS = @FFLAGS@ |
129 | GREP = @GREP@ | ||
130 | INSTALL_DATA = @INSTALL_DATA@ | 136 | INSTALL_DATA = @INSTALL_DATA@ |
131 | INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ | 137 | INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ |
132 | INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ | 138 | INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ |
@@ -159,9 +165,15 @@ SET_MAKE = @SET_MAKE@ | |||
159 | SHELL = @SHELL@ | 165 | SHELL = @SHELL@ |
160 | STRIP = @STRIP@ | 166 | STRIP = @STRIP@ |
161 | VERSION = @VERSION@ | 167 | VERSION = @VERSION@ |
168 | ac_ct_AR = @ac_ct_AR@ | ||
169 | ac_ct_AS = @ac_ct_AS@ | ||
162 | ac_ct_CC = @ac_ct_CC@ | 170 | ac_ct_CC = @ac_ct_CC@ |
163 | ac_ct_CXX = @ac_ct_CXX@ | 171 | ac_ct_CXX = @ac_ct_CXX@ |
172 | ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ | ||
164 | ac_ct_F77 = @ac_ct_F77@ | 173 | ac_ct_F77 = @ac_ct_F77@ |
174 | ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ | ||
175 | ac_ct_RANLIB = @ac_ct_RANLIB@ | ||
176 | ac_ct_STRIP = @ac_ct_STRIP@ | ||
165 | am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ | 177 | am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ |
166 | am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ | 178 | am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ |
167 | am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ | 179 | am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ |
@@ -169,6 +181,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ | |||
169 | am__include = @am__include@ | 181 | am__include = @am__include@ |
170 | am__leading_dot = @am__leading_dot@ | 182 | am__leading_dot = @am__leading_dot@ |
171 | am__quote = @am__quote@ | 183 | am__quote = @am__quote@ |
184 | am__tar = @am__tar@ | ||
185 | am__untar = @am__untar@ | ||
172 | bindir = @bindir@ | 186 | bindir = @bindir@ |
173 | build = @build@ | 187 | build = @build@ |
174 | build_alias = @build_alias@ | 188 | build_alias = @build_alias@ |
@@ -176,30 +190,23 @@ build_cpu = @build_cpu@ | |||
176 | build_os = @build_os@ | 190 | build_os = @build_os@ |
177 | build_vendor = @build_vendor@ | 191 | build_vendor = @build_vendor@ |
178 | datadir = @datadir@ | 192 | datadir = @datadir@ |
179 | datarootdir = @datarootdir@ | ||
180 | docdir = @docdir@ | ||
181 | dvidir = @dvidir@ | ||
182 | exec_prefix = @exec_prefix@ | 193 | exec_prefix = @exec_prefix@ |
183 | host = @host@ | 194 | host = @host@ |
184 | host_alias = @host_alias@ | 195 | host_alias = @host_alias@ |
185 | host_cpu = @host_cpu@ | 196 | host_cpu = @host_cpu@ |
186 | host_os = @host_os@ | 197 | host_os = @host_os@ |
187 | host_vendor = @host_vendor@ | 198 | host_vendor = @host_vendor@ |
188 | htmldir = @htmldir@ | ||
189 | includedir = @includedir@ | 199 | includedir = @includedir@ |
190 | infodir = @infodir@ | 200 | infodir = @infodir@ |
191 | install_sh = @install_sh@ | 201 | install_sh = @install_sh@ |
192 | libdir = @libdir@ | 202 | libdir = @libdir@ |
193 | libexecdir = @libexecdir@ | 203 | libexecdir = @libexecdir@ |
194 | localedir = @localedir@ | ||
195 | localstatedir = @localstatedir@ | 204 | localstatedir = @localstatedir@ |
196 | mandir = @mandir@ | 205 | mandir = @mandir@ |
197 | mkdir_p = @mkdir_p@ | 206 | mkdir_p = @mkdir_p@ |
198 | oldincludedir = @oldincludedir@ | 207 | oldincludedir = @oldincludedir@ |
199 | pdfdir = @pdfdir@ | ||
200 | prefix = @prefix@ | 208 | prefix = @prefix@ |
201 | program_transform_name = @program_transform_name@ | 209 | program_transform_name = @program_transform_name@ |
202 | psdir = @psdir@ | ||
203 | sbindir = @sbindir@ | 210 | sbindir = @sbindir@ |
204 | sharedstatedir = @sharedstatedir@ | 211 | sharedstatedir = @sharedstatedir@ |
205 | sysconfdir = @sysconfdir@ | 212 | sysconfdir = @sysconfdir@ |
@@ -275,7 +282,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) | |||
275 | test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" | 282 | test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" |
276 | @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | 283 | @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ |
277 | if test -f $$p; then \ | 284 | if test -f $$p; then \ |
278 | f="`echo $$p | sed -e 's|^.*/||'`"; \ | 285 | f=$(am__strip_dir) \ |
279 | echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ | 286 | echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ |
280 | $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ | 287 | $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ |
281 | else :; fi; \ | 288 | else :; fi; \ |
@@ -283,8 +290,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) | |||
283 | 290 | ||
284 | uninstall-libLTLIBRARIES: | 291 | uninstall-libLTLIBRARIES: |
285 | @$(NORMAL_UNINSTALL) | 292 | @$(NORMAL_UNINSTALL) |
286 | @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | 293 | @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ |
287 | p="`echo $$p | sed -e 's|^.*/||'`"; \ | 294 | p=$(am__strip_dir) \ |
288 | echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ | 295 | echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ |
289 | $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ | 296 | $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ |
290 | done | 297 | done |
@@ -307,9 +314,9 @@ clean-noinstLTLIBRARIES: | |||
307 | rm -f "$${dir}/so_locations"; \ | 314 | rm -f "$${dir}/so_locations"; \ |
308 | done | 315 | done |
309 | libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES) | 316 | libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES) |
310 | $(LINK) -rpath $(libdir) $(libltdl_la_LDFLAGS) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS) | 317 | $(LINK) $(am_libltdl_la_rpath) $(libltdl_la_LDFLAGS) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS) |
311 | libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES) | 318 | libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES) |
312 | $(LINK) $(libltdlc_la_LDFLAGS) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS) | 319 | $(LINK) $(am_libltdlc_la_rpath) $(libltdlc_la_LDFLAGS) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS) |
313 | 320 | ||
314 | mostlyclean-compile: | 321 | mostlyclean-compile: |
315 | -rm -f *.$(OBJEXT) | 322 | -rm -f *.$(OBJEXT) |
@@ -340,7 +347,7 @@ install-includeHEADERS: $(include_HEADERS) | |||
340 | test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" | 347 | test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" |
341 | @list='$(include_HEADERS)'; for p in $$list; do \ | 348 | @list='$(include_HEADERS)'; for p in $$list; do \ |
342 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | 349 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
343 | f="`echo $$p | sed -e 's|^.*/||'`"; \ | 350 | f=$(am__strip_dir) \ |
344 | echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ | 351 | echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ |
345 | $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ | 352 | $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ |
346 | done | 353 | done |
@@ -348,7 +355,7 @@ install-includeHEADERS: $(include_HEADERS) | |||
348 | uninstall-includeHEADERS: | 355 | uninstall-includeHEADERS: |
349 | @$(NORMAL_UNINSTALL) | 356 | @$(NORMAL_UNINSTALL) |
350 | @list='$(include_HEADERS)'; for p in $$list; do \ | 357 | @list='$(include_HEADERS)'; for p in $$list; do \ |
351 | f="`echo $$p | sed -e 's|^.*/||'`"; \ | 358 | f=$(am__strip_dir) \ |
352 | echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ | 359 | echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ |
353 | rm -f "$(DESTDIR)$(includedir)/$$f"; \ | 360 | rm -f "$(DESTDIR)$(includedir)/$$f"; \ |
354 | done | 361 | done |
@@ -436,15 +443,15 @@ distdir: $(DISTFILES) | |||
436 | ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ | 443 | ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ |
437 | || chmod -R a+r $(distdir) | 444 | || chmod -R a+r $(distdir) |
438 | dist-gzip: distdir | 445 | dist-gzip: distdir |
439 | $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | 446 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
440 | $(am__remove_distdir) | 447 | $(am__remove_distdir) |
441 | 448 | ||
442 | dist-bzip2: distdir | 449 | dist-bzip2: distdir |
443 | $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 | 450 | tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
444 | $(am__remove_distdir) | 451 | $(am__remove_distdir) |
445 | 452 | ||
446 | dist-tarZ: distdir | 453 | dist-tarZ: distdir |
447 | $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z | 454 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
448 | $(am__remove_distdir) | 455 | $(am__remove_distdir) |
449 | 456 | ||
450 | dist-shar: distdir | 457 | dist-shar: distdir |
@@ -457,7 +464,7 @@ dist-zip: distdir | |||
457 | $(am__remove_distdir) | 464 | $(am__remove_distdir) |
458 | 465 | ||
459 | dist dist-all: distdir | 466 | dist dist-all: distdir |
460 | $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | 467 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
461 | $(am__remove_distdir) | 468 | $(am__remove_distdir) |
462 | 469 | ||
463 | # This target untars the dist file and tries a VPATH configuration. Then | 470 | # This target untars the dist file and tries a VPATH configuration. Then |
@@ -466,11 +473,11 @@ dist dist-all: distdir | |||
466 | distcheck: dist | 473 | distcheck: dist |
467 | case '$(DIST_ARCHIVES)' in \ | 474 | case '$(DIST_ARCHIVES)' in \ |
468 | *.tar.gz*) \ | 475 | *.tar.gz*) \ |
469 | GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ | 476 | GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ |
470 | *.tar.bz2*) \ | 477 | *.tar.bz2*) \ |
471 | bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ | 478 | bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ |
472 | *.tar.Z*) \ | 479 | *.tar.Z*) \ |
473 | uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ | 480 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ |
474 | *.shar.gz*) \ | 481 | *.shar.gz*) \ |
475 | GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ | 482 | GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ |
476 | *.zip*) \ | 483 | *.zip*) \ |
@@ -554,7 +561,7 @@ clean-generic: | |||
554 | -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) | 561 | -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) |
555 | 562 | ||
556 | distclean-generic: | 563 | distclean-generic: |
557 | -rm -f $(CONFIG_CLEAN_FILES) | 564 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
558 | 565 | ||
559 | maintainer-clean-generic: | 566 | maintainer-clean-generic: |
560 | @echo "This command is intended for maintainers to use" | 567 | @echo "This command is intended for maintainers to use" |
diff --git a/libltdl/aclocal.m4 b/libltdl/aclocal.m4 index 4f3077ba..a3321548 100644 --- a/libltdl/aclocal.m4 +++ b/libltdl/aclocal.m4 | |||
@@ -1,7 +1,7 @@ | |||
1 | # generated automatically by aclocal 1.8.5 -*- Autoconf -*- | 1 | # generated automatically by aclocal 1.9.6 -*- Autoconf -*- |
2 | 2 | ||
3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
4 | # Free Software Foundation, Inc. | 4 | # 2005 Free Software Foundation, Inc. |
5 | # This file is free software; the Free Software Foundation | 5 | # This file is free software; the Free Software Foundation |
6 | # gives unlimited permission to copy and/or distribute it, | 6 | # gives unlimited permission to copy and/or distribute it, |
7 | # with or without modifications, as long as this notice is preserved. | 7 | # with or without modifications, as long as this notice is preserved. |
@@ -13,7 +13,7 @@ | |||
13 | 13 | ||
14 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | 14 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
15 | 15 | ||
16 | # serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL | 16 | # serial 48 AC_PROG_LIBTOOL |
17 | 17 | ||
18 | 18 | ||
19 | # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) | 19 | # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) |
@@ -1397,6 +1397,18 @@ freebsd1*) | |||
1397 | dynamic_linker=no | 1397 | dynamic_linker=no |
1398 | ;; | 1398 | ;; |
1399 | 1399 | ||
1400 | kfreebsd*-gnu) | ||
1401 | version_type=linux | ||
1402 | need_lib_prefix=no | ||
1403 | need_version=no | ||
1404 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
1405 | soname_spec='${libname}${release}${shared_ext}$major' | ||
1406 | shlibpath_var=LD_LIBRARY_PATH | ||
1407 | shlibpath_overrides_runpath=no | ||
1408 | hardcode_into_libs=yes | ||
1409 | dynamic_linker='GNU ld.so' | ||
1410 | ;; | ||
1411 | |||
1400 | freebsd* | dragonfly*) | 1412 | freebsd* | dragonfly*) |
1401 | # DragonFly does not have aout. When/if they implement a new | 1413 | # DragonFly does not have aout. When/if they implement a new |
1402 | # versioning mechanism, adjust this. | 1414 | # versioning mechanism, adjust this. |
@@ -1552,7 +1564,7 @@ linux*oldld* | linux*aout* | linux*coff*) | |||
1552 | ;; | 1564 | ;; |
1553 | 1565 | ||
1554 | # This must be Linux ELF. | 1566 | # This must be Linux ELF. |
1555 | linux* | k*bsd*-gnu) | 1567 | linux*) |
1556 | version_type=linux | 1568 | version_type=linux |
1557 | need_lib_prefix=no | 1569 | need_lib_prefix=no |
1558 | need_version=no | 1570 | need_version=no |
@@ -1566,10 +1578,27 @@ linux* | k*bsd*-gnu) | |||
1566 | # before this can be enabled. | 1578 | # before this can be enabled. |
1567 | hardcode_into_libs=yes | 1579 | hardcode_into_libs=yes |
1568 | 1580 | ||
1581 | # find out which ABI we are using | ||
1582 | libsuff= | ||
1583 | case "$host_cpu" in | ||
1584 | x86_64*|s390x*|powerpc64*) | ||
1585 | echo '[#]line __oline__ "configure"' > conftest.$ac_ext | ||
1586 | if AC_TRY_EVAL(ac_compile); then | ||
1587 | case `/usr/bin/file conftest.$ac_objext` in | ||
1588 | *64-bit*) | ||
1589 | libsuff=64 | ||
1590 | sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | ||
1591 | ;; | ||
1592 | esac | ||
1593 | fi | ||
1594 | rm -rf conftest* | ||
1595 | ;; | ||
1596 | esac | ||
1597 | |||
1569 | # Append ld.so.conf contents to the search path | 1598 | # Append ld.so.conf contents to the search path |
1570 | if test -f /etc/ld.so.conf; then | 1599 | if test -f /etc/ld.so.conf; then |
1571 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | 1600 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
1572 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | 1601 | sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" |
1573 | fi | 1602 | fi |
1574 | 1603 | ||
1575 | # We used to test for /lib/ld.so.1 and disable shared libraries on | 1604 | # We used to test for /lib/ld.so.1 and disable shared libraries on |
@@ -1581,7 +1610,7 @@ linux* | k*bsd*-gnu) | |||
1581 | dynamic_linker='GNU/Linux ld.so' | 1610 | dynamic_linker='GNU/Linux ld.so' |
1582 | ;; | 1611 | ;; |
1583 | 1612 | ||
1584 | netbsdelf*-gnu) | 1613 | knetbsd*-gnu) |
1585 | version_type=linux | 1614 | version_type=linux |
1586 | need_lib_prefix=no | 1615 | need_lib_prefix=no |
1587 | need_version=no | 1616 | need_version=no |
@@ -1590,7 +1619,7 @@ netbsdelf*-gnu) | |||
1590 | shlibpath_var=LD_LIBRARY_PATH | 1619 | shlibpath_var=LD_LIBRARY_PATH |
1591 | shlibpath_overrides_runpath=no | 1620 | shlibpath_overrides_runpath=no |
1592 | hardcode_into_libs=yes | 1621 | hardcode_into_libs=yes |
1593 | dynamic_linker='NetBSD ld.elf_so' | 1622 | dynamic_linker='GNU ld.so' |
1594 | ;; | 1623 | ;; |
1595 | 1624 | ||
1596 | netbsd*) | 1625 | netbsd*) |
@@ -2298,7 +2327,7 @@ darwin* | rhapsody*) | |||
2298 | lt_cv_deplibs_check_method=pass_all | 2327 | lt_cv_deplibs_check_method=pass_all |
2299 | ;; | 2328 | ;; |
2300 | 2329 | ||
2301 | freebsd* | dragonfly*) | 2330 | freebsd* | kfreebsd*-gnu | dragonfly*) |
2302 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | 2331 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
2303 | case $host_cpu in | 2332 | case $host_cpu in |
2304 | i*86 ) | 2333 | i*86 ) |
@@ -2352,11 +2381,11 @@ irix5* | irix6* | nonstopux*) | |||
2352 | ;; | 2381 | ;; |
2353 | 2382 | ||
2354 | # This must be Linux ELF. | 2383 | # This must be Linux ELF. |
2355 | linux* | k*bsd*-gnu) | 2384 | linux*) |
2356 | lt_cv_deplibs_check_method=pass_all | 2385 | lt_cv_deplibs_check_method=pass_all |
2357 | ;; | 2386 | ;; |
2358 | 2387 | ||
2359 | netbsd* | netbsdelf*-gnu) | 2388 | netbsd*) |
2360 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | 2389 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
2361 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' | 2390 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
2362 | else | 2391 | else |
@@ -3104,7 +3133,7 @@ case $host_os in | |||
3104 | freebsd-elf*) | 3133 | freebsd-elf*) |
3105 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no | 3134 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
3106 | ;; | 3135 | ;; |
3107 | freebsd* | dragonfly*) | 3136 | freebsd* | kfreebsd*-gnu | dragonfly*) |
3108 | # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF | 3137 | # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF |
3109 | # conventions | 3138 | # conventions |
3110 | _LT_AC_TAGVAR(ld_shlibs, $1)=yes | 3139 | _LT_AC_TAGVAR(ld_shlibs, $1)=yes |
@@ -3263,7 +3292,7 @@ case $host_os in | |||
3263 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 3292 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3264 | _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: | 3293 | _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
3265 | ;; | 3294 | ;; |
3266 | linux* | k*bsd*-gnu) | 3295 | linux*) |
3267 | case $cc_basename in | 3296 | case $cc_basename in |
3268 | KCC*) | 3297 | KCC*) |
3269 | # Kuck and Associates, Inc. (KAI) C++ Compiler | 3298 | # Kuck and Associates, Inc. (KAI) C++ Compiler |
@@ -3365,7 +3394,7 @@ case $host_os in | |||
3365 | ;; | 3394 | ;; |
3366 | esac | 3395 | esac |
3367 | ;; | 3396 | ;; |
3368 | netbsd* | netbsdelf*-gnu) | 3397 | netbsd*) |
3369 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 3398 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
3370 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' | 3399 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' |
3371 | wlarc= | 3400 | wlarc= |
@@ -4630,7 +4659,7 @@ hpux*) # Its linker distinguishes data from code symbols | |||
4630 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 4659 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
4631 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" | 4660 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" |
4632 | ;; | 4661 | ;; |
4633 | linux* | k*bsd*-gnu) | 4662 | linux*) |
4634 | if test "$host_cpu" = ia64; then | 4663 | if test "$host_cpu" = ia64; then |
4635 | symcode='[[ABCDGIRSTW]]' | 4664 | symcode='[[ABCDGIRSTW]]' |
4636 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 4665 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
@@ -4903,7 +4932,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) | |||
4903 | ;; | 4932 | ;; |
4904 | esac | 4933 | esac |
4905 | ;; | 4934 | ;; |
4906 | freebsd* | dragonfly*) | 4935 | freebsd* | kfreebsd*-gnu | dragonfly*) |
4907 | # FreeBSD uses GNU C++ | 4936 | # FreeBSD uses GNU C++ |
4908 | ;; | 4937 | ;; |
4909 | hpux9* | hpux10* | hpux11*) | 4938 | hpux9* | hpux10* | hpux11*) |
@@ -4946,7 +4975,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) | |||
4946 | ;; | 4975 | ;; |
4947 | esac | 4976 | esac |
4948 | ;; | 4977 | ;; |
4949 | linux* | k*bsd*-gnu) | 4978 | linux*) |
4950 | case $cc_basename in | 4979 | case $cc_basename in |
4951 | KCC*) | 4980 | KCC*) |
4952 | # KAI C++ Compiler | 4981 | # KAI C++ Compiler |
@@ -4989,7 +5018,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) | |||
4989 | ;; | 5018 | ;; |
4990 | esac | 5019 | esac |
4991 | ;; | 5020 | ;; |
4992 | netbsd* | netbsdelf*-gnu) | 5021 | netbsd*) |
4993 | ;; | 5022 | ;; |
4994 | osf3* | osf4* | osf5*) | 5023 | osf3* | osf4* | osf5*) |
4995 | case $cc_basename in | 5024 | case $cc_basename in |
@@ -5200,7 +5229,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) | |||
5200 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 5229 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
5201 | ;; | 5230 | ;; |
5202 | 5231 | ||
5203 | linux* | k*bsd*-gnu) | 5232 | linux*) |
5204 | case $cc_basename in | 5233 | case $cc_basename in |
5205 | icc* | ecc*) | 5234 | icc* | ecc*) |
5206 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 5235 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
@@ -5341,9 +5370,6 @@ ifelse([$1],[CXX],[ | |||
5341 | cygwin* | mingw*) | 5370 | cygwin* | mingw*) |
5342 | _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' | 5371 | _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' |
5343 | ;; | 5372 | ;; |
5344 | linux* | k*bsd*-gnu) | ||
5345 | _LT_AC_TAGVAR(link_all_deplibs, $1)=no | ||
5346 | ;; | ||
5347 | *) | 5373 | *) |
5348 | _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 5374 | _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
5349 | ;; | 5375 | ;; |
@@ -5514,7 +5540,7 @@ EOF | |||
5514 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' | 5540 | _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
5515 | ;; | 5541 | ;; |
5516 | 5542 | ||
5517 | linux* | k*bsd*-gnu) | 5543 | linux*) |
5518 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | 5544 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
5519 | tmp_addflag= | 5545 | tmp_addflag= |
5520 | case $cc_basename,$host_cpu in | 5546 | case $cc_basename,$host_cpu in |
@@ -5540,13 +5566,12 @@ EOF | |||
5540 | $echo "local: *; };" >> $output_objdir/$libname.ver~ | 5566 | $echo "local: *; };" >> $output_objdir/$libname.ver~ |
5541 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | 5567 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
5542 | fi | 5568 | fi |
5543 | _LT_AC_TAGVAR(link_all_deplibs, $1)=no | ||
5544 | else | 5569 | else |
5545 | _LT_AC_TAGVAR(ld_shlibs, $1)=no | 5570 | _LT_AC_TAGVAR(ld_shlibs, $1)=no |
5546 | fi | 5571 | fi |
5547 | ;; | 5572 | ;; |
5548 | 5573 | ||
5549 | netbsd* | netbsdelf*-gnu) | 5574 | netbsd*) |
5550 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 5575 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
5551 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 5576 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
5552 | wlarc= | 5577 | wlarc= |
@@ -5876,7 +5901,7 @@ _LT_EOF | |||
5876 | ;; | 5901 | ;; |
5877 | 5902 | ||
5878 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 5903 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
5879 | freebsd* | dragonfly*) | 5904 | freebsd* | kfreebsd*-gnu | dragonfly*) |
5880 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | 5905 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
5881 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | 5906 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
5882 | _LT_AC_TAGVAR(hardcode_direct, $1)=yes | 5907 | _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
@@ -5978,7 +6003,7 @@ _LT_EOF | |||
5978 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes | 6003 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
5979 | ;; | 6004 | ;; |
5980 | 6005 | ||
5981 | netbsd* | netbsdelf*-gnu) | 6006 | netbsd*) |
5982 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 6007 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
5983 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 6008 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
5984 | else | 6009 | else |
@@ -6503,7 +6528,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen], | |||
6503 | # If you are looking for one http://www.opendarwin.org/projects/dlcompat | 6528 | # If you are looking for one http://www.opendarwin.org/projects/dlcompat |
6504 | libltdl_cv_sys_dlopen_deplibs=yes | 6529 | libltdl_cv_sys_dlopen_deplibs=yes |
6505 | ;; | 6530 | ;; |
6506 | gnu* | linux* | k*bsd*-gnu) | 6531 | gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) |
6507 | # GNU and its variants, using gnu ld.so (Glibc) | 6532 | # GNU and its variants, using gnu ld.so (Glibc) |
6508 | libltdl_cv_sys_dlopen_deplibs=yes | 6533 | libltdl_cv_sys_dlopen_deplibs=yes |
6509 | ;; | 6534 | ;; |
@@ -6523,7 +6548,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen], | |||
6523 | # at 6.2 and later dlopen does load deplibs. | 6548 | # at 6.2 and later dlopen does load deplibs. |
6524 | libltdl_cv_sys_dlopen_deplibs=yes | 6549 | libltdl_cv_sys_dlopen_deplibs=yes |
6525 | ;; | 6550 | ;; |
6526 | netbsd* | netbsdelf*-gnu) | 6551 | netbsd*) |
6527 | libltdl_cv_sys_dlopen_deplibs=yes | 6552 | libltdl_cv_sys_dlopen_deplibs=yes |
6528 | ;; | 6553 | ;; |
6529 | openbsd*) | 6554 | openbsd*) |
@@ -6796,55 +6821,32 @@ AC_CHECK_TYPES([error_t], | |||
6796 | AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next argz_stringify]) | 6821 | AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next argz_stringify]) |
6797 | ])# AC_LTDL_FUNC_ARGZ | 6822 | ])# AC_LTDL_FUNC_ARGZ |
6798 | 6823 | ||
6799 | # -*- Autoconf -*- | 6824 | # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. |
6800 | # Copyright (C) 2002, 2003 Free Software Foundation, Inc. | 6825 | # |
6801 | # Generated from amversion.in; do not edit by hand. | 6826 | # This file is free software; the Free Software Foundation |
6802 | 6827 | # gives unlimited permission to copy and/or distribute it, | |
6803 | # This program is free software; you can redistribute it and/or modify | 6828 | # with or without modifications, as long as this notice is preserved. |
6804 | # it under the terms of the GNU General Public License as published by | ||
6805 | # the Free Software Foundation; either version 2, or (at your option) | ||
6806 | # any later version. | ||
6807 | |||
6808 | # This program is distributed in the hope that it will be useful, | ||
6809 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
6810 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
6811 | # GNU General Public License for more details. | ||
6812 | |||
6813 | # You should have received a copy of the GNU General Public License | ||
6814 | # along with this program; if not, write to the Free Software | ||
6815 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
6816 | 6829 | ||
6817 | # AM_AUTOMAKE_VERSION(VERSION) | 6830 | # AM_AUTOMAKE_VERSION(VERSION) |
6818 | # ---------------------------- | 6831 | # ---------------------------- |
6819 | # Automake X.Y traces this macro to ensure aclocal.m4 has been | 6832 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
6820 | # generated from the m4 files accompanying Automake X.Y. | 6833 | # generated from the m4 files accompanying Automake X.Y. |
6821 | AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) | 6834 | AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) |
6822 | 6835 | ||
6823 | # AM_SET_CURRENT_AUTOMAKE_VERSION | 6836 | # AM_SET_CURRENT_AUTOMAKE_VERSION |
6824 | # ------------------------------- | 6837 | # ------------------------------- |
6825 | # Call AM_AUTOMAKE_VERSION so it can be traced. | 6838 | # Call AM_AUTOMAKE_VERSION so it can be traced. |
6826 | # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. | 6839 | # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. |
6827 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | 6840 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
6828 | [AM_AUTOMAKE_VERSION([1.8.5])]) | 6841 | [AM_AUTOMAKE_VERSION([1.9.6])]) |
6829 | |||
6830 | # AM_AUX_DIR_EXPAND | ||
6831 | 6842 | ||
6832 | # Copyright (C) 2001, 2003 Free Software Foundation, Inc. | 6843 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
6833 | 6844 | ||
6834 | # This program is free software; you can redistribute it and/or modify | 6845 | # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
6835 | # it under the terms of the GNU General Public License as published by | 6846 | # |
6836 | # the Free Software Foundation; either version 2, or (at your option) | 6847 | # This file is free software; the Free Software Foundation |
6837 | # any later version. | 6848 | # gives unlimited permission to copy and/or distribute it, |
6838 | 6849 | # with or without modifications, as long as this notice is preserved. | |
6839 | # This program is distributed in the hope that it will be useful, | ||
6840 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
6841 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
6842 | # GNU General Public License for more details. | ||
6843 | |||
6844 | # You should have received a copy of the GNU General Public License | ||
6845 | # along with this program; if not, write to the Free Software | ||
6846 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
6847 | # 02111-1307, USA. | ||
6848 | 6850 | ||
6849 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets | 6851 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
6850 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to | 6852 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
@@ -6891,26 +6893,16 @@ AC_PREREQ([2.50])dnl | |||
6891 | am_aux_dir=`cd $ac_aux_dir && pwd` | 6893 | am_aux_dir=`cd $ac_aux_dir && pwd` |
6892 | ]) | 6894 | ]) |
6893 | 6895 | ||
6894 | # AM_CONDITIONAL -*- Autoconf -*- | 6896 | # AM_CONDITIONAL -*- Autoconf -*- |
6895 | 6897 | ||
6896 | # Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. | 6898 | # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 |
6897 | 6899 | # Free Software Foundation, Inc. | |
6898 | # This program is free software; you can redistribute it and/or modify | 6900 | # |
6899 | # it under the terms of the GNU General Public License as published by | 6901 | # This file is free software; the Free Software Foundation |
6900 | # the Free Software Foundation; either version 2, or (at your option) | 6902 | # gives unlimited permission to copy and/or distribute it, |
6901 | # any later version. | 6903 | # with or without modifications, as long as this notice is preserved. |
6902 | |||
6903 | # This program is distributed in the hope that it will be useful, | ||
6904 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
6905 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
6906 | # GNU General Public License for more details. | ||
6907 | |||
6908 | # You should have received a copy of the GNU General Public License | ||
6909 | # along with this program; if not, write to the Free Software | ||
6910 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
6911 | # 02111-1307, USA. | ||
6912 | 6904 | ||
6913 | # serial 6 | 6905 | # serial 7 |
6914 | 6906 | ||
6915 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) | 6907 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) |
6916 | # ------------------------------------- | 6908 | # ------------------------------------- |
@@ -6930,30 +6922,19 @@ else | |||
6930 | fi | 6922 | fi |
6931 | AC_CONFIG_COMMANDS_PRE( | 6923 | AC_CONFIG_COMMANDS_PRE( |
6932 | [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then | 6924 | [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then |
6933 | AC_MSG_ERROR([conditional "$1" was never defined. | 6925 | AC_MSG_ERROR([[conditional "$1" was never defined. |
6934 | Usually this means the macro was only invoked conditionally.]) | 6926 | Usually this means the macro was only invoked conditionally.]]) |
6935 | fi])]) | 6927 | fi])]) |
6936 | 6928 | ||
6937 | # serial 7 -*- Autoconf -*- | ||
6938 | 6929 | ||
6939 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 | 6930 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
6940 | # Free Software Foundation, Inc. | 6931 | # Free Software Foundation, Inc. |
6932 | # | ||
6933 | # This file is free software; the Free Software Foundation | ||
6934 | # gives unlimited permission to copy and/or distribute it, | ||
6935 | # with or without modifications, as long as this notice is preserved. | ||
6941 | 6936 | ||
6942 | # This program is free software; you can redistribute it and/or modify | 6937 | # serial 8 |
6943 | # it under the terms of the GNU General Public License as published by | ||
6944 | # the Free Software Foundation; either version 2, or (at your option) | ||
6945 | # any later version. | ||
6946 | |||
6947 | # This program is distributed in the hope that it will be useful, | ||
6948 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
6949 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
6950 | # GNU General Public License for more details. | ||
6951 | |||
6952 | # You should have received a copy of the GNU General Public License | ||
6953 | # along with this program; if not, write to the Free Software | ||
6954 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
6955 | # 02111-1307, USA. | ||
6956 | |||
6957 | 6938 | ||
6958 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be | 6939 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
6959 | # written in clear, in which case automake, when reading aclocal.m4, | 6940 | # written in clear, in which case automake, when reading aclocal.m4, |
@@ -6962,7 +6943,6 @@ fi])]) | |||
6962 | # CC etc. in the Makefile, will ask for an AC_PROG_CC use... | 6943 | # CC etc. in the Makefile, will ask for an AC_PROG_CC use... |
6963 | 6944 | ||
6964 | 6945 | ||
6965 | |||
6966 | # _AM_DEPENDENCIES(NAME) | 6946 | # _AM_DEPENDENCIES(NAME) |
6967 | # ---------------------- | 6947 | # ---------------------- |
6968 | # See how the compiler implements dependency checking. | 6948 | # See how the compiler implements dependency checking. |
@@ -7102,26 +7082,16 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) | |||
7102 | AC_SUBST([AMDEPBACKSLASH]) | 7082 | AC_SUBST([AMDEPBACKSLASH]) |
7103 | ]) | 7083 | ]) |
7104 | 7084 | ||
7105 | # Generate code to set up dependency tracking. -*- Autoconf -*- | 7085 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
7106 | |||
7107 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. | ||
7108 | 7086 | ||
7109 | # This program is free software; you can redistribute it and/or modify | 7087 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
7110 | # it under the terms of the GNU General Public License as published by | 7088 | # Free Software Foundation, Inc. |
7111 | # the Free Software Foundation; either version 2, or (at your option) | 7089 | # |
7112 | # any later version. | 7090 | # This file is free software; the Free Software Foundation |
7113 | 7091 | # gives unlimited permission to copy and/or distribute it, | |
7114 | # This program is distributed in the hope that it will be useful, | 7092 | # with or without modifications, as long as this notice is preserved. |
7115 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
7116 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
7117 | # GNU General Public License for more details. | ||
7118 | |||
7119 | # You should have received a copy of the GNU General Public License | ||
7120 | # along with this program; if not, write to the Free Software | ||
7121 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
7122 | # 02111-1307, USA. | ||
7123 | 7093 | ||
7124 | #serial 2 | 7094 | #serial 3 |
7125 | 7095 | ||
7126 | # _AM_OUTPUT_DEPENDENCY_COMMANDS | 7096 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
7127 | # ------------------------------ | 7097 | # ------------------------------ |
@@ -7140,27 +7110,21 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | |||
7140 | else | 7110 | else |
7141 | continue | 7111 | continue |
7142 | fi | 7112 | fi |
7143 | grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue | 7113 | # Extract the definition of DEPDIR, am__include, and am__quote |
7144 | # Extract the definition of DEP_FILES from the Makefile without | 7114 | # from the Makefile without running `make'. |
7145 | # running `make'. | ||
7146 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | 7115 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
7147 | test -z "$DEPDIR" && continue | 7116 | test -z "$DEPDIR" && continue |
7117 | am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
7118 | test -z "am__include" && continue | ||
7119 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
7148 | # When using ansi2knr, U may be empty or an underscore; expand it | 7120 | # When using ansi2knr, U may be empty or an underscore; expand it |
7149 | U=`sed -n 's/^U = //p' < "$mf"` | 7121 | U=`sed -n 's/^U = //p' < "$mf"` |
7150 | test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" | 7122 | # Find all dependency output files, they are included files with |
7151 | # We invoke sed twice because it is the simplest approach to | 7123 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
7152 | # changing $(DEPDIR) to its actual value in the expansion. | 7124 | # simplest approach to changing $(DEPDIR) to its actual value in the |
7153 | for file in `sed -n ' | 7125 | # expansion. |
7154 | /^DEP_FILES = .*\\\\$/ { | 7126 | for file in `sed -n " |
7155 | s/^DEP_FILES = // | 7127 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
7156 | :loop | ||
7157 | s/\\\\$// | ||
7158 | p | ||
7159 | n | ||
7160 | /\\\\$/ b loop | ||
7161 | p | ||
7162 | } | ||
7163 | /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ | ||
7164 | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | 7128 | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
7165 | # Make sure the directory exists. | 7129 | # Make sure the directory exists. |
7166 | test -f "$dirpart/$file" && continue | 7130 | test -f "$dirpart/$file" && continue |
@@ -7186,54 +7150,31 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], | |||
7186 | [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) | 7150 | [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) |
7187 | ]) | 7151 | ]) |
7188 | 7152 | ||
7189 | # Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- | 7153 | # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 |
7190 | 7154 | # Free Software Foundation, Inc. | |
7191 | # Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. | 7155 | # |
7192 | 7156 | # This file is free software; the Free Software Foundation | |
7193 | # This program is free software; you can redistribute it and/or modify | 7157 | # gives unlimited permission to copy and/or distribute it, |
7194 | # it under the terms of the GNU General Public License as published by | 7158 | # with or without modifications, as long as this notice is preserved. |
7195 | # the Free Software Foundation; either version 2, or (at your option) | ||
7196 | # any later version. | ||
7197 | |||
7198 | # This program is distributed in the hope that it will be useful, | ||
7199 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
7200 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
7201 | # GNU General Public License for more details. | ||
7202 | |||
7203 | # You should have received a copy of the GNU General Public License | ||
7204 | # along with this program; if not, write to the Free Software | ||
7205 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
7206 | # 02111-1307, USA. | ||
7207 | 7159 | ||
7208 | # serial 7 | 7160 | # serial 8 |
7209 | 7161 | ||
7210 | # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. | 7162 | # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. |
7211 | AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) | 7163 | AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) |
7212 | 7164 | ||
7213 | # Do all the work for Automake. -*- Autoconf -*- | 7165 | # Do all the work for Automake. -*- Autoconf -*- |
7214 | 7166 | ||
7215 | # This macro actually does too much some checks are only needed if | 7167 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
7216 | # your package does certain things. But this isn't really a big deal. | ||
7217 | |||
7218 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 | ||
7219 | # Free Software Foundation, Inc. | 7168 | # Free Software Foundation, Inc. |
7169 | # | ||
7170 | # This file is free software; the Free Software Foundation | ||
7171 | # gives unlimited permission to copy and/or distribute it, | ||
7172 | # with or without modifications, as long as this notice is preserved. | ||
7220 | 7173 | ||
7221 | # This program is free software; you can redistribute it and/or modify | 7174 | # serial 12 |
7222 | # it under the terms of the GNU General Public License as published by | ||
7223 | # the Free Software Foundation; either version 2, or (at your option) | ||
7224 | # any later version. | ||
7225 | |||
7226 | # This program is distributed in the hope that it will be useful, | ||
7227 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
7228 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
7229 | # GNU General Public License for more details. | ||
7230 | |||
7231 | # You should have received a copy of the GNU General Public License | ||
7232 | # along with this program; if not, write to the Free Software | ||
7233 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
7234 | # 02111-1307, USA. | ||
7235 | 7175 | ||
7236 | # serial 11 | 7176 | # This macro actually does too much. Some checks are only needed if |
7177 | # your package does certain things. But this isn't really a big deal. | ||
7237 | 7178 | ||
7238 | # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) | 7179 | # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) |
7239 | # AM_INIT_AUTOMAKE([OPTIONS]) | 7180 | # AM_INIT_AUTOMAKE([OPTIONS]) |
@@ -7291,7 +7232,6 @@ AM_MISSING_PROG(AUTOCONF, autoconf) | |||
7291 | AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) | 7232 | AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) |
7292 | AM_MISSING_PROG(AUTOHEADER, autoheader) | 7233 | AM_MISSING_PROG(AUTOHEADER, autoheader) |
7293 | AM_MISSING_PROG(MAKEINFO, makeinfo) | 7234 | AM_MISSING_PROG(MAKEINFO, makeinfo) |
7294 | AM_MISSING_PROG(AMTAR, tar) | ||
7295 | AM_PROG_INSTALL_SH | 7235 | AM_PROG_INSTALL_SH |
7296 | AM_PROG_INSTALL_STRIP | 7236 | AM_PROG_INSTALL_STRIP |
7297 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl | 7237 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl |
@@ -7300,7 +7240,9 @@ AC_REQUIRE([AM_PROG_MKDIR_P])dnl | |||
7300 | AC_REQUIRE([AC_PROG_AWK])dnl | 7240 | AC_REQUIRE([AC_PROG_AWK])dnl |
7301 | AC_REQUIRE([AC_PROG_MAKE_SET])dnl | 7241 | AC_REQUIRE([AC_PROG_MAKE_SET])dnl |
7302 | AC_REQUIRE([AM_SET_LEADING_DOT])dnl | 7242 | AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
7303 | 7243 | _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], | |
7244 | [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], | ||
7245 | [_AM_PROG_TAR([v7])])]) | ||
7304 | _AM_IF_OPTION([no-dependencies],, | 7246 | _AM_IF_OPTION([no-dependencies],, |
7305 | [AC_PROVIDE_IFELSE([AC_PROG_CC], | 7247 | [AC_PROVIDE_IFELSE([AC_PROG_CC], |
7306 | [_AM_DEPENDENCIES(CC)], | 7248 | [_AM_DEPENDENCIES(CC)], |
@@ -7334,51 +7276,27 @@ for _am_header in $config_headers :; do | |||
7334 | done | 7276 | done |
7335 | echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) | 7277 | echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) |
7336 | 7278 | ||
7279 | # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | ||
7280 | # | ||
7281 | # This file is free software; the Free Software Foundation | ||
7282 | # gives unlimited permission to copy and/or distribute it, | ||
7283 | # with or without modifications, as long as this notice is preserved. | ||
7284 | |||
7337 | # AM_PROG_INSTALL_SH | 7285 | # AM_PROG_INSTALL_SH |
7338 | # ------------------ | 7286 | # ------------------ |
7339 | # Define $install_sh. | 7287 | # Define $install_sh. |
7340 | |||
7341 | # Copyright (C) 2001, 2003 Free Software Foundation, Inc. | ||
7342 | |||
7343 | # This program is free software; you can redistribute it and/or modify | ||
7344 | # it under the terms of the GNU General Public License as published by | ||
7345 | # the Free Software Foundation; either version 2, or (at your option) | ||
7346 | # any later version. | ||
7347 | |||
7348 | # This program is distributed in the hope that it will be useful, | ||
7349 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
7350 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
7351 | # GNU General Public License for more details. | ||
7352 | |||
7353 | # You should have received a copy of the GNU General Public License | ||
7354 | # along with this program; if not, write to the Free Software | ||
7355 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
7356 | # 02111-1307, USA. | ||
7357 | |||
7358 | AC_DEFUN([AM_PROG_INSTALL_SH], | 7288 | AC_DEFUN([AM_PROG_INSTALL_SH], |
7359 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | 7289 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
7360 | install_sh=${install_sh-"$am_aux_dir/install-sh"} | 7290 | install_sh=${install_sh-"$am_aux_dir/install-sh"} |
7361 | AC_SUBST(install_sh)]) | 7291 | AC_SUBST(install_sh)]) |
7362 | 7292 | ||
7363 | # -*- Autoconf -*- | 7293 | # Copyright (C) 2003, 2005 Free Software Foundation, Inc. |
7364 | # Copyright (C) 2003 Free Software Foundation, Inc. | 7294 | # |
7365 | 7295 | # This file is free software; the Free Software Foundation | |
7366 | # This program is free software; you can redistribute it and/or modify | 7296 | # gives unlimited permission to copy and/or distribute it, |
7367 | # it under the terms of the GNU General Public License as published by | 7297 | # with or without modifications, as long as this notice is preserved. |
7368 | # the Free Software Foundation; either version 2, or (at your option) | ||
7369 | # any later version. | ||
7370 | |||
7371 | # This program is distributed in the hope that it will be useful, | ||
7372 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
7373 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
7374 | # GNU General Public License for more details. | ||
7375 | |||
7376 | # You should have received a copy of the GNU General Public License | ||
7377 | # along with this program; if not, write to the Free Software | ||
7378 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
7379 | # 02111-1307, USA. | ||
7380 | 7298 | ||
7381 | # serial 1 | 7299 | # serial 2 |
7382 | 7300 | ||
7383 | # Check whether the underlying file-system supports filenames | 7301 | # Check whether the underlying file-system supports filenames |
7384 | # with a leading dot. For instance MS-DOS doesn't. | 7302 | # with a leading dot. For instance MS-DOS doesn't. |
@@ -7393,28 +7311,17 @@ fi | |||
7393 | rmdir .tst 2>/dev/null | 7311 | rmdir .tst 2>/dev/null |
7394 | AC_SUBST([am__leading_dot])]) | 7312 | AC_SUBST([am__leading_dot])]) |
7395 | 7313 | ||
7396 | # Add --enable-maintainer-mode option to configure. | 7314 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
7397 | # From Jim Meyering | 7315 | # From Jim Meyering |
7398 | 7316 | ||
7399 | # Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004 | 7317 | # Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 |
7400 | # Free Software Foundation, Inc. | 7318 | # Free Software Foundation, Inc. |
7319 | # | ||
7320 | # This file is free software; the Free Software Foundation | ||
7321 | # gives unlimited permission to copy and/or distribute it, | ||
7322 | # with or without modifications, as long as this notice is preserved. | ||
7401 | 7323 | ||
7402 | # This program is free software; you can redistribute it and/or modify | 7324 | # serial 4 |
7403 | # it under the terms of the GNU General Public License as published by | ||
7404 | # the Free Software Foundation; either version 2, or (at your option) | ||
7405 | # any later version. | ||
7406 | |||
7407 | # This program is distributed in the hope that it will be useful, | ||
7408 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
7409 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
7410 | # GNU General Public License for more details. | ||
7411 | |||
7412 | # You should have received a copy of the GNU General Public License | ||
7413 | # along with this program; if not, write to the Free Software | ||
7414 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
7415 | # 02111-1307, USA. | ||
7416 | |||
7417 | # serial 3 | ||
7418 | 7325 | ||
7419 | AC_DEFUN([AM_MAINTAINER_MODE], | 7326 | AC_DEFUN([AM_MAINTAINER_MODE], |
7420 | [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | 7327 | [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
@@ -7433,26 +7340,15 @@ AC_DEFUN([AM_MAINTAINER_MODE], | |||
7433 | 7340 | ||
7434 | AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) | 7341 | AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) |
7435 | 7342 | ||
7436 | # Check to see how 'make' treats includes. -*- Autoconf -*- | 7343 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
7437 | 7344 | ||
7438 | # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. | 7345 | # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. |
7439 | 7346 | # | |
7440 | # This program is free software; you can redistribute it and/or modify | 7347 | # This file is free software; the Free Software Foundation |
7441 | # it under the terms of the GNU General Public License as published by | 7348 | # gives unlimited permission to copy and/or distribute it, |
7442 | # the Free Software Foundation; either version 2, or (at your option) | 7349 | # with or without modifications, as long as this notice is preserved. |
7443 | # any later version. | ||
7444 | |||
7445 | # This program is distributed in the hope that it will be useful, | ||
7446 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
7447 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
7448 | # GNU General Public License for more details. | ||
7449 | |||
7450 | # You should have received a copy of the GNU General Public License | ||
7451 | # along with this program; if not, write to the Free Software | ||
7452 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
7453 | # 02111-1307, USA. | ||
7454 | 7350 | ||
7455 | # serial 2 | 7351 | # serial 3 |
7456 | 7352 | ||
7457 | # AM_MAKE_INCLUDE() | 7353 | # AM_MAKE_INCLUDE() |
7458 | # ----------------- | 7354 | # ----------------- |
@@ -7496,27 +7392,16 @@ AC_MSG_RESULT([$_am_result]) | |||
7496 | rm -f confinc confmf | 7392 | rm -f confinc confmf |
7497 | ]) | 7393 | ]) |
7498 | 7394 | ||
7499 | # -*- Autoconf -*- | 7395 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
7500 | |||
7501 | 7396 | ||
7502 | # Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. | 7397 | # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 |
7503 | 7398 | # Free Software Foundation, Inc. | |
7504 | # This program is free software; you can redistribute it and/or modify | 7399 | # |
7505 | # it under the terms of the GNU General Public License as published by | 7400 | # This file is free software; the Free Software Foundation |
7506 | # the Free Software Foundation; either version 2, or (at your option) | 7401 | # gives unlimited permission to copy and/or distribute it, |
7507 | # any later version. | 7402 | # with or without modifications, as long as this notice is preserved. |
7508 | |||
7509 | # This program is distributed in the hope that it will be useful, | ||
7510 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
7511 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
7512 | # GNU General Public License for more details. | ||
7513 | |||
7514 | # You should have received a copy of the GNU General Public License | ||
7515 | # along with this program; if not, write to the Free Software | ||
7516 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
7517 | # 02111-1307, USA. | ||
7518 | 7403 | ||
7519 | # serial 3 | 7404 | # serial 4 |
7520 | 7405 | ||
7521 | # AM_MISSING_PROG(NAME, PROGRAM) | 7406 | # AM_MISSING_PROG(NAME, PROGRAM) |
7522 | # ------------------------------ | 7407 | # ------------------------------ |
@@ -7542,27 +7427,16 @@ else | |||
7542 | fi | 7427 | fi |
7543 | ]) | 7428 | ]) |
7544 | 7429 | ||
7430 | # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. | ||
7431 | # | ||
7432 | # This file is free software; the Free Software Foundation | ||
7433 | # gives unlimited permission to copy and/or distribute it, | ||
7434 | # with or without modifications, as long as this notice is preserved. | ||
7435 | |||
7545 | # AM_PROG_MKDIR_P | 7436 | # AM_PROG_MKDIR_P |
7546 | # --------------- | 7437 | # --------------- |
7547 | # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. | 7438 | # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. |
7548 | 7439 | # | |
7549 | # Copyright (C) 2003, 2004 Free Software Foundation, Inc. | ||
7550 | |||
7551 | # This program is free software; you can redistribute it and/or modify | ||
7552 | # it under the terms of the GNU General Public License as published by | ||
7553 | # the Free Software Foundation; either version 2, or (at your option) | ||
7554 | # any later version. | ||
7555 | |||
7556 | # This program is distributed in the hope that it will be useful, | ||
7557 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
7558 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
7559 | # GNU General Public License for more details. | ||
7560 | |||
7561 | # You should have received a copy of the GNU General Public License | ||
7562 | # along with this program; if not, write to the Free Software | ||
7563 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
7564 | # 02111-1307, USA. | ||
7565 | |||
7566 | # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories | 7440 | # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories |
7567 | # created by `make install' are always world readable, even if the | 7441 | # created by `make install' are always world readable, even if the |
7568 | # installer happens to have an overly restrictive umask (e.g. 077). | 7442 | # installer happens to have an overly restrictive umask (e.g. 077). |
@@ -7583,13 +7457,21 @@ fi | |||
7583 | # this.) | 7457 | # this.) |
7584 | AC_DEFUN([AM_PROG_MKDIR_P], | 7458 | AC_DEFUN([AM_PROG_MKDIR_P], |
7585 | [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then | 7459 | [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then |
7586 | # Keeping the `.' argument allows $(mkdir_p) to be used without | 7460 | # We used to keeping the `.' as first argument, in order to |
7587 | # argument. Indeed, we sometimes output rules like | 7461 | # allow $(mkdir_p) to be used without argument. As in |
7588 | # $(mkdir_p) $(somedir) | 7462 | # $(mkdir_p) $(somedir) |
7589 | # where $(somedir) is conditionally defined. | 7463 | # where $(somedir) is conditionally defined. However this is wrong |
7590 | # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more | 7464 | # for two reasons: |
7591 | # expensive solution, as it forces Make to start a sub-shell.) | 7465 | # 1. if the package is installed by a user who cannot write `.' |
7592 | mkdir_p='mkdir -p -- .' | 7466 | # make install will fail, |
7467 | # 2. the above comment should most certainly read | ||
7468 | # $(mkdir_p) $(DESTDIR)$(somedir) | ||
7469 | # so it does not work when $(somedir) is undefined and | ||
7470 | # $(DESTDIR) is not. | ||
7471 | # To support the latter case, we have to write | ||
7472 | # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), | ||
7473 | # so the `.' trick is pointless. | ||
7474 | mkdir_p='mkdir -p --' | ||
7593 | else | 7475 | else |
7594 | # On NextStep and OpenStep, the `mkdir' command does not | 7476 | # On NextStep and OpenStep, the `mkdir' command does not |
7595 | # recognize any option. It will interpret all options as | 7477 | # recognize any option. It will interpret all options as |
@@ -7608,26 +7490,15 @@ else | |||
7608 | fi | 7490 | fi |
7609 | AC_SUBST([mkdir_p])]) | 7491 | AC_SUBST([mkdir_p])]) |
7610 | 7492 | ||
7611 | # Helper functions for option handling. -*- Autoconf -*- | 7493 | # Helper functions for option handling. -*- Autoconf -*- |
7612 | |||
7613 | # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. | ||
7614 | |||
7615 | # This program is free software; you can redistribute it and/or modify | ||
7616 | # it under the terms of the GNU General Public License as published by | ||
7617 | # the Free Software Foundation; either version 2, or (at your option) | ||
7618 | # any later version. | ||
7619 | |||
7620 | # This program is distributed in the hope that it will be useful, | ||
7621 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
7622 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
7623 | # GNU General Public License for more details. | ||
7624 | 7494 | ||
7625 | # You should have received a copy of the GNU General Public License | 7495 | # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. |
7626 | # along with this program; if not, write to the Free Software | 7496 | # |
7627 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | 7497 | # This file is free software; the Free Software Foundation |
7628 | # 02111-1307, USA. | 7498 | # gives unlimited permission to copy and/or distribute it, |
7499 | # with or without modifications, as long as this notice is preserved. | ||
7629 | 7500 | ||
7630 | # serial 2 | 7501 | # serial 3 |
7631 | 7502 | ||
7632 | # _AM_MANGLE_OPTION(NAME) | 7503 | # _AM_MANGLE_OPTION(NAME) |
7633 | # ----------------------- | 7504 | # ----------------------- |
@@ -7652,28 +7523,16 @@ AC_DEFUN([_AM_SET_OPTIONS], | |||
7652 | AC_DEFUN([_AM_IF_OPTION], | 7523 | AC_DEFUN([_AM_IF_OPTION], |
7653 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) | 7524 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
7654 | 7525 | ||
7655 | # | 7526 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
7656 | # Check to make sure that the build environment is sane. | ||
7657 | # | ||
7658 | |||
7659 | # Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. | ||
7660 | |||
7661 | # This program is free software; you can redistribute it and/or modify | ||
7662 | # it under the terms of the GNU General Public License as published by | ||
7663 | # the Free Software Foundation; either version 2, or (at your option) | ||
7664 | # any later version. | ||
7665 | 7527 | ||
7666 | # This program is distributed in the hope that it will be useful, | 7528 | # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 |
7667 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | 7529 | # Free Software Foundation, Inc. |
7668 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 7530 | # |
7669 | # GNU General Public License for more details. | 7531 | # This file is free software; the Free Software Foundation |
7670 | 7532 | # gives unlimited permission to copy and/or distribute it, | |
7671 | # You should have received a copy of the GNU General Public License | 7533 | # with or without modifications, as long as this notice is preserved. |
7672 | # along with this program; if not, write to the Free Software | ||
7673 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
7674 | # 02111-1307, USA. | ||
7675 | 7534 | ||
7676 | # serial 3 | 7535 | # serial 4 |
7677 | 7536 | ||
7678 | # AM_SANITY_CHECK | 7537 | # AM_SANITY_CHECK |
7679 | # --------------- | 7538 | # --------------- |
@@ -7716,25 +7575,14 @@ Check your system clock]) | |||
7716 | fi | 7575 | fi |
7717 | AC_MSG_RESULT(yes)]) | 7576 | AC_MSG_RESULT(yes)]) |
7718 | 7577 | ||
7719 | # AM_PROG_INSTALL_STRIP | 7578 | # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
7720 | 7579 | # | |
7721 | # Copyright (C) 2001, 2003 Free Software Foundation, Inc. | 7580 | # This file is free software; the Free Software Foundation |
7722 | 7581 | # gives unlimited permission to copy and/or distribute it, | |
7723 | # This program is free software; you can redistribute it and/or modify | 7582 | # with or without modifications, as long as this notice is preserved. |
7724 | # it under the terms of the GNU General Public License as published by | ||
7725 | # the Free Software Foundation; either version 2, or (at your option) | ||
7726 | # any later version. | ||
7727 | |||
7728 | # This program is distributed in the hope that it will be useful, | ||
7729 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
7730 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
7731 | # GNU General Public License for more details. | ||
7732 | |||
7733 | # You should have received a copy of the GNU General Public License | ||
7734 | # along with this program; if not, write to the Free Software | ||
7735 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
7736 | # 02111-1307, USA. | ||
7737 | 7583 | ||
7584 | # AM_PROG_INSTALL_STRIP | ||
7585 | # --------------------- | ||
7738 | # One issue with vendor `install' (even GNU) is that you can't | 7586 | # One issue with vendor `install' (even GNU) is that you can't |
7739 | # specify the program used to strip binaries. This is especially | 7587 | # specify the program used to strip binaries. This is especially |
7740 | # annoying in cross-compiling environments, where the build's strip | 7588 | # annoying in cross-compiling environments, where the build's strip |
@@ -7755,3 +7603,99 @@ fi | |||
7755 | INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" | 7603 | INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" |
7756 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | 7604 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
7757 | 7605 | ||
7606 | # Check how to create a tarball. -*- Autoconf -*- | ||
7607 | |||
7608 | # Copyright (C) 2004, 2005 Free Software Foundation, Inc. | ||
7609 | # | ||
7610 | # This file is free software; the Free Software Foundation | ||
7611 | # gives unlimited permission to copy and/or distribute it, | ||
7612 | # with or without modifications, as long as this notice is preserved. | ||
7613 | |||
7614 | # serial 2 | ||
7615 | |||
7616 | # _AM_PROG_TAR(FORMAT) | ||
7617 | # -------------------- | ||
7618 | # Check how to create a tarball in format FORMAT. | ||
7619 | # FORMAT should be one of `v7', `ustar', or `pax'. | ||
7620 | # | ||
7621 | # Substitute a variable $(am__tar) that is a command | ||
7622 | # writing to stdout a FORMAT-tarball containing the directory | ||
7623 | # $tardir. | ||
7624 | # tardir=directory && $(am__tar) > result.tar | ||
7625 | # | ||
7626 | # Substitute a variable $(am__untar) that extract such | ||
7627 | # a tarball read from stdin. | ||
7628 | # $(am__untar) < result.tar | ||
7629 | AC_DEFUN([_AM_PROG_TAR], | ||
7630 | [# Always define AMTAR for backward compatibility. | ||
7631 | AM_MISSING_PROG([AMTAR], [tar]) | ||
7632 | m4_if([$1], [v7], | ||
7633 | [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], | ||
7634 | [m4_case([$1], [ustar],, [pax],, | ||
7635 | [m4_fatal([Unknown tar format])]) | ||
7636 | AC_MSG_CHECKING([how to create a $1 tar archive]) | ||
7637 | # Loop over all known methods to create a tar archive until one works. | ||
7638 | _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' | ||
7639 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} | ||
7640 | # Do not fold the above two line into one, because Tru64 sh and | ||
7641 | # Solaris sh will not grok spaces in the rhs of `-'. | ||
7642 | for _am_tool in $_am_tools | ||
7643 | do | ||
7644 | case $_am_tool in | ||
7645 | gnutar) | ||
7646 | for _am_tar in tar gnutar gtar; | ||
7647 | do | ||
7648 | AM_RUN_LOG([$_am_tar --version]) && break | ||
7649 | done | ||
7650 | am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' | ||
7651 | am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' | ||
7652 | am__untar="$_am_tar -xf -" | ||
7653 | ;; | ||
7654 | plaintar) | ||
7655 | # Must skip GNU tar: if it does not support --format= it doesn't create | ||
7656 | # ustar tarball either. | ||
7657 | (tar --version) >/dev/null 2>&1 && continue | ||
7658 | am__tar='tar chf - "$$tardir"' | ||
7659 | am__tar_='tar chf - "$tardir"' | ||
7660 | am__untar='tar xf -' | ||
7661 | ;; | ||
7662 | pax) | ||
7663 | am__tar='pax -L -x $1 -w "$$tardir"' | ||
7664 | am__tar_='pax -L -x $1 -w "$tardir"' | ||
7665 | am__untar='pax -r' | ||
7666 | ;; | ||
7667 | cpio) | ||
7668 | am__tar='find "$$tardir" -print | cpio -o -H $1 -L' | ||
7669 | am__tar_='find "$tardir" -print | cpio -o -H $1 -L' | ||
7670 | am__untar='cpio -i -H $1 -d' | ||
7671 | ;; | ||
7672 | none) | ||
7673 | am__tar=false | ||
7674 | am__tar_=false | ||
7675 | am__untar=false | ||
7676 | ;; | ||
7677 | esac | ||
7678 | |||
7679 | # If the value was cached, stop now. We just wanted to have am__tar | ||
7680 | # and am__untar set. | ||
7681 | test -n "${am_cv_prog_tar_$1}" && break | ||
7682 | |||
7683 | # tar/untar a dummy directory, and stop if the command works | ||
7684 | rm -rf conftest.dir | ||
7685 | mkdir conftest.dir | ||
7686 | echo GrepMe > conftest.dir/file | ||
7687 | AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) | ||
7688 | rm -rf conftest.dir | ||
7689 | if test -s conftest.tar; then | ||
7690 | AM_RUN_LOG([$am__untar <conftest.tar]) | ||
7691 | grep GrepMe conftest.dir/file >/dev/null 2>&1 && break | ||
7692 | fi | ||
7693 | done | ||
7694 | rm -rf conftest.dir | ||
7695 | |||
7696 | AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) | ||
7697 | AC_MSG_RESULT([$am_cv_prog_tar_$1])]) | ||
7698 | AC_SUBST([am__tar]) | ||
7699 | AC_SUBST([am__untar]) | ||
7700 | ]) # _AM_PROG_TAR | ||
7701 | |||
diff --git a/libltdl/config.guess b/libltdl/config.guess index 396482d6..917bbc50 100755 --- a/libltdl/config.guess +++ b/libltdl/config.guess | |||
@@ -1,10 +1,9 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, | 4 | # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. |
5 | # Inc. | ||
6 | 5 | ||
7 | timestamp='2006-07-02' | 6 | timestamp='2005-07-08' |
8 | 7 | ||
9 | # This file is free software; you can redistribute it and/or modify it | 8 | # This file is free software; you can redistribute it and/or modify it |
10 | # under the terms of the GNU General Public License as published by | 9 | # under the terms of the GNU General Public License as published by |
@@ -107,7 +106,7 @@ set_cc_for_build=' | |||
107 | trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; | 106 | trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; |
108 | trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; | 107 | trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; |
109 | : ${TMPDIR=/tmp} ; | 108 | : ${TMPDIR=/tmp} ; |
110 | { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || | 109 | { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || |
111 | { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || | 110 | { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || |
112 | { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || | 111 | { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || |
113 | { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; | 112 | { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; |
@@ -207,11 +206,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
207 | *:ekkoBSD:*:*) | 206 | *:ekkoBSD:*:*) |
208 | echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} | 207 | echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} |
209 | exit ;; | 208 | exit ;; |
210 | *:SolidBSD:*:*) | ||
211 | echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} | ||
212 | exit ;; | ||
213 | macppc:MirBSD:*:*) | 209 | macppc:MirBSD:*:*) |
214 | echo powerpc-unknown-mirbsd${UNAME_RELEASE} | 210 | echo powerppc-unknown-mirbsd${UNAME_RELEASE} |
215 | exit ;; | 211 | exit ;; |
216 | *:MirBSD:*:*) | 212 | *:MirBSD:*:*) |
217 | echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} | 213 | echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} |
@@ -768,14 +764,7 @@ EOF | |||
768 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} | 764 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
769 | exit ;; | 765 | exit ;; |
770 | *:FreeBSD:*:*) | 766 | *:FreeBSD:*:*) |
771 | case ${UNAME_MACHINE} in | 767 | echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
772 | pc98) | ||
773 | echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | ||
774 | amd64) | ||
775 | echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | ||
776 | *) | ||
777 | echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | ||
778 | esac | ||
779 | exit ;; | 768 | exit ;; |
780 | i*:CYGWIN*:*) | 769 | i*:CYGWIN*:*) |
781 | echo ${UNAME_MACHINE}-pc-cygwin | 770 | echo ${UNAME_MACHINE}-pc-cygwin |
@@ -790,11 +779,8 @@ EOF | |||
790 | i*:PW*:*) | 779 | i*:PW*:*) |
791 | echo ${UNAME_MACHINE}-pc-pw32 | 780 | echo ${UNAME_MACHINE}-pc-pw32 |
792 | exit ;; | 781 | exit ;; |
793 | x86:Interix*:[3456]*) | 782 | x86:Interix*:[34]*) |
794 | echo i586-pc-interix${UNAME_RELEASE} | 783 | echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' |
795 | exit ;; | ||
796 | EM64T:Interix*:[3456]*) | ||
797 | echo x86_64-unknown-interix${UNAME_RELEASE} | ||
798 | exit ;; | 784 | exit ;; |
799 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) | 785 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) |
800 | echo i${UNAME_MACHINE}-pc-mks | 786 | echo i${UNAME_MACHINE}-pc-mks |
@@ -808,7 +794,7 @@ EOF | |||
808 | i*:UWIN*:*) | 794 | i*:UWIN*:*) |
809 | echo ${UNAME_MACHINE}-pc-uwin | 795 | echo ${UNAME_MACHINE}-pc-uwin |
810 | exit ;; | 796 | exit ;; |
811 | amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) | 797 | amd64:CYGWIN*:*:*) |
812 | echo x86_64-unknown-cygwin | 798 | echo x86_64-unknown-cygwin |
813 | exit ;; | 799 | exit ;; |
814 | p*:CYGWIN*:*) | 800 | p*:CYGWIN*:*) |
@@ -831,9 +817,6 @@ EOF | |||
831 | arm*:Linux:*:*) | 817 | arm*:Linux:*:*) |
832 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 818 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
833 | exit ;; | 819 | exit ;; |
834 | avr32*:Linux:*:*) | ||
835 | echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
836 | exit ;; | ||
837 | cris:Linux:*:*) | 820 | cris:Linux:*:*) |
838 | echo cris-axis-linux-gnu | 821 | echo cris-axis-linux-gnu |
839 | exit ;; | 822 | exit ;; |
@@ -868,11 +851,7 @@ EOF | |||
868 | #endif | 851 | #endif |
869 | #endif | 852 | #endif |
870 | EOF | 853 | EOF |
871 | eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' | 854 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` |
872 | /^CPU/{ | ||
873 | s: ::g | ||
874 | p | ||
875 | }'`" | ||
876 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | 855 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
877 | ;; | 856 | ;; |
878 | mips64:Linux:*:*) | 857 | mips64:Linux:*:*) |
@@ -891,16 +870,9 @@ EOF | |||
891 | #endif | 870 | #endif |
892 | #endif | 871 | #endif |
893 | EOF | 872 | EOF |
894 | eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' | 873 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` |
895 | /^CPU/{ | ||
896 | s: ::g | ||
897 | p | ||
898 | }'`" | ||
899 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | 874 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
900 | ;; | 875 | ;; |
901 | or32:Linux:*:*) | ||
902 | echo or32-unknown-linux-gnu | ||
903 | exit ;; | ||
904 | ppc:Linux:*:*) | 876 | ppc:Linux:*:*) |
905 | echo powerpc-unknown-linux-gnu | 877 | echo powerpc-unknown-linux-gnu |
906 | exit ;; | 878 | exit ;; |
@@ -944,9 +916,6 @@ EOF | |||
944 | sparc:Linux:*:* | sparc64:Linux:*:*) | 916 | sparc:Linux:*:* | sparc64:Linux:*:*) |
945 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 917 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
946 | exit ;; | 918 | exit ;; |
947 | vax:Linux:*:*) | ||
948 | echo ${UNAME_MACHINE}-dec-linux-gnu | ||
949 | exit ;; | ||
950 | x86_64:Linux:*:*) | 919 | x86_64:Linux:*:*) |
951 | echo x86_64-unknown-linux-gnu | 920 | echo x86_64-unknown-linux-gnu |
952 | exit ;; | 921 | exit ;; |
@@ -992,7 +961,7 @@ EOF | |||
992 | LIBC=gnulibc1 | 961 | LIBC=gnulibc1 |
993 | # endif | 962 | # endif |
994 | #else | 963 | #else |
995 | #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) | 964 | #ifdef __INTEL_COMPILER |
996 | LIBC=gnu | 965 | LIBC=gnu |
997 | #else | 966 | #else |
998 | LIBC=gnuaout | 967 | LIBC=gnuaout |
@@ -1002,11 +971,7 @@ EOF | |||
1002 | LIBC=dietlibc | 971 | LIBC=dietlibc |
1003 | #endif | 972 | #endif |
1004 | EOF | 973 | EOF |
1005 | eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' | 974 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` |
1006 | /^LIBC/{ | ||
1007 | s: ::g | ||
1008 | p | ||
1009 | }'`" | ||
1010 | test x"${LIBC}" != x && { | 975 | test x"${LIBC}" != x && { |
1011 | echo "${UNAME_MACHINE}-pc-linux-${LIBC}" | 976 | echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
1012 | exit | 977 | exit |
@@ -1217,6 +1182,7 @@ EOF | |||
1217 | *:Darwin:*:*) | 1182 | *:Darwin:*:*) |
1218 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown | 1183 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
1219 | case $UNAME_PROCESSOR in | 1184 | case $UNAME_PROCESSOR in |
1185 | *86) UNAME_PROCESSOR=i686 ;; | ||
1220 | unknown) UNAME_PROCESSOR=powerpc ;; | 1186 | unknown) UNAME_PROCESSOR=powerpc ;; |
1221 | esac | 1187 | esac |
1222 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} | 1188 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
@@ -1295,9 +1261,6 @@ EOF | |||
1295 | i*86:skyos:*:*) | 1261 | i*86:skyos:*:*) |
1296 | echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' | 1262 | echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' |
1297 | exit ;; | 1263 | exit ;; |
1298 | i*86:rdos:*:*) | ||
1299 | echo ${UNAME_MACHINE}-pc-rdos | ||
1300 | exit ;; | ||
1301 | esac | 1264 | esac |
1302 | 1265 | ||
1303 | #echo '(No uname command or uname output not recognized.)' 1>&2 | 1266 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
diff --git a/libltdl/config.sub b/libltdl/config.sub index 387c18d1..1c366dfd 100755 --- a/libltdl/config.sub +++ b/libltdl/config.sub | |||
@@ -1,10 +1,9 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, | 4 | # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. |
5 | # Inc. | ||
6 | 5 | ||
7 | timestamp='2006-07-02' | 6 | timestamp='2005-07-08' |
8 | 7 | ||
9 | # This file is (in principle) common to ALL GNU software. | 8 | # This file is (in principle) common to ALL GNU software. |
10 | # The presence of a machine in this file suggests that SOME GNU software | 9 | # The presence of a machine in this file suggests that SOME GNU software |
@@ -120,9 +119,8 @@ esac | |||
120 | # Here we must recognize all the valid KERNEL-OS combinations. | 119 | # Here we must recognize all the valid KERNEL-OS combinations. |
121 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | 120 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
122 | case $maybe_os in | 121 | case $maybe_os in |
123 | nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ | 122 | nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ |
124 | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ | 123 | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) |
125 | storm-chaos* | os2-emx* | rtmk-nova*) | ||
126 | os=-$maybe_os | 124 | os=-$maybe_os |
127 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | 125 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
128 | ;; | 126 | ;; |
@@ -173,10 +171,6 @@ case $os in | |||
173 | -hiux*) | 171 | -hiux*) |
174 | os=-hiuxwe2 | 172 | os=-hiuxwe2 |
175 | ;; | 173 | ;; |
176 | -sco6) | ||
177 | os=-sco5v6 | ||
178 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | ||
179 | ;; | ||
180 | -sco5) | 174 | -sco5) |
181 | os=-sco3.2v5 | 175 | os=-sco3.2v5 |
182 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 176 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
@@ -193,10 +187,6 @@ case $os in | |||
193 | # Don't forget version if it is 3.2v4 or newer. | 187 | # Don't forget version if it is 3.2v4 or newer. |
194 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 188 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
195 | ;; | 189 | ;; |
196 | -sco5v6*) | ||
197 | # Don't forget version if it is 3.2v4 or newer. | ||
198 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | ||
199 | ;; | ||
200 | -sco*) | 190 | -sco*) |
201 | os=-sco3.2v2 | 191 | os=-sco3.2v2 |
202 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 192 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
@@ -241,7 +231,7 @@ case $basic_machine in | |||
241 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | 231 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
242 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | 232 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
243 | | am33_2.0 \ | 233 | | am33_2.0 \ |
244 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | 234 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ |
245 | | bfin \ | 235 | | bfin \ |
246 | | c4x | clipper \ | 236 | | c4x | clipper \ |
247 | | d10v | d30v | dlx | dsp16xx \ | 237 | | d10v | d30v | dlx | dsp16xx \ |
@@ -249,8 +239,7 @@ case $basic_machine in | |||
249 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | 239 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
250 | | i370 | i860 | i960 | ia64 \ | 240 | | i370 | i860 | i960 | ia64 \ |
251 | | ip2k | iq2000 \ | 241 | | ip2k | iq2000 \ |
252 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ | 242 | | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ |
253 | | maxq | mb | microblaze | mcore \ | ||
254 | | mips | mipsbe | mipseb | mipsel | mipsle \ | 243 | | mips | mipsbe | mipseb | mipsel | mipsle \ |
255 | | mips16 \ | 244 | | mips16 \ |
256 | | mips64 | mips64el \ | 245 | | mips64 | mips64el \ |
@@ -268,19 +257,18 @@ case $basic_machine in | |||
268 | | mipsisa64sr71k | mipsisa64sr71kel \ | 257 | | mipsisa64sr71k | mipsisa64sr71kel \ |
269 | | mipstx39 | mipstx39el \ | 258 | | mipstx39 | mipstx39el \ |
270 | | mn10200 | mn10300 \ | 259 | | mn10200 | mn10300 \ |
271 | | mt \ | 260 | | ms1 \ |
272 | | msp430 \ | 261 | | msp430 \ |
273 | | nios | nios2 \ | ||
274 | | ns16k | ns32k \ | 262 | | ns16k | ns32k \ |
275 | | or32 \ | 263 | | or32 \ |
276 | | pdp10 | pdp11 | pj | pjl \ | 264 | | pdp10 | pdp11 | pj | pjl \ |
277 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | 265 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
278 | | pyramid \ | 266 | | pyramid \ |
279 | | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | 267 | | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ |
280 | | sh64 | sh64le \ | 268 | | sh64 | sh64le \ |
281 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | 269 | | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ |
282 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | 270 | | sparcv8 | sparcv9 | sparcv9b \ |
283 | | spu | strongarm \ | 271 | | strongarm \ |
284 | | tahoe | thumb | tic4x | tic80 | tron \ | 272 | | tahoe | thumb | tic4x | tic80 | tron \ |
285 | | v850 | v850e \ | 273 | | v850 | v850e \ |
286 | | we32k \ | 274 | | we32k \ |
@@ -288,6 +276,9 @@ case $basic_machine in | |||
288 | | z8k) | 276 | | z8k) |
289 | basic_machine=$basic_machine-unknown | 277 | basic_machine=$basic_machine-unknown |
290 | ;; | 278 | ;; |
279 | m32c) | ||
280 | basic_machine=$basic_machine-unknown | ||
281 | ;; | ||
291 | m6811 | m68hc11 | m6812 | m68hc12) | 282 | m6811 | m68hc11 | m6812 | m68hc12) |
292 | # Motorola 68HC11/12. | 283 | # Motorola 68HC11/12. |
293 | basic_machine=$basic_machine-unknown | 284 | basic_machine=$basic_machine-unknown |
@@ -295,9 +286,6 @@ case $basic_machine in | |||
295 | ;; | 286 | ;; |
296 | m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) | 287 | m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) |
297 | ;; | 288 | ;; |
298 | ms1) | ||
299 | basic_machine=mt-unknown | ||
300 | ;; | ||
301 | 289 | ||
302 | # We use `pc' rather than `unknown' | 290 | # We use `pc' rather than `unknown' |
303 | # because (1) that's what they normally are, and | 291 | # because (1) that's what they normally are, and |
@@ -317,7 +305,7 @@ case $basic_machine in | |||
317 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | 305 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
318 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | 306 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
319 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | 307 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
320 | | avr-* | avr32-* \ | 308 | | avr-* \ |
321 | | bfin-* | bs2000-* \ | 309 | | bfin-* | bs2000-* \ |
322 | | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | 310 | | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ |
323 | | clipper-* | craynv-* | cydra-* \ | 311 | | clipper-* | craynv-* | cydra-* \ |
@@ -328,7 +316,7 @@ case $basic_machine in | |||
328 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | 316 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
329 | | i*86-* | i860-* | i960-* | ia64-* \ | 317 | | i*86-* | i860-* | i960-* | ia64-* \ |
330 | | ip2k-* | iq2000-* \ | 318 | | ip2k-* | iq2000-* \ |
331 | | m32c-* | m32r-* | m32rle-* \ | 319 | | m32r-* | m32rle-* \ |
332 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | 320 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
333 | | m88110-* | m88k-* | maxq-* | mcore-* \ | 321 | | m88110-* | m88k-* | maxq-* | mcore-* \ |
334 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | 322 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
@@ -348,20 +336,19 @@ case $basic_machine in | |||
348 | | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | 336 | | mipsisa64sr71k-* | mipsisa64sr71kel-* \ |
349 | | mipstx39-* | mipstx39el-* \ | 337 | | mipstx39-* | mipstx39el-* \ |
350 | | mmix-* \ | 338 | | mmix-* \ |
351 | | mt-* \ | 339 | | ms1-* \ |
352 | | msp430-* \ | 340 | | msp430-* \ |
353 | | nios-* | nios2-* \ | ||
354 | | none-* | np1-* | ns16k-* | ns32k-* \ | 341 | | none-* | np1-* | ns16k-* | ns32k-* \ |
355 | | orion-* \ | 342 | | orion-* \ |
356 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | 343 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
357 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | 344 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
358 | | pyramid-* \ | 345 | | pyramid-* \ |
359 | | romp-* | rs6000-* \ | 346 | | romp-* | rs6000-* \ |
360 | | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | 347 | | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ |
361 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | 348 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
362 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | 349 | | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ |
363 | | sparclite-* \ | 350 | | sparclite-* \ |
364 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | 351 | | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ |
365 | | tahoe-* | thumb-* \ | 352 | | tahoe-* | thumb-* \ |
366 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | 353 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
367 | | tron-* \ | 354 | | tron-* \ |
@@ -372,6 +359,8 @@ case $basic_machine in | |||
372 | | ymp-* \ | 359 | | ymp-* \ |
373 | | z8k-*) | 360 | | z8k-*) |
374 | ;; | 361 | ;; |
362 | m32c-*) | ||
363 | ;; | ||
375 | # Recognize the various machine names and aliases which stand | 364 | # Recognize the various machine names and aliases which stand |
376 | # for a CPU type and a company and sometimes even an OS. | 365 | # for a CPU type and a company and sometimes even an OS. |
377 | 386bsd) | 366 | 386bsd) |
@@ -707,9 +696,6 @@ case $basic_machine in | |||
707 | basic_machine=i386-pc | 696 | basic_machine=i386-pc |
708 | os=-msdos | 697 | os=-msdos |
709 | ;; | 698 | ;; |
710 | ms1-*) | ||
711 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` | ||
712 | ;; | ||
713 | mvs) | 699 | mvs) |
714 | basic_machine=i370-ibm | 700 | basic_machine=i370-ibm |
715 | os=-mvs | 701 | os=-mvs |
@@ -817,12 +803,6 @@ case $basic_machine in | |||
817 | pc532 | pc532-*) | 803 | pc532 | pc532-*) |
818 | basic_machine=ns32k-pc532 | 804 | basic_machine=ns32k-pc532 |
819 | ;; | 805 | ;; |
820 | pc98) | ||
821 | basic_machine=i386-pc | ||
822 | ;; | ||
823 | pc98-*) | ||
824 | basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
825 | ;; | ||
826 | pentium | p5 | k5 | k6 | nexgen | viac3) | 806 | pentium | p5 | k5 | k6 | nexgen | viac3) |
827 | basic_machine=i586-pc | 807 | basic_machine=i586-pc |
828 | ;; | 808 | ;; |
@@ -879,10 +859,6 @@ case $basic_machine in | |||
879 | basic_machine=i586-unknown | 859 | basic_machine=i586-unknown |
880 | os=-pw32 | 860 | os=-pw32 |
881 | ;; | 861 | ;; |
882 | rdos) | ||
883 | basic_machine=i386-pc | ||
884 | os=-rdos | ||
885 | ;; | ||
886 | rom68k) | 862 | rom68k) |
887 | basic_machine=m68k-rom68k | 863 | basic_machine=m68k-rom68k |
888 | os=-coff | 864 | os=-coff |
@@ -1125,7 +1101,7 @@ case $basic_machine in | |||
1125 | sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) | 1101 | sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) |
1126 | basic_machine=sh-unknown | 1102 | basic_machine=sh-unknown |
1127 | ;; | 1103 | ;; |
1128 | sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) | 1104 | sparc | sparcv8 | sparcv9 | sparcv9b) |
1129 | basic_machine=sparc-sun | 1105 | basic_machine=sparc-sun |
1130 | ;; | 1106 | ;; |
1131 | cydra) | 1107 | cydra) |
@@ -1198,23 +1174,21 @@ case $os in | |||
1198 | | -aos* \ | 1174 | | -aos* \ |
1199 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | 1175 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
1200 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | 1176 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ |
1201 | | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ | 1177 | | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ |
1202 | | -openbsd* | -solidbsd* \ | ||
1203 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | 1178 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ |
1204 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | 1179 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
1205 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | 1180 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
1206 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | 1181 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
1207 | | -chorusos* | -chorusrdb* \ | 1182 | | -chorusos* | -chorusrdb* \ |
1208 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | 1183 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
1209 | | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | 1184 | | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ |
1210 | | -uxpv* | -beos* | -mpeix* | -udk* \ | ||
1211 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | 1185 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
1212 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | 1186 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
1213 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | 1187 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
1214 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | 1188 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
1215 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | 1189 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
1216 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | 1190 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
1217 | | -skyos* | -haiku* | -rdos* | -toppers*) | 1191 | | -skyos* | -haiku*) |
1218 | # Remember, each alternative MUST END IN *, to match a version number. | 1192 | # Remember, each alternative MUST END IN *, to match a version number. |
1219 | ;; | 1193 | ;; |
1220 | -qnx*) | 1194 | -qnx*) |
@@ -1366,9 +1340,6 @@ else | |||
1366 | # system, and we'll never get to this point. | 1340 | # system, and we'll never get to this point. |
1367 | 1341 | ||
1368 | case $basic_machine in | 1342 | case $basic_machine in |
1369 | spu-*) | ||
1370 | os=-elf | ||
1371 | ;; | ||
1372 | *-acorn) | 1343 | *-acorn) |
1373 | os=-riscix1.2 | 1344 | os=-riscix1.2 |
1374 | ;; | 1345 | ;; |
@@ -1378,9 +1349,9 @@ case $basic_machine in | |||
1378 | arm*-semi) | 1349 | arm*-semi) |
1379 | os=-aout | 1350 | os=-aout |
1380 | ;; | 1351 | ;; |
1381 | c4x-* | tic4x-*) | 1352 | c4x-* | tic4x-*) |
1382 | os=-coff | 1353 | os=-coff |
1383 | ;; | 1354 | ;; |
1384 | # This must come before the *-dec entry. | 1355 | # This must come before the *-dec entry. |
1385 | pdp10-*) | 1356 | pdp10-*) |
1386 | os=-tops20 | 1357 | os=-tops20 |
diff --git a/libltdl/configure b/libltdl/configure index 7e32fbe0..d5a971e3 100755 --- a/libltdl/configure +++ b/libltdl/configure | |||
@@ -1,11 +1,10 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
3 | # Generated by GNU Autoconf 2.60a for libltdl 1.2. | 3 | # Generated by GNU Autoconf 2.59 for libltdl 1.2. |
4 | # | 4 | # |
5 | # Report bugs to <bug-libtool@gnu.org>. | 5 | # Report bugs to <bug-libtool@gnu.org>. |
6 | # | 6 | # |
7 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 7 | # Copyright (C) 2003 Free Software Foundation, Inc. |
8 | # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | ||
9 | # This configure script is free software; the Free Software Foundation | 8 | # This configure script is free software; the Free Software Foundation |
10 | # gives unlimited permission to copy, distribute and modify it. | 9 | # gives unlimited permission to copy, distribute and modify it. |
11 | ## --------------------- ## | 10 | ## --------------------- ## |
@@ -19,35 +18,11 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |||
19 | # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | 18 | # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which |
20 | # is contrary to our usage. Disable this feature. | 19 | # is contrary to our usage. Disable this feature. |
21 | alias -g '${1+"$@"}'='"$@"' | 20 | alias -g '${1+"$@"}'='"$@"' |
22 | setopt NO_GLOB_SUBST | 21 | elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then |
23 | else | 22 | set -o posix |
24 | case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | ||
25 | fi | 23 | fi |
26 | BIN_SH=xpg4; export BIN_SH # for Tru64 | ||
27 | DUALCASE=1; export DUALCASE # for MKS sh | 24 | DUALCASE=1; export DUALCASE # for MKS sh |
28 | 25 | ||
29 | |||
30 | # PATH needs CR | ||
31 | # Avoid depending upon Character Ranges. | ||
32 | as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
33 | as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
34 | as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
35 | as_cr_digits='0123456789' | ||
36 | as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
37 | |||
38 | # The user is always right. | ||
39 | if test "${PATH_SEPARATOR+set}" != set; then | ||
40 | echo "#! /bin/sh" >conf$$.sh | ||
41 | echo "exit 0" >>conf$$.sh | ||
42 | chmod +x conf$$.sh | ||
43 | if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
44 | PATH_SEPARATOR=';' | ||
45 | else | ||
46 | PATH_SEPARATOR=: | ||
47 | fi | ||
48 | rm -f conf$$.sh | ||
49 | fi | ||
50 | |||
51 | # Support unset when possible. | 26 | # Support unset when possible. |
52 | if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | 27 | if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then |
53 | as_unset=unset | 28 | as_unset=unset |
@@ -56,43 +31,8 @@ else | |||
56 | fi | 31 | fi |
57 | 32 | ||
58 | 33 | ||
59 | # IFS | ||
60 | # We need space, tab and new line, in precisely that order. Quoting is | ||
61 | # there to prevent editors from complaining about space-tab. | ||
62 | # (If _AS_PATH_WALK were called with IFS unset, it would disable word | ||
63 | # splitting by setting IFS to empty value.) | ||
64 | as_nl=' | ||
65 | ' | ||
66 | IFS=" "" $as_nl" | ||
67 | |||
68 | # Find who we are. Look in the path if we contain no directory separator. | ||
69 | case $0 in | ||
70 | *[\\/]* ) as_myself=$0 ;; | ||
71 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
72 | for as_dir in $PATH | ||
73 | do | ||
74 | IFS=$as_save_IFS | ||
75 | test -z "$as_dir" && as_dir=. | ||
76 | test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
77 | done | ||
78 | IFS=$as_save_IFS | ||
79 | |||
80 | ;; | ||
81 | esac | ||
82 | # We did not find ourselves, most probably we were run as `sh COMMAND' | ||
83 | # in which case we are not to be found in the path. | ||
84 | if test "x$as_myself" = x; then | ||
85 | as_myself=$0 | ||
86 | fi | ||
87 | if test ! -f "$as_myself"; then | ||
88 | echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | ||
89 | { (exit 1); exit 1; } | ||
90 | fi | ||
91 | |||
92 | # Work around bugs in pre-3.0 UWIN ksh. | 34 | # Work around bugs in pre-3.0 UWIN ksh. |
93 | for as_var in ENV MAIL MAILPATH | 35 | $as_unset ENV MAIL MAILPATH |
94 | do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
95 | done | ||
96 | PS1='$ ' | 36 | PS1='$ ' |
97 | PS2='> ' | 37 | PS2='> ' |
98 | PS4='+ ' | 38 | PS4='+ ' |
@@ -106,19 +46,18 @@ do | |||
106 | if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | 46 | if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then |
107 | eval $as_var=C; export $as_var | 47 | eval $as_var=C; export $as_var |
108 | else | 48 | else |
109 | ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | 49 | $as_unset $as_var |
110 | fi | 50 | fi |
111 | done | 51 | done |
112 | 52 | ||
113 | # Required to use basename. | 53 | # Required to use basename. |
114 | if expr a : '\(a\)' >/dev/null 2>&1 && | 54 | if expr a : '\(a\)' >/dev/null 2>&1; then |
115 | test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
116 | as_expr=expr | 55 | as_expr=expr |
117 | else | 56 | else |
118 | as_expr=false | 57 | as_expr=false |
119 | fi | 58 | fi |
120 | 59 | ||
121 | if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then | 60 | if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then |
122 | as_basename=basename | 61 | as_basename=basename |
123 | else | 62 | else |
124 | as_basename=false | 63 | as_basename=false |
@@ -126,386 +65,157 @@ fi | |||
126 | 65 | ||
127 | 66 | ||
128 | # Name of the executable. | 67 | # Name of the executable. |
129 | as_me=`$as_basename -- "$0" || | 68 | as_me=`$as_basename "$0" || |
130 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | 69 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ |
131 | X"$0" : 'X\(//\)$' \| \ | 70 | X"$0" : 'X\(//\)$' \| \ |
132 | X"$0" : 'X\(/\)' \| . 2>/dev/null || | 71 | X"$0" : 'X\(/\)$' \| \ |
72 | . : '\(.\)' 2>/dev/null || | ||
133 | echo X/"$0" | | 73 | echo X/"$0" | |
134 | sed '/^.*\/\([^/][^/]*\)\/*$/{ | 74 | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } |
135 | s//\1/ | 75 | /^X\/\(\/\/\)$/{ s//\1/; q; } |
136 | q | 76 | /^X\/\(\/\).*/{ s//\1/; q; } |
137 | } | 77 | s/.*/./; q'` |
138 | /^X\/\(\/\/\)$/{ | ||
139 | s//\1/ | ||
140 | q | ||
141 | } | ||
142 | /^X\/\(\/\).*/{ | ||
143 | s//\1/ | ||
144 | q | ||
145 | } | ||
146 | s/.*/./; q'` | ||
147 | |||
148 | # CDPATH. | ||
149 | $as_unset CDPATH | ||
150 | |||
151 | |||
152 | if test "x$CONFIG_SHELL" = x; then | ||
153 | if (eval ":") 2>/dev/null; then | ||
154 | as_have_required=yes | ||
155 | else | ||
156 | as_have_required=no | ||
157 | fi | ||
158 | |||
159 | if test $as_have_required = yes && (eval ": | ||
160 | (as_func_return () { | ||
161 | (exit \$1) | ||
162 | } | ||
163 | as_func_success () { | ||
164 | as_func_return 0 | ||
165 | } | ||
166 | as_func_failure () { | ||
167 | as_func_return 1 | ||
168 | } | ||
169 | as_func_ret_success () { | ||
170 | return 0 | ||
171 | } | ||
172 | as_func_ret_failure () { | ||
173 | return 1 | ||
174 | } | ||
175 | |||
176 | exitcode=0 | ||
177 | if as_func_success; then | ||
178 | : | ||
179 | else | ||
180 | exitcode=1 | ||
181 | echo as_func_success failed. | ||
182 | fi | ||
183 | 78 | ||
184 | if as_func_failure; then | ||
185 | exitcode=1 | ||
186 | echo as_func_failure succeeded. | ||
187 | fi | ||
188 | 79 | ||
189 | if as_func_ret_success; then | 80 | # PATH needs CR, and LINENO needs CR and PATH. |
190 | : | 81 | # Avoid depending upon Character Ranges. |
191 | else | 82 | as_cr_letters='abcdefghijklmnopqrstuvwxyz' |
192 | exitcode=1 | 83 | as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' |
193 | echo as_func_ret_success failed. | 84 | as_cr_Letters=$as_cr_letters$as_cr_LETTERS |
194 | fi | 85 | as_cr_digits='0123456789' |
86 | as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
195 | 87 | ||
196 | if as_func_ret_failure; then | 88 | # The user is always right. |
197 | exitcode=1 | 89 | if test "${PATH_SEPARATOR+set}" != set; then |
198 | echo as_func_ret_failure succeeded. | 90 | echo "#! /bin/sh" >conf$$.sh |
91 | echo "exit 0" >>conf$$.sh | ||
92 | chmod +x conf$$.sh | ||
93 | if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
94 | PATH_SEPARATOR=';' | ||
95 | else | ||
96 | PATH_SEPARATOR=: | ||
97 | fi | ||
98 | rm -f conf$$.sh | ||
199 | fi | 99 | fi |
200 | 100 | ||
201 | if ( set x; as_func_ret_success y && test x = \"\$1\" ); then | ||
202 | : | ||
203 | else | ||
204 | exitcode=1 | ||
205 | echo positional parameters were not saved. | ||
206 | fi | ||
207 | 101 | ||
208 | test \$exitcode = 0) || { (exit 1); exit 1; } | 102 | as_lineno_1=$LINENO |
103 | as_lineno_2=$LINENO | ||
104 | as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | ||
105 | test "x$as_lineno_1" != "x$as_lineno_2" && | ||
106 | test "x$as_lineno_3" = "x$as_lineno_2" || { | ||
107 | # Find who we are. Look in the path if we contain no path at all | ||
108 | # relative or not. | ||
109 | case $0 in | ||
110 | *[\\/]* ) as_myself=$0 ;; | ||
111 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
112 | for as_dir in $PATH | ||
113 | do | ||
114 | IFS=$as_save_IFS | ||
115 | test -z "$as_dir" && as_dir=. | ||
116 | test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
117 | done | ||
209 | 118 | ||
210 | ( | 119 | ;; |
211 | as_lineno_1=\$LINENO | 120 | esac |
212 | as_lineno_2=\$LINENO | 121 | # We did not find ourselves, most probably we were run as `sh COMMAND' |
213 | test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && | 122 | # in which case we are not to be found in the path. |
214 | test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } | 123 | if test "x$as_myself" = x; then |
215 | ") 2> /dev/null; then | 124 | as_myself=$0 |
216 | : | 125 | fi |
217 | else | 126 | if test ! -f "$as_myself"; then |
218 | as_candidate_shells= | 127 | { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 |
128 | { (exit 1); exit 1; }; } | ||
129 | fi | ||
130 | case $CONFIG_SHELL in | ||
131 | '') | ||
219 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | 132 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
220 | for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | 133 | for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH |
221 | do | 134 | do |
222 | IFS=$as_save_IFS | 135 | IFS=$as_save_IFS |
223 | test -z "$as_dir" && as_dir=. | 136 | test -z "$as_dir" && as_dir=. |
224 | case $as_dir in | 137 | for as_base in sh bash ksh sh5; do |
138 | case $as_dir in | ||
225 | /*) | 139 | /*) |
226 | for as_base in sh bash ksh sh5; do | 140 | if ("$as_dir/$as_base" -c ' |
227 | as_candidate_shells="$as_candidate_shells $as_dir/$as_base" | ||
228 | done;; | ||
229 | esac | ||
230 | done | ||
231 | IFS=$as_save_IFS | ||
232 | |||
233 | |||
234 | for as_shell in $as_candidate_shells $SHELL; do | ||
235 | # Try only shells that exist, to save several forks. | ||
236 | if { test -f "$as_shell" || test -f "$as_shell.exe"; } && | ||
237 | { ("$as_shell") 2> /dev/null <<\_ASEOF | ||
238 | # Be Bourne compatible | ||
239 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
240 | emulate sh | ||
241 | NULLCMD=: | ||
242 | # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | ||
243 | # is contrary to our usage. Disable this feature. | ||
244 | alias -g '${1+"$@"}'='"$@"' | ||
245 | setopt NO_GLOB_SUBST | ||
246 | else | ||
247 | case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | ||
248 | fi | ||
249 | BIN_SH=xpg4; export BIN_SH # for Tru64 | ||
250 | DUALCASE=1; export DUALCASE # for MKS sh | ||
251 | |||
252 | : | ||
253 | _ASEOF | ||
254 | }; then | ||
255 | CONFIG_SHELL=$as_shell | ||
256 | as_have_required=yes | ||
257 | if { "$as_shell" 2> /dev/null <<\_ASEOF | ||
258 | # Be Bourne compatible | ||
259 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
260 | emulate sh | ||
261 | NULLCMD=: | ||
262 | # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | ||
263 | # is contrary to our usage. Disable this feature. | ||
264 | alias -g '${1+"$@"}'='"$@"' | ||
265 | setopt NO_GLOB_SUBST | ||
266 | else | ||
267 | case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | ||
268 | fi | ||
269 | BIN_SH=xpg4; export BIN_SH # for Tru64 | ||
270 | DUALCASE=1; export DUALCASE # for MKS sh | ||
271 | |||
272 | : | ||
273 | (as_func_return () { | ||
274 | (exit $1) | ||
275 | } | ||
276 | as_func_success () { | ||
277 | as_func_return 0 | ||
278 | } | ||
279 | as_func_failure () { | ||
280 | as_func_return 1 | ||
281 | } | ||
282 | as_func_ret_success () { | ||
283 | return 0 | ||
284 | } | ||
285 | as_func_ret_failure () { | ||
286 | return 1 | ||
287 | } | ||
288 | |||
289 | exitcode=0 | ||
290 | if as_func_success; then | ||
291 | : | ||
292 | else | ||
293 | exitcode=1 | ||
294 | echo as_func_success failed. | ||
295 | fi | ||
296 | |||
297 | if as_func_failure; then | ||
298 | exitcode=1 | ||
299 | echo as_func_failure succeeded. | ||
300 | fi | ||
301 | |||
302 | if as_func_ret_success; then | ||
303 | : | ||
304 | else | ||
305 | exitcode=1 | ||
306 | echo as_func_ret_success failed. | ||
307 | fi | ||
308 | |||
309 | if as_func_ret_failure; then | ||
310 | exitcode=1 | ||
311 | echo as_func_ret_failure succeeded. | ||
312 | fi | ||
313 | |||
314 | if ( set x; as_func_ret_success y && test x = "$1" ); then | ||
315 | : | ||
316 | else | ||
317 | exitcode=1 | ||
318 | echo positional parameters were not saved. | ||
319 | fi | ||
320 | |||
321 | test $exitcode = 0) || { (exit 1); exit 1; } | ||
322 | |||
323 | ( | ||
324 | as_lineno_1=$LINENO | 141 | as_lineno_1=$LINENO |
325 | as_lineno_2=$LINENO | 142 | as_lineno_2=$LINENO |
143 | as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | ||
326 | test "x$as_lineno_1" != "x$as_lineno_2" && | 144 | test "x$as_lineno_1" != "x$as_lineno_2" && |
327 | test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } | 145 | test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then |
328 | 146 | $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } | |
329 | _ASEOF | 147 | $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } |
330 | }; then | 148 | CONFIG_SHELL=$as_dir/$as_base |
331 | break | 149 | export CONFIG_SHELL |
332 | fi | 150 | exec "$CONFIG_SHELL" "$0" ${1+"$@"} |
333 | 151 | fi;; | |
334 | fi | 152 | esac |
335 | 153 | done | |
336 | done | 154 | done |
337 | 155 | ;; | |
338 | if test "x$CONFIG_SHELL" != x; then | 156 | esac |
339 | for as_var in BASH_ENV ENV | ||
340 | do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
341 | done | ||
342 | export CONFIG_SHELL | ||
343 | exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} | ||
344 | fi | ||
345 | |||
346 | |||
347 | if test $as_have_required = no; then | ||
348 | echo This script requires a shell more modern than all the | ||
349 | echo shells that I found on your system. Please install a | ||
350 | echo modern shell, or manually run the script under such a | ||
351 | echo shell if you do have one. | ||
352 | { (exit 1); exit 1; } | ||
353 | fi | ||
354 | |||
355 | |||
356 | fi | ||
357 | |||
358 | fi | ||
359 | |||
360 | |||
361 | |||
362 | (eval "as_func_return () { | ||
363 | (exit \$1) | ||
364 | } | ||
365 | as_func_success () { | ||
366 | as_func_return 0 | ||
367 | } | ||
368 | as_func_failure () { | ||
369 | as_func_return 1 | ||
370 | } | ||
371 | as_func_ret_success () { | ||
372 | return 0 | ||
373 | } | ||
374 | as_func_ret_failure () { | ||
375 | return 1 | ||
376 | } | ||
377 | |||
378 | exitcode=0 | ||
379 | if as_func_success; then | ||
380 | : | ||
381 | else | ||
382 | exitcode=1 | ||
383 | echo as_func_success failed. | ||
384 | fi | ||
385 | |||
386 | if as_func_failure; then | ||
387 | exitcode=1 | ||
388 | echo as_func_failure succeeded. | ||
389 | fi | ||
390 | |||
391 | if as_func_ret_success; then | ||
392 | : | ||
393 | else | ||
394 | exitcode=1 | ||
395 | echo as_func_ret_success failed. | ||
396 | fi | ||
397 | |||
398 | if as_func_ret_failure; then | ||
399 | exitcode=1 | ||
400 | echo as_func_ret_failure succeeded. | ||
401 | fi | ||
402 | |||
403 | if ( set x; as_func_ret_success y && test x = \"\$1\" ); then | ||
404 | : | ||
405 | else | ||
406 | exitcode=1 | ||
407 | echo positional parameters were not saved. | ||
408 | fi | ||
409 | |||
410 | test \$exitcode = 0") || { | ||
411 | echo No shell found that supports shell functions. | ||
412 | echo Please tell autoconf@gnu.org about your system, | ||
413 | echo including any error possibly output before this | ||
414 | echo message | ||
415 | } | ||
416 | |||
417 | |||
418 | |||
419 | as_lineno_1=$LINENO | ||
420 | as_lineno_2=$LINENO | ||
421 | test "x$as_lineno_1" != "x$as_lineno_2" && | ||
422 | test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { | ||
423 | 157 | ||
424 | # Create $as_me.lineno as a copy of $as_myself, but with $LINENO | 158 | # Create $as_me.lineno as a copy of $as_myself, but with $LINENO |
425 | # uniformly replaced by the line number. The first 'sed' inserts a | 159 | # uniformly replaced by the line number. The first 'sed' inserts a |
426 | # line-number line after each line using $LINENO; the second 'sed' | 160 | # line-number line before each line; the second 'sed' does the real |
427 | # does the real work. The second script uses 'N' to pair each | 161 | # work. The second script uses 'N' to pair each line-number line |
428 | # line-number line with the line containing $LINENO, and appends | 162 | # with the numbered line, and appends trailing '-' during |
429 | # trailing '-' during substitution so that $LINENO is not a special | 163 | # substitution so that $LINENO is not a special case at line end. |
430 | # case at line end. | ||
431 | # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the | 164 | # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the |
432 | # scripts with optimization help from Paolo Bonzini. Blame Lee | 165 | # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) |
433 | # E. McMahon (1931-1989) for sed's syntax. :-) | 166 | sed '=' <$as_myself | |
434 | sed -n ' | ||
435 | p | ||
436 | /[$]LINENO/= | ||
437 | ' <$as_myself | | ||
438 | sed ' | 167 | sed ' |
439 | s/[$]LINENO.*/&-/ | ||
440 | t lineno | ||
441 | b | ||
442 | :lineno | ||
443 | N | 168 | N |
444 | :loop | 169 | s,$,-, |
445 | s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ | 170 | : loop |
171 | s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, | ||
446 | t loop | 172 | t loop |
447 | s/-\n.*// | 173 | s,-$,, |
174 | s,^['$as_cr_digits']*\n,, | ||
448 | ' >$as_me.lineno && | 175 | ' >$as_me.lineno && |
449 | chmod +x "$as_me.lineno" || | 176 | chmod +x $as_me.lineno || |
450 | { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | 177 | { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 |
451 | { (exit 1); exit 1; }; } | 178 | { (exit 1); exit 1; }; } |
452 | 179 | ||
453 | # Don't try to exec as it changes $[0], causing all sort of problems | 180 | # Don't try to exec as it changes $[0], causing all sort of problems |
454 | # (the dirname of $[0] is not the place where we might find the | 181 | # (the dirname of $[0] is not the place where we might find the |
455 | # original and so on. Autoconf is especially sensitive to this). | 182 | # original and so on. Autoconf is especially sensible to this). |
456 | . "./$as_me.lineno" | 183 | . ./$as_me.lineno |
457 | # Exit status is that of the last command. | 184 | # Exit status is that of the last command. |
458 | exit | 185 | exit |
459 | } | 186 | } |
460 | 187 | ||
461 | 188 | ||
462 | if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then | 189 | case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in |
463 | as_dirname=dirname | 190 | *c*,-n*) ECHO_N= ECHO_C=' |
464 | else | 191 | ' ECHO_T=' ' ;; |
465 | as_dirname=false | 192 | *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; |
466 | fi | 193 | *) ECHO_N= ECHO_C='\c' ECHO_T= ;; |
467 | |||
468 | ECHO_C= ECHO_N= ECHO_T= | ||
469 | case `echo -n x` in | ||
470 | -n*) | ||
471 | case `echo 'x\c'` in | ||
472 | *c*) ECHO_T=' ';; # ECHO_T is single tab character. | ||
473 | *) ECHO_C='\c';; | ||
474 | esac;; | ||
475 | *) | ||
476 | ECHO_N='-n';; | ||
477 | esac | 194 | esac |
478 | 195 | ||
479 | if expr a : '\(a\)' >/dev/null 2>&1 && | 196 | if expr a : '\(a\)' >/dev/null 2>&1; then |
480 | test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
481 | as_expr=expr | 197 | as_expr=expr |
482 | else | 198 | else |
483 | as_expr=false | 199 | as_expr=false |
484 | fi | 200 | fi |
485 | 201 | ||
486 | rm -f conf$$ conf$$.exe conf$$.file | 202 | rm -f conf$$ conf$$.exe conf$$.file |
487 | if test -d conf$$.dir; then | ||
488 | rm -f conf$$.dir/conf$$.file | ||
489 | else | ||
490 | rm -f conf$$.dir | ||
491 | mkdir conf$$.dir | ||
492 | fi | ||
493 | echo >conf$$.file | 203 | echo >conf$$.file |
494 | if ln -s conf$$.file conf$$ 2>/dev/null; then | 204 | if ln -s conf$$.file conf$$ 2>/dev/null; then |
495 | as_ln_s='ln -s' | 205 | # We could just check for DJGPP; but this test a) works b) is more generic |
496 | # ... but there are two gotchas: | 206 | # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). |
497 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | 207 | if test -f conf$$.exe; then |
498 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | 208 | # Don't use ln at all; we don't have any links |
499 | # In both cases, we have to default to `cp -p'. | ||
500 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | ||
501 | as_ln_s='cp -p' | 209 | as_ln_s='cp -p' |
210 | else | ||
211 | as_ln_s='ln -s' | ||
212 | fi | ||
502 | elif ln conf$$.file conf$$ 2>/dev/null; then | 213 | elif ln conf$$.file conf$$ 2>/dev/null; then |
503 | as_ln_s=ln | 214 | as_ln_s=ln |
504 | else | 215 | else |
505 | as_ln_s='cp -p' | 216 | as_ln_s='cp -p' |
506 | fi | 217 | fi |
507 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file | 218 | rm -f conf$$ conf$$.exe conf$$.file |
508 | rmdir conf$$.dir 2>/dev/null | ||
509 | 219 | ||
510 | if mkdir -p . 2>/dev/null; then | 220 | if mkdir -p . 2>/dev/null; then |
511 | as_mkdir_p=: | 221 | as_mkdir_p=: |
@@ -514,19 +224,7 @@ else | |||
514 | as_mkdir_p=false | 224 | as_mkdir_p=false |
515 | fi | 225 | fi |
516 | 226 | ||
517 | # Find out whether ``test -x'' works. Don't use a zero-byte file, as | 227 | as_executable_p="test -f" |
518 | # systems may use methods other than mode bits to determine executability. | ||
519 | cat >conf$$.file <<_ASEOF | ||
520 | #! /bin/sh | ||
521 | exit 0 | ||
522 | _ASEOF | ||
523 | chmod +x conf$$.file | ||
524 | if test -x conf$$.file >/dev/null 2>&1; then | ||
525 | as_executable_p="test -x" | ||
526 | else | ||
527 | as_executable_p=: | ||
528 | fi | ||
529 | rm -f conf$$.file | ||
530 | 228 | ||
531 | # Sed expression to map a string onto a valid CPP name. | 229 | # Sed expression to map a string onto a valid CPP name. |
532 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | 230 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
@@ -535,6 +233,15 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | |||
535 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | 233 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" |
536 | 234 | ||
537 | 235 | ||
236 | # IFS | ||
237 | # We need space, tab and new line, in precisely that order. | ||
238 | as_nl=' | ||
239 | ' | ||
240 | IFS=" $as_nl" | ||
241 | |||
242 | # CDPATH. | ||
243 | $as_unset CDPATH | ||
244 | |||
538 | 245 | ||
539 | 246 | ||
540 | # Check that we are running under the correct shell. | 247 | # Check that we are running under the correct shell. |
@@ -690,26 +397,29 @@ tagnames=${tagnames+${tagnames},}CXX | |||
690 | 397 | ||
691 | tagnames=${tagnames+${tagnames},}F77 | 398 | tagnames=${tagnames+${tagnames},}F77 |
692 | 399 | ||
693 | exec 7<&0 </dev/null 6>&1 | ||
694 | |||
695 | # Name of the host. | 400 | # Name of the host. |
696 | # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, | 401 | # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, |
697 | # so uname gets run too. | 402 | # so uname gets run too. |
698 | ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` | 403 | ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` |
699 | 404 | ||
405 | exec 6>&1 | ||
406 | |||
700 | # | 407 | # |
701 | # Initializations. | 408 | # Initializations. |
702 | # | 409 | # |
703 | ac_default_prefix=/usr/local | 410 | ac_default_prefix=/usr/local |
704 | ac_clean_files= | ||
705 | ac_config_libobj_dir=. | 411 | ac_config_libobj_dir=. |
706 | LIBOBJS= | ||
707 | cross_compiling=no | 412 | cross_compiling=no |
708 | subdirs= | 413 | subdirs= |
709 | MFLAGS= | 414 | MFLAGS= |
710 | MAKEFLAGS= | 415 | MAKEFLAGS= |
711 | SHELL=${CONFIG_SHELL-/bin/sh} | 416 | SHELL=${CONFIG_SHELL-/bin/sh} |
712 | 417 | ||
418 | # Maximum number of lines to put in a shell here document. | ||
419 | # This variable seems obsolete. It should probably be removed, and | ||
420 | # only ac_max_sed_lines should be used. | ||
421 | : ${ac_max_here_lines=38} | ||
422 | |||
713 | # Identity of this package. | 423 | # Identity of this package. |
714 | PACKAGE_NAME='libltdl' | 424 | PACKAGE_NAME='libltdl' |
715 | PACKAGE_TARNAME='libltdl' | 425 | PACKAGE_TARNAME='libltdl' |
@@ -721,167 +431,42 @@ ac_unique_file="ltdl.c" | |||
721 | # Factoring default headers for most tests. | 431 | # Factoring default headers for most tests. |
722 | ac_includes_default="\ | 432 | ac_includes_default="\ |
723 | #include <stdio.h> | 433 | #include <stdio.h> |
724 | #ifdef HAVE_SYS_TYPES_H | 434 | #if HAVE_SYS_TYPES_H |
725 | # include <sys/types.h> | 435 | # include <sys/types.h> |
726 | #endif | 436 | #endif |
727 | #ifdef HAVE_SYS_STAT_H | 437 | #if HAVE_SYS_STAT_H |
728 | # include <sys/stat.h> | 438 | # include <sys/stat.h> |
729 | #endif | 439 | #endif |
730 | #ifdef STDC_HEADERS | 440 | #if STDC_HEADERS |
731 | # include <stdlib.h> | 441 | # include <stdlib.h> |
732 | # include <stddef.h> | 442 | # include <stddef.h> |
733 | #else | 443 | #else |
734 | # ifdef HAVE_STDLIB_H | 444 | # if HAVE_STDLIB_H |
735 | # include <stdlib.h> | 445 | # include <stdlib.h> |
736 | # endif | 446 | # endif |
737 | #endif | 447 | #endif |
738 | #ifdef HAVE_STRING_H | 448 | #if HAVE_STRING_H |
739 | # if !defined STDC_HEADERS && defined HAVE_MEMORY_H | 449 | # if !STDC_HEADERS && HAVE_MEMORY_H |
740 | # include <memory.h> | 450 | # include <memory.h> |
741 | # endif | 451 | # endif |
742 | # include <string.h> | 452 | # include <string.h> |
743 | #endif | 453 | #endif |
744 | #ifdef HAVE_STRINGS_H | 454 | #if HAVE_STRINGS_H |
745 | # include <strings.h> | 455 | # include <strings.h> |
746 | #endif | 456 | #endif |
747 | #ifdef HAVE_INTTYPES_H | 457 | #if HAVE_INTTYPES_H |
748 | # include <inttypes.h> | 458 | # include <inttypes.h> |
459 | #else | ||
460 | # if HAVE_STDINT_H | ||
461 | # include <stdint.h> | ||
462 | # endif | ||
749 | #endif | 463 | #endif |
750 | #ifdef HAVE_STDINT_H | 464 | #if HAVE_UNISTD_H |
751 | # include <stdint.h> | ||
752 | #endif | ||
753 | #ifdef HAVE_UNISTD_H | ||
754 | # include <unistd.h> | 465 | # include <unistd.h> |
755 | #endif" | 466 | #endif" |
756 | 467 | ||
757 | ac_subst_vars='SHELL | 468 | ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL LIBOBJS LTLIBOBJS' |
758 | PATH_SEPARATOR | ||
759 | PACKAGE_NAME | ||
760 | PACKAGE_TARNAME | ||
761 | PACKAGE_VERSION | ||
762 | PACKAGE_STRING | ||
763 | PACKAGE_BUGREPORT | ||
764 | exec_prefix | ||
765 | prefix | ||
766 | program_transform_name | ||
767 | bindir | ||
768 | sbindir | ||
769 | libexecdir | ||
770 | datarootdir | ||
771 | datadir | ||
772 | sysconfdir | ||
773 | sharedstatedir | ||
774 | localstatedir | ||
775 | includedir | ||
776 | oldincludedir | ||
777 | docdir | ||
778 | infodir | ||
779 | htmldir | ||
780 | dvidir | ||
781 | pdfdir | ||
782 | psdir | ||
783 | libdir | ||
784 | localedir | ||
785 | mandir | ||
786 | DEFS | ||
787 | ECHO_C | ||
788 | ECHO_N | ||
789 | ECHO_T | ||
790 | LIBS | ||
791 | build_alias | ||
792 | host_alias | ||
793 | target_alias | ||
794 | INSTALL_PROGRAM | ||
795 | INSTALL_SCRIPT | ||
796 | INSTALL_DATA | ||
797 | CYGPATH_W | ||
798 | PACKAGE | ||
799 | VERSION | ||
800 | ACLOCAL | ||
801 | AUTOCONF | ||
802 | AUTOMAKE | ||
803 | AUTOHEADER | ||
804 | MAKEINFO | ||
805 | AMTAR | ||
806 | install_sh | ||
807 | STRIP | ||
808 | INSTALL_STRIP_PROGRAM | ||
809 | mkdir_p | ||
810 | AWK | ||
811 | SET_MAKE | ||
812 | am__leading_dot | ||
813 | MAINTAINER_MODE_TRUE | ||
814 | MAINTAINER_MODE_FALSE | ||
815 | MAINT | ||
816 | CC | ||
817 | CFLAGS | ||
818 | LDFLAGS | ||
819 | CPPFLAGS | ||
820 | ac_ct_CC | ||
821 | EXEEXT | ||
822 | OBJEXT | ||
823 | DEPDIR | ||
824 | am__include | ||
825 | am__quote | ||
826 | AMDEP_TRUE | ||
827 | AMDEP_FALSE | ||
828 | AMDEPBACKSLASH | ||
829 | CCDEPMODE | ||
830 | am__fastdepCC_TRUE | ||
831 | am__fastdepCC_FALSE | ||
832 | build | ||
833 | build_cpu | ||
834 | build_vendor | ||
835 | build_os | ||
836 | host | ||
837 | host_cpu | ||
838 | host_vendor | ||
839 | host_os | ||
840 | GREP | ||
841 | EGREP | ||
842 | LN_S | ||
843 | ECHO | ||
844 | AR | ||
845 | RANLIB | ||
846 | DLLTOOL | ||
847 | AS | ||
848 | OBJDUMP | ||
849 | CPP | ||
850 | CXX | ||
851 | CXXFLAGS | ||
852 | ac_ct_CXX | ||
853 | CXXDEPMODE | ||
854 | am__fastdepCXX_TRUE | ||
855 | am__fastdepCXX_FALSE | ||
856 | CXXCPP | ||
857 | F77 | ||
858 | FFLAGS | ||
859 | ac_ct_F77 | ||
860 | LIBTOOL | ||
861 | LIBTOOL_DEPS | ||
862 | INSTALL_LTDL_TRUE | ||
863 | INSTALL_LTDL_FALSE | ||
864 | CONVENIENCE_LTDL_TRUE | ||
865 | CONVENIENCE_LTDL_FALSE | ||
866 | LIBADD_DL | ||
867 | LIBOBJS | ||
868 | LTLIBOBJS' | ||
869 | ac_subst_files='' | 469 | ac_subst_files='' |
870 | ac_precious_vars='build_alias | ||
871 | host_alias | ||
872 | target_alias | ||
873 | CC | ||
874 | CFLAGS | ||
875 | LDFLAGS | ||
876 | CPPFLAGS | ||
877 | CPP | ||
878 | CXX | ||
879 | CXXFLAGS | ||
880 | CCC | ||
881 | CXXCPP | ||
882 | F77 | ||
883 | FFLAGS' | ||
884 | |||
885 | 470 | ||
886 | # Initialize some variables set by options. | 471 | # Initialize some variables set by options. |
887 | ac_init_help= | 472 | ac_init_help= |
@@ -908,48 +493,34 @@ x_libraries=NONE | |||
908 | # and all the variables that are supposed to be based on exec_prefix | 493 | # and all the variables that are supposed to be based on exec_prefix |
909 | # by default will actually change. | 494 | # by default will actually change. |
910 | # Use braces instead of parens because sh, perl, etc. also accept them. | 495 | # Use braces instead of parens because sh, perl, etc. also accept them. |
911 | # (The list follows the same order as the GNU Coding Standards.) | ||
912 | bindir='${exec_prefix}/bin' | 496 | bindir='${exec_prefix}/bin' |
913 | sbindir='${exec_prefix}/sbin' | 497 | sbindir='${exec_prefix}/sbin' |
914 | libexecdir='${exec_prefix}/libexec' | 498 | libexecdir='${exec_prefix}/libexec' |
915 | datarootdir='${prefix}/share' | 499 | datadir='${prefix}/share' |
916 | datadir='${datarootdir}' | ||
917 | sysconfdir='${prefix}/etc' | 500 | sysconfdir='${prefix}/etc' |
918 | sharedstatedir='${prefix}/com' | 501 | sharedstatedir='${prefix}/com' |
919 | localstatedir='${prefix}/var' | 502 | localstatedir='${prefix}/var' |
503 | libdir='${exec_prefix}/lib' | ||
920 | includedir='${prefix}/include' | 504 | includedir='${prefix}/include' |
921 | oldincludedir='/usr/include' | 505 | oldincludedir='/usr/include' |
922 | docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' | 506 | infodir='${prefix}/info' |
923 | infodir='${datarootdir}/info' | 507 | mandir='${prefix}/man' |
924 | htmldir='${docdir}' | ||
925 | dvidir='${docdir}' | ||
926 | pdfdir='${docdir}' | ||
927 | psdir='${docdir}' | ||
928 | libdir='${exec_prefix}/lib' | ||
929 | localedir='${datarootdir}/locale' | ||
930 | mandir='${datarootdir}/man' | ||
931 | 508 | ||
932 | ac_prev= | 509 | ac_prev= |
933 | ac_dashdash= | ||
934 | for ac_option | 510 | for ac_option |
935 | do | 511 | do |
936 | # If the previous option needs an argument, assign it. | 512 | # If the previous option needs an argument, assign it. |
937 | if test -n "$ac_prev"; then | 513 | if test -n "$ac_prev"; then |
938 | eval $ac_prev=\$ac_option | 514 | eval "$ac_prev=\$ac_option" |
939 | ac_prev= | 515 | ac_prev= |
940 | continue | 516 | continue |
941 | fi | 517 | fi |
942 | 518 | ||
943 | case $ac_option in | 519 | ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` |
944 | *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; | ||
945 | *) ac_optarg=yes ;; | ||
946 | esac | ||
947 | 520 | ||
948 | # Accept the important Cygnus configure options, so we can diagnose typos. | 521 | # Accept the important Cygnus configure options, so we can diagnose typos. |
949 | 522 | ||
950 | case $ac_dashdash$ac_option in | 523 | case $ac_option in |
951 | --) | ||
952 | ac_dashdash=yes ;; | ||
953 | 524 | ||
954 | -bindir | --bindir | --bindi | --bind | --bin | --bi) | 525 | -bindir | --bindir | --bindi | --bind | --bin | --bi) |
955 | ac_prev=bindir ;; | 526 | ac_prev=bindir ;; |
@@ -971,18 +542,12 @@ do | |||
971 | --config-cache | -C) | 542 | --config-cache | -C) |
972 | cache_file=config.cache ;; | 543 | cache_file=config.cache ;; |
973 | 544 | ||
974 | -datadir | --datadir | --datadi | --datad) | 545 | -datadir | --datadir | --datadi | --datad | --data | --dat | --da) |
975 | ac_prev=datadir ;; | 546 | ac_prev=datadir ;; |
976 | -datadir=* | --datadir=* | --datadi=* | --datad=*) | 547 | -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ |
548 | | --da=*) | ||
977 | datadir=$ac_optarg ;; | 549 | datadir=$ac_optarg ;; |
978 | 550 | ||
979 | -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ | ||
980 | | --dataroo | --dataro | --datar) | ||
981 | ac_prev=datarootdir ;; | ||
982 | -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ | ||
983 | | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) | ||
984 | datarootdir=$ac_optarg ;; | ||
985 | |||
986 | -disable-* | --disable-*) | 551 | -disable-* | --disable-*) |
987 | ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` | 552 | ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
988 | # Reject names that are not valid shell variable names. | 553 | # Reject names that are not valid shell variable names. |
@@ -990,17 +555,7 @@ do | |||
990 | { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | 555 | { echo "$as_me: error: invalid feature name: $ac_feature" >&2 |
991 | { (exit 1); exit 1; }; } | 556 | { (exit 1); exit 1; }; } |
992 | ac_feature=`echo $ac_feature | sed 's/-/_/g'` | 557 | ac_feature=`echo $ac_feature | sed 's/-/_/g'` |
993 | eval enable_$ac_feature=no ;; | 558 | eval "enable_$ac_feature=no" ;; |
994 | |||
995 | -docdir | --docdir | --docdi | --doc | --do) | ||
996 | ac_prev=docdir ;; | ||
997 | -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) | ||
998 | docdir=$ac_optarg ;; | ||
999 | |||
1000 | -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) | ||
1001 | ac_prev=dvidir ;; | ||
1002 | -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) | ||
1003 | dvidir=$ac_optarg ;; | ||
1004 | 559 | ||
1005 | -enable-* | --enable-*) | 560 | -enable-* | --enable-*) |
1006 | ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` | 561 | ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
@@ -1009,7 +564,11 @@ do | |||
1009 | { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | 564 | { echo "$as_me: error: invalid feature name: $ac_feature" >&2 |
1010 | { (exit 1); exit 1; }; } | 565 | { (exit 1); exit 1; }; } |
1011 | ac_feature=`echo $ac_feature | sed 's/-/_/g'` | 566 | ac_feature=`echo $ac_feature | sed 's/-/_/g'` |
1012 | eval enable_$ac_feature=\$ac_optarg ;; | 567 | case $ac_option in |
568 | *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; | ||
569 | *) ac_optarg=yes ;; | ||
570 | esac | ||
571 | eval "enable_$ac_feature='$ac_optarg'" ;; | ||
1013 | 572 | ||
1014 | -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | 573 | -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ |
1015 | | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ | 574 | | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ |
@@ -1036,12 +595,6 @@ do | |||
1036 | -host=* | --host=* | --hos=* | --ho=*) | 595 | -host=* | --host=* | --hos=* | --ho=*) |
1037 | host_alias=$ac_optarg ;; | 596 | host_alias=$ac_optarg ;; |
1038 | 597 | ||
1039 | -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) | ||
1040 | ac_prev=htmldir ;; | ||
1041 | -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ | ||
1042 | | --ht=*) | ||
1043 | htmldir=$ac_optarg ;; | ||
1044 | |||
1045 | -includedir | --includedir | --includedi | --included | --include \ | 598 | -includedir | --includedir | --includedi | --included | --include \ |
1046 | | --includ | --inclu | --incl | --inc) | 599 | | --includ | --inclu | --incl | --inc) |
1047 | ac_prev=includedir ;; | 600 | ac_prev=includedir ;; |
@@ -1066,16 +619,13 @@ do | |||
1066 | | --libexe=* | --libex=* | --libe=*) | 619 | | --libexe=* | --libex=* | --libe=*) |
1067 | libexecdir=$ac_optarg ;; | 620 | libexecdir=$ac_optarg ;; |
1068 | 621 | ||
1069 | -localedir | --localedir | --localedi | --localed | --locale) | ||
1070 | ac_prev=localedir ;; | ||
1071 | -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) | ||
1072 | localedir=$ac_optarg ;; | ||
1073 | |||
1074 | -localstatedir | --localstatedir | --localstatedi | --localstated \ | 622 | -localstatedir | --localstatedir | --localstatedi | --localstated \ |
1075 | | --localstate | --localstat | --localsta | --localst | --locals) | 623 | | --localstate | --localstat | --localsta | --localst \ |
624 | | --locals | --local | --loca | --loc | --lo) | ||
1076 | ac_prev=localstatedir ;; | 625 | ac_prev=localstatedir ;; |
1077 | -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ | 626 | -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ |
1078 | | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) | 627 | | --localstate=* | --localstat=* | --localsta=* | --localst=* \ |
628 | | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) | ||
1079 | localstatedir=$ac_optarg ;; | 629 | localstatedir=$ac_optarg ;; |
1080 | 630 | ||
1081 | -mandir | --mandir | --mandi | --mand | --man | --ma | --m) | 631 | -mandir | --mandir | --mandi | --mand | --man | --ma | --m) |
@@ -1140,16 +690,6 @@ do | |||
1140 | | --progr-tra=* | --program-tr=* | --program-t=*) | 690 | | --progr-tra=* | --program-tr=* | --program-t=*) |
1141 | program_transform_name=$ac_optarg ;; | 691 | program_transform_name=$ac_optarg ;; |
1142 | 692 | ||
1143 | -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) | ||
1144 | ac_prev=pdfdir ;; | ||
1145 | -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) | ||
1146 | pdfdir=$ac_optarg ;; | ||
1147 | |||
1148 | -psdir | --psdir | --psdi | --psd | --ps) | ||
1149 | ac_prev=psdir ;; | ||
1150 | -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) | ||
1151 | psdir=$ac_optarg ;; | ||
1152 | |||
1153 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | 693 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ |
1154 | | -silent | --silent | --silen | --sile | --sil) | 694 | | -silent | --silent | --silen | --sile | --sil) |
1155 | silent=yes ;; | 695 | silent=yes ;; |
@@ -1206,7 +746,11 @@ do | |||
1206 | { echo "$as_me: error: invalid package name: $ac_package" >&2 | 746 | { echo "$as_me: error: invalid package name: $ac_package" >&2 |
1207 | { (exit 1); exit 1; }; } | 747 | { (exit 1); exit 1; }; } |
1208 | ac_package=`echo $ac_package| sed 's/-/_/g'` | 748 | ac_package=`echo $ac_package| sed 's/-/_/g'` |
1209 | eval with_$ac_package=\$ac_optarg ;; | 749 | case $ac_option in |
750 | *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; | ||
751 | *) ac_optarg=yes ;; | ||
752 | esac | ||
753 | eval "with_$ac_package='$ac_optarg'" ;; | ||
1210 | 754 | ||
1211 | -without-* | --without-*) | 755 | -without-* | --without-*) |
1212 | ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` | 756 | ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
@@ -1215,7 +759,7 @@ do | |||
1215 | { echo "$as_me: error: invalid package name: $ac_package" >&2 | 759 | { echo "$as_me: error: invalid package name: $ac_package" >&2 |
1216 | { (exit 1); exit 1; }; } | 760 | { (exit 1); exit 1; }; } |
1217 | ac_package=`echo $ac_package | sed 's/-/_/g'` | 761 | ac_package=`echo $ac_package | sed 's/-/_/g'` |
1218 | eval with_$ac_package=no ;; | 762 | eval "with_$ac_package=no" ;; |
1219 | 763 | ||
1220 | --x) | 764 | --x) |
1221 | # Obsolete; use --with-x. | 765 | # Obsolete; use --with-x. |
@@ -1246,7 +790,8 @@ Try \`$0 --help' for more information." >&2 | |||
1246 | expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && | 790 | expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && |
1247 | { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 | 791 | { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 |
1248 | { (exit 1); exit 1; }; } | 792 | { (exit 1); exit 1; }; } |
1249 | eval $ac_envvar=\$ac_optarg | 793 | ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` |
794 | eval "$ac_envvar='$ac_optarg'" | ||
1250 | export $ac_envvar ;; | 795 | export $ac_envvar ;; |
1251 | 796 | ||
1252 | *) | 797 | *) |
@@ -1266,19 +811,27 @@ if test -n "$ac_prev"; then | |||
1266 | { (exit 1); exit 1; }; } | 811 | { (exit 1); exit 1; }; } |
1267 | fi | 812 | fi |
1268 | 813 | ||
1269 | # Be sure to have absolute directory names. | 814 | # Be sure to have absolute paths. |
1270 | for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ | 815 | for ac_var in exec_prefix prefix |
1271 | datadir sysconfdir sharedstatedir localstatedir includedir \ | ||
1272 | oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ | ||
1273 | libdir localedir mandir | ||
1274 | do | 816 | do |
1275 | eval ac_val=\$$ac_var | 817 | eval ac_val=$`echo $ac_var` |
1276 | case $ac_val in | 818 | case $ac_val in |
1277 | [\\/$]* | ?:[\\/]* ) continue;; | 819 | [\\/$]* | ?:[\\/]* | NONE | '' ) ;; |
1278 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; | 820 | *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 |
821 | { (exit 1); exit 1; }; };; | ||
822 | esac | ||
823 | done | ||
824 | |||
825 | # Be sure to have absolute paths. | ||
826 | for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ | ||
827 | localstatedir libdir includedir oldincludedir infodir mandir | ||
828 | do | ||
829 | eval ac_val=$`echo $ac_var` | ||
830 | case $ac_val in | ||
831 | [\\/$]* | ?:[\\/]* ) ;; | ||
832 | *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 | ||
833 | { (exit 1); exit 1; }; };; | ||
1279 | esac | 834 | esac |
1280 | { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 | ||
1281 | { (exit 1); exit 1; }; } | ||
1282 | done | 835 | done |
1283 | 836 | ||
1284 | # There might be people who depend on the old broken behavior: `$host' | 837 | # There might be people who depend on the old broken behavior: `$host' |
@@ -1305,76 +858,94 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- | |||
1305 | test "$silent" = yes && exec 6>/dev/null | 858 | test "$silent" = yes && exec 6>/dev/null |
1306 | 859 | ||
1307 | 860 | ||
1308 | ac_pwd=`pwd` && test -n "$ac_pwd" && | ||
1309 | ac_ls_di=`ls -di .` && | ||
1310 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || | ||
1311 | { echo "$as_me: error: Working directory cannot be determined" >&2 | ||
1312 | { (exit 1); exit 1; }; } | ||
1313 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || | ||
1314 | { echo "$as_me: error: pwd does not report name of working directory" >&2 | ||
1315 | { (exit 1); exit 1; }; } | ||
1316 | |||
1317 | |||
1318 | # Find the source files, if location was not specified. | 861 | # Find the source files, if location was not specified. |
1319 | if test -z "$srcdir"; then | 862 | if test -z "$srcdir"; then |
1320 | ac_srcdir_defaulted=yes | 863 | ac_srcdir_defaulted=yes |
1321 | # Try the directory containing this script, then the parent directory. | 864 | # Try the directory containing this script, then its parent. |
1322 | ac_confdir=`$as_dirname -- "$0" || | 865 | ac_confdir=`(dirname "$0") 2>/dev/null || |
1323 | $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | 866 | $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
1324 | X"$0" : 'X\(//\)[^/]' \| \ | 867 | X"$0" : 'X\(//\)[^/]' \| \ |
1325 | X"$0" : 'X\(//\)$' \| \ | 868 | X"$0" : 'X\(//\)$' \| \ |
1326 | X"$0" : 'X\(/\)' \| . 2>/dev/null || | 869 | X"$0" : 'X\(/\)' \| \ |
870 | . : '\(.\)' 2>/dev/null || | ||
1327 | echo X"$0" | | 871 | echo X"$0" | |
1328 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | 872 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } |
1329 | s//\1/ | 873 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } |
1330 | q | 874 | /^X\(\/\/\)$/{ s//\1/; q; } |
1331 | } | 875 | /^X\(\/\).*/{ s//\1/; q; } |
1332 | /^X\(\/\/\)[^/].*/{ | 876 | s/.*/./; q'` |
1333 | s//\1/ | ||
1334 | q | ||
1335 | } | ||
1336 | /^X\(\/\/\)$/{ | ||
1337 | s//\1/ | ||
1338 | q | ||
1339 | } | ||
1340 | /^X\(\/\).*/{ | ||
1341 | s//\1/ | ||
1342 | q | ||
1343 | } | ||
1344 | s/.*/./; q'` | ||
1345 | srcdir=$ac_confdir | 877 | srcdir=$ac_confdir |
1346 | if test ! -r "$srcdir/$ac_unique_file"; then | 878 | if test ! -r $srcdir/$ac_unique_file; then |
1347 | srcdir=.. | 879 | srcdir=.. |
1348 | fi | 880 | fi |
1349 | else | 881 | else |
1350 | ac_srcdir_defaulted=no | 882 | ac_srcdir_defaulted=no |
1351 | fi | 883 | fi |
1352 | if test ! -r "$srcdir/$ac_unique_file"; then | 884 | if test ! -r $srcdir/$ac_unique_file; then |
1353 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." | 885 | if test "$ac_srcdir_defaulted" = yes; then |
1354 | { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 | 886 | { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 |
887 | { (exit 1); exit 1; }; } | ||
888 | else | ||
889 | { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 | ||
1355 | { (exit 1); exit 1; }; } | 890 | { (exit 1); exit 1; }; } |
891 | fi | ||
1356 | fi | 892 | fi |
1357 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" | 893 | (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || |
1358 | ac_abs_confdir=`( | 894 | { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 |
1359 | cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 | ||
1360 | { (exit 1); exit 1; }; } | 895 | { (exit 1); exit 1; }; } |
1361 | pwd)` | 896 | srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` |
1362 | # When building in place, set srcdir=. | 897 | ac_env_build_alias_set=${build_alias+set} |
1363 | if test "$ac_abs_confdir" = "$ac_pwd"; then | 898 | ac_env_build_alias_value=$build_alias |
1364 | srcdir=. | 899 | ac_cv_env_build_alias_set=${build_alias+set} |
1365 | fi | 900 | ac_cv_env_build_alias_value=$build_alias |
1366 | # Remove unnecessary trailing slashes from srcdir. | 901 | ac_env_host_alias_set=${host_alias+set} |
1367 | # Double slashes in file names in object file debugging info | 902 | ac_env_host_alias_value=$host_alias |
1368 | # mess up M-x gdb in Emacs. | 903 | ac_cv_env_host_alias_set=${host_alias+set} |
1369 | case $srcdir in | 904 | ac_cv_env_host_alias_value=$host_alias |
1370 | */) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; | 905 | ac_env_target_alias_set=${target_alias+set} |
1371 | esac | 906 | ac_env_target_alias_value=$target_alias |
1372 | for ac_var in $ac_precious_vars; do | 907 | ac_cv_env_target_alias_set=${target_alias+set} |
1373 | eval ac_env_${ac_var}_set=\${${ac_var}+set} | 908 | ac_cv_env_target_alias_value=$target_alias |
1374 | eval ac_env_${ac_var}_value=\$${ac_var} | 909 | ac_env_CC_set=${CC+set} |
1375 | eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} | 910 | ac_env_CC_value=$CC |
1376 | eval ac_cv_env_${ac_var}_value=\$${ac_var} | 911 | ac_cv_env_CC_set=${CC+set} |
1377 | done | 912 | ac_cv_env_CC_value=$CC |
913 | ac_env_CFLAGS_set=${CFLAGS+set} | ||
914 | ac_env_CFLAGS_value=$CFLAGS | ||
915 | ac_cv_env_CFLAGS_set=${CFLAGS+set} | ||
916 | ac_cv_env_CFLAGS_value=$CFLAGS | ||
917 | ac_env_LDFLAGS_set=${LDFLAGS+set} | ||
918 | ac_env_LDFLAGS_value=$LDFLAGS | ||
919 | ac_cv_env_LDFLAGS_set=${LDFLAGS+set} | ||
920 | ac_cv_env_LDFLAGS_value=$LDFLAGS | ||
921 | ac_env_CPPFLAGS_set=${CPPFLAGS+set} | ||
922 | ac_env_CPPFLAGS_value=$CPPFLAGS | ||
923 | ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} | ||
924 | ac_cv_env_CPPFLAGS_value=$CPPFLAGS | ||
925 | ac_env_CPP_set=${CPP+set} | ||
926 | ac_env_CPP_value=$CPP | ||
927 | ac_cv_env_CPP_set=${CPP+set} | ||
928 | ac_cv_env_CPP_value=$CPP | ||
929 | ac_env_CXX_set=${CXX+set} | ||
930 | ac_env_CXX_value=$CXX | ||
931 | ac_cv_env_CXX_set=${CXX+set} | ||
932 | ac_cv_env_CXX_value=$CXX | ||
933 | ac_env_CXXFLAGS_set=${CXXFLAGS+set} | ||
934 | ac_env_CXXFLAGS_value=$CXXFLAGS | ||
935 | ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} | ||
936 | ac_cv_env_CXXFLAGS_value=$CXXFLAGS | ||
937 | ac_env_CXXCPP_set=${CXXCPP+set} | ||
938 | ac_env_CXXCPP_value=$CXXCPP | ||
939 | ac_cv_env_CXXCPP_set=${CXXCPP+set} | ||
940 | ac_cv_env_CXXCPP_value=$CXXCPP | ||
941 | ac_env_F77_set=${F77+set} | ||
942 | ac_env_F77_value=$F77 | ||
943 | ac_cv_env_F77_set=${F77+set} | ||
944 | ac_cv_env_F77_value=$F77 | ||
945 | ac_env_FFLAGS_set=${FFLAGS+set} | ||
946 | ac_env_FFLAGS_value=$FFLAGS | ||
947 | ac_cv_env_FFLAGS_set=${FFLAGS+set} | ||
948 | ac_cv_env_FFLAGS_value=$FFLAGS | ||
1378 | 949 | ||
1379 | # | 950 | # |
1380 | # Report the --help message. | 951 | # Report the --help message. |
@@ -1403,6 +974,9 @@ Configuration: | |||
1403 | -n, --no-create do not create output files | 974 | -n, --no-create do not create output files |
1404 | --srcdir=DIR find the sources in DIR [configure dir or \`..'] | 975 | --srcdir=DIR find the sources in DIR [configure dir or \`..'] |
1405 | 976 | ||
977 | _ACEOF | ||
978 | |||
979 | cat <<_ACEOF | ||
1406 | Installation directories: | 980 | Installation directories: |
1407 | --prefix=PREFIX install architecture-independent files in PREFIX | 981 | --prefix=PREFIX install architecture-independent files in PREFIX |
1408 | [$ac_default_prefix] | 982 | [$ac_default_prefix] |
@@ -1420,22 +994,15 @@ Fine tuning of the installation directories: | |||
1420 | --bindir=DIR user executables [EPREFIX/bin] | 994 | --bindir=DIR user executables [EPREFIX/bin] |
1421 | --sbindir=DIR system admin executables [EPREFIX/sbin] | 995 | --sbindir=DIR system admin executables [EPREFIX/sbin] |
1422 | --libexecdir=DIR program executables [EPREFIX/libexec] | 996 | --libexecdir=DIR program executables [EPREFIX/libexec] |
997 | --datadir=DIR read-only architecture-independent data [PREFIX/share] | ||
1423 | --sysconfdir=DIR read-only single-machine data [PREFIX/etc] | 998 | --sysconfdir=DIR read-only single-machine data [PREFIX/etc] |
1424 | --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] | 999 | --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] |
1425 | --localstatedir=DIR modifiable single-machine data [PREFIX/var] | 1000 | --localstatedir=DIR modifiable single-machine data [PREFIX/var] |
1426 | --libdir=DIR object code libraries [EPREFIX/lib] | 1001 | --libdir=DIR object code libraries [EPREFIX/lib] |
1427 | --includedir=DIR C header files [PREFIX/include] | 1002 | --includedir=DIR C header files [PREFIX/include] |
1428 | --oldincludedir=DIR C header files for non-gcc [/usr/include] | 1003 | --oldincludedir=DIR C header files for non-gcc [/usr/include] |
1429 | --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] | 1004 | --infodir=DIR info documentation [PREFIX/info] |
1430 | --datadir=DIR read-only architecture-independent data [DATAROOTDIR] | 1005 | --mandir=DIR man documentation [PREFIX/man] |
1431 | --infodir=DIR info documentation [DATAROOTDIR/info] | ||
1432 | --localedir=DIR locale-dependent data [DATAROOTDIR/locale] | ||
1433 | --mandir=DIR man documentation [DATAROOTDIR/man] | ||
1434 | --docdir=DIR documentation root [DATAROOTDIR/doc/libltdl] | ||
1435 | --htmldir=DIR html documentation [DOCDIR] | ||
1436 | --dvidir=DIR dvi documentation [DOCDIR] | ||
1437 | --pdfdir=DIR pdf documentation [DOCDIR] | ||
1438 | --psdir=DIR ps documentation [DOCDIR] | ||
1439 | _ACEOF | 1006 | _ACEOF |
1440 | 1007 | ||
1441 | cat <<\_ACEOF | 1008 | cat <<\_ACEOF |
@@ -1464,8 +1031,10 @@ Optional Features: | |||
1464 | (and sometimes confusing) to the casual installer | 1031 | (and sometimes confusing) to the casual installer |
1465 | --disable-dependency-tracking speeds up one-time build | 1032 | --disable-dependency-tracking speeds up one-time build |
1466 | --enable-dependency-tracking do not reject slow dependency extractors | 1033 | --enable-dependency-tracking do not reject slow dependency extractors |
1467 | --enable-shared[=PKGS] build shared libraries [default=yes] | 1034 | --enable-shared[=PKGS] |
1468 | --enable-static[=PKGS] build static libraries [default=yes] | 1035 | build shared libraries [default=yes] |
1036 | --enable-static[=PKGS] | ||
1037 | build static libraries [default=yes] | ||
1469 | --enable-fast-install[=PKGS] | 1038 | --enable-fast-install[=PKGS] |
1470 | optimize for fast installation [default=yes] | 1039 | optimize for fast installation [default=yes] |
1471 | --disable-libtool-lock avoid locking (might break parallel builds) | 1040 | --disable-libtool-lock avoid locking (might break parallel builds) |
@@ -1477,15 +1046,16 @@ Optional Packages: | |||
1477 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 1046 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
1478 | --with-pic try to use only PIC/non-PIC objects [default=use | 1047 | --with-pic try to use only PIC/non-PIC objects [default=use |
1479 | both] | 1048 | both] |
1480 | --with-tags[=TAGS] include additional configurations [automatic] | 1049 | --with-tags[=TAGS] |
1050 | include additional configurations [automatic] | ||
1481 | 1051 | ||
1482 | Some influential environment variables: | 1052 | Some influential environment variables: |
1483 | CC C compiler command | 1053 | CC C compiler command |
1484 | CFLAGS C compiler flags | 1054 | CFLAGS C compiler flags |
1485 | LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a | 1055 | LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a |
1486 | nonstandard directory <lib dir> | 1056 | nonstandard directory <lib dir> |
1487 | CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if | 1057 | CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have |
1488 | you have headers in a nonstandard directory <include dir> | 1058 | headers in a nonstandard directory <include dir> |
1489 | CPP C preprocessor | 1059 | CPP C preprocessor |
1490 | CXX C++ compiler command | 1060 | CXX C++ compiler command |
1491 | CXXFLAGS C++ compiler flags | 1061 | CXXFLAGS C++ compiler flags |
@@ -1498,86 +1068,120 @@ it to find libraries and programs with nonstandard names/locations. | |||
1498 | 1068 | ||
1499 | Report bugs to <bug-libtool@gnu.org>. | 1069 | Report bugs to <bug-libtool@gnu.org>. |
1500 | _ACEOF | 1070 | _ACEOF |
1501 | ac_status=$? | ||
1502 | fi | 1071 | fi |
1503 | 1072 | ||
1504 | if test "$ac_init_help" = "recursive"; then | 1073 | if test "$ac_init_help" = "recursive"; then |
1505 | # If there are subdirs, report their specific --help. | 1074 | # If there are subdirs, report their specific --help. |
1075 | ac_popdir=`pwd` | ||
1506 | for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue | 1076 | for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue |
1507 | test -d "$ac_dir" || continue | 1077 | test -d $ac_dir || continue |
1508 | ac_builddir=. | 1078 | ac_builddir=. |
1509 | 1079 | ||
1510 | case "$ac_dir" in | 1080 | if test "$ac_dir" != .; then |
1511 | .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; | ||
1512 | *) | ||
1513 | ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | 1081 | ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` |
1514 | # A ".." for each directory in $ac_dir_suffix. | 1082 | # A "../" for each directory in $ac_dir_suffix. |
1515 | ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` | 1083 | ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` |
1516 | case $ac_top_builddir_sub in | 1084 | else |
1517 | "") ac_top_builddir_sub=. ac_top_build_prefix= ;; | 1085 | ac_dir_suffix= ac_top_builddir= |
1518 | *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; | 1086 | fi |
1519 | esac ;; | ||
1520 | esac | ||
1521 | ac_abs_top_builddir=$ac_pwd | ||
1522 | ac_abs_builddir=$ac_pwd$ac_dir_suffix | ||
1523 | # for backward compatibility: | ||
1524 | ac_top_builddir=$ac_top_build_prefix | ||
1525 | 1087 | ||
1526 | case $srcdir in | 1088 | case $srcdir in |
1527 | .) # We are building in place. | 1089 | .) # No --srcdir option. We are building in place. |
1528 | ac_srcdir=. | 1090 | ac_srcdir=. |
1529 | ac_top_srcdir=$ac_top_builddir_sub | 1091 | if test -z "$ac_top_builddir"; then |
1530 | ac_abs_top_srcdir=$ac_pwd ;; | 1092 | ac_top_srcdir=. |
1531 | [\\/]* | ?:[\\/]* ) # Absolute name. | 1093 | else |
1094 | ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` | ||
1095 | fi ;; | ||
1096 | [\\/]* | ?:[\\/]* ) # Absolute path. | ||
1532 | ac_srcdir=$srcdir$ac_dir_suffix; | 1097 | ac_srcdir=$srcdir$ac_dir_suffix; |
1533 | ac_top_srcdir=$srcdir | 1098 | ac_top_srcdir=$srcdir ;; |
1534 | ac_abs_top_srcdir=$srcdir ;; | 1099 | *) # Relative path. |
1535 | *) # Relative name. | 1100 | ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix |
1536 | ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix | 1101 | ac_top_srcdir=$ac_top_builddir$srcdir ;; |
1537 | ac_top_srcdir=$ac_top_build_prefix$srcdir | 1102 | esac |
1538 | ac_abs_top_srcdir=$ac_pwd/$srcdir ;; | 1103 | |
1104 | # Do not use `cd foo && pwd` to compute absolute paths, because | ||
1105 | # the directories may not exist. | ||
1106 | case `pwd` in | ||
1107 | .) ac_abs_builddir="$ac_dir";; | ||
1108 | *) | ||
1109 | case "$ac_dir" in | ||
1110 | .) ac_abs_builddir=`pwd`;; | ||
1111 | [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | ||
1112 | *) ac_abs_builddir=`pwd`/"$ac_dir";; | ||
1113 | esac;; | ||
1539 | esac | 1114 | esac |
1540 | ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix | 1115 | case $ac_abs_builddir in |
1541 | 1116 | .) ac_abs_top_builddir=${ac_top_builddir}.;; | |
1542 | cd "$ac_dir" || { ac_status=$?; continue; } | 1117 | *) |
1543 | # Check for guested configure. | 1118 | case ${ac_top_builddir}. in |
1544 | if test -f "$ac_srcdir/configure.gnu"; then | 1119 | .) ac_abs_top_builddir=$ac_abs_builddir;; |
1545 | echo && | 1120 | [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; |
1546 | $SHELL "$ac_srcdir/configure.gnu" --help=recursive | 1121 | *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; |
1547 | elif test -f "$ac_srcdir/configure"; then | 1122 | esac;; |
1548 | echo && | 1123 | esac |
1549 | $SHELL "$ac_srcdir/configure" --help=recursive | 1124 | case $ac_abs_builddir in |
1125 | .) ac_abs_srcdir=$ac_srcdir;; | ||
1126 | *) | ||
1127 | case $ac_srcdir in | ||
1128 | .) ac_abs_srcdir=$ac_abs_builddir;; | ||
1129 | [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | ||
1130 | *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | ||
1131 | esac;; | ||
1132 | esac | ||
1133 | case $ac_abs_builddir in | ||
1134 | .) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
1135 | *) | ||
1136 | case $ac_top_srcdir in | ||
1137 | .) ac_abs_top_srcdir=$ac_abs_builddir;; | ||
1138 | [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
1139 | *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | ||
1140 | esac;; | ||
1141 | esac | ||
1142 | |||
1143 | cd $ac_dir | ||
1144 | # Check for guested configure; otherwise get Cygnus style configure. | ||
1145 | if test -f $ac_srcdir/configure.gnu; then | ||
1146 | echo | ||
1147 | $SHELL $ac_srcdir/configure.gnu --help=recursive | ||
1148 | elif test -f $ac_srcdir/configure; then | ||
1149 | echo | ||
1150 | $SHELL $ac_srcdir/configure --help=recursive | ||
1151 | elif test -f $ac_srcdir/configure.ac || | ||
1152 | test -f $ac_srcdir/configure.in; then | ||
1153 | echo | ||
1154 | $ac_configure --help | ||
1550 | else | 1155 | else |
1551 | echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 | 1156 | echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 |
1552 | fi || ac_status=$? | 1157 | fi |
1553 | cd "$ac_pwd" || { ac_status=$?; break; } | 1158 | cd $ac_popdir |
1554 | done | 1159 | done |
1555 | fi | 1160 | fi |
1556 | 1161 | ||
1557 | test -n "$ac_init_help" && exit $ac_status | 1162 | test -n "$ac_init_help" && exit 0 |
1558 | if $ac_init_version; then | 1163 | if $ac_init_version; then |
1559 | cat <<\_ACEOF | 1164 | cat <<\_ACEOF |
1560 | libltdl configure 1.2 | 1165 | libltdl configure 1.2 |
1561 | generated by GNU Autoconf 2.60a | 1166 | generated by GNU Autoconf 2.59 |
1562 | 1167 | ||
1563 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 1168 | Copyright (C) 2003 Free Software Foundation, Inc. |
1564 | 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | ||
1565 | This configure script is free software; the Free Software Foundation | 1169 | This configure script is free software; the Free Software Foundation |
1566 | gives unlimited permission to copy, distribute and modify it. | 1170 | gives unlimited permission to copy, distribute and modify it. |
1567 | _ACEOF | 1171 | _ACEOF |
1568 | exit | 1172 | exit 0 |
1569 | fi | 1173 | fi |
1570 | cat >config.log <<_ACEOF | 1174 | exec 5>config.log |
1175 | cat >&5 <<_ACEOF | ||
1571 | This file contains any messages produced by compilers while | 1176 | This file contains any messages produced by compilers while |
1572 | running configure, to aid debugging if configure makes a mistake. | 1177 | running configure, to aid debugging if configure makes a mistake. |
1573 | 1178 | ||
1574 | It was created by libltdl $as_me 1.2, which was | 1179 | It was created by libltdl $as_me 1.2, which was |
1575 | generated by GNU Autoconf 2.60a. Invocation command line was | 1180 | generated by GNU Autoconf 2.59. Invocation command line was |
1576 | 1181 | ||
1577 | $ $0 $@ | 1182 | $ $0 $@ |
1578 | 1183 | ||
1579 | _ACEOF | 1184 | _ACEOF |
1580 | exec 5>>config.log | ||
1581 | { | 1185 | { |
1582 | cat <<_ASUNAME | 1186 | cat <<_ASUNAME |
1583 | ## --------- ## | 1187 | ## --------- ## |
@@ -1596,7 +1200,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown` | |||
1596 | /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` | 1200 | /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` |
1597 | /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` | 1201 | /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` |
1598 | /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` | 1202 | /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` |
1599 | /usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` | 1203 | hostinfo = `(hostinfo) 2>/dev/null || echo unknown` |
1600 | /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` | 1204 | /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` |
1601 | /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` | 1205 | /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` |
1602 | /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` | 1206 | /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` |
@@ -1610,7 +1214,6 @@ do | |||
1610 | test -z "$as_dir" && as_dir=. | 1214 | test -z "$as_dir" && as_dir=. |
1611 | echo "PATH: $as_dir" | 1215 | echo "PATH: $as_dir" |
1612 | done | 1216 | done |
1613 | IFS=$as_save_IFS | ||
1614 | 1217 | ||
1615 | } >&5 | 1218 | } >&5 |
1616 | 1219 | ||
@@ -1632,6 +1235,7 @@ _ACEOF | |||
1632 | ac_configure_args= | 1235 | ac_configure_args= |
1633 | ac_configure_args0= | 1236 | ac_configure_args0= |
1634 | ac_configure_args1= | 1237 | ac_configure_args1= |
1238 | ac_sep= | ||
1635 | ac_must_keep_next=false | 1239 | ac_must_keep_next=false |
1636 | for ac_pass in 1 2 | 1240 | for ac_pass in 1 2 |
1637 | do | 1241 | do |
@@ -1642,7 +1246,7 @@ do | |||
1642 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | 1246 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ |
1643 | | -silent | --silent | --silen | --sile | --sil) | 1247 | | -silent | --silent | --silen | --sile | --sil) |
1644 | continue ;; | 1248 | continue ;; |
1645 | *\'*) | 1249 | *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) |
1646 | ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; | 1250 | ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; |
1647 | esac | 1251 | esac |
1648 | case $ac_pass in | 1252 | case $ac_pass in |
@@ -1664,7 +1268,9 @@ do | |||
1664 | -* ) ac_must_keep_next=true ;; | 1268 | -* ) ac_must_keep_next=true ;; |
1665 | esac | 1269 | esac |
1666 | fi | 1270 | fi |
1667 | ac_configure_args="$ac_configure_args '$ac_arg'" | 1271 | ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" |
1272 | # Get rid of the leading space. | ||
1273 | ac_sep=" " | ||
1668 | ;; | 1274 | ;; |
1669 | esac | 1275 | esac |
1670 | done | 1276 | done |
@@ -1675,8 +1281,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_ | |||
1675 | # When interrupted or exit'd, cleanup temporary files, and complete | 1281 | # When interrupted or exit'd, cleanup temporary files, and complete |
1676 | # config.log. We remove comments because anyway the quotes in there | 1282 | # config.log. We remove comments because anyway the quotes in there |
1677 | # would cause problems or look ugly. | 1283 | # would cause problems or look ugly. |
1678 | # WARNING: Use '\'' to represent an apostrophe within the trap. | 1284 | # WARNING: Be sure not to use single quotes in there, as some shells, |
1679 | # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. | 1285 | # such as our DU 5.0 friend, will then `close' the trap. |
1680 | trap 'exit_status=$? | 1286 | trap 'exit_status=$? |
1681 | # Save into config.log some information that might help in debugging. | 1287 | # Save into config.log some information that might help in debugging. |
1682 | { | 1288 | { |
@@ -1689,34 +1295,20 @@ trap 'exit_status=$? | |||
1689 | _ASBOX | 1295 | _ASBOX |
1690 | echo | 1296 | echo |
1691 | # The following way of writing the cache mishandles newlines in values, | 1297 | # The following way of writing the cache mishandles newlines in values, |
1692 | ( | 1298 | { |
1693 | for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do | ||
1694 | eval ac_val=\$$ac_var | ||
1695 | case $ac_val in #( | ||
1696 | *${as_nl}*) | ||
1697 | case $ac_var in #( | ||
1698 | *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 | ||
1699 | echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; | ||
1700 | esac | ||
1701 | case $ac_var in #( | ||
1702 | _ | IFS | as_nl) ;; #( | ||
1703 | *) $as_unset $ac_var ;; | ||
1704 | esac ;; | ||
1705 | esac | ||
1706 | done | ||
1707 | (set) 2>&1 | | 1299 | (set) 2>&1 | |
1708 | case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( | 1300 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in |
1709 | *${as_nl}ac_space=\ *) | 1301 | *ac_space=\ *) |
1710 | sed -n \ | 1302 | sed -n \ |
1711 | "s/'\''/'\''\\\\'\'''\''/g; | 1303 | "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; |
1712 | s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" | 1304 | s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" |
1713 | ;; #( | 1305 | ;; |
1714 | *) | 1306 | *) |
1715 | sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" | 1307 | sed -n \ |
1308 | "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
1716 | ;; | 1309 | ;; |
1717 | esac | | 1310 | esac; |
1718 | sort | 1311 | } |
1719 | ) | ||
1720 | echo | 1312 | echo |
1721 | 1313 | ||
1722 | cat <<\_ASBOX | 1314 | cat <<\_ASBOX |
@@ -1727,28 +1319,22 @@ _ASBOX | |||
1727 | echo | 1319 | echo |
1728 | for ac_var in $ac_subst_vars | 1320 | for ac_var in $ac_subst_vars |
1729 | do | 1321 | do |
1730 | eval ac_val=\$$ac_var | 1322 | eval ac_val=$`echo $ac_var` |
1731 | case $ac_val in | 1323 | echo "$ac_var='"'"'$ac_val'"'"'" |
1732 | *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | ||
1733 | esac | ||
1734 | echo "$ac_var='\''$ac_val'\''" | ||
1735 | done | sort | 1324 | done | sort |
1736 | echo | 1325 | echo |
1737 | 1326 | ||
1738 | if test -n "$ac_subst_files"; then | 1327 | if test -n "$ac_subst_files"; then |
1739 | cat <<\_ASBOX | 1328 | cat <<\_ASBOX |
1740 | ## ------------------- ## | 1329 | ## ------------- ## |
1741 | ## File substitutions. ## | 1330 | ## Output files. ## |
1742 | ## ------------------- ## | 1331 | ## ------------- ## |
1743 | _ASBOX | 1332 | _ASBOX |
1744 | echo | 1333 | echo |
1745 | for ac_var in $ac_subst_files | 1334 | for ac_var in $ac_subst_files |
1746 | do | 1335 | do |
1747 | eval ac_val=\$$ac_var | 1336 | eval ac_val=$`echo $ac_var` |
1748 | case $ac_val in | 1337 | echo "$ac_var='"'"'$ac_val'"'"'" |
1749 | *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | ||
1750 | esac | ||
1751 | echo "$ac_var='\''$ac_val'\''" | ||
1752 | done | sort | 1338 | done | sort |
1753 | echo | 1339 | echo |
1754 | fi | 1340 | fi |
@@ -1760,24 +1346,26 @@ _ASBOX | |||
1760 | ## ----------- ## | 1346 | ## ----------- ## |
1761 | _ASBOX | 1347 | _ASBOX |
1762 | echo | 1348 | echo |
1763 | cat confdefs.h | 1349 | sed "/^$/d" confdefs.h | sort |
1764 | echo | 1350 | echo |
1765 | fi | 1351 | fi |
1766 | test "$ac_signal" != 0 && | 1352 | test "$ac_signal" != 0 && |
1767 | echo "$as_me: caught signal $ac_signal" | 1353 | echo "$as_me: caught signal $ac_signal" |
1768 | echo "$as_me: exit $exit_status" | 1354 | echo "$as_me: exit $exit_status" |
1769 | } >&5 | 1355 | } >&5 |
1770 | rm -f core *.core core.conftest.* && | 1356 | rm -f core *.core && |
1771 | rm -f -r conftest* confdefs* conf$$* $ac_clean_files && | 1357 | rm -rf conftest* confdefs* conf$$* $ac_clean_files && |
1772 | exit $exit_status | 1358 | exit $exit_status |
1773 | ' 0 | 1359 | ' 0 |
1774 | for ac_signal in 1 2 13 15; do | 1360 | for ac_signal in 1 2 13 15; do |
1775 | trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal | 1361 | trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal |
1776 | done | 1362 | done |
1777 | ac_signal=0 | 1363 | ac_signal=0 |
1778 | 1364 | ||
1779 | # confdefs.h avoids OS command line length limits that DEFS can exceed. | 1365 | # confdefs.h avoids OS command line length limits that DEFS can exceed. |
1780 | rm -f -r conftest* confdefs.h | 1366 | rm -rf conftest* confdefs.h |
1367 | # AIX cpp loses on an empty file, so make sure it contains at least a newline. | ||
1368 | echo >confdefs.h | ||
1781 | 1369 | ||
1782 | # Predefined preprocessor variables. | 1370 | # Predefined preprocessor variables. |
1783 | 1371 | ||
@@ -1808,17 +1396,14 @@ _ACEOF | |||
1808 | 1396 | ||
1809 | # Let the site file select an alternate cache file if it wants to. | 1397 | # Let the site file select an alternate cache file if it wants to. |
1810 | # Prefer explicitly selected file to automatically selected ones. | 1398 | # Prefer explicitly selected file to automatically selected ones. |
1811 | if test -n "$CONFIG_SITE"; then | 1399 | if test -z "$CONFIG_SITE"; then |
1812 | set x "$CONFIG_SITE" | 1400 | if test "x$prefix" != xNONE; then |
1813 | elif test "x$prefix" != xNONE; then | 1401 | CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" |
1814 | set x "$prefix/share/config.site" "$prefix/etc/config.site" | 1402 | else |
1815 | else | 1403 | CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" |
1816 | set x "$ac_default_prefix/share/config.site" \ | 1404 | fi |
1817 | "$ac_default_prefix/etc/config.site" | ||
1818 | fi | 1405 | fi |
1819 | shift | 1406 | for ac_site_file in $CONFIG_SITE; do |
1820 | for ac_site_file | ||
1821 | do | ||
1822 | if test -r "$ac_site_file"; then | 1407 | if test -r "$ac_site_file"; then |
1823 | { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 | 1408 | { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 |
1824 | echo "$as_me: loading site script $ac_site_file" >&6;} | 1409 | echo "$as_me: loading site script $ac_site_file" >&6;} |
@@ -1834,8 +1419,8 @@ if test -r "$cache_file"; then | |||
1834 | { echo "$as_me:$LINENO: loading cache $cache_file" >&5 | 1419 | { echo "$as_me:$LINENO: loading cache $cache_file" >&5 |
1835 | echo "$as_me: loading cache $cache_file" >&6;} | 1420 | echo "$as_me: loading cache $cache_file" >&6;} |
1836 | case $cache_file in | 1421 | case $cache_file in |
1837 | [\\/]* | ?:[\\/]* ) . "$cache_file";; | 1422 | [\\/]* | ?:[\\/]* ) . $cache_file;; |
1838 | *) . "./$cache_file";; | 1423 | *) . ./$cache_file;; |
1839 | esac | 1424 | esac |
1840 | fi | 1425 | fi |
1841 | else | 1426 | else |
@@ -1847,11 +1432,12 @@ fi | |||
1847 | # Check that the precious variables saved in the cache have kept the same | 1432 | # Check that the precious variables saved in the cache have kept the same |
1848 | # value. | 1433 | # value. |
1849 | ac_cache_corrupted=false | 1434 | ac_cache_corrupted=false |
1850 | for ac_var in $ac_precious_vars; do | 1435 | for ac_var in `(set) 2>&1 | |
1436 | sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do | ||
1851 | eval ac_old_set=\$ac_cv_env_${ac_var}_set | 1437 | eval ac_old_set=\$ac_cv_env_${ac_var}_set |
1852 | eval ac_new_set=\$ac_env_${ac_var}_set | 1438 | eval ac_new_set=\$ac_env_${ac_var}_set |
1853 | eval ac_old_val=\$ac_cv_env_${ac_var}_value | 1439 | eval ac_old_val="\$ac_cv_env_${ac_var}_value" |
1854 | eval ac_new_val=\$ac_env_${ac_var}_value | 1440 | eval ac_new_val="\$ac_env_${ac_var}_value" |
1855 | case $ac_old_set,$ac_new_set in | 1441 | case $ac_old_set,$ac_new_set in |
1856 | set,) | 1442 | set,) |
1857 | { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 | 1443 | { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 |
@@ -1876,7 +1462,8 @@ echo "$as_me: current value: $ac_new_val" >&2;} | |||
1876 | # Pass precious variables to config.status. | 1462 | # Pass precious variables to config.status. |
1877 | if test "$ac_new_set" = set; then | 1463 | if test "$ac_new_set" = set; then |
1878 | case $ac_new_val in | 1464 | case $ac_new_val in |
1879 | *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; | 1465 | *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) |
1466 | ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; | ||
1880 | *) ac_arg=$ac_var=$ac_new_val ;; | 1467 | *) ac_arg=$ac_var=$ac_new_val ;; |
1881 | esac | 1468 | esac |
1882 | case " $ac_configure_args " in | 1469 | case " $ac_configure_args " in |
@@ -1893,6 +1480,12 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov | |||
1893 | { (exit 1); exit 1; }; } | 1480 | { (exit 1); exit 1; }; } |
1894 | fi | 1481 | fi |
1895 | 1482 | ||
1483 | ac_ext=c | ||
1484 | ac_cpp='$CPP $CPPFLAGS' | ||
1485 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
1486 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
1487 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
1488 | |||
1896 | 1489 | ||
1897 | 1490 | ||
1898 | 1491 | ||
@@ -1917,11 +1510,6 @@ fi | |||
1917 | 1510 | ||
1918 | 1511 | ||
1919 | 1512 | ||
1920 | ac_ext=c | ||
1921 | ac_cpp='$CPP $CPPFLAGS' | ||
1922 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
1923 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
1924 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
1925 | 1513 | ||
1926 | 1514 | ||
1927 | 1515 | ||
@@ -1932,35 +1520,29 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
1932 | ## ------------------------------- ## | 1520 | ## ------------------------------- ## |
1933 | 1521 | ||
1934 | ac_aux_dir= | 1522 | ac_aux_dir= |
1935 | for ac_dir in . "$srcdir"/.; do | 1523 | for ac_dir in . $srcdir/.; do |
1936 | if test -f "$ac_dir/install-sh"; then | 1524 | if test -f $ac_dir/install-sh; then |
1937 | ac_aux_dir=$ac_dir | 1525 | ac_aux_dir=$ac_dir |
1938 | ac_install_sh="$ac_aux_dir/install-sh -c" | 1526 | ac_install_sh="$ac_aux_dir/install-sh -c" |
1939 | break | 1527 | break |
1940 | elif test -f "$ac_dir/install.sh"; then | 1528 | elif test -f $ac_dir/install.sh; then |
1941 | ac_aux_dir=$ac_dir | 1529 | ac_aux_dir=$ac_dir |
1942 | ac_install_sh="$ac_aux_dir/install.sh -c" | 1530 | ac_install_sh="$ac_aux_dir/install.sh -c" |
1943 | break | 1531 | break |
1944 | elif test -f "$ac_dir/shtool"; then | 1532 | elif test -f $ac_dir/shtool; then |
1945 | ac_aux_dir=$ac_dir | 1533 | ac_aux_dir=$ac_dir |
1946 | ac_install_sh="$ac_aux_dir/shtool install -c" | 1534 | ac_install_sh="$ac_aux_dir/shtool install -c" |
1947 | break | 1535 | break |
1948 | fi | 1536 | fi |
1949 | done | 1537 | done |
1950 | if test -z "$ac_aux_dir"; then | 1538 | if test -z "$ac_aux_dir"; then |
1951 | { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in . \"$srcdir\"/." >&5 | 1539 | { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in . $srcdir/." >&5 |
1952 | echo "$as_me: error: cannot find install-sh or install.sh in . \"$srcdir\"/." >&2;} | 1540 | echo "$as_me: error: cannot find install-sh or install.sh in . $srcdir/." >&2;} |
1953 | { (exit 1); exit 1; }; } | 1541 | { (exit 1); exit 1; }; } |
1954 | fi | 1542 | fi |
1955 | 1543 | ac_config_guess="$SHELL $ac_aux_dir/config.guess" | |
1956 | # These three variables are undocumented and unsupported, | 1544 | ac_config_sub="$SHELL $ac_aux_dir/config.sub" |
1957 | # and are intended to be withdrawn in a future Autoconf release. | 1545 | ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. |
1958 | # They can cause serious problems if a builder's source tree is in a directory | ||
1959 | # whose full name contains unusual characters. | ||
1960 | ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. | ||
1961 | ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. | ||
1962 | ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. | ||
1963 | |||
1964 | 1546 | ||
1965 | 1547 | ||
1966 | if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then | 1548 | if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then |
@@ -1983,7 +1565,7 @@ fi | |||
1983 | ## ------------------------ ## | 1565 | ## ------------------------ ## |
1984 | ## Automake Initialisation. ## | 1566 | ## Automake Initialisation. ## |
1985 | ## ------------------------ ## | 1567 | ## ------------------------ ## |
1986 | am__api_version="1.8" | 1568 | am__api_version="1.9" |
1987 | # Find a good install program. We prefer a C program (faster), | 1569 | # Find a good install program. We prefer a C program (faster), |
1988 | # so one script is as good as another. But avoid the broken or | 1570 | # so one script is as good as another. But avoid the broken or |
1989 | # incompatible versions: | 1571 | # incompatible versions: |
@@ -1997,8 +1579,8 @@ am__api_version="1.8" | |||
1997 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | 1579 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" |
1998 | # OS/2's system install, which has a completely different semantic | 1580 | # OS/2's system install, which has a completely different semantic |
1999 | # ./install, which can be erroneously created by make from ./install.sh. | 1581 | # ./install, which can be erroneously created by make from ./install.sh. |
2000 | { echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 | 1582 | echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 |
2001 | echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } | 1583 | echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 |
2002 | if test -z "$INSTALL"; then | 1584 | if test -z "$INSTALL"; then |
2003 | if test "${ac_cv_path_install+set}" = set; then | 1585 | if test "${ac_cv_path_install+set}" = set; then |
2004 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 1586 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2020,7 +1602,7 @@ case $as_dir/ in | |||
2020 | # by default. | 1602 | # by default. |
2021 | for ac_prog in ginstall scoinst install; do | 1603 | for ac_prog in ginstall scoinst install; do |
2022 | for ac_exec_ext in '' $ac_executable_extensions; do | 1604 | for ac_exec_ext in '' $ac_executable_extensions; do |
2023 | if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then | 1605 | if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then |
2024 | if test $ac_prog = install && | 1606 | if test $ac_prog = install && |
2025 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | 1607 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
2026 | # AIX install. It has an incompatible calling convention. | 1608 | # AIX install. It has an incompatible calling convention. |
@@ -2039,22 +1621,21 @@ case $as_dir/ in | |||
2039 | ;; | 1621 | ;; |
2040 | esac | 1622 | esac |
2041 | done | 1623 | done |
2042 | IFS=$as_save_IFS | ||
2043 | 1624 | ||
2044 | 1625 | ||
2045 | fi | 1626 | fi |
2046 | if test "${ac_cv_path_install+set}" = set; then | 1627 | if test "${ac_cv_path_install+set}" = set; then |
2047 | INSTALL=$ac_cv_path_install | 1628 | INSTALL=$ac_cv_path_install |
2048 | else | 1629 | else |
2049 | # As a last resort, use the slow shell script. Don't cache a | 1630 | # As a last resort, use the slow shell script. We don't cache a |
2050 | # value for INSTALL within a source directory, because that will | 1631 | # path for INSTALL within a source directory, because that will |
2051 | # break other packages using the cache if that directory is | 1632 | # break other packages using the cache if that directory is |
2052 | # removed, or if the value is a relative name. | 1633 | # removed, or if the path is relative. |
2053 | INSTALL=$ac_install_sh | 1634 | INSTALL=$ac_install_sh |
2054 | fi | 1635 | fi |
2055 | fi | 1636 | fi |
2056 | { echo "$as_me:$LINENO: result: $INSTALL" >&5 | 1637 | echo "$as_me:$LINENO: result: $INSTALL" >&5 |
2057 | echo "${ECHO_T}$INSTALL" >&6; } | 1638 | echo "${ECHO_T}$INSTALL" >&6 |
2058 | 1639 | ||
2059 | # Use test -z because SunOS4 sh mishandles braces in ${var-val}. | 1640 | # Use test -z because SunOS4 sh mishandles braces in ${var-val}. |
2060 | # It thinks the first close brace ends the variable substitution. | 1641 | # It thinks the first close brace ends the variable substitution. |
@@ -2064,8 +1645,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' | |||
2064 | 1645 | ||
2065 | test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' | 1646 | test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' |
2066 | 1647 | ||
2067 | { echo "$as_me:$LINENO: checking whether build environment is sane" >&5 | 1648 | echo "$as_me:$LINENO: checking whether build environment is sane" >&5 |
2068 | echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } | 1649 | echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 |
2069 | # Just in case | 1650 | # Just in case |
2070 | sleep 1 | 1651 | sleep 1 |
2071 | echo timestamp > conftest.file | 1652 | echo timestamp > conftest.file |
@@ -2107,20 +1688,20 @@ echo "$as_me: error: newly created file is older than distributed files! | |||
2107 | Check your system clock" >&2;} | 1688 | Check your system clock" >&2;} |
2108 | { (exit 1); exit 1; }; } | 1689 | { (exit 1); exit 1; }; } |
2109 | fi | 1690 | fi |
2110 | { echo "$as_me:$LINENO: result: yes" >&5 | 1691 | echo "$as_me:$LINENO: result: yes" >&5 |
2111 | echo "${ECHO_T}yes" >&6; } | 1692 | echo "${ECHO_T}yes" >&6 |
2112 | test "$program_prefix" != NONE && | 1693 | test "$program_prefix" != NONE && |
2113 | program_transform_name="s&^&$program_prefix&;$program_transform_name" | 1694 | program_transform_name="s,^,$program_prefix,;$program_transform_name" |
2114 | # Use a double $ so make ignores it. | 1695 | # Use a double $ so make ignores it. |
2115 | test "$program_suffix" != NONE && | 1696 | test "$program_suffix" != NONE && |
2116 | program_transform_name="s&\$&$program_suffix&;$program_transform_name" | 1697 | program_transform_name="s,\$,$program_suffix,;$program_transform_name" |
2117 | # Double any \ or $. echo might interpret backslashes. | 1698 | # Double any \ or $. echo might interpret backslashes. |
2118 | # By default was `s,x,x', remove it if useless. | 1699 | # By default was `s,x,x', remove it if useless. |
2119 | cat <<\_ACEOF >conftest.sed | 1700 | cat <<\_ACEOF >conftest.sed |
2120 | s/[\\$]/&&/g;s/;s,x,x,$// | 1701 | s/[\\$]/&&/g;s/;s,x,x,$// |
2121 | _ACEOF | 1702 | _ACEOF |
2122 | program_transform_name=`echo $program_transform_name | sed -f conftest.sed` | 1703 | program_transform_name=`echo $program_transform_name | sed -f conftest.sed` |
2123 | rm -f conftest.sed | 1704 | rm conftest.sed |
2124 | 1705 | ||
2125 | # expand $ac_aux_dir to an absolute path | 1706 | # expand $ac_aux_dir to an absolute path |
2126 | am_aux_dir=`cd $ac_aux_dir && pwd` | 1707 | am_aux_dir=`cd $ac_aux_dir && pwd` |
@@ -2136,13 +1717,21 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} | |||
2136 | fi | 1717 | fi |
2137 | 1718 | ||
2138 | if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then | 1719 | if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then |
2139 | # Keeping the `.' argument allows $(mkdir_p) to be used without | 1720 | # We used to keeping the `.' as first argument, in order to |
2140 | # argument. Indeed, we sometimes output rules like | 1721 | # allow $(mkdir_p) to be used without argument. As in |
2141 | # $(mkdir_p) $(somedir) | 1722 | # $(mkdir_p) $(somedir) |
2142 | # where $(somedir) is conditionally defined. | 1723 | # where $(somedir) is conditionally defined. However this is wrong |
2143 | # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more | 1724 | # for two reasons: |
2144 | # expensive solution, as it forces Make to start a sub-shell.) | 1725 | # 1. if the package is installed by a user who cannot write `.' |
2145 | mkdir_p='mkdir -p -- .' | 1726 | # make install will fail, |
1727 | # 2. the above comment should most certainly read | ||
1728 | # $(mkdir_p) $(DESTDIR)$(somedir) | ||
1729 | # so it does not work when $(somedir) is undefined and | ||
1730 | # $(DESTDIR) is not. | ||
1731 | # To support the latter case, we have to write | ||
1732 | # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), | ||
1733 | # so the `.' trick is pointless. | ||
1734 | mkdir_p='mkdir -p --' | ||
2146 | else | 1735 | else |
2147 | # On NextStep and OpenStep, the `mkdir' command does not | 1736 | # On NextStep and OpenStep, the `mkdir' command does not |
2148 | # recognize any option. It will interpret all options as | 1737 | # recognize any option. It will interpret all options as |
@@ -2164,8 +1753,8 @@ for ac_prog in gawk mawk nawk awk | |||
2164 | do | 1753 | do |
2165 | # Extract the first word of "$ac_prog", so it can be a program name with args. | 1754 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
2166 | set dummy $ac_prog; ac_word=$2 | 1755 | set dummy $ac_prog; ac_word=$2 |
2167 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 1756 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2168 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 1757 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2169 | if test "${ac_cv_prog_AWK+set}" = set; then | 1758 | if test "${ac_cv_prog_AWK+set}" = set; then |
2170 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 1759 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
2171 | else | 1760 | else |
@@ -2178,57 +1767,54 @@ do | |||
2178 | IFS=$as_save_IFS | 1767 | IFS=$as_save_IFS |
2179 | test -z "$as_dir" && as_dir=. | 1768 | test -z "$as_dir" && as_dir=. |
2180 | for ac_exec_ext in '' $ac_executable_extensions; do | 1769 | for ac_exec_ext in '' $ac_executable_extensions; do |
2181 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 1770 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2182 | ac_cv_prog_AWK="$ac_prog" | 1771 | ac_cv_prog_AWK="$ac_prog" |
2183 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 1772 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2184 | break 2 | 1773 | break 2 |
2185 | fi | 1774 | fi |
2186 | done | 1775 | done |
2187 | done | 1776 | done |
2188 | IFS=$as_save_IFS | ||
2189 | 1777 | ||
2190 | fi | 1778 | fi |
2191 | fi | 1779 | fi |
2192 | AWK=$ac_cv_prog_AWK | 1780 | AWK=$ac_cv_prog_AWK |
2193 | if test -n "$AWK"; then | 1781 | if test -n "$AWK"; then |
2194 | { echo "$as_me:$LINENO: result: $AWK" >&5 | 1782 | echo "$as_me:$LINENO: result: $AWK" >&5 |
2195 | echo "${ECHO_T}$AWK" >&6; } | 1783 | echo "${ECHO_T}$AWK" >&6 |
2196 | else | 1784 | else |
2197 | { echo "$as_me:$LINENO: result: no" >&5 | 1785 | echo "$as_me:$LINENO: result: no" >&5 |
2198 | echo "${ECHO_T}no" >&6; } | 1786 | echo "${ECHO_T}no" >&6 |
2199 | fi | 1787 | fi |
2200 | 1788 | ||
2201 | |||
2202 | test -n "$AWK" && break | 1789 | test -n "$AWK" && break |
2203 | done | 1790 | done |
2204 | 1791 | ||
2205 | { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | 1792 | echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 |
2206 | echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } | 1793 | echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 |
2207 | set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` | 1794 | set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` |
2208 | if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then | 1795 | if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then |
2209 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 1796 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
2210 | else | 1797 | else |
2211 | cat >conftest.make <<\_ACEOF | 1798 | cat >conftest.make <<\_ACEOF |
2212 | SHELL = /bin/sh | ||
2213 | all: | 1799 | all: |
2214 | @echo '@@@%%%=$(MAKE)=@@@%%%' | 1800 | @echo 'ac_maketemp="$(MAKE)"' |
2215 | _ACEOF | 1801 | _ACEOF |
2216 | # GNU make sometimes prints "make[1]: Entering...", which would confuse us. | 1802 | # GNU make sometimes prints "make[1]: Entering...", which would confuse us. |
2217 | case `${MAKE-make} -f conftest.make 2>/dev/null` in | 1803 | eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` |
2218 | *@@@%%%=?*=@@@%%%*) | 1804 | if test -n "$ac_maketemp"; then |
2219 | eval ac_cv_prog_make_${ac_make}_set=yes;; | 1805 | eval ac_cv_prog_make_${ac_make}_set=yes |
2220 | *) | 1806 | else |
2221 | eval ac_cv_prog_make_${ac_make}_set=no;; | 1807 | eval ac_cv_prog_make_${ac_make}_set=no |
2222 | esac | 1808 | fi |
2223 | rm -f conftest.make | 1809 | rm -f conftest.make |
2224 | fi | 1810 | fi |
2225 | if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then | 1811 | if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then |
2226 | { echo "$as_me:$LINENO: result: yes" >&5 | 1812 | echo "$as_me:$LINENO: result: yes" >&5 |
2227 | echo "${ECHO_T}yes" >&6; } | 1813 | echo "${ECHO_T}yes" >&6 |
2228 | SET_MAKE= | 1814 | SET_MAKE= |
2229 | else | 1815 | else |
2230 | { echo "$as_me:$LINENO: result: no" >&5 | 1816 | echo "$as_me:$LINENO: result: no" >&5 |
2231 | echo "${ECHO_T}no" >&6; } | 1817 | echo "${ECHO_T}no" >&6 |
2232 | SET_MAKE="MAKE=${MAKE-make}" | 1818 | SET_MAKE="MAKE=${MAKE-make}" |
2233 | fi | 1819 | fi |
2234 | 1820 | ||
@@ -2280,9 +1866,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} | |||
2280 | 1866 | ||
2281 | MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} | 1867 | MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} |
2282 | 1868 | ||
2283 | |||
2284 | AMTAR=${AMTAR-"${am_missing_run}tar"} | ||
2285 | |||
2286 | install_sh=${install_sh-"$am_aux_dir/install-sh"} | 1869 | install_sh=${install_sh-"$am_aux_dir/install-sh"} |
2287 | 1870 | ||
2288 | # Installed binaries are usually stripped using `strip' when the user | 1871 | # Installed binaries are usually stripped using `strip' when the user |
@@ -2293,8 +1876,8 @@ if test "$cross_compiling" != no; then | |||
2293 | if test -n "$ac_tool_prefix"; then | 1876 | if test -n "$ac_tool_prefix"; then |
2294 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | 1877 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
2295 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | 1878 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
2296 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 1879 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2297 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 1880 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2298 | if test "${ac_cv_prog_STRIP+set}" = set; then | 1881 | if test "${ac_cv_prog_STRIP+set}" = set; then |
2299 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 1882 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
2300 | else | 1883 | else |
@@ -2307,34 +1890,32 @@ do | |||
2307 | IFS=$as_save_IFS | 1890 | IFS=$as_save_IFS |
2308 | test -z "$as_dir" && as_dir=. | 1891 | test -z "$as_dir" && as_dir=. |
2309 | for ac_exec_ext in '' $ac_executable_extensions; do | 1892 | for ac_exec_ext in '' $ac_executable_extensions; do |
2310 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 1893 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2311 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" | 1894 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
2312 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 1895 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2313 | break 2 | 1896 | break 2 |
2314 | fi | 1897 | fi |
2315 | done | 1898 | done |
2316 | done | 1899 | done |
2317 | IFS=$as_save_IFS | ||
2318 | 1900 | ||
2319 | fi | 1901 | fi |
2320 | fi | 1902 | fi |
2321 | STRIP=$ac_cv_prog_STRIP | 1903 | STRIP=$ac_cv_prog_STRIP |
2322 | if test -n "$STRIP"; then | 1904 | if test -n "$STRIP"; then |
2323 | { echo "$as_me:$LINENO: result: $STRIP" >&5 | 1905 | echo "$as_me:$LINENO: result: $STRIP" >&5 |
2324 | echo "${ECHO_T}$STRIP" >&6; } | 1906 | echo "${ECHO_T}$STRIP" >&6 |
2325 | else | 1907 | else |
2326 | { echo "$as_me:$LINENO: result: no" >&5 | 1908 | echo "$as_me:$LINENO: result: no" >&5 |
2327 | echo "${ECHO_T}no" >&6; } | 1909 | echo "${ECHO_T}no" >&6 |
2328 | fi | 1910 | fi |
2329 | 1911 | ||
2330 | |||
2331 | fi | 1912 | fi |
2332 | if test -z "$ac_cv_prog_STRIP"; then | 1913 | if test -z "$ac_cv_prog_STRIP"; then |
2333 | ac_ct_STRIP=$STRIP | 1914 | ac_ct_STRIP=$STRIP |
2334 | # Extract the first word of "strip", so it can be a program name with args. | 1915 | # Extract the first word of "strip", so it can be a program name with args. |
2335 | set dummy strip; ac_word=$2 | 1916 | set dummy strip; ac_word=$2 |
2336 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 1917 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2337 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 1918 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2338 | if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then | 1919 | if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then |
2339 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 1920 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
2340 | else | 1921 | else |
@@ -2347,41 +1928,27 @@ do | |||
2347 | IFS=$as_save_IFS | 1928 | IFS=$as_save_IFS |
2348 | test -z "$as_dir" && as_dir=. | 1929 | test -z "$as_dir" && as_dir=. |
2349 | for ac_exec_ext in '' $ac_executable_extensions; do | 1930 | for ac_exec_ext in '' $ac_executable_extensions; do |
2350 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 1931 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2351 | ac_cv_prog_ac_ct_STRIP="strip" | 1932 | ac_cv_prog_ac_ct_STRIP="strip" |
2352 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 1933 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2353 | break 2 | 1934 | break 2 |
2354 | fi | 1935 | fi |
2355 | done | 1936 | done |
2356 | done | 1937 | done |
2357 | IFS=$as_save_IFS | ||
2358 | 1938 | ||
1939 | test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" | ||
2359 | fi | 1940 | fi |
2360 | fi | 1941 | fi |
2361 | ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP | 1942 | ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP |
2362 | if test -n "$ac_ct_STRIP"; then | 1943 | if test -n "$ac_ct_STRIP"; then |
2363 | { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 | 1944 | echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 |
2364 | echo "${ECHO_T}$ac_ct_STRIP" >&6; } | 1945 | echo "${ECHO_T}$ac_ct_STRIP" >&6 |
2365 | else | 1946 | else |
2366 | { echo "$as_me:$LINENO: result: no" >&5 | 1947 | echo "$as_me:$LINENO: result: no" >&5 |
2367 | echo "${ECHO_T}no" >&6; } | 1948 | echo "${ECHO_T}no" >&6 |
2368 | fi | 1949 | fi |
2369 | 1950 | ||
2370 | if test "x$ac_ct_STRIP" = x; then | 1951 | STRIP=$ac_ct_STRIP |
2371 | STRIP=":" | ||
2372 | else | ||
2373 | case $cross_compiling:$ac_tool_warned in | ||
2374 | yes:) | ||
2375 | { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
2376 | whose name does not start with the host triplet. If you think this | ||
2377 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
2378 | echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
2379 | whose name does not start with the host triplet. If you think this | ||
2380 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
2381 | ac_tool_warned=yes ;; | ||
2382 | esac | ||
2383 | STRIP=$ac_ct_STRIP | ||
2384 | fi | ||
2385 | else | 1952 | else |
2386 | STRIP="$ac_cv_prog_STRIP" | 1953 | STRIP="$ac_cv_prog_STRIP" |
2387 | fi | 1954 | fi |
@@ -2391,22 +1958,29 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" | |||
2391 | 1958 | ||
2392 | # We need awk for the "check" target. The system "awk" is bad on | 1959 | # We need awk for the "check" target. The system "awk" is bad on |
2393 | # some platforms. | 1960 | # some platforms. |
1961 | # Always define AMTAR for backward compatibility. | ||
1962 | |||
1963 | AMTAR=${AMTAR-"${am_missing_run}tar"} | ||
1964 | |||
1965 | am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' | ||
1966 | |||
2394 | 1967 | ||
2395 | 1968 | ||
2396 | 1969 | ||
2397 | ac_config_headers="$ac_config_headers config.h:config-h.in" | ||
2398 | 1970 | ||
2399 | { echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 | 1971 | ac_config_headers="$ac_config_headers config.h:config-h.in" |
2400 | echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } | 1972 | |
2401 | # Check whether --enable-maintainer-mode was given. | 1973 | echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
1974 | echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 | ||
1975 | # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. | ||
2402 | if test "${enable_maintainer_mode+set}" = set; then | 1976 | if test "${enable_maintainer_mode+set}" = set; then |
2403 | enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval | 1977 | enableval="$enable_maintainer_mode" |
1978 | USE_MAINTAINER_MODE=$enableval | ||
2404 | else | 1979 | else |
2405 | USE_MAINTAINER_MODE=no | 1980 | USE_MAINTAINER_MODE=no |
2406 | fi | 1981 | fi; |
2407 | 1982 | echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 | |
2408 | { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 | 1983 | echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 |
2409 | echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } | ||
2410 | 1984 | ||
2411 | 1985 | ||
2412 | if test $USE_MAINTAINER_MODE = yes; then | 1986 | if test $USE_MAINTAINER_MODE = yes; then |
@@ -2433,8 +2007,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
2433 | if test -n "$ac_tool_prefix"; then | 2007 | if test -n "$ac_tool_prefix"; then |
2434 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. | 2008 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. |
2435 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 | 2009 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
2436 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 2010 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2437 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 2011 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2438 | if test "${ac_cv_prog_CC+set}" = set; then | 2012 | if test "${ac_cv_prog_CC+set}" = set; then |
2439 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2013 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
2440 | else | 2014 | else |
@@ -2447,34 +2021,32 @@ do | |||
2447 | IFS=$as_save_IFS | 2021 | IFS=$as_save_IFS |
2448 | test -z "$as_dir" && as_dir=. | 2022 | test -z "$as_dir" && as_dir=. |
2449 | for ac_exec_ext in '' $ac_executable_extensions; do | 2023 | for ac_exec_ext in '' $ac_executable_extensions; do |
2450 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 2024 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2451 | ac_cv_prog_CC="${ac_tool_prefix}gcc" | 2025 | ac_cv_prog_CC="${ac_tool_prefix}gcc" |
2452 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2026 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2453 | break 2 | 2027 | break 2 |
2454 | fi | 2028 | fi |
2455 | done | 2029 | done |
2456 | done | 2030 | done |
2457 | IFS=$as_save_IFS | ||
2458 | 2031 | ||
2459 | fi | 2032 | fi |
2460 | fi | 2033 | fi |
2461 | CC=$ac_cv_prog_CC | 2034 | CC=$ac_cv_prog_CC |
2462 | if test -n "$CC"; then | 2035 | if test -n "$CC"; then |
2463 | { echo "$as_me:$LINENO: result: $CC" >&5 | 2036 | echo "$as_me:$LINENO: result: $CC" >&5 |
2464 | echo "${ECHO_T}$CC" >&6; } | 2037 | echo "${ECHO_T}$CC" >&6 |
2465 | else | 2038 | else |
2466 | { echo "$as_me:$LINENO: result: no" >&5 | 2039 | echo "$as_me:$LINENO: result: no" >&5 |
2467 | echo "${ECHO_T}no" >&6; } | 2040 | echo "${ECHO_T}no" >&6 |
2468 | fi | 2041 | fi |
2469 | 2042 | ||
2470 | |||
2471 | fi | 2043 | fi |
2472 | if test -z "$ac_cv_prog_CC"; then | 2044 | if test -z "$ac_cv_prog_CC"; then |
2473 | ac_ct_CC=$CC | 2045 | ac_ct_CC=$CC |
2474 | # Extract the first word of "gcc", so it can be a program name with args. | 2046 | # Extract the first word of "gcc", so it can be a program name with args. |
2475 | set dummy gcc; ac_word=$2 | 2047 | set dummy gcc; ac_word=$2 |
2476 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 2048 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2477 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 2049 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2478 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | 2050 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then |
2479 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2051 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
2480 | else | 2052 | else |
@@ -2487,51 +2059,36 @@ do | |||
2487 | IFS=$as_save_IFS | 2059 | IFS=$as_save_IFS |
2488 | test -z "$as_dir" && as_dir=. | 2060 | test -z "$as_dir" && as_dir=. |
2489 | for ac_exec_ext in '' $ac_executable_extensions; do | 2061 | for ac_exec_ext in '' $ac_executable_extensions; do |
2490 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 2062 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2491 | ac_cv_prog_ac_ct_CC="gcc" | 2063 | ac_cv_prog_ac_ct_CC="gcc" |
2492 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2064 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2493 | break 2 | 2065 | break 2 |
2494 | fi | 2066 | fi |
2495 | done | 2067 | done |
2496 | done | 2068 | done |
2497 | IFS=$as_save_IFS | ||
2498 | 2069 | ||
2499 | fi | 2070 | fi |
2500 | fi | 2071 | fi |
2501 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | 2072 | ac_ct_CC=$ac_cv_prog_ac_ct_CC |
2502 | if test -n "$ac_ct_CC"; then | 2073 | if test -n "$ac_ct_CC"; then |
2503 | { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | 2074 | echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
2504 | echo "${ECHO_T}$ac_ct_CC" >&6; } | 2075 | echo "${ECHO_T}$ac_ct_CC" >&6 |
2505 | else | 2076 | else |
2506 | { echo "$as_me:$LINENO: result: no" >&5 | 2077 | echo "$as_me:$LINENO: result: no" >&5 |
2507 | echo "${ECHO_T}no" >&6; } | 2078 | echo "${ECHO_T}no" >&6 |
2508 | fi | 2079 | fi |
2509 | 2080 | ||
2510 | if test "x$ac_ct_CC" = x; then | 2081 | CC=$ac_ct_CC |
2511 | CC="" | ||
2512 | else | ||
2513 | case $cross_compiling:$ac_tool_warned in | ||
2514 | yes:) | ||
2515 | { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
2516 | whose name does not start with the host triplet. If you think this | ||
2517 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
2518 | echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
2519 | whose name does not start with the host triplet. If you think this | ||
2520 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
2521 | ac_tool_warned=yes ;; | ||
2522 | esac | ||
2523 | CC=$ac_ct_CC | ||
2524 | fi | ||
2525 | else | 2082 | else |
2526 | CC="$ac_cv_prog_CC" | 2083 | CC="$ac_cv_prog_CC" |
2527 | fi | 2084 | fi |
2528 | 2085 | ||
2529 | if test -z "$CC"; then | 2086 | if test -z "$CC"; then |
2530 | if test -n "$ac_tool_prefix"; then | 2087 | if test -n "$ac_tool_prefix"; then |
2531 | # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | 2088 | # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. |
2532 | set dummy ${ac_tool_prefix}cc; ac_word=$2 | 2089 | set dummy ${ac_tool_prefix}cc; ac_word=$2 |
2533 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 2090 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2534 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 2091 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2535 | if test "${ac_cv_prog_CC+set}" = set; then | 2092 | if test "${ac_cv_prog_CC+set}" = set; then |
2536 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2093 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
2537 | else | 2094 | else |
@@ -2544,34 +2101,74 @@ do | |||
2544 | IFS=$as_save_IFS | 2101 | IFS=$as_save_IFS |
2545 | test -z "$as_dir" && as_dir=. | 2102 | test -z "$as_dir" && as_dir=. |
2546 | for ac_exec_ext in '' $ac_executable_extensions; do | 2103 | for ac_exec_ext in '' $ac_executable_extensions; do |
2547 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 2104 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2548 | ac_cv_prog_CC="${ac_tool_prefix}cc" | 2105 | ac_cv_prog_CC="${ac_tool_prefix}cc" |
2549 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2106 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2550 | break 2 | 2107 | break 2 |
2551 | fi | 2108 | fi |
2552 | done | 2109 | done |
2553 | done | 2110 | done |
2554 | IFS=$as_save_IFS | ||
2555 | 2111 | ||
2556 | fi | 2112 | fi |
2557 | fi | 2113 | fi |
2558 | CC=$ac_cv_prog_CC | 2114 | CC=$ac_cv_prog_CC |
2559 | if test -n "$CC"; then | 2115 | if test -n "$CC"; then |
2560 | { echo "$as_me:$LINENO: result: $CC" >&5 | 2116 | echo "$as_me:$LINENO: result: $CC" >&5 |
2561 | echo "${ECHO_T}$CC" >&6; } | 2117 | echo "${ECHO_T}$CC" >&6 |
2562 | else | 2118 | else |
2563 | { echo "$as_me:$LINENO: result: no" >&5 | 2119 | echo "$as_me:$LINENO: result: no" >&5 |
2564 | echo "${ECHO_T}no" >&6; } | 2120 | echo "${ECHO_T}no" >&6 |
2565 | fi | 2121 | fi |
2566 | 2122 | ||
2567 | 2123 | fi | |
2124 | if test -z "$ac_cv_prog_CC"; then | ||
2125 | ac_ct_CC=$CC | ||
2126 | # Extract the first word of "cc", so it can be a program name with args. | ||
2127 | set dummy cc; ac_word=$2 | ||
2128 | echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
2129 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2130 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
2131 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2132 | else | ||
2133 | if test -n "$ac_ct_CC"; then | ||
2134 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | ||
2135 | else | ||
2136 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2137 | for as_dir in $PATH | ||
2138 | do | ||
2139 | IFS=$as_save_IFS | ||
2140 | test -z "$as_dir" && as_dir=. | ||
2141 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2142 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2143 | ac_cv_prog_ac_ct_CC="cc" | ||
2144 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2145 | break 2 | ||
2568 | fi | 2146 | fi |
2147 | done | ||
2148 | done | ||
2149 | |||
2150 | fi | ||
2151 | fi | ||
2152 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
2153 | if test -n "$ac_ct_CC"; then | ||
2154 | echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | ||
2155 | echo "${ECHO_T}$ac_ct_CC" >&6 | ||
2156 | else | ||
2157 | echo "$as_me:$LINENO: result: no" >&5 | ||
2158 | echo "${ECHO_T}no" >&6 | ||
2159 | fi | ||
2160 | |||
2161 | CC=$ac_ct_CC | ||
2162 | else | ||
2163 | CC="$ac_cv_prog_CC" | ||
2164 | fi | ||
2165 | |||
2569 | fi | 2166 | fi |
2570 | if test -z "$CC"; then | 2167 | if test -z "$CC"; then |
2571 | # Extract the first word of "cc", so it can be a program name with args. | 2168 | # Extract the first word of "cc", so it can be a program name with args. |
2572 | set dummy cc; ac_word=$2 | 2169 | set dummy cc; ac_word=$2 |
2573 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 2170 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2574 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 2171 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2575 | if test "${ac_cv_prog_CC+set}" = set; then | 2172 | if test "${ac_cv_prog_CC+set}" = set; then |
2576 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2173 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
2577 | else | 2174 | else |
@@ -2585,7 +2182,7 @@ do | |||
2585 | IFS=$as_save_IFS | 2182 | IFS=$as_save_IFS |
2586 | test -z "$as_dir" && as_dir=. | 2183 | test -z "$as_dir" && as_dir=. |
2587 | for ac_exec_ext in '' $ac_executable_extensions; do | 2184 | for ac_exec_ext in '' $ac_executable_extensions; do |
2588 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 2185 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2589 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then | 2186 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
2590 | ac_prog_rejected=yes | 2187 | ac_prog_rejected=yes |
2591 | continue | 2188 | continue |
@@ -2596,7 +2193,6 @@ do | |||
2596 | fi | 2193 | fi |
2597 | done | 2194 | done |
2598 | done | 2195 | done |
2599 | IFS=$as_save_IFS | ||
2600 | 2196 | ||
2601 | if test $ac_prog_rejected = yes; then | 2197 | if test $ac_prog_rejected = yes; then |
2602 | # We found a bogon in the path, so make sure we never use it. | 2198 | # We found a bogon in the path, so make sure we never use it. |
@@ -2614,23 +2210,22 @@ fi | |||
2614 | fi | 2210 | fi |
2615 | CC=$ac_cv_prog_CC | 2211 | CC=$ac_cv_prog_CC |
2616 | if test -n "$CC"; then | 2212 | if test -n "$CC"; then |
2617 | { echo "$as_me:$LINENO: result: $CC" >&5 | 2213 | echo "$as_me:$LINENO: result: $CC" >&5 |
2618 | echo "${ECHO_T}$CC" >&6; } | 2214 | echo "${ECHO_T}$CC" >&6 |
2619 | else | 2215 | else |
2620 | { echo "$as_me:$LINENO: result: no" >&5 | 2216 | echo "$as_me:$LINENO: result: no" >&5 |
2621 | echo "${ECHO_T}no" >&6; } | 2217 | echo "${ECHO_T}no" >&6 |
2622 | fi | 2218 | fi |
2623 | 2219 | ||
2624 | |||
2625 | fi | 2220 | fi |
2626 | if test -z "$CC"; then | 2221 | if test -z "$CC"; then |
2627 | if test -n "$ac_tool_prefix"; then | 2222 | if test -n "$ac_tool_prefix"; then |
2628 | for ac_prog in cl.exe | 2223 | for ac_prog in cl |
2629 | do | 2224 | do |
2630 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | 2225 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
2631 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | 2226 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
2632 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 2227 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2633 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 2228 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2634 | if test "${ac_cv_prog_CC+set}" = set; then | 2229 | if test "${ac_cv_prog_CC+set}" = set; then |
2635 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2230 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
2636 | else | 2231 | else |
@@ -2643,38 +2238,36 @@ do | |||
2643 | IFS=$as_save_IFS | 2238 | IFS=$as_save_IFS |
2644 | test -z "$as_dir" && as_dir=. | 2239 | test -z "$as_dir" && as_dir=. |
2645 | for ac_exec_ext in '' $ac_executable_extensions; do | 2240 | for ac_exec_ext in '' $ac_executable_extensions; do |
2646 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 2241 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2647 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | 2242 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
2648 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2243 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2649 | break 2 | 2244 | break 2 |
2650 | fi | 2245 | fi |
2651 | done | 2246 | done |
2652 | done | 2247 | done |
2653 | IFS=$as_save_IFS | ||
2654 | 2248 | ||
2655 | fi | 2249 | fi |
2656 | fi | 2250 | fi |
2657 | CC=$ac_cv_prog_CC | 2251 | CC=$ac_cv_prog_CC |
2658 | if test -n "$CC"; then | 2252 | if test -n "$CC"; then |
2659 | { echo "$as_me:$LINENO: result: $CC" >&5 | 2253 | echo "$as_me:$LINENO: result: $CC" >&5 |
2660 | echo "${ECHO_T}$CC" >&6; } | 2254 | echo "${ECHO_T}$CC" >&6 |
2661 | else | 2255 | else |
2662 | { echo "$as_me:$LINENO: result: no" >&5 | 2256 | echo "$as_me:$LINENO: result: no" >&5 |
2663 | echo "${ECHO_T}no" >&6; } | 2257 | echo "${ECHO_T}no" >&6 |
2664 | fi | 2258 | fi |
2665 | 2259 | ||
2666 | |||
2667 | test -n "$CC" && break | 2260 | test -n "$CC" && break |
2668 | done | 2261 | done |
2669 | fi | 2262 | fi |
2670 | if test -z "$CC"; then | 2263 | if test -z "$CC"; then |
2671 | ac_ct_CC=$CC | 2264 | ac_ct_CC=$CC |
2672 | for ac_prog in cl.exe | 2265 | for ac_prog in cl |
2673 | do | 2266 | do |
2674 | # Extract the first word of "$ac_prog", so it can be a program name with args. | 2267 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
2675 | set dummy $ac_prog; ac_word=$2 | 2268 | set dummy $ac_prog; ac_word=$2 |
2676 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 2269 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2677 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 2270 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2678 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | 2271 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then |
2679 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2272 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
2680 | else | 2273 | else |
@@ -2687,45 +2280,29 @@ do | |||
2687 | IFS=$as_save_IFS | 2280 | IFS=$as_save_IFS |
2688 | test -z "$as_dir" && as_dir=. | 2281 | test -z "$as_dir" && as_dir=. |
2689 | for ac_exec_ext in '' $ac_executable_extensions; do | 2282 | for ac_exec_ext in '' $ac_executable_extensions; do |
2690 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 2283 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2691 | ac_cv_prog_ac_ct_CC="$ac_prog" | 2284 | ac_cv_prog_ac_ct_CC="$ac_prog" |
2692 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2285 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2693 | break 2 | 2286 | break 2 |
2694 | fi | 2287 | fi |
2695 | done | 2288 | done |
2696 | done | 2289 | done |
2697 | IFS=$as_save_IFS | ||
2698 | 2290 | ||
2699 | fi | 2291 | fi |
2700 | fi | 2292 | fi |
2701 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | 2293 | ac_ct_CC=$ac_cv_prog_ac_ct_CC |
2702 | if test -n "$ac_ct_CC"; then | 2294 | if test -n "$ac_ct_CC"; then |
2703 | { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | 2295 | echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
2704 | echo "${ECHO_T}$ac_ct_CC" >&6; } | 2296 | echo "${ECHO_T}$ac_ct_CC" >&6 |
2705 | else | 2297 | else |
2706 | { echo "$as_me:$LINENO: result: no" >&5 | 2298 | echo "$as_me:$LINENO: result: no" >&5 |
2707 | echo "${ECHO_T}no" >&6; } | 2299 | echo "${ECHO_T}no" >&6 |
2708 | fi | 2300 | fi |
2709 | 2301 | ||
2710 | |||
2711 | test -n "$ac_ct_CC" && break | 2302 | test -n "$ac_ct_CC" && break |
2712 | done | 2303 | done |
2713 | 2304 | ||
2714 | if test "x$ac_ct_CC" = x; then | 2305 | CC=$ac_ct_CC |
2715 | CC="" | ||
2716 | else | ||
2717 | case $cross_compiling:$ac_tool_warned in | ||
2718 | yes:) | ||
2719 | { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
2720 | whose name does not start with the host triplet. If you think this | ||
2721 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
2722 | echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
2723 | whose name does not start with the host triplet. If you think this | ||
2724 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
2725 | ac_tool_warned=yes ;; | ||
2726 | esac | ||
2727 | CC=$ac_ct_CC | ||
2728 | fi | ||
2729 | fi | 2306 | fi |
2730 | 2307 | ||
2731 | fi | 2308 | fi |
@@ -2738,35 +2315,21 @@ See \`config.log' for more details." >&2;} | |||
2738 | { (exit 1); exit 1; }; } | 2315 | { (exit 1); exit 1; }; } |
2739 | 2316 | ||
2740 | # Provide some information about the compiler. | 2317 | # Provide some information about the compiler. |
2741 | echo "$as_me:$LINENO: checking for C compiler version" >&5 | 2318 | echo "$as_me:$LINENO:" \ |
2319 | "checking for C compiler version" >&5 | ||
2742 | ac_compiler=`set X $ac_compile; echo $2` | 2320 | ac_compiler=`set X $ac_compile; echo $2` |
2743 | { (ac_try="$ac_compiler --version >&5" | 2321 | { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 |
2744 | case "(($ac_try" in | 2322 | (eval $ac_compiler --version </dev/null >&5) 2>&5 |
2745 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
2746 | *) ac_try_echo=$ac_try;; | ||
2747 | esac | ||
2748 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
2749 | (eval "$ac_compiler --version >&5") 2>&5 | ||
2750 | ac_status=$? | 2323 | ac_status=$? |
2751 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2324 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2752 | (exit $ac_status); } | 2325 | (exit $ac_status); } |
2753 | { (ac_try="$ac_compiler -v >&5" | 2326 | { (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 |
2754 | case "(($ac_try" in | 2327 | (eval $ac_compiler -v </dev/null >&5) 2>&5 |
2755 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
2756 | *) ac_try_echo=$ac_try;; | ||
2757 | esac | ||
2758 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
2759 | (eval "$ac_compiler -v >&5") 2>&5 | ||
2760 | ac_status=$? | 2328 | ac_status=$? |
2761 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2329 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2762 | (exit $ac_status); } | 2330 | (exit $ac_status); } |
2763 | { (ac_try="$ac_compiler -V >&5" | 2331 | { (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 |
2764 | case "(($ac_try" in | 2332 | (eval $ac_compiler -V </dev/null >&5) 2>&5 |
2765 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
2766 | *) ac_try_echo=$ac_try;; | ||
2767 | esac | ||
2768 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
2769 | (eval "$ac_compiler -V >&5") 2>&5 | ||
2770 | ac_status=$? | 2333 | ac_status=$? |
2771 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2334 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2772 | (exit $ac_status); } | 2335 | (exit $ac_status); } |
@@ -2791,77 +2354,47 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out" | |||
2791 | # Try to create an executable without -o first, disregard a.out. | 2354 | # Try to create an executable without -o first, disregard a.out. |
2792 | # It will help us diagnose broken compilers, and finding out an intuition | 2355 | # It will help us diagnose broken compilers, and finding out an intuition |
2793 | # of exeext. | 2356 | # of exeext. |
2794 | { echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 | 2357 | echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 |
2795 | echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } | 2358 | echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 |
2796 | ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | 2359 | ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` |
2797 | # | 2360 | if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 |
2798 | # List of possible output files, starting from the most likely. | 2361 | (eval $ac_link_default) 2>&5 |
2799 | # The algorithm is not robust to junk in `.', hence go to wildcards (a.*) | ||
2800 | # only as a last resort. b.out is created by i960 compilers. | ||
2801 | ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' | ||
2802 | # | ||
2803 | # The IRIX 6 linker writes into existing files which may not be | ||
2804 | # executable, retaining their permissions. Remove them first so a | ||
2805 | # subsequent execution test works. | ||
2806 | ac_rmfiles= | ||
2807 | for ac_file in $ac_files | ||
2808 | do | ||
2809 | case $ac_file in | ||
2810 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; | ||
2811 | * ) ac_rmfiles="$ac_rmfiles $ac_file";; | ||
2812 | esac | ||
2813 | done | ||
2814 | rm -f $ac_rmfiles | ||
2815 | |||
2816 | if { (ac_try="$ac_link_default" | ||
2817 | case "(($ac_try" in | ||
2818 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
2819 | *) ac_try_echo=$ac_try;; | ||
2820 | esac | ||
2821 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
2822 | (eval "$ac_link_default") 2>&5 | ||
2823 | ac_status=$? | 2362 | ac_status=$? |
2824 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2363 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2825 | (exit $ac_status); }; then | 2364 | (exit $ac_status); }; then |
2826 | # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. | 2365 | # Find the output, starting from the most likely. This scheme is |
2827 | # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' | 2366 | # not robust to junk in `.', hence go to wildcards (a.*) only as a last |
2828 | # in a Makefile. We should not override ac_cv_exeext if it was cached, | 2367 | # resort. |
2829 | # so that the user can short-circuit this test for compilers unknown to | 2368 | |
2830 | # Autoconf. | 2369 | # Be careful to initialize this variable, since it used to be cached. |
2831 | for ac_file in $ac_files '' | 2370 | # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. |
2371 | ac_cv_exeext= | ||
2372 | # b.out is created by i960 compilers. | ||
2373 | for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out | ||
2832 | do | 2374 | do |
2833 | test -f "$ac_file" || continue | 2375 | test -f "$ac_file" || continue |
2834 | case $ac_file in | 2376 | case $ac_file in |
2835 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) | 2377 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) |
2378 | ;; | ||
2379 | conftest.$ac_ext ) | ||
2380 | # This is the source file. | ||
2836 | ;; | 2381 | ;; |
2837 | [ab].out ) | 2382 | [ab].out ) |
2838 | # We found the default executable, but exeext='' is most | 2383 | # We found the default executable, but exeext='' is most |
2839 | # certainly right. | 2384 | # certainly right. |
2840 | break;; | 2385 | break;; |
2841 | *.* ) | 2386 | *.* ) |
2842 | if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; | 2387 | ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` |
2843 | then :; else | 2388 | # FIXME: I believe we export ac_cv_exeext for Libtool, |
2844 | ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | 2389 | # but it would be cool to find out if it's true. Does anybody |
2845 | fi | 2390 | # maintain Libtool? --akim. |
2846 | # We set ac_cv_exeext here because the later test for it is not | 2391 | export ac_cv_exeext |
2847 | # safe: cross compilers may not add the suffix if given an `-o' | ||
2848 | # argument, so we may need to know it at that point already. | ||
2849 | # Even if this section looks crufty: it has the advantage of | ||
2850 | # actually working. | ||
2851 | break;; | 2392 | break;; |
2852 | * ) | 2393 | * ) |
2853 | break;; | 2394 | break;; |
2854 | esac | 2395 | esac |
2855 | done | 2396 | done |
2856 | test "$ac_cv_exeext" = no && ac_cv_exeext= | ||
2857 | |||
2858 | else | 2397 | else |
2859 | ac_file='' | ||
2860 | fi | ||
2861 | |||
2862 | { echo "$as_me:$LINENO: result: $ac_file" >&5 | ||
2863 | echo "${ECHO_T}$ac_file" >&6; } | ||
2864 | if test -z "$ac_file"; then | ||
2865 | echo "$as_me: failed program was:" >&5 | 2398 | echo "$as_me: failed program was:" >&5 |
2866 | sed 's/^/| /' conftest.$ac_ext >&5 | 2399 | sed 's/^/| /' conftest.$ac_ext >&5 |
2867 | 2400 | ||
@@ -2873,21 +2406,19 @@ See \`config.log' for more details." >&2;} | |||
2873 | fi | 2406 | fi |
2874 | 2407 | ||
2875 | ac_exeext=$ac_cv_exeext | 2408 | ac_exeext=$ac_cv_exeext |
2409 | echo "$as_me:$LINENO: result: $ac_file" >&5 | ||
2410 | echo "${ECHO_T}$ac_file" >&6 | ||
2876 | 2411 | ||
2877 | # Check that the compiler produces executables we can run. If not, either | 2412 | # Check the compiler produces executables we can run. If not, either |
2878 | # the compiler is broken, or we cross compile. | 2413 | # the compiler is broken, or we cross compile. |
2879 | { echo "$as_me:$LINENO: checking whether the C compiler works" >&5 | 2414 | echo "$as_me:$LINENO: checking whether the C compiler works" >&5 |
2880 | echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } | 2415 | echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 |
2881 | # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 | 2416 | # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 |
2882 | # If not cross compiling, check that we can run a simple program. | 2417 | # If not cross compiling, check that we can run a simple program. |
2883 | if test "$cross_compiling" != yes; then | 2418 | if test "$cross_compiling" != yes; then |
2884 | if { ac_try='./$ac_file' | 2419 | if { ac_try='./$ac_file' |
2885 | { (case "(($ac_try" in | 2420 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
2886 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 2421 | (eval $ac_try) 2>&5 |
2887 | *) ac_try_echo=$ac_try;; | ||
2888 | esac | ||
2889 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
2890 | (eval "$ac_try") 2>&5 | ||
2891 | ac_status=$? | 2422 | ac_status=$? |
2892 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2423 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2893 | (exit $ac_status); }; }; then | 2424 | (exit $ac_status); }; }; then |
@@ -2906,27 +2437,22 @@ See \`config.log' for more details." >&2;} | |||
2906 | fi | 2437 | fi |
2907 | fi | 2438 | fi |
2908 | fi | 2439 | fi |
2909 | { echo "$as_me:$LINENO: result: yes" >&5 | 2440 | echo "$as_me:$LINENO: result: yes" >&5 |
2910 | echo "${ECHO_T}yes" >&6; } | 2441 | echo "${ECHO_T}yes" >&6 |
2911 | 2442 | ||
2912 | rm -f a.out a.exe conftest$ac_cv_exeext b.out | 2443 | rm -f a.out a.exe conftest$ac_cv_exeext b.out |
2913 | ac_clean_files=$ac_clean_files_save | 2444 | ac_clean_files=$ac_clean_files_save |
2914 | # Check that the compiler produces executables we can run. If not, either | 2445 | # Check the compiler produces executables we can run. If not, either |
2915 | # the compiler is broken, or we cross compile. | 2446 | # the compiler is broken, or we cross compile. |
2916 | { echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 | 2447 | echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 |
2917 | echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } | 2448 | echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 |
2918 | { echo "$as_me:$LINENO: result: $cross_compiling" >&5 | 2449 | echo "$as_me:$LINENO: result: $cross_compiling" >&5 |
2919 | echo "${ECHO_T}$cross_compiling" >&6; } | 2450 | echo "${ECHO_T}$cross_compiling" >&6 |
2920 | 2451 | ||
2921 | { echo "$as_me:$LINENO: checking for suffix of executables" >&5 | 2452 | echo "$as_me:$LINENO: checking for suffix of executables" >&5 |
2922 | echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } | 2453 | echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 |
2923 | if { (ac_try="$ac_link" | 2454 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
2924 | case "(($ac_try" in | 2455 | (eval $ac_link) 2>&5 |
2925 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
2926 | *) ac_try_echo=$ac_try;; | ||
2927 | esac | ||
2928 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
2929 | (eval "$ac_link") 2>&5 | ||
2930 | ac_status=$? | 2456 | ac_status=$? |
2931 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2457 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2932 | (exit $ac_status); }; then | 2458 | (exit $ac_status); }; then |
@@ -2937,8 +2463,9 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |||
2937 | for ac_file in conftest.exe conftest conftest.*; do | 2463 | for ac_file in conftest.exe conftest conftest.*; do |
2938 | test -f "$ac_file" || continue | 2464 | test -f "$ac_file" || continue |
2939 | case $ac_file in | 2465 | case $ac_file in |
2940 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; | 2466 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; |
2941 | *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | 2467 | *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` |
2468 | export ac_cv_exeext | ||
2942 | break;; | 2469 | break;; |
2943 | * ) break;; | 2470 | * ) break;; |
2944 | esac | 2471 | esac |
@@ -2952,14 +2479,14 @@ See \`config.log' for more details." >&2;} | |||
2952 | fi | 2479 | fi |
2953 | 2480 | ||
2954 | rm -f conftest$ac_cv_exeext | 2481 | rm -f conftest$ac_cv_exeext |
2955 | { echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 | 2482 | echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 |
2956 | echo "${ECHO_T}$ac_cv_exeext" >&6; } | 2483 | echo "${ECHO_T}$ac_cv_exeext" >&6 |
2957 | 2484 | ||
2958 | rm -f conftest.$ac_ext | 2485 | rm -f conftest.$ac_ext |
2959 | EXEEXT=$ac_cv_exeext | 2486 | EXEEXT=$ac_cv_exeext |
2960 | ac_exeext=$EXEEXT | 2487 | ac_exeext=$EXEEXT |
2961 | { echo "$as_me:$LINENO: checking for suffix of object files" >&5 | 2488 | echo "$as_me:$LINENO: checking for suffix of object files" >&5 |
2962 | echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } | 2489 | echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 |
2963 | if test "${ac_cv_objext+set}" = set; then | 2490 | if test "${ac_cv_objext+set}" = set; then |
2964 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2491 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
2965 | else | 2492 | else |
@@ -2979,20 +2506,14 @@ main () | |||
2979 | } | 2506 | } |
2980 | _ACEOF | 2507 | _ACEOF |
2981 | rm -f conftest.o conftest.obj | 2508 | rm -f conftest.o conftest.obj |
2982 | if { (ac_try="$ac_compile" | 2509 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
2983 | case "(($ac_try" in | 2510 | (eval $ac_compile) 2>&5 |
2984 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
2985 | *) ac_try_echo=$ac_try;; | ||
2986 | esac | ||
2987 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
2988 | (eval "$ac_compile") 2>&5 | ||
2989 | ac_status=$? | 2511 | ac_status=$? |
2990 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2512 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2991 | (exit $ac_status); }; then | 2513 | (exit $ac_status); }; then |
2992 | for ac_file in conftest.o conftest.obj conftest.*; do | 2514 | for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do |
2993 | test -f "$ac_file" || continue; | ||
2994 | case $ac_file in | 2515 | case $ac_file in |
2995 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; | 2516 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; |
2996 | *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` | 2517 | *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` |
2997 | break;; | 2518 | break;; |
2998 | esac | 2519 | esac |
@@ -3010,12 +2531,12 @@ fi | |||
3010 | 2531 | ||
3011 | rm -f conftest.$ac_cv_objext conftest.$ac_ext | 2532 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
3012 | fi | 2533 | fi |
3013 | { echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 | 2534 | echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 |
3014 | echo "${ECHO_T}$ac_cv_objext" >&6; } | 2535 | echo "${ECHO_T}$ac_cv_objext" >&6 |
3015 | OBJEXT=$ac_cv_objext | 2536 | OBJEXT=$ac_cv_objext |
3016 | ac_objext=$OBJEXT | 2537 | ac_objext=$OBJEXT |
3017 | { echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | 2538 | echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 |
3018 | echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } | 2539 | echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 |
3019 | if test "${ac_cv_c_compiler_gnu+set}" = set; then | 2540 | if test "${ac_cv_c_compiler_gnu+set}" = set; then |
3020 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2541 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
3021 | else | 2542 | else |
@@ -3038,36 +2559,24 @@ main () | |||
3038 | } | 2559 | } |
3039 | _ACEOF | 2560 | _ACEOF |
3040 | rm -f conftest.$ac_objext | 2561 | rm -f conftest.$ac_objext |
3041 | if { (ac_try="$ac_compile" | 2562 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
3042 | case "(($ac_try" in | 2563 | (eval $ac_compile) 2>conftest.er1 |
3043 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3044 | *) ac_try_echo=$ac_try;; | ||
3045 | esac | ||
3046 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3047 | (eval "$ac_compile") 2>conftest.er1 | ||
3048 | ac_status=$? | 2564 | ac_status=$? |
3049 | grep -v '^ *+' conftest.er1 >conftest.err | 2565 | grep -v '^ *+' conftest.er1 >conftest.err |
3050 | rm -f conftest.er1 | 2566 | rm -f conftest.er1 |
3051 | cat conftest.err >&5 | 2567 | cat conftest.err >&5 |
3052 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2568 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3053 | (exit $ac_status); } && | 2569 | (exit $ac_status); } && |
3054 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 2570 | { ac_try='test -z "$ac_c_werror_flag" |
3055 | { (case "(($ac_try" in | 2571 | || test ! -s conftest.err' |
3056 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 2572 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3057 | *) ac_try_echo=$ac_try;; | 2573 | (eval $ac_try) 2>&5 |
3058 | esac | ||
3059 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3060 | (eval "$ac_try") 2>&5 | ||
3061 | ac_status=$? | 2574 | ac_status=$? |
3062 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2575 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3063 | (exit $ac_status); }; } && | 2576 | (exit $ac_status); }; } && |
3064 | { ac_try='test -s conftest.$ac_objext' | 2577 | { ac_try='test -s conftest.$ac_objext' |
3065 | { (case "(($ac_try" in | 2578 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3066 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 2579 | (eval $ac_try) 2>&5 |
3067 | *) ac_try_echo=$ac_try;; | ||
3068 | esac | ||
3069 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3070 | (eval "$ac_try") 2>&5 | ||
3071 | ac_status=$? | 2580 | ac_status=$? |
3072 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2581 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3073 | (exit $ac_status); }; }; then | 2582 | (exit $ac_status); }; }; then |
@@ -3076,139 +2585,24 @@ else | |||
3076 | echo "$as_me: failed program was:" >&5 | 2585 | echo "$as_me: failed program was:" >&5 |
3077 | sed 's/^/| /' conftest.$ac_ext >&5 | 2586 | sed 's/^/| /' conftest.$ac_ext >&5 |
3078 | 2587 | ||
3079 | ac_compiler_gnu=no | 2588 | ac_compiler_gnu=no |
3080 | fi | 2589 | fi |
3081 | 2590 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
3082 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3083 | ac_cv_c_compiler_gnu=$ac_compiler_gnu | 2591 | ac_cv_c_compiler_gnu=$ac_compiler_gnu |
3084 | 2592 | ||
3085 | fi | 2593 | fi |
3086 | { echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | 2594 | echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 |
3087 | echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } | 2595 | echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 |
3088 | GCC=`test $ac_compiler_gnu = yes && echo yes` | 2596 | GCC=`test $ac_compiler_gnu = yes && echo yes` |
3089 | ac_test_CFLAGS=${CFLAGS+set} | 2597 | ac_test_CFLAGS=${CFLAGS+set} |
3090 | ac_save_CFLAGS=$CFLAGS | 2598 | ac_save_CFLAGS=$CFLAGS |
3091 | { echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | 2599 | CFLAGS="-g" |
3092 | echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } | 2600 | echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 |
2601 | echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 | ||
3093 | if test "${ac_cv_prog_cc_g+set}" = set; then | 2602 | if test "${ac_cv_prog_cc_g+set}" = set; then |
3094 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2603 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
3095 | else | 2604 | else |
3096 | ac_save_c_werror_flag=$ac_c_werror_flag | 2605 | cat >conftest.$ac_ext <<_ACEOF |
3097 | ac_c_werror_flag=yes | ||
3098 | ac_cv_prog_cc_g=no | ||
3099 | CFLAGS="-g" | ||
3100 | cat >conftest.$ac_ext <<_ACEOF | ||
3101 | /* confdefs.h. */ | ||
3102 | _ACEOF | ||
3103 | cat confdefs.h >>conftest.$ac_ext | ||
3104 | cat >>conftest.$ac_ext <<_ACEOF | ||
3105 | /* end confdefs.h. */ | ||
3106 | |||
3107 | int | ||
3108 | main () | ||
3109 | { | ||
3110 | |||
3111 | ; | ||
3112 | return 0; | ||
3113 | } | ||
3114 | _ACEOF | ||
3115 | rm -f conftest.$ac_objext | ||
3116 | if { (ac_try="$ac_compile" | ||
3117 | case "(($ac_try" in | ||
3118 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3119 | *) ac_try_echo=$ac_try;; | ||
3120 | esac | ||
3121 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3122 | (eval "$ac_compile") 2>conftest.er1 | ||
3123 | ac_status=$? | ||
3124 | grep -v '^ *+' conftest.er1 >conftest.err | ||
3125 | rm -f conftest.er1 | ||
3126 | cat conftest.err >&5 | ||
3127 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3128 | (exit $ac_status); } && | ||
3129 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3130 | { (case "(($ac_try" in | ||
3131 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3132 | *) ac_try_echo=$ac_try;; | ||
3133 | esac | ||
3134 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3135 | (eval "$ac_try") 2>&5 | ||
3136 | ac_status=$? | ||
3137 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3138 | (exit $ac_status); }; } && | ||
3139 | { ac_try='test -s conftest.$ac_objext' | ||
3140 | { (case "(($ac_try" in | ||
3141 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3142 | *) ac_try_echo=$ac_try;; | ||
3143 | esac | ||
3144 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3145 | (eval "$ac_try") 2>&5 | ||
3146 | ac_status=$? | ||
3147 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3148 | (exit $ac_status); }; }; then | ||
3149 | ac_cv_prog_cc_g=yes | ||
3150 | else | ||
3151 | echo "$as_me: failed program was:" >&5 | ||
3152 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3153 | |||
3154 | CFLAGS="" | ||
3155 | cat >conftest.$ac_ext <<_ACEOF | ||
3156 | /* confdefs.h. */ | ||
3157 | _ACEOF | ||
3158 | cat confdefs.h >>conftest.$ac_ext | ||
3159 | cat >>conftest.$ac_ext <<_ACEOF | ||
3160 | /* end confdefs.h. */ | ||
3161 | |||
3162 | int | ||
3163 | main () | ||
3164 | { | ||
3165 | |||
3166 | ; | ||
3167 | return 0; | ||
3168 | } | ||
3169 | _ACEOF | ||
3170 | rm -f conftest.$ac_objext | ||
3171 | if { (ac_try="$ac_compile" | ||
3172 | case "(($ac_try" in | ||
3173 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3174 | *) ac_try_echo=$ac_try;; | ||
3175 | esac | ||
3176 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3177 | (eval "$ac_compile") 2>conftest.er1 | ||
3178 | ac_status=$? | ||
3179 | grep -v '^ *+' conftest.er1 >conftest.err | ||
3180 | rm -f conftest.er1 | ||
3181 | cat conftest.err >&5 | ||
3182 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3183 | (exit $ac_status); } && | ||
3184 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | ||
3185 | { (case "(($ac_try" in | ||
3186 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3187 | *) ac_try_echo=$ac_try;; | ||
3188 | esac | ||
3189 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3190 | (eval "$ac_try") 2>&5 | ||
3191 | ac_status=$? | ||
3192 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3193 | (exit $ac_status); }; } && | ||
3194 | { ac_try='test -s conftest.$ac_objext' | ||
3195 | { (case "(($ac_try" in | ||
3196 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3197 | *) ac_try_echo=$ac_try;; | ||
3198 | esac | ||
3199 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3200 | (eval "$ac_try") 2>&5 | ||
3201 | ac_status=$? | ||
3202 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3203 | (exit $ac_status); }; }; then | ||
3204 | : | ||
3205 | else | ||
3206 | echo "$as_me: failed program was:" >&5 | ||
3207 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3208 | |||
3209 | ac_c_werror_flag=$ac_save_c_werror_flag | ||
3210 | CFLAGS="-g" | ||
3211 | cat >conftest.$ac_ext <<_ACEOF | ||
3212 | /* confdefs.h. */ | 2606 | /* confdefs.h. */ |
3213 | _ACEOF | 2607 | _ACEOF |
3214 | cat confdefs.h >>conftest.$ac_ext | 2608 | cat confdefs.h >>conftest.$ac_ext |
@@ -3224,36 +2618,24 @@ main () | |||
3224 | } | 2618 | } |
3225 | _ACEOF | 2619 | _ACEOF |
3226 | rm -f conftest.$ac_objext | 2620 | rm -f conftest.$ac_objext |
3227 | if { (ac_try="$ac_compile" | 2621 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
3228 | case "(($ac_try" in | 2622 | (eval $ac_compile) 2>conftest.er1 |
3229 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3230 | *) ac_try_echo=$ac_try;; | ||
3231 | esac | ||
3232 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3233 | (eval "$ac_compile") 2>conftest.er1 | ||
3234 | ac_status=$? | 2623 | ac_status=$? |
3235 | grep -v '^ *+' conftest.er1 >conftest.err | 2624 | grep -v '^ *+' conftest.er1 >conftest.err |
3236 | rm -f conftest.er1 | 2625 | rm -f conftest.er1 |
3237 | cat conftest.err >&5 | 2626 | cat conftest.err >&5 |
3238 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2627 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3239 | (exit $ac_status); } && | 2628 | (exit $ac_status); } && |
3240 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 2629 | { ac_try='test -z "$ac_c_werror_flag" |
3241 | { (case "(($ac_try" in | 2630 | || test ! -s conftest.err' |
3242 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 2631 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3243 | *) ac_try_echo=$ac_try;; | 2632 | (eval $ac_try) 2>&5 |
3244 | esac | ||
3245 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3246 | (eval "$ac_try") 2>&5 | ||
3247 | ac_status=$? | 2633 | ac_status=$? |
3248 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2634 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3249 | (exit $ac_status); }; } && | 2635 | (exit $ac_status); }; } && |
3250 | { ac_try='test -s conftest.$ac_objext' | 2636 | { ac_try='test -s conftest.$ac_objext' |
3251 | { (case "(($ac_try" in | 2637 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3252 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 2638 | (eval $ac_try) 2>&5 |
3253 | *) ac_try_echo=$ac_try;; | ||
3254 | esac | ||
3255 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3256 | (eval "$ac_try") 2>&5 | ||
3257 | ac_status=$? | 2639 | ac_status=$? |
3258 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2640 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3259 | (exit $ac_status); }; }; then | 2641 | (exit $ac_status); }; }; then |
@@ -3262,20 +2644,12 @@ else | |||
3262 | echo "$as_me: failed program was:" >&5 | 2644 | echo "$as_me: failed program was:" >&5 |
3263 | sed 's/^/| /' conftest.$ac_ext >&5 | 2645 | sed 's/^/| /' conftest.$ac_ext >&5 |
3264 | 2646 | ||
3265 | 2647 | ac_cv_prog_cc_g=no | |
3266 | fi | ||
3267 | |||
3268 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3269 | fi | 2648 | fi |
3270 | 2649 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
3271 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3272 | fi | 2650 | fi |
3273 | 2651 | echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | |
3274 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 2652 | echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 |
3275 | ac_c_werror_flag=$ac_save_c_werror_flag | ||
3276 | fi | ||
3277 | { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | ||
3278 | echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } | ||
3279 | if test "$ac_test_CFLAGS" = set; then | 2653 | if test "$ac_test_CFLAGS" = set; then |
3280 | CFLAGS=$ac_save_CFLAGS | 2654 | CFLAGS=$ac_save_CFLAGS |
3281 | elif test $ac_cv_prog_cc_g = yes; then | 2655 | elif test $ac_cv_prog_cc_g = yes; then |
@@ -3291,12 +2665,12 @@ else | |||
3291 | CFLAGS= | 2665 | CFLAGS= |
3292 | fi | 2666 | fi |
3293 | fi | 2667 | fi |
3294 | { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 | 2668 | echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 |
3295 | echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } | 2669 | echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 |
3296 | if test "${ac_cv_prog_cc_c89+set}" = set; then | 2670 | if test "${ac_cv_prog_cc_stdc+set}" = set; then |
3297 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2671 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
3298 | else | 2672 | else |
3299 | ac_cv_prog_cc_c89=no | 2673 | ac_cv_prog_cc_stdc=no |
3300 | ac_save_CC=$CC | 2674 | ac_save_CC=$CC |
3301 | cat >conftest.$ac_ext <<_ACEOF | 2675 | cat >conftest.$ac_ext <<_ACEOF |
3302 | /* confdefs.h. */ | 2676 | /* confdefs.h. */ |
@@ -3330,17 +2704,12 @@ static char *f (char * (*g) (char **, int), char **p, ...) | |||
3330 | /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has | 2704 | /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has |
3331 | function prototypes and stuff, but not '\xHH' hex character constants. | 2705 | function prototypes and stuff, but not '\xHH' hex character constants. |
3332 | These don't provoke an error unfortunately, instead are silently treated | 2706 | These don't provoke an error unfortunately, instead are silently treated |
3333 | as 'x'. The following induces an error, until -std is added to get | 2707 | as 'x'. The following induces an error, until -std1 is added to get |
3334 | proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an | 2708 | proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an |
3335 | array size at least. It's necessary to write '\x00'==0 to get something | 2709 | array size at least. It's necessary to write '\x00'==0 to get something |
3336 | that's true only with -std. */ | 2710 | that's true only with -std1. */ |
3337 | int osf4_cc_array ['\x00' == 0 ? 1 : -1]; | 2711 | int osf4_cc_array ['\x00' == 0 ? 1 : -1]; |
3338 | 2712 | ||
3339 | /* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters | ||
3340 | inside strings and character constants. */ | ||
3341 | #define FOO(x) 'x' | ||
3342 | int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; | ||
3343 | |||
3344 | int test (int i, double x); | 2713 | int test (int i, double x); |
3345 | struct s1 {int (*f) (int a);}; | 2714 | struct s1 {int (*f) (int a);}; |
3346 | struct s2 {int (*f) (double a);}; | 2715 | struct s2 {int (*f) (double a);}; |
@@ -3355,74 +2724,205 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; | |||
3355 | return 0; | 2724 | return 0; |
3356 | } | 2725 | } |
3357 | _ACEOF | 2726 | _ACEOF |
3358 | for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ | 2727 | # Don't try gcc -ansi; that turns off useful extensions and |
3359 | -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | 2728 | # breaks some systems' header files. |
2729 | # AIX -qlanglvl=ansi | ||
2730 | # Ultrix and OSF/1 -std1 | ||
2731 | # HP-UX 10.20 and later -Ae | ||
2732 | # HP-UX older versions -Aa -D_HPUX_SOURCE | ||
2733 | # SVR4 -Xc -D__EXTENSIONS__ | ||
2734 | for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | ||
3360 | do | 2735 | do |
3361 | CC="$ac_save_CC $ac_arg" | 2736 | CC="$ac_save_CC $ac_arg" |
3362 | rm -f conftest.$ac_objext | 2737 | rm -f conftest.$ac_objext |
3363 | if { (ac_try="$ac_compile" | 2738 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
3364 | case "(($ac_try" in | 2739 | (eval $ac_compile) 2>conftest.er1 |
3365 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3366 | *) ac_try_echo=$ac_try;; | ||
3367 | esac | ||
3368 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3369 | (eval "$ac_compile") 2>conftest.er1 | ||
3370 | ac_status=$? | 2740 | ac_status=$? |
3371 | grep -v '^ *+' conftest.er1 >conftest.err | 2741 | grep -v '^ *+' conftest.er1 >conftest.err |
3372 | rm -f conftest.er1 | 2742 | rm -f conftest.er1 |
3373 | cat conftest.err >&5 | 2743 | cat conftest.err >&5 |
3374 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2744 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3375 | (exit $ac_status); } && | 2745 | (exit $ac_status); } && |
3376 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 2746 | { ac_try='test -z "$ac_c_werror_flag" |
3377 | { (case "(($ac_try" in | 2747 | || test ! -s conftest.err' |
3378 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 2748 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3379 | *) ac_try_echo=$ac_try;; | 2749 | (eval $ac_try) 2>&5 |
3380 | esac | ||
3381 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3382 | (eval "$ac_try") 2>&5 | ||
3383 | ac_status=$? | 2750 | ac_status=$? |
3384 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2751 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3385 | (exit $ac_status); }; } && | 2752 | (exit $ac_status); }; } && |
3386 | { ac_try='test -s conftest.$ac_objext' | 2753 | { ac_try='test -s conftest.$ac_objext' |
3387 | { (case "(($ac_try" in | 2754 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3388 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 2755 | (eval $ac_try) 2>&5 |
3389 | *) ac_try_echo=$ac_try;; | ||
3390 | esac | ||
3391 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3392 | (eval "$ac_try") 2>&5 | ||
3393 | ac_status=$? | 2756 | ac_status=$? |
3394 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 2757 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3395 | (exit $ac_status); }; }; then | 2758 | (exit $ac_status); }; }; then |
3396 | ac_cv_prog_cc_c89=$ac_arg | 2759 | ac_cv_prog_cc_stdc=$ac_arg |
2760 | break | ||
3397 | else | 2761 | else |
3398 | echo "$as_me: failed program was:" >&5 | 2762 | echo "$as_me: failed program was:" >&5 |
3399 | sed 's/^/| /' conftest.$ac_ext >&5 | 2763 | sed 's/^/| /' conftest.$ac_ext >&5 |
3400 | 2764 | ||
3401 | |||
3402 | fi | 2765 | fi |
3403 | 2766 | rm -f conftest.err conftest.$ac_objext | |
3404 | rm -f core conftest.err conftest.$ac_objext | ||
3405 | test "x$ac_cv_prog_cc_c89" != "xno" && break | ||
3406 | done | 2767 | done |
3407 | rm -f conftest.$ac_ext | 2768 | rm -f conftest.$ac_ext conftest.$ac_objext |
3408 | CC=$ac_save_CC | 2769 | CC=$ac_save_CC |
3409 | 2770 | ||
3410 | fi | 2771 | fi |
3411 | # AC_CACHE_VAL | 2772 | |
3412 | case "x$ac_cv_prog_cc_c89" in | 2773 | case "x$ac_cv_prog_cc_stdc" in |
3413 | x) | 2774 | x|xno) |
3414 | { echo "$as_me:$LINENO: result: none needed" >&5 | 2775 | echo "$as_me:$LINENO: result: none needed" >&5 |
3415 | echo "${ECHO_T}none needed" >&6; } ;; | 2776 | echo "${ECHO_T}none needed" >&6 ;; |
3416 | xno) | ||
3417 | { echo "$as_me:$LINENO: result: unsupported" >&5 | ||
3418 | echo "${ECHO_T}unsupported" >&6; } ;; | ||
3419 | *) | 2777 | *) |
3420 | CC="$CC $ac_cv_prog_cc_c89" | 2778 | echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 |
3421 | { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 | 2779 | echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 |
3422 | echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; | 2780 | CC="$CC $ac_cv_prog_cc_stdc" ;; |
3423 | esac | 2781 | esac |
3424 | 2782 | ||
2783 | # Some people use a C++ compiler to compile C. Since we use `exit', | ||
2784 | # in C++ we need to declare it. In case someone uses the same compiler | ||
2785 | # for both compiling C and C++ we need to have the C++ compiler decide | ||
2786 | # the declaration of exit, since it's the most demanding environment. | ||
2787 | cat >conftest.$ac_ext <<_ACEOF | ||
2788 | #ifndef __cplusplus | ||
2789 | choke me | ||
2790 | #endif | ||
2791 | _ACEOF | ||
2792 | rm -f conftest.$ac_objext | ||
2793 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2794 | (eval $ac_compile) 2>conftest.er1 | ||
2795 | ac_status=$? | ||
2796 | grep -v '^ *+' conftest.er1 >conftest.err | ||
2797 | rm -f conftest.er1 | ||
2798 | cat conftest.err >&5 | ||
2799 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2800 | (exit $ac_status); } && | ||
2801 | { ac_try='test -z "$ac_c_werror_flag" | ||
2802 | || test ! -s conftest.err' | ||
2803 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2804 | (eval $ac_try) 2>&5 | ||
2805 | ac_status=$? | ||
2806 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2807 | (exit $ac_status); }; } && | ||
2808 | { ac_try='test -s conftest.$ac_objext' | ||
2809 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2810 | (eval $ac_try) 2>&5 | ||
2811 | ac_status=$? | ||
2812 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2813 | (exit $ac_status); }; }; then | ||
2814 | for ac_declaration in \ | ||
2815 | '' \ | ||
2816 | 'extern "C" void std::exit (int) throw (); using std::exit;' \ | ||
2817 | 'extern "C" void std::exit (int); using std::exit;' \ | ||
2818 | 'extern "C" void exit (int) throw ();' \ | ||
2819 | 'extern "C" void exit (int);' \ | ||
2820 | 'void exit (int);' | ||
2821 | do | ||
2822 | cat >conftest.$ac_ext <<_ACEOF | ||
2823 | /* confdefs.h. */ | ||
2824 | _ACEOF | ||
2825 | cat confdefs.h >>conftest.$ac_ext | ||
2826 | cat >>conftest.$ac_ext <<_ACEOF | ||
2827 | /* end confdefs.h. */ | ||
2828 | $ac_declaration | ||
2829 | #include <stdlib.h> | ||
2830 | int | ||
2831 | main () | ||
2832 | { | ||
2833 | exit (42); | ||
2834 | ; | ||
2835 | return 0; | ||
2836 | } | ||
2837 | _ACEOF | ||
2838 | rm -f conftest.$ac_objext | ||
2839 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2840 | (eval $ac_compile) 2>conftest.er1 | ||
2841 | ac_status=$? | ||
2842 | grep -v '^ *+' conftest.er1 >conftest.err | ||
2843 | rm -f conftest.er1 | ||
2844 | cat conftest.err >&5 | ||
2845 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2846 | (exit $ac_status); } && | ||
2847 | { ac_try='test -z "$ac_c_werror_flag" | ||
2848 | || test ! -s conftest.err' | ||
2849 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2850 | (eval $ac_try) 2>&5 | ||
2851 | ac_status=$? | ||
2852 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2853 | (exit $ac_status); }; } && | ||
2854 | { ac_try='test -s conftest.$ac_objext' | ||
2855 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2856 | (eval $ac_try) 2>&5 | ||
2857 | ac_status=$? | ||
2858 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2859 | (exit $ac_status); }; }; then | ||
2860 | : | ||
2861 | else | ||
2862 | echo "$as_me: failed program was:" >&5 | ||
2863 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
2864 | |||
2865 | continue | ||
2866 | fi | ||
2867 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2868 | cat >conftest.$ac_ext <<_ACEOF | ||
2869 | /* confdefs.h. */ | ||
2870 | _ACEOF | ||
2871 | cat confdefs.h >>conftest.$ac_ext | ||
2872 | cat >>conftest.$ac_ext <<_ACEOF | ||
2873 | /* end confdefs.h. */ | ||
2874 | $ac_declaration | ||
2875 | int | ||
2876 | main () | ||
2877 | { | ||
2878 | exit (42); | ||
2879 | ; | ||
2880 | return 0; | ||
2881 | } | ||
2882 | _ACEOF | ||
2883 | rm -f conftest.$ac_objext | ||
2884 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2885 | (eval $ac_compile) 2>conftest.er1 | ||
2886 | ac_status=$? | ||
2887 | grep -v '^ *+' conftest.er1 >conftest.err | ||
2888 | rm -f conftest.er1 | ||
2889 | cat conftest.err >&5 | ||
2890 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2891 | (exit $ac_status); } && | ||
2892 | { ac_try='test -z "$ac_c_werror_flag" | ||
2893 | || test ! -s conftest.err' | ||
2894 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2895 | (eval $ac_try) 2>&5 | ||
2896 | ac_status=$? | ||
2897 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2898 | (exit $ac_status); }; } && | ||
2899 | { ac_try='test -s conftest.$ac_objext' | ||
2900 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2901 | (eval $ac_try) 2>&5 | ||
2902 | ac_status=$? | ||
2903 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2904 | (exit $ac_status); }; }; then | ||
2905 | break | ||
2906 | else | ||
2907 | echo "$as_me: failed program was:" >&5 | ||
2908 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
3425 | 2909 | ||
2910 | fi | ||
2911 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2912 | done | ||
2913 | rm -f conftest* | ||
2914 | if test -n "$ac_declaration"; then | ||
2915 | echo '#ifdef __cplusplus' >>confdefs.h | ||
2916 | echo $ac_declaration >>confdefs.h | ||
2917 | echo '#endif' >>confdefs.h | ||
2918 | fi | ||
2919 | |||
2920 | else | ||
2921 | echo "$as_me: failed program was:" >&5 | ||
2922 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
2923 | |||
2924 | fi | ||
2925 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3426 | ac_ext=c | 2926 | ac_ext=c |
3427 | ac_cpp='$CPP $CPPFLAGS' | 2927 | ac_cpp='$CPP $CPPFLAGS' |
3428 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 2928 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
@@ -3430,7 +2930,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ | |||
3430 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 2930 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
3431 | DEPDIR="${am__leading_dot}deps" | 2931 | DEPDIR="${am__leading_dot}deps" |
3432 | 2932 | ||
3433 | ac_config_commands="$ac_config_commands depfiles" | 2933 | ac_config_commands="$ac_config_commands depfiles" |
3434 | 2934 | ||
3435 | 2935 | ||
3436 | am_make=${MAKE-make} | 2936 | am_make=${MAKE-make} |
@@ -3440,8 +2940,8 @@ am__doit: | |||
3440 | .PHONY: am__doit | 2940 | .PHONY: am__doit |
3441 | END | 2941 | END |
3442 | # If we don't find an include directive, just comment out the code. | 2942 | # If we don't find an include directive, just comment out the code. |
3443 | { echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 | 2943 | echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 |
3444 | echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } | 2944 | echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 |
3445 | am__include="#" | 2945 | am__include="#" |
3446 | am__quote= | 2946 | am__quote= |
3447 | _am_result=none | 2947 | _am_result=none |
@@ -3468,15 +2968,15 @@ if test "$am__include" = "#"; then | |||
3468 | fi | 2968 | fi |
3469 | 2969 | ||
3470 | 2970 | ||
3471 | { echo "$as_me:$LINENO: result: $_am_result" >&5 | 2971 | echo "$as_me:$LINENO: result: $_am_result" >&5 |
3472 | echo "${ECHO_T}$_am_result" >&6; } | 2972 | echo "${ECHO_T}$_am_result" >&6 |
3473 | rm -f confinc confmf | 2973 | rm -f confinc confmf |
3474 | 2974 | ||
3475 | # Check whether --enable-dependency-tracking was given. | 2975 | # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. |
3476 | if test "${enable_dependency_tracking+set}" = set; then | 2976 | if test "${enable_dependency_tracking+set}" = set; then |
3477 | enableval=$enable_dependency_tracking; | 2977 | enableval="$enable_dependency_tracking" |
3478 | fi | ||
3479 | 2978 | ||
2979 | fi; | ||
3480 | if test "x$enable_dependency_tracking" != xno; then | 2980 | if test "x$enable_dependency_tracking" != xno; then |
3481 | am_depcomp="$ac_aux_dir/depcomp" | 2981 | am_depcomp="$ac_aux_dir/depcomp" |
3482 | AMDEPBACKSLASH='\' | 2982 | AMDEPBACKSLASH='\' |
@@ -3496,8 +2996,8 @@ fi | |||
3496 | 2996 | ||
3497 | depcc="$CC" am_compiler_list= | 2997 | depcc="$CC" am_compiler_list= |
3498 | 2998 | ||
3499 | { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | 2999 | echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 |
3500 | echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } | 3000 | echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 |
3501 | if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then | 3001 | if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then |
3502 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3002 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
3503 | else | 3003 | else |
@@ -3586,8 +3086,8 @@ else | |||
3586 | fi | 3086 | fi |
3587 | 3087 | ||
3588 | fi | 3088 | fi |
3589 | { echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 | 3089 | echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 |
3590 | echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } | 3090 | echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 |
3591 | CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type | 3091 | CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type |
3592 | 3092 | ||
3593 | 3093 | ||
@@ -3604,8 +3104,8 @@ fi | |||
3604 | 3104 | ||
3605 | 3105 | ||
3606 | 3106 | ||
3607 | { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 | 3107 | echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 |
3608 | echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } | 3108 | echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 |
3609 | if test "${ac_cv_c_const+set}" = set; then | 3109 | if test "${ac_cv_c_const+set}" = set; then |
3610 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3110 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
3611 | else | 3111 | else |
@@ -3623,10 +3123,10 @@ main () | |||
3623 | #ifndef __cplusplus | 3123 | #ifndef __cplusplus |
3624 | /* Ultrix mips cc rejects this. */ | 3124 | /* Ultrix mips cc rejects this. */ |
3625 | typedef int charset[2]; | 3125 | typedef int charset[2]; |
3626 | const charset cs; | 3126 | const charset x; |
3627 | /* SunOS 4.1.1 cc rejects this. */ | 3127 | /* SunOS 4.1.1 cc rejects this. */ |
3628 | char const *const *pcpcc; | 3128 | char const *const *ccp; |
3629 | char **ppc; | 3129 | char **p; |
3630 | /* NEC SVR4.0.2 mips cc rejects this. */ | 3130 | /* NEC SVR4.0.2 mips cc rejects this. */ |
3631 | struct point {int x, y;}; | 3131 | struct point {int x, y;}; |
3632 | static struct point const zero = {0,0}; | 3132 | static struct point const zero = {0,0}; |
@@ -3635,17 +3135,16 @@ main () | |||
3635 | an arm of an if-expression whose if-part is not a constant | 3135 | an arm of an if-expression whose if-part is not a constant |
3636 | expression */ | 3136 | expression */ |
3637 | const char *g = "string"; | 3137 | const char *g = "string"; |
3638 | pcpcc = &g + (g ? g-g : 0); | 3138 | ccp = &g + (g ? g-g : 0); |
3639 | /* HPUX 7.0 cc rejects these. */ | 3139 | /* HPUX 7.0 cc rejects these. */ |
3640 | ++pcpcc; | 3140 | ++ccp; |
3641 | ppc = (char**) pcpcc; | 3141 | p = (char**) ccp; |
3642 | pcpcc = (char const *const *) ppc; | 3142 | ccp = (char const *const *) p; |
3643 | { /* SCO 3.2v4 cc rejects this. */ | 3143 | { /* SCO 3.2v4 cc rejects this. */ |
3644 | char *t; | 3144 | char *t; |
3645 | char const *s = 0 ? (char *) 0 : (char const *) 0; | 3145 | char const *s = 0 ? (char *) 0 : (char const *) 0; |
3646 | 3146 | ||
3647 | *t++ = 0; | 3147 | *t++ = 0; |
3648 | if (s) return 0; | ||
3649 | } | 3148 | } |
3650 | { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ | 3149 | { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ |
3651 | int x[] = {25, 17}; | 3150 | int x[] = {25, 17}; |
@@ -3664,9 +3163,7 @@ main () | |||
3664 | } | 3163 | } |
3665 | { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ | 3164 | { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ |
3666 | const int foo = 10; | 3165 | const int foo = 10; |
3667 | if (!foo) return 0; | ||
3668 | } | 3166 | } |
3669 | return !cs[0] && !zero.x; | ||
3670 | #endif | 3167 | #endif |
3671 | 3168 | ||
3672 | ; | 3169 | ; |
@@ -3674,36 +3171,24 @@ main () | |||
3674 | } | 3171 | } |
3675 | _ACEOF | 3172 | _ACEOF |
3676 | rm -f conftest.$ac_objext | 3173 | rm -f conftest.$ac_objext |
3677 | if { (ac_try="$ac_compile" | 3174 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
3678 | case "(($ac_try" in | 3175 | (eval $ac_compile) 2>conftest.er1 |
3679 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3680 | *) ac_try_echo=$ac_try;; | ||
3681 | esac | ||
3682 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3683 | (eval "$ac_compile") 2>conftest.er1 | ||
3684 | ac_status=$? | 3176 | ac_status=$? |
3685 | grep -v '^ *+' conftest.er1 >conftest.err | 3177 | grep -v '^ *+' conftest.er1 >conftest.err |
3686 | rm -f conftest.er1 | 3178 | rm -f conftest.er1 |
3687 | cat conftest.err >&5 | 3179 | cat conftest.err >&5 |
3688 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 3180 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3689 | (exit $ac_status); } && | 3181 | (exit $ac_status); } && |
3690 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 3182 | { ac_try='test -z "$ac_c_werror_flag" |
3691 | { (case "(($ac_try" in | 3183 | || test ! -s conftest.err' |
3692 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 3184 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3693 | *) ac_try_echo=$ac_try;; | 3185 | (eval $ac_try) 2>&5 |
3694 | esac | ||
3695 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3696 | (eval "$ac_try") 2>&5 | ||
3697 | ac_status=$? | 3186 | ac_status=$? |
3698 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 3187 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3699 | (exit $ac_status); }; } && | 3188 | (exit $ac_status); }; } && |
3700 | { ac_try='test -s conftest.$ac_objext' | 3189 | { ac_try='test -s conftest.$ac_objext' |
3701 | { (case "(($ac_try" in | 3190 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3702 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 3191 | (eval $ac_try) 2>&5 |
3703 | *) ac_try_echo=$ac_try;; | ||
3704 | esac | ||
3705 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3706 | (eval "$ac_try") 2>&5 | ||
3707 | ac_status=$? | 3192 | ac_status=$? |
3708 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 3193 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3709 | (exit $ac_status); }; }; then | 3194 | (exit $ac_status); }; }; then |
@@ -3712,13 +3197,12 @@ else | |||
3712 | echo "$as_me: failed program was:" >&5 | 3197 | echo "$as_me: failed program was:" >&5 |
3713 | sed 's/^/| /' conftest.$ac_ext >&5 | 3198 | sed 's/^/| /' conftest.$ac_ext >&5 |
3714 | 3199 | ||
3715 | ac_cv_c_const=no | 3200 | ac_cv_c_const=no |
3716 | fi | 3201 | fi |
3717 | 3202 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
3718 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3719 | fi | 3203 | fi |
3720 | { echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 | 3204 | echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 |
3721 | echo "${ECHO_T}$ac_cv_c_const" >&6; } | 3205 | echo "${ECHO_T}$ac_cv_c_const" >&6 |
3722 | if test $ac_cv_c_const = no; then | 3206 | if test $ac_cv_c_const = no; then |
3723 | 3207 | ||
3724 | cat >>confdefs.h <<\_ACEOF | 3208 | cat >>confdefs.h <<\_ACEOF |
@@ -3727,8 +3211,8 @@ _ACEOF | |||
3727 | 3211 | ||
3728 | fi | 3212 | fi |
3729 | 3213 | ||
3730 | { echo "$as_me:$LINENO: checking for inline" >&5 | 3214 | echo "$as_me:$LINENO: checking for inline" >&5 |
3731 | echo $ECHO_N "checking for inline... $ECHO_C" >&6; } | 3215 | echo $ECHO_N "checking for inline... $ECHO_C" >&6 |
3732 | if test "${ac_cv_c_inline+set}" = set; then | 3216 | if test "${ac_cv_c_inline+set}" = set; then |
3733 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3217 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
3734 | else | 3218 | else |
@@ -3748,54 +3232,39 @@ $ac_kw foo_t foo () {return 0; } | |||
3748 | 3232 | ||
3749 | _ACEOF | 3233 | _ACEOF |
3750 | rm -f conftest.$ac_objext | 3234 | rm -f conftest.$ac_objext |
3751 | if { (ac_try="$ac_compile" | 3235 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
3752 | case "(($ac_try" in | 3236 | (eval $ac_compile) 2>conftest.er1 |
3753 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
3754 | *) ac_try_echo=$ac_try;; | ||
3755 | esac | ||
3756 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3757 | (eval "$ac_compile") 2>conftest.er1 | ||
3758 | ac_status=$? | 3237 | ac_status=$? |
3759 | grep -v '^ *+' conftest.er1 >conftest.err | 3238 | grep -v '^ *+' conftest.er1 >conftest.err |
3760 | rm -f conftest.er1 | 3239 | rm -f conftest.er1 |
3761 | cat conftest.err >&5 | 3240 | cat conftest.err >&5 |
3762 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 3241 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3763 | (exit $ac_status); } && | 3242 | (exit $ac_status); } && |
3764 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 3243 | { ac_try='test -z "$ac_c_werror_flag" |
3765 | { (case "(($ac_try" in | 3244 | || test ! -s conftest.err' |
3766 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 3245 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3767 | *) ac_try_echo=$ac_try;; | 3246 | (eval $ac_try) 2>&5 |
3768 | esac | ||
3769 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3770 | (eval "$ac_try") 2>&5 | ||
3771 | ac_status=$? | 3247 | ac_status=$? |
3772 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 3248 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3773 | (exit $ac_status); }; } && | 3249 | (exit $ac_status); }; } && |
3774 | { ac_try='test -s conftest.$ac_objext' | 3250 | { ac_try='test -s conftest.$ac_objext' |
3775 | { (case "(($ac_try" in | 3251 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3776 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 3252 | (eval $ac_try) 2>&5 |
3777 | *) ac_try_echo=$ac_try;; | ||
3778 | esac | ||
3779 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
3780 | (eval "$ac_try") 2>&5 | ||
3781 | ac_status=$? | 3253 | ac_status=$? |
3782 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 3254 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3783 | (exit $ac_status); }; }; then | 3255 | (exit $ac_status); }; }; then |
3784 | ac_cv_c_inline=$ac_kw | 3256 | ac_cv_c_inline=$ac_kw; break |
3785 | else | 3257 | else |
3786 | echo "$as_me: failed program was:" >&5 | 3258 | echo "$as_me: failed program was:" >&5 |
3787 | sed 's/^/| /' conftest.$ac_ext >&5 | 3259 | sed 's/^/| /' conftest.$ac_ext >&5 |
3788 | 3260 | ||
3789 | |||
3790 | fi | 3261 | fi |
3791 | 3262 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
3792 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3793 | test "$ac_cv_c_inline" != no && break | ||
3794 | done | 3263 | done |
3795 | 3264 | ||
3796 | fi | 3265 | fi |
3797 | { echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 | 3266 | echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 |
3798 | echo "${ECHO_T}$ac_cv_c_inline" >&6; } | 3267 | echo "${ECHO_T}$ac_cv_c_inline" >&6 |
3799 | 3268 | ||
3800 | 3269 | ||
3801 | case $ac_cv_c_inline in | 3270 | case $ac_cv_c_inline in |
@@ -3820,9 +3289,10 @@ esac | |||
3820 | ## ----------------------- ## | 3289 | ## ----------------------- ## |
3821 | 3290 | ||
3822 | 3291 | ||
3823 | # Check whether --enable-shared was given. | 3292 | # Check whether --enable-shared or --disable-shared was given. |
3824 | if test "${enable_shared+set}" = set; then | 3293 | if test "${enable_shared+set}" = set; then |
3825 | enableval=$enable_shared; p=${PACKAGE-default} | 3294 | enableval="$enable_shared" |
3295 | p=${PACKAGE-default} | ||
3826 | case $enableval in | 3296 | case $enableval in |
3827 | yes) enable_shared=yes ;; | 3297 | yes) enable_shared=yes ;; |
3828 | no) enable_shared=no ;; | 3298 | no) enable_shared=no ;; |
@@ -3841,12 +3311,12 @@ if test "${enable_shared+set}" = set; then | |||
3841 | esac | 3311 | esac |
3842 | else | 3312 | else |
3843 | enable_shared=yes | 3313 | enable_shared=yes |
3844 | fi | 3314 | fi; |
3845 | |||
3846 | 3315 | ||
3847 | # Check whether --enable-static was given. | 3316 | # Check whether --enable-static or --disable-static was given. |
3848 | if test "${enable_static+set}" = set; then | 3317 | if test "${enable_static+set}" = set; then |
3849 | enableval=$enable_static; p=${PACKAGE-default} | 3318 | enableval="$enable_static" |
3319 | p=${PACKAGE-default} | ||
3850 | case $enableval in | 3320 | case $enableval in |
3851 | yes) enable_static=yes ;; | 3321 | yes) enable_static=yes ;; |
3852 | no) enable_static=no ;; | 3322 | no) enable_static=no ;; |
@@ -3865,12 +3335,12 @@ if test "${enable_static+set}" = set; then | |||
3865 | esac | 3335 | esac |
3866 | else | 3336 | else |
3867 | enable_static=yes | 3337 | enable_static=yes |
3868 | fi | 3338 | fi; |
3869 | |||
3870 | 3339 | ||
3871 | # Check whether --enable-fast-install was given. | 3340 | # Check whether --enable-fast-install or --disable-fast-install was given. |
3872 | if test "${enable_fast_install+set}" = set; then | 3341 | if test "${enable_fast_install+set}" = set; then |
3873 | enableval=$enable_fast_install; p=${PACKAGE-default} | 3342 | enableval="$enable_fast_install" |
3343 | p=${PACKAGE-default} | ||
3874 | case $enableval in | 3344 | case $enableval in |
3875 | yes) enable_fast_install=yes ;; | 3345 | yes) enable_fast_install=yes ;; |
3876 | no) enable_fast_install=no ;; | 3346 | no) enable_fast_install=no ;; |
@@ -3889,94 +3359,64 @@ if test "${enable_fast_install+set}" = set; then | |||
3889 | esac | 3359 | esac |
3890 | else | 3360 | else |
3891 | enable_fast_install=yes | 3361 | enable_fast_install=yes |
3892 | fi | 3362 | fi; |
3893 | |||
3894 | 3363 | ||
3895 | # Make sure we can run config.sub. | 3364 | # Make sure we can run config.sub. |
3896 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || | 3365 | $ac_config_sub sun4 >/dev/null 2>&1 || |
3897 | { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 | 3366 | { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 |
3898 | echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} | 3367 | echo "$as_me: error: cannot run $ac_config_sub" >&2;} |
3899 | { (exit 1); exit 1; }; } | 3368 | { (exit 1); exit 1; }; } |
3900 | 3369 | ||
3901 | { echo "$as_me:$LINENO: checking build system type" >&5 | 3370 | echo "$as_me:$LINENO: checking build system type" >&5 |
3902 | echo $ECHO_N "checking build system type... $ECHO_C" >&6; } | 3371 | echo $ECHO_N "checking build system type... $ECHO_C" >&6 |
3903 | if test "${ac_cv_build+set}" = set; then | 3372 | if test "${ac_cv_build+set}" = set; then |
3904 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3373 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
3905 | else | 3374 | else |
3906 | ac_build_alias=$build_alias | 3375 | ac_cv_build_alias=$build_alias |
3907 | test "x$ac_build_alias" = x && | 3376 | test -z "$ac_cv_build_alias" && |
3908 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` | 3377 | ac_cv_build_alias=`$ac_config_guess` |
3909 | test "x$ac_build_alias" = x && | 3378 | test -z "$ac_cv_build_alias" && |
3910 | { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 | 3379 | { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 |
3911 | echo "$as_me: error: cannot guess build type; you must specify one" >&2;} | 3380 | echo "$as_me: error: cannot guess build type; you must specify one" >&2;} |
3912 | { (exit 1); exit 1; }; } | 3381 | { (exit 1); exit 1; }; } |
3913 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || | 3382 | ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || |
3914 | { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 | 3383 | { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 |
3915 | echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} | 3384 | echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} |
3916 | { (exit 1); exit 1; }; } | 3385 | { (exit 1); exit 1; }; } |
3917 | 3386 | ||
3918 | fi | 3387 | fi |
3919 | { echo "$as_me:$LINENO: result: $ac_cv_build" >&5 | 3388 | echo "$as_me:$LINENO: result: $ac_cv_build" >&5 |
3920 | echo "${ECHO_T}$ac_cv_build" >&6; } | 3389 | echo "${ECHO_T}$ac_cv_build" >&6 |
3921 | case $ac_cv_build in | ||
3922 | *-*-*) ;; | ||
3923 | *) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 | ||
3924 | echo "$as_me: error: invalid value of canonical build" >&2;} | ||
3925 | { (exit 1); exit 1; }; };; | ||
3926 | esac | ||
3927 | build=$ac_cv_build | 3390 | build=$ac_cv_build |
3928 | ac_save_IFS=$IFS; IFS='-' | 3391 | build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` |
3929 | set x $ac_cv_build | 3392 | build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` |
3930 | shift | 3393 | build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` |
3931 | build_cpu=$1 | 3394 | |
3932 | build_vendor=$2 | 3395 | |
3933 | shift; shift | 3396 | echo "$as_me:$LINENO: checking host system type" >&5 |
3934 | # Remember, the first character of IFS is used to create $*, | 3397 | echo $ECHO_N "checking host system type... $ECHO_C" >&6 |
3935 | # except with old shells: | ||
3936 | build_os=$* | ||
3937 | IFS=$ac_save_IFS | ||
3938 | case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac | ||
3939 | |||
3940 | |||
3941 | { echo "$as_me:$LINENO: checking host system type" >&5 | ||
3942 | echo $ECHO_N "checking host system type... $ECHO_C" >&6; } | ||
3943 | if test "${ac_cv_host+set}" = set; then | 3398 | if test "${ac_cv_host+set}" = set; then |
3944 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3399 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
3945 | else | 3400 | else |
3946 | if test "x$host_alias" = x; then | 3401 | ac_cv_host_alias=$host_alias |
3947 | ac_cv_host=$ac_cv_build | 3402 | test -z "$ac_cv_host_alias" && |
3948 | else | 3403 | ac_cv_host_alias=$ac_cv_build_alias |
3949 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || | 3404 | ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || |
3950 | { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 | 3405 | { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 |
3951 | echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} | 3406 | echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} |
3952 | { (exit 1); exit 1; }; } | 3407 | { (exit 1); exit 1; }; } |
3953 | fi | ||
3954 | 3408 | ||
3955 | fi | 3409 | fi |
3956 | { echo "$as_me:$LINENO: result: $ac_cv_host" >&5 | 3410 | echo "$as_me:$LINENO: result: $ac_cv_host" >&5 |
3957 | echo "${ECHO_T}$ac_cv_host" >&6; } | 3411 | echo "${ECHO_T}$ac_cv_host" >&6 |
3958 | case $ac_cv_host in | ||
3959 | *-*-*) ;; | ||
3960 | *) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 | ||
3961 | echo "$as_me: error: invalid value of canonical host" >&2;} | ||
3962 | { (exit 1); exit 1; }; };; | ||
3963 | esac | ||
3964 | host=$ac_cv_host | 3412 | host=$ac_cv_host |
3965 | ac_save_IFS=$IFS; IFS='-' | 3413 | host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` |
3966 | set x $ac_cv_host | 3414 | host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` |
3967 | shift | 3415 | host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` |
3968 | host_cpu=$1 | 3416 | |
3969 | host_vendor=$2 | 3417 | |
3970 | shift; shift | 3418 | echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 |
3971 | # Remember, the first character of IFS is used to create $*, | 3419 | echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 |
3972 | # except with old shells: | ||
3973 | host_os=$* | ||
3974 | IFS=$ac_save_IFS | ||
3975 | case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac | ||
3976 | |||
3977 | |||
3978 | { echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 | ||
3979 | echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } | ||
3980 | if test "${lt_cv_path_SED+set}" = set; then | 3420 | if test "${lt_cv_path_SED+set}" = set; then |
3981 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3421 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
3982 | else | 3422 | else |
@@ -4029,184 +3469,37 @@ done | |||
4029 | fi | 3469 | fi |
4030 | 3470 | ||
4031 | SED=$lt_cv_path_SED | 3471 | SED=$lt_cv_path_SED |
4032 | { echo "$as_me:$LINENO: result: $SED" >&5 | 3472 | echo "$as_me:$LINENO: result: $SED" >&5 |
4033 | echo "${ECHO_T}$SED" >&6; } | 3473 | echo "${ECHO_T}$SED" >&6 |
4034 | |||
4035 | { echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 | ||
4036 | echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } | ||
4037 | if test "${ac_cv_path_GREP+set}" = set; then | ||
4038 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4039 | else | ||
4040 | # Extract the first word of "grep ggrep" to use in msg output | ||
4041 | if test -z "$GREP"; then | ||
4042 | set dummy grep ggrep; ac_prog_name=$2 | ||
4043 | if test "${ac_cv_path_GREP+set}" = set; then | ||
4044 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4045 | else | ||
4046 | ac_path_GREP_found=false | ||
4047 | # Loop through the user's path and test for each of PROGNAME-LIST | ||
4048 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4049 | for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin | ||
4050 | do | ||
4051 | IFS=$as_save_IFS | ||
4052 | test -z "$as_dir" && as_dir=. | ||
4053 | for ac_prog in grep ggrep; do | ||
4054 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
4055 | ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" | ||
4056 | { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue | ||
4057 | # Check for GNU ac_path_GREP and select it if it is found. | ||
4058 | # Check for GNU $ac_path_GREP | ||
4059 | case `"$ac_path_GREP" --version 2>&1` in | ||
4060 | *GNU*) | ||
4061 | ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; | ||
4062 | *) | ||
4063 | ac_count=0 | ||
4064 | echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" | ||
4065 | while : | ||
4066 | do | ||
4067 | cat "conftest.in" "conftest.in" >"conftest.tmp" | ||
4068 | mv "conftest.tmp" "conftest.in" | ||
4069 | cp "conftest.in" "conftest.nl" | ||
4070 | echo 'GREP' >> "conftest.nl" | ||
4071 | "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break | ||
4072 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | ||
4073 | ac_count=`expr $ac_count + 1` | ||
4074 | if test $ac_count -gt ${ac_path_GREP_max-0}; then | ||
4075 | # Best one so far, save it but keep looking for a better one | ||
4076 | ac_cv_path_GREP="$ac_path_GREP" | ||
4077 | ac_path_GREP_max=$ac_count | ||
4078 | fi | ||
4079 | # 10*(2^10) chars as input seems more than enough | ||
4080 | test $ac_count -gt 10 && break | ||
4081 | done | ||
4082 | rm -f conftest.in conftest.tmp conftest.nl conftest.out;; | ||
4083 | esac | ||
4084 | |||
4085 | |||
4086 | $ac_path_GREP_found && break 3 | ||
4087 | done | ||
4088 | done | ||
4089 | |||
4090 | done | ||
4091 | IFS=$as_save_IFS | ||
4092 | |||
4093 | |||
4094 | fi | ||
4095 | |||
4096 | GREP="$ac_cv_path_GREP" | ||
4097 | if test -z "$GREP"; then | ||
4098 | { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | ||
4099 | echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | ||
4100 | { (exit 1); exit 1; }; } | ||
4101 | fi | ||
4102 | 3474 | ||
4103 | else | 3475 | echo "$as_me:$LINENO: checking for egrep" >&5 |
4104 | ac_cv_path_GREP=$GREP | 3476 | echo $ECHO_N "checking for egrep... $ECHO_C" >&6 |
4105 | fi | 3477 | if test "${ac_cv_prog_egrep+set}" = set; then |
4106 | |||
4107 | |||
4108 | fi | ||
4109 | { echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 | ||
4110 | echo "${ECHO_T}$ac_cv_path_GREP" >&6; } | ||
4111 | GREP="$ac_cv_path_GREP" | ||
4112 | |||
4113 | |||
4114 | { echo "$as_me:$LINENO: checking for egrep" >&5 | ||
4115 | echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } | ||
4116 | if test "${ac_cv_path_EGREP+set}" = set; then | ||
4117 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3478 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
4118 | else | 3479 | else |
4119 | if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 | 3480 | if echo a | (grep -E '(a|b)') >/dev/null 2>&1 |
4120 | then ac_cv_path_EGREP="$GREP -E" | 3481 | then ac_cv_prog_egrep='grep -E' |
4121 | else | 3482 | else ac_cv_prog_egrep='egrep' |
4122 | # Extract the first word of "egrep" to use in msg output | ||
4123 | if test -z "$EGREP"; then | ||
4124 | set dummy egrep; ac_prog_name=$2 | ||
4125 | if test "${ac_cv_path_EGREP+set}" = set; then | ||
4126 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4127 | else | ||
4128 | ac_path_EGREP_found=false | ||
4129 | # Loop through the user's path and test for each of PROGNAME-LIST | ||
4130 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
4131 | for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin | ||
4132 | do | ||
4133 | IFS=$as_save_IFS | ||
4134 | test -z "$as_dir" && as_dir=. | ||
4135 | for ac_prog in egrep; do | ||
4136 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
4137 | ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" | ||
4138 | { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue | ||
4139 | # Check for GNU ac_path_EGREP and select it if it is found. | ||
4140 | # Check for GNU $ac_path_EGREP | ||
4141 | case `"$ac_path_EGREP" --version 2>&1` in | ||
4142 | *GNU*) | ||
4143 | ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; | ||
4144 | *) | ||
4145 | ac_count=0 | ||
4146 | echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" | ||
4147 | while : | ||
4148 | do | ||
4149 | cat "conftest.in" "conftest.in" >"conftest.tmp" | ||
4150 | mv "conftest.tmp" "conftest.in" | ||
4151 | cp "conftest.in" "conftest.nl" | ||
4152 | echo 'EGREP' >> "conftest.nl" | ||
4153 | "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break | ||
4154 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | ||
4155 | ac_count=`expr $ac_count + 1` | ||
4156 | if test $ac_count -gt ${ac_path_EGREP_max-0}; then | ||
4157 | # Best one so far, save it but keep looking for a better one | ||
4158 | ac_cv_path_EGREP="$ac_path_EGREP" | ||
4159 | ac_path_EGREP_max=$ac_count | ||
4160 | fi | 3483 | fi |
4161 | # 10*(2^10) chars as input seems more than enough | ||
4162 | test $ac_count -gt 10 && break | ||
4163 | done | ||
4164 | rm -f conftest.in conftest.tmp conftest.nl conftest.out;; | ||
4165 | esac | ||
4166 | |||
4167 | |||
4168 | $ac_path_EGREP_found && break 3 | ||
4169 | done | ||
4170 | done | ||
4171 | |||
4172 | done | ||
4173 | IFS=$as_save_IFS | ||
4174 | |||
4175 | |||
4176 | fi | 3484 | fi |
3485 | echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 | ||
3486 | echo "${ECHO_T}$ac_cv_prog_egrep" >&6 | ||
3487 | EGREP=$ac_cv_prog_egrep | ||
4177 | 3488 | ||
4178 | EGREP="$ac_cv_path_EGREP" | ||
4179 | if test -z "$EGREP"; then | ||
4180 | { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | ||
4181 | echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | ||
4182 | { (exit 1); exit 1; }; } | ||
4183 | fi | ||
4184 | |||
4185 | else | ||
4186 | ac_cv_path_EGREP=$EGREP | ||
4187 | fi | ||
4188 | 3489 | ||
4189 | 3490 | ||
4190 | fi | 3491 | # Check whether --with-gnu-ld or --without-gnu-ld was given. |
4191 | fi | ||
4192 | { echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 | ||
4193 | echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } | ||
4194 | EGREP="$ac_cv_path_EGREP" | ||
4195 | |||
4196 | |||
4197 | |||
4198 | # Check whether --with-gnu-ld was given. | ||
4199 | if test "${with_gnu_ld+set}" = set; then | 3492 | if test "${with_gnu_ld+set}" = set; then |
4200 | withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes | 3493 | withval="$with_gnu_ld" |
3494 | test "$withval" = no || with_gnu_ld=yes | ||
4201 | else | 3495 | else |
4202 | with_gnu_ld=no | 3496 | with_gnu_ld=no |
4203 | fi | 3497 | fi; |
4204 | |||
4205 | ac_prog=ld | 3498 | ac_prog=ld |
4206 | if test "$GCC" = yes; then | 3499 | if test "$GCC" = yes; then |
4207 | # Check if gcc -print-prog-name=ld gives a path. | 3500 | # Check if gcc -print-prog-name=ld gives a path. |
4208 | { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 | 3501 | echo "$as_me:$LINENO: checking for ld used by $CC" >&5 |
4209 | echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } | 3502 | echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 |
4210 | case $host in | 3503 | case $host in |
4211 | *-*-mingw*) | 3504 | *-*-mingw*) |
4212 | # gcc leaves a trailing carriage return which upsets mingw | 3505 | # gcc leaves a trailing carriage return which upsets mingw |
@@ -4235,11 +3528,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } | |||
4235 | ;; | 3528 | ;; |
4236 | esac | 3529 | esac |
4237 | elif test "$with_gnu_ld" = yes; then | 3530 | elif test "$with_gnu_ld" = yes; then |
4238 | { echo "$as_me:$LINENO: checking for GNU ld" >&5 | 3531 | echo "$as_me:$LINENO: checking for GNU ld" >&5 |
4239 | echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } | 3532 | echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 |
4240 | else | 3533 | else |
4241 | { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 | 3534 | echo "$as_me:$LINENO: checking for non-GNU ld" >&5 |
4242 | echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } | 3535 | echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 |
4243 | fi | 3536 | fi |
4244 | if test "${lt_cv_path_LD+set}" = set; then | 3537 | if test "${lt_cv_path_LD+set}" = set; then |
4245 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3538 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -4272,17 +3565,17 @@ fi | |||
4272 | 3565 | ||
4273 | LD="$lt_cv_path_LD" | 3566 | LD="$lt_cv_path_LD" |
4274 | if test -n "$LD"; then | 3567 | if test -n "$LD"; then |
4275 | { echo "$as_me:$LINENO: result: $LD" >&5 | 3568 | echo "$as_me:$LINENO: result: $LD" >&5 |
4276 | echo "${ECHO_T}$LD" >&6; } | 3569 | echo "${ECHO_T}$LD" >&6 |
4277 | else | 3570 | else |
4278 | { echo "$as_me:$LINENO: result: no" >&5 | 3571 | echo "$as_me:$LINENO: result: no" >&5 |
4279 | echo "${ECHO_T}no" >&6; } | 3572 | echo "${ECHO_T}no" >&6 |
4280 | fi | 3573 | fi |
4281 | test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 | 3574 | test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 |
4282 | echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} | 3575 | echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} |
4283 | { (exit 1); exit 1; }; } | 3576 | { (exit 1); exit 1; }; } |
4284 | { echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 | 3577 | echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 |
4285 | echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } | 3578 | echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 |
4286 | if test "${lt_cv_prog_gnu_ld+set}" = set; then | 3579 | if test "${lt_cv_prog_gnu_ld+set}" = set; then |
4287 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3580 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
4288 | else | 3581 | else |
@@ -4296,20 +3589,20 @@ case `$LD -v 2>&1 </dev/null` in | |||
4296 | ;; | 3589 | ;; |
4297 | esac | 3590 | esac |
4298 | fi | 3591 | fi |
4299 | { echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 | 3592 | echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 |
4300 | echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } | 3593 | echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 |
4301 | with_gnu_ld=$lt_cv_prog_gnu_ld | 3594 | with_gnu_ld=$lt_cv_prog_gnu_ld |
4302 | 3595 | ||
4303 | 3596 | ||
4304 | { echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 | 3597 | echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 |
4305 | echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } | 3598 | echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 |
4306 | if test "${lt_cv_ld_reload_flag+set}" = set; then | 3599 | if test "${lt_cv_ld_reload_flag+set}" = set; then |
4307 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3600 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
4308 | else | 3601 | else |
4309 | lt_cv_ld_reload_flag='-r' | 3602 | lt_cv_ld_reload_flag='-r' |
4310 | fi | 3603 | fi |
4311 | { echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 | 3604 | echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 |
4312 | echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } | 3605 | echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 |
4313 | reload_flag=$lt_cv_ld_reload_flag | 3606 | reload_flag=$lt_cv_ld_reload_flag |
4314 | case $reload_flag in | 3607 | case $reload_flag in |
4315 | "" | " "*) ;; | 3608 | "" | " "*) ;; |
@@ -4326,8 +3619,8 @@ case $host_os in | |||
4326 | ;; | 3619 | ;; |
4327 | esac | 3620 | esac |
4328 | 3621 | ||
4329 | { echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 | 3622 | echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 |
4330 | echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } | 3623 | echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 |
4331 | if test "${lt_cv_path_NM+set}" = set; then | 3624 | if test "${lt_cv_path_NM+set}" = set; then |
4332 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3625 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
4333 | else | 3626 | else |
@@ -4375,23 +3668,23 @@ else | |||
4375 | test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm | 3668 | test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm |
4376 | fi | 3669 | fi |
4377 | fi | 3670 | fi |
4378 | { echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 | 3671 | echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 |
4379 | echo "${ECHO_T}$lt_cv_path_NM" >&6; } | 3672 | echo "${ECHO_T}$lt_cv_path_NM" >&6 |
4380 | NM="$lt_cv_path_NM" | 3673 | NM="$lt_cv_path_NM" |
4381 | 3674 | ||
4382 | { echo "$as_me:$LINENO: checking whether ln -s works" >&5 | 3675 | echo "$as_me:$LINENO: checking whether ln -s works" >&5 |
4383 | echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } | 3676 | echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 |
4384 | LN_S=$as_ln_s | 3677 | LN_S=$as_ln_s |
4385 | if test "$LN_S" = "ln -s"; then | 3678 | if test "$LN_S" = "ln -s"; then |
4386 | { echo "$as_me:$LINENO: result: yes" >&5 | 3679 | echo "$as_me:$LINENO: result: yes" >&5 |
4387 | echo "${ECHO_T}yes" >&6; } | 3680 | echo "${ECHO_T}yes" >&6 |
4388 | else | 3681 | else |
4389 | { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 | 3682 | echo "$as_me:$LINENO: result: no, using $LN_S" >&5 |
4390 | echo "${ECHO_T}no, using $LN_S" >&6; } | 3683 | echo "${ECHO_T}no, using $LN_S" >&6 |
4391 | fi | 3684 | fi |
4392 | 3685 | ||
4393 | { echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 | 3686 | echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 |
4394 | echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } | 3687 | echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 |
4395 | if test "${lt_cv_deplibs_check_method+set}" = set; then | 3688 | if test "${lt_cv_deplibs_check_method+set}" = set; then |
4396 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3689 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
4397 | else | 3690 | else |
@@ -4441,7 +3734,7 @@ darwin* | rhapsody*) | |||
4441 | lt_cv_deplibs_check_method=pass_all | 3734 | lt_cv_deplibs_check_method=pass_all |
4442 | ;; | 3735 | ;; |
4443 | 3736 | ||
4444 | freebsd* | dragonfly*) | 3737 | freebsd* | kfreebsd*-gnu | dragonfly*) |
4445 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | 3738 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
4446 | case $host_cpu in | 3739 | case $host_cpu in |
4447 | i*86 ) | 3740 | i*86 ) |
@@ -4495,11 +3788,11 @@ irix5* | irix6* | nonstopux*) | |||
4495 | ;; | 3788 | ;; |
4496 | 3789 | ||
4497 | # This must be Linux ELF. | 3790 | # This must be Linux ELF. |
4498 | linux* | k*bsd*-gnu) | 3791 | linux*) |
4499 | lt_cv_deplibs_check_method=pass_all | 3792 | lt_cv_deplibs_check_method=pass_all |
4500 | ;; | 3793 | ;; |
4501 | 3794 | ||
4502 | netbsd* | netbsdelf*-gnu) | 3795 | netbsd*) |
4503 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | 3796 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
4504 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' | 3797 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' |
4505 | else | 3798 | else |
@@ -4566,8 +3859,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) | |||
4566 | esac | 3859 | esac |
4567 | 3860 | ||
4568 | fi | 3861 | fi |
4569 | { echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 | 3862 | echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 |
4570 | echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } | 3863 | echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 |
4571 | file_magic_cmd=$lt_cv_file_magic_cmd | 3864 | file_magic_cmd=$lt_cv_file_magic_cmd |
4572 | deplibs_check_method=$lt_cv_deplibs_check_method | 3865 | deplibs_check_method=$lt_cv_deplibs_check_method |
4573 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 3866 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
@@ -4584,11 +3877,11 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"} | |||
4584 | # Allow CC to be a program name with arguments. | 3877 | # Allow CC to be a program name with arguments. |
4585 | compiler=$CC | 3878 | compiler=$CC |
4586 | 3879 | ||
4587 | # Check whether --enable-libtool-lock was given. | 3880 | # Check whether --enable-libtool-lock or --disable-libtool-lock was given. |
4588 | if test "${enable_libtool_lock+set}" = set; then | 3881 | if test "${enable_libtool_lock+set}" = set; then |
4589 | enableval=$enable_libtool_lock; | 3882 | enableval="$enable_libtool_lock" |
4590 | fi | ||
4591 | 3883 | ||
3884 | fi; | ||
4592 | test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes | 3885 | test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes |
4593 | 3886 | ||
4594 | # Some flags need to be propagated to the compiler or linker for good | 3887 | # Some flags need to be propagated to the compiler or linker for good |
@@ -4615,7 +3908,7 @@ ia64-*-hpux*) | |||
4615 | ;; | 3908 | ;; |
4616 | *-*-irix6*) | 3909 | *-*-irix6*) |
4617 | # Find out which ABI we are using. | 3910 | # Find out which ABI we are using. |
4618 | echo '#line 4618 "configure"' > conftest.$ac_ext | 3911 | echo '#line 3911 "configure"' > conftest.$ac_ext |
4619 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | 3912 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
4620 | (eval $ac_compile) 2>&5 | 3913 | (eval $ac_compile) 2>&5 |
4621 | ac_status=$? | 3914 | ac_status=$? |
@@ -4700,8 +3993,8 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) | |||
4700 | # On SCO OpenServer 5, we need -belf to get full-featured binaries. | 3993 | # On SCO OpenServer 5, we need -belf to get full-featured binaries. |
4701 | SAVE_CFLAGS="$CFLAGS" | 3994 | SAVE_CFLAGS="$CFLAGS" |
4702 | CFLAGS="$CFLAGS -belf" | 3995 | CFLAGS="$CFLAGS -belf" |
4703 | { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 | 3996 | echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 |
4704 | echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } | 3997 | echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 |
4705 | if test "${lt_cv_cc_needs_belf+set}" = set; then | 3998 | if test "${lt_cv_cc_needs_belf+set}" = set; then |
4706 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3999 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
4707 | else | 4000 | else |
@@ -4727,36 +4020,24 @@ main () | |||
4727 | } | 4020 | } |
4728 | _ACEOF | 4021 | _ACEOF |
4729 | rm -f conftest.$ac_objext conftest$ac_exeext | 4022 | rm -f conftest.$ac_objext conftest$ac_exeext |
4730 | if { (ac_try="$ac_link" | 4023 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
4731 | case "(($ac_try" in | 4024 | (eval $ac_link) 2>conftest.er1 |
4732 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
4733 | *) ac_try_echo=$ac_try;; | ||
4734 | esac | ||
4735 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4736 | (eval "$ac_link") 2>conftest.er1 | ||
4737 | ac_status=$? | 4025 | ac_status=$? |
4738 | grep -v '^ *+' conftest.er1 >conftest.err | 4026 | grep -v '^ *+' conftest.er1 >conftest.err |
4739 | rm -f conftest.er1 | 4027 | rm -f conftest.er1 |
4740 | cat conftest.err >&5 | 4028 | cat conftest.err >&5 |
4741 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4029 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4742 | (exit $ac_status); } && | 4030 | (exit $ac_status); } && |
4743 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 4031 | { ac_try='test -z "$ac_c_werror_flag" |
4744 | { (case "(($ac_try" in | 4032 | || test ! -s conftest.err' |
4745 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 4033 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
4746 | *) ac_try_echo=$ac_try;; | 4034 | (eval $ac_try) 2>&5 |
4747 | esac | ||
4748 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4749 | (eval "$ac_try") 2>&5 | ||
4750 | ac_status=$? | 4035 | ac_status=$? |
4751 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4036 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4752 | (exit $ac_status); }; } && | 4037 | (exit $ac_status); }; } && |
4753 | { ac_try='test -s conftest$ac_exeext' | 4038 | { ac_try='test -s conftest$ac_exeext' |
4754 | { (case "(($ac_try" in | 4039 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
4755 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 4040 | (eval $ac_try) 2>&5 |
4756 | *) ac_try_echo=$ac_try;; | ||
4757 | esac | ||
4758 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
4759 | (eval "$ac_try") 2>&5 | ||
4760 | ac_status=$? | 4041 | ac_status=$? |
4761 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4042 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4762 | (exit $ac_status); }; }; then | 4043 | (exit $ac_status); }; }; then |
@@ -4765,10 +4046,9 @@ else | |||
4765 | echo "$as_me: failed program was:" >&5 | 4046 | echo "$as_me: failed program was:" >&5 |
4766 | sed 's/^/| /' conftest.$ac_ext >&5 | 4047 | sed 's/^/| /' conftest.$ac_ext >&5 |
4767 | 4048 | ||
4768 | lt_cv_cc_needs_belf=no | 4049 | lt_cv_cc_needs_belf=no |
4769 | fi | 4050 | fi |
4770 | 4051 | rm -f conftest.err conftest.$ac_objext \ | |
4771 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
4772 | conftest$ac_exeext conftest.$ac_ext | 4052 | conftest$ac_exeext conftest.$ac_ext |
4773 | ac_ext=c | 4053 | ac_ext=c |
4774 | ac_cpp='$CPP $CPPFLAGS' | 4054 | ac_cpp='$CPP $CPPFLAGS' |
@@ -4777,8 +4057,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ | |||
4777 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 4057 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
4778 | 4058 | ||
4779 | fi | 4059 | fi |
4780 | { echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 | 4060 | echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 |
4781 | echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } | 4061 | echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 |
4782 | if test x"$lt_cv_cc_needs_belf" != x"yes"; then | 4062 | if test x"$lt_cv_cc_needs_belf" != x"yes"; then |
4783 | # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf | 4063 | # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf |
4784 | CFLAGS="$SAVE_CFLAGS" | 4064 | CFLAGS="$SAVE_CFLAGS" |
@@ -4808,8 +4088,8 @@ sparc*-*solaris*) | |||
4808 | if test -n "$ac_tool_prefix"; then | 4088 | if test -n "$ac_tool_prefix"; then |
4809 | # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | 4089 | # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
4810 | set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | 4090 | set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
4811 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 4091 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4812 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 4092 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
4813 | if test "${ac_cv_prog_DLLTOOL+set}" = set; then | 4093 | if test "${ac_cv_prog_DLLTOOL+set}" = set; then |
4814 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4094 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
4815 | else | 4095 | else |
@@ -4822,34 +4102,32 @@ do | |||
4822 | IFS=$as_save_IFS | 4102 | IFS=$as_save_IFS |
4823 | test -z "$as_dir" && as_dir=. | 4103 | test -z "$as_dir" && as_dir=. |
4824 | for ac_exec_ext in '' $ac_executable_extensions; do | 4104 | for ac_exec_ext in '' $ac_executable_extensions; do |
4825 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 4105 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4826 | ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | 4106 | ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
4827 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4107 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4828 | break 2 | 4108 | break 2 |
4829 | fi | 4109 | fi |
4830 | done | 4110 | done |
4831 | done | 4111 | done |
4832 | IFS=$as_save_IFS | ||
4833 | 4112 | ||
4834 | fi | 4113 | fi |
4835 | fi | 4114 | fi |
4836 | DLLTOOL=$ac_cv_prog_DLLTOOL | 4115 | DLLTOOL=$ac_cv_prog_DLLTOOL |
4837 | if test -n "$DLLTOOL"; then | 4116 | if test -n "$DLLTOOL"; then |
4838 | { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 | 4117 | echo "$as_me:$LINENO: result: $DLLTOOL" >&5 |
4839 | echo "${ECHO_T}$DLLTOOL" >&6; } | 4118 | echo "${ECHO_T}$DLLTOOL" >&6 |
4840 | else | 4119 | else |
4841 | { echo "$as_me:$LINENO: result: no" >&5 | 4120 | echo "$as_me:$LINENO: result: no" >&5 |
4842 | echo "${ECHO_T}no" >&6; } | 4121 | echo "${ECHO_T}no" >&6 |
4843 | fi | 4122 | fi |
4844 | 4123 | ||
4845 | |||
4846 | fi | 4124 | fi |
4847 | if test -z "$ac_cv_prog_DLLTOOL"; then | 4125 | if test -z "$ac_cv_prog_DLLTOOL"; then |
4848 | ac_ct_DLLTOOL=$DLLTOOL | 4126 | ac_ct_DLLTOOL=$DLLTOOL |
4849 | # Extract the first word of "dlltool", so it can be a program name with args. | 4127 | # Extract the first word of "dlltool", so it can be a program name with args. |
4850 | set dummy dlltool; ac_word=$2 | 4128 | set dummy dlltool; ac_word=$2 |
4851 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 4129 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4852 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 4130 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
4853 | if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then | 4131 | if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then |
4854 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4132 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
4855 | else | 4133 | else |
@@ -4862,41 +4140,27 @@ do | |||
4862 | IFS=$as_save_IFS | 4140 | IFS=$as_save_IFS |
4863 | test -z "$as_dir" && as_dir=. | 4141 | test -z "$as_dir" && as_dir=. |
4864 | for ac_exec_ext in '' $ac_executable_extensions; do | 4142 | for ac_exec_ext in '' $ac_executable_extensions; do |
4865 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 4143 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4866 | ac_cv_prog_ac_ct_DLLTOOL="dlltool" | 4144 | ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
4867 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4145 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4868 | break 2 | 4146 | break 2 |
4869 | fi | 4147 | fi |
4870 | done | 4148 | done |
4871 | done | 4149 | done |
4872 | IFS=$as_save_IFS | ||
4873 | 4150 | ||
4151 | test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false" | ||
4874 | fi | 4152 | fi |
4875 | fi | 4153 | fi |
4876 | ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | 4154 | ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
4877 | if test -n "$ac_ct_DLLTOOL"; then | 4155 | if test -n "$ac_ct_DLLTOOL"; then |
4878 | { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 | 4156 | echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 |
4879 | echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } | 4157 | echo "${ECHO_T}$ac_ct_DLLTOOL" >&6 |
4880 | else | 4158 | else |
4881 | { echo "$as_me:$LINENO: result: no" >&5 | 4159 | echo "$as_me:$LINENO: result: no" >&5 |
4882 | echo "${ECHO_T}no" >&6; } | 4160 | echo "${ECHO_T}no" >&6 |
4883 | fi | 4161 | fi |
4884 | 4162 | ||
4885 | if test "x$ac_ct_DLLTOOL" = x; then | 4163 | DLLTOOL=$ac_ct_DLLTOOL |
4886 | DLLTOOL="false" | ||
4887 | else | ||
4888 | case $cross_compiling:$ac_tool_warned in | ||
4889 | yes:) | ||
4890 | { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
4891 | whose name does not start with the host triplet. If you think this | ||
4892 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
4893 | echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
4894 | whose name does not start with the host triplet. If you think this | ||
4895 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
4896 | ac_tool_warned=yes ;; | ||
4897 | esac | ||
4898 | DLLTOOL=$ac_ct_DLLTOOL | ||
4899 | fi | ||
4900 | else | 4164 | else |
4901 | DLLTOOL="$ac_cv_prog_DLLTOOL" | 4165 | DLLTOOL="$ac_cv_prog_DLLTOOL" |
4902 | fi | 4166 | fi |
@@ -4904,8 +4168,8 @@ fi | |||
4904 | if test -n "$ac_tool_prefix"; then | 4168 | if test -n "$ac_tool_prefix"; then |
4905 | # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. | 4169 | # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. |
4906 | set dummy ${ac_tool_prefix}as; ac_word=$2 | 4170 | set dummy ${ac_tool_prefix}as; ac_word=$2 |
4907 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 4171 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4908 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 4172 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
4909 | if test "${ac_cv_prog_AS+set}" = set; then | 4173 | if test "${ac_cv_prog_AS+set}" = set; then |
4910 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4174 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
4911 | else | 4175 | else |
@@ -4918,34 +4182,32 @@ do | |||
4918 | IFS=$as_save_IFS | 4182 | IFS=$as_save_IFS |
4919 | test -z "$as_dir" && as_dir=. | 4183 | test -z "$as_dir" && as_dir=. |
4920 | for ac_exec_ext in '' $ac_executable_extensions; do | 4184 | for ac_exec_ext in '' $ac_executable_extensions; do |
4921 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 4185 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4922 | ac_cv_prog_AS="${ac_tool_prefix}as" | 4186 | ac_cv_prog_AS="${ac_tool_prefix}as" |
4923 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4187 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4924 | break 2 | 4188 | break 2 |
4925 | fi | 4189 | fi |
4926 | done | 4190 | done |
4927 | done | 4191 | done |
4928 | IFS=$as_save_IFS | ||
4929 | 4192 | ||
4930 | fi | 4193 | fi |
4931 | fi | 4194 | fi |
4932 | AS=$ac_cv_prog_AS | 4195 | AS=$ac_cv_prog_AS |
4933 | if test -n "$AS"; then | 4196 | if test -n "$AS"; then |
4934 | { echo "$as_me:$LINENO: result: $AS" >&5 | 4197 | echo "$as_me:$LINENO: result: $AS" >&5 |
4935 | echo "${ECHO_T}$AS" >&6; } | 4198 | echo "${ECHO_T}$AS" >&6 |
4936 | else | 4199 | else |
4937 | { echo "$as_me:$LINENO: result: no" >&5 | 4200 | echo "$as_me:$LINENO: result: no" >&5 |
4938 | echo "${ECHO_T}no" >&6; } | 4201 | echo "${ECHO_T}no" >&6 |
4939 | fi | 4202 | fi |
4940 | 4203 | ||
4941 | |||
4942 | fi | 4204 | fi |
4943 | if test -z "$ac_cv_prog_AS"; then | 4205 | if test -z "$ac_cv_prog_AS"; then |
4944 | ac_ct_AS=$AS | 4206 | ac_ct_AS=$AS |
4945 | # Extract the first word of "as", so it can be a program name with args. | 4207 | # Extract the first word of "as", so it can be a program name with args. |
4946 | set dummy as; ac_word=$2 | 4208 | set dummy as; ac_word=$2 |
4947 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 4209 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4948 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 4210 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
4949 | if test "${ac_cv_prog_ac_ct_AS+set}" = set; then | 4211 | if test "${ac_cv_prog_ac_ct_AS+set}" = set; then |
4950 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4212 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
4951 | else | 4213 | else |
@@ -4958,41 +4220,27 @@ do | |||
4958 | IFS=$as_save_IFS | 4220 | IFS=$as_save_IFS |
4959 | test -z "$as_dir" && as_dir=. | 4221 | test -z "$as_dir" && as_dir=. |
4960 | for ac_exec_ext in '' $ac_executable_extensions; do | 4222 | for ac_exec_ext in '' $ac_executable_extensions; do |
4961 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 4223 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4962 | ac_cv_prog_ac_ct_AS="as" | 4224 | ac_cv_prog_ac_ct_AS="as" |
4963 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4225 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4964 | break 2 | 4226 | break 2 |
4965 | fi | 4227 | fi |
4966 | done | 4228 | done |
4967 | done | 4229 | done |
4968 | IFS=$as_save_IFS | ||
4969 | 4230 | ||
4231 | test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false" | ||
4970 | fi | 4232 | fi |
4971 | fi | 4233 | fi |
4972 | ac_ct_AS=$ac_cv_prog_ac_ct_AS | 4234 | ac_ct_AS=$ac_cv_prog_ac_ct_AS |
4973 | if test -n "$ac_ct_AS"; then | 4235 | if test -n "$ac_ct_AS"; then |
4974 | { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 | 4236 | echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 |
4975 | echo "${ECHO_T}$ac_ct_AS" >&6; } | 4237 | echo "${ECHO_T}$ac_ct_AS" >&6 |
4976 | else | 4238 | else |
4977 | { echo "$as_me:$LINENO: result: no" >&5 | 4239 | echo "$as_me:$LINENO: result: no" >&5 |
4978 | echo "${ECHO_T}no" >&6; } | 4240 | echo "${ECHO_T}no" >&6 |
4979 | fi | 4241 | fi |
4980 | 4242 | ||
4981 | if test "x$ac_ct_AS" = x; then | 4243 | AS=$ac_ct_AS |
4982 | AS="false" | ||
4983 | else | ||
4984 | case $cross_compiling:$ac_tool_warned in | ||
4985 | yes:) | ||
4986 | { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
4987 | whose name does not start with the host triplet. If you think this | ||
4988 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
4989 | echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
4990 | whose name does not start with the host triplet. If you think this | ||
4991 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
4992 | ac_tool_warned=yes ;; | ||
4993 | esac | ||
4994 | AS=$ac_ct_AS | ||
4995 | fi | ||
4996 | else | 4244 | else |
4997 | AS="$ac_cv_prog_AS" | 4245 | AS="$ac_cv_prog_AS" |
4998 | fi | 4246 | fi |
@@ -5000,8 +4248,8 @@ fi | |||
5000 | if test -n "$ac_tool_prefix"; then | 4248 | if test -n "$ac_tool_prefix"; then |
5001 | # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. | 4249 | # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. |
5002 | set dummy ${ac_tool_prefix}objdump; ac_word=$2 | 4250 | set dummy ${ac_tool_prefix}objdump; ac_word=$2 |
5003 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 4251 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
5004 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 4252 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
5005 | if test "${ac_cv_prog_OBJDUMP+set}" = set; then | 4253 | if test "${ac_cv_prog_OBJDUMP+set}" = set; then |
5006 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4254 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
5007 | else | 4255 | else |
@@ -5014,34 +4262,32 @@ do | |||
5014 | IFS=$as_save_IFS | 4262 | IFS=$as_save_IFS |
5015 | test -z "$as_dir" && as_dir=. | 4263 | test -z "$as_dir" && as_dir=. |
5016 | for ac_exec_ext in '' $ac_executable_extensions; do | 4264 | for ac_exec_ext in '' $ac_executable_extensions; do |
5017 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 4265 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
5018 | ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" | 4266 | ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" |
5019 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4267 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
5020 | break 2 | 4268 | break 2 |
5021 | fi | 4269 | fi |
5022 | done | 4270 | done |
5023 | done | 4271 | done |
5024 | IFS=$as_save_IFS | ||
5025 | 4272 | ||
5026 | fi | 4273 | fi |
5027 | fi | 4274 | fi |
5028 | OBJDUMP=$ac_cv_prog_OBJDUMP | 4275 | OBJDUMP=$ac_cv_prog_OBJDUMP |
5029 | if test -n "$OBJDUMP"; then | 4276 | if test -n "$OBJDUMP"; then |
5030 | { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 | 4277 | echo "$as_me:$LINENO: result: $OBJDUMP" >&5 |
5031 | echo "${ECHO_T}$OBJDUMP" >&6; } | 4278 | echo "${ECHO_T}$OBJDUMP" >&6 |
5032 | else | 4279 | else |
5033 | { echo "$as_me:$LINENO: result: no" >&5 | 4280 | echo "$as_me:$LINENO: result: no" >&5 |
5034 | echo "${ECHO_T}no" >&6; } | 4281 | echo "${ECHO_T}no" >&6 |
5035 | fi | 4282 | fi |
5036 | 4283 | ||
5037 | |||
5038 | fi | 4284 | fi |
5039 | if test -z "$ac_cv_prog_OBJDUMP"; then | 4285 | if test -z "$ac_cv_prog_OBJDUMP"; then |
5040 | ac_ct_OBJDUMP=$OBJDUMP | 4286 | ac_ct_OBJDUMP=$OBJDUMP |
5041 | # Extract the first word of "objdump", so it can be a program name with args. | 4287 | # Extract the first word of "objdump", so it can be a program name with args. |
5042 | set dummy objdump; ac_word=$2 | 4288 | set dummy objdump; ac_word=$2 |
5043 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 4289 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
5044 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 4290 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
5045 | if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then | 4291 | if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then |
5046 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4292 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
5047 | else | 4293 | else |
@@ -5054,41 +4300,27 @@ do | |||
5054 | IFS=$as_save_IFS | 4300 | IFS=$as_save_IFS |
5055 | test -z "$as_dir" && as_dir=. | 4301 | test -z "$as_dir" && as_dir=. |
5056 | for ac_exec_ext in '' $ac_executable_extensions; do | 4302 | for ac_exec_ext in '' $ac_executable_extensions; do |
5057 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 4303 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
5058 | ac_cv_prog_ac_ct_OBJDUMP="objdump" | 4304 | ac_cv_prog_ac_ct_OBJDUMP="objdump" |
5059 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4305 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
5060 | break 2 | 4306 | break 2 |
5061 | fi | 4307 | fi |
5062 | done | 4308 | done |
5063 | done | 4309 | done |
5064 | IFS=$as_save_IFS | ||
5065 | 4310 | ||
4311 | test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false" | ||
5066 | fi | 4312 | fi |
5067 | fi | 4313 | fi |
5068 | ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP | 4314 | ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP |
5069 | if test -n "$ac_ct_OBJDUMP"; then | 4315 | if test -n "$ac_ct_OBJDUMP"; then |
5070 | { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 | 4316 | echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 |
5071 | echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } | 4317 | echo "${ECHO_T}$ac_ct_OBJDUMP" >&6 |
5072 | else | 4318 | else |
5073 | { echo "$as_me:$LINENO: result: no" >&5 | 4319 | echo "$as_me:$LINENO: result: no" >&5 |
5074 | echo "${ECHO_T}no" >&6; } | 4320 | echo "${ECHO_T}no" >&6 |
5075 | fi | 4321 | fi |
5076 | 4322 | ||
5077 | if test "x$ac_ct_OBJDUMP" = x; then | 4323 | OBJDUMP=$ac_ct_OBJDUMP |
5078 | OBJDUMP="false" | ||
5079 | else | ||
5080 | case $cross_compiling:$ac_tool_warned in | ||
5081 | yes:) | ||
5082 | { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
5083 | whose name does not start with the host triplet. If you think this | ||
5084 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
5085 | echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
5086 | whose name does not start with the host triplet. If you think this | ||
5087 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
5088 | ac_tool_warned=yes ;; | ||
5089 | esac | ||
5090 | OBJDUMP=$ac_ct_OBJDUMP | ||
5091 | fi | ||
5092 | else | 4324 | else |
5093 | OBJDUMP="$ac_cv_prog_OBJDUMP" | 4325 | OBJDUMP="$ac_cv_prog_OBJDUMP" |
5094 | fi | 4326 | fi |
@@ -5105,8 +4337,8 @@ ac_cpp='$CPP $CPPFLAGS' | |||
5105 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 4337 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
5106 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 4338 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
5107 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 4339 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
5108 | { echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 | 4340 | echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 |
5109 | echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } | 4341 | echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 |
5110 | # On Suns, sometimes $CPP names a directory. | 4342 | # On Suns, sometimes $CPP names a directory. |
5111 | if test -n "$CPP" && test -d "$CPP"; then | 4343 | if test -n "$CPP" && test -d "$CPP"; then |
5112 | CPP= | 4344 | CPP= |
@@ -5140,13 +4372,8 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
5140 | #endif | 4372 | #endif |
5141 | Syntax error | 4373 | Syntax error |
5142 | _ACEOF | 4374 | _ACEOF |
5143 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 4375 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
5144 | case "(($ac_try" in | 4376 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
5145 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5146 | *) ac_try_echo=$ac_try;; | ||
5147 | esac | ||
5148 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5149 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
5150 | ac_status=$? | 4377 | ac_status=$? |
5151 | grep -v '^ *+' conftest.er1 >conftest.err | 4378 | grep -v '^ *+' conftest.er1 >conftest.err |
5152 | rm -f conftest.er1 | 4379 | rm -f conftest.er1 |
@@ -5171,10 +4398,9 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
5171 | # Broken: fails on valid input. | 4398 | # Broken: fails on valid input. |
5172 | continue | 4399 | continue |
5173 | fi | 4400 | fi |
5174 | |||
5175 | rm -f conftest.err conftest.$ac_ext | 4401 | rm -f conftest.err conftest.$ac_ext |
5176 | 4402 | ||
5177 | # OK, works on sane cases. Now check whether nonexistent headers | 4403 | # OK, works on sane cases. Now check whether non-existent headers |
5178 | # can be detected and how. | 4404 | # can be detected and how. |
5179 | cat >conftest.$ac_ext <<_ACEOF | 4405 | cat >conftest.$ac_ext <<_ACEOF |
5180 | /* confdefs.h. */ | 4406 | /* confdefs.h. */ |
@@ -5184,13 +4410,8 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
5184 | /* end confdefs.h. */ | 4410 | /* end confdefs.h. */ |
5185 | #include <ac_nonexistent.h> | 4411 | #include <ac_nonexistent.h> |
5186 | _ACEOF | 4412 | _ACEOF |
5187 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 4413 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
5188 | case "(($ac_try" in | 4414 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
5189 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5190 | *) ac_try_echo=$ac_try;; | ||
5191 | esac | ||
5192 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5193 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
5194 | ac_status=$? | 4415 | ac_status=$? |
5195 | grep -v '^ *+' conftest.er1 >conftest.err | 4416 | grep -v '^ *+' conftest.er1 >conftest.err |
5196 | rm -f conftest.er1 | 4417 | rm -f conftest.er1 |
@@ -5217,7 +4438,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
5217 | ac_preproc_ok=: | 4438 | ac_preproc_ok=: |
5218 | break | 4439 | break |
5219 | fi | 4440 | fi |
5220 | |||
5221 | rm -f conftest.err conftest.$ac_ext | 4441 | rm -f conftest.err conftest.$ac_ext |
5222 | 4442 | ||
5223 | done | 4443 | done |
@@ -5235,8 +4455,8 @@ fi | |||
5235 | else | 4455 | else |
5236 | ac_cv_prog_CPP=$CPP | 4456 | ac_cv_prog_CPP=$CPP |
5237 | fi | 4457 | fi |
5238 | { echo "$as_me:$LINENO: result: $CPP" >&5 | 4458 | echo "$as_me:$LINENO: result: $CPP" >&5 |
5239 | echo "${ECHO_T}$CPP" >&6; } | 4459 | echo "${ECHO_T}$CPP" >&6 |
5240 | ac_preproc_ok=false | 4460 | ac_preproc_ok=false |
5241 | for ac_c_preproc_warn_flag in '' yes | 4461 | for ac_c_preproc_warn_flag in '' yes |
5242 | do | 4462 | do |
@@ -5259,13 +4479,8 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
5259 | #endif | 4479 | #endif |
5260 | Syntax error | 4480 | Syntax error |
5261 | _ACEOF | 4481 | _ACEOF |
5262 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 4482 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
5263 | case "(($ac_try" in | 4483 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
5264 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5265 | *) ac_try_echo=$ac_try;; | ||
5266 | esac | ||
5267 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5268 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
5269 | ac_status=$? | 4484 | ac_status=$? |
5270 | grep -v '^ *+' conftest.er1 >conftest.err | 4485 | grep -v '^ *+' conftest.er1 >conftest.err |
5271 | rm -f conftest.er1 | 4486 | rm -f conftest.er1 |
@@ -5290,10 +4505,9 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
5290 | # Broken: fails on valid input. | 4505 | # Broken: fails on valid input. |
5291 | continue | 4506 | continue |
5292 | fi | 4507 | fi |
5293 | |||
5294 | rm -f conftest.err conftest.$ac_ext | 4508 | rm -f conftest.err conftest.$ac_ext |
5295 | 4509 | ||
5296 | # OK, works on sane cases. Now check whether nonexistent headers | 4510 | # OK, works on sane cases. Now check whether non-existent headers |
5297 | # can be detected and how. | 4511 | # can be detected and how. |
5298 | cat >conftest.$ac_ext <<_ACEOF | 4512 | cat >conftest.$ac_ext <<_ACEOF |
5299 | /* confdefs.h. */ | 4513 | /* confdefs.h. */ |
@@ -5303,13 +4517,8 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
5303 | /* end confdefs.h. */ | 4517 | /* end confdefs.h. */ |
5304 | #include <ac_nonexistent.h> | 4518 | #include <ac_nonexistent.h> |
5305 | _ACEOF | 4519 | _ACEOF |
5306 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 4520 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
5307 | case "(($ac_try" in | 4521 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
5308 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5309 | *) ac_try_echo=$ac_try;; | ||
5310 | esac | ||
5311 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5312 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
5313 | ac_status=$? | 4522 | ac_status=$? |
5314 | grep -v '^ *+' conftest.er1 >conftest.err | 4523 | grep -v '^ *+' conftest.er1 >conftest.err |
5315 | rm -f conftest.er1 | 4524 | rm -f conftest.er1 |
@@ -5336,7 +4545,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
5336 | ac_preproc_ok=: | 4545 | ac_preproc_ok=: |
5337 | break | 4546 | break |
5338 | fi | 4547 | fi |
5339 | |||
5340 | rm -f conftest.err conftest.$ac_ext | 4548 | rm -f conftest.err conftest.$ac_ext |
5341 | 4549 | ||
5342 | done | 4550 | done |
@@ -5359,8 +4567,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ | |||
5359 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 4567 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
5360 | 4568 | ||
5361 | 4569 | ||
5362 | { echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | 4570 | echo "$as_me:$LINENO: checking for ANSI C header files" >&5 |
5363 | echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } | 4571 | echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 |
5364 | if test "${ac_cv_header_stdc+set}" = set; then | 4572 | if test "${ac_cv_header_stdc+set}" = set; then |
5365 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4573 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
5366 | else | 4574 | else |
@@ -5384,36 +4592,24 @@ main () | |||
5384 | } | 4592 | } |
5385 | _ACEOF | 4593 | _ACEOF |
5386 | rm -f conftest.$ac_objext | 4594 | rm -f conftest.$ac_objext |
5387 | if { (ac_try="$ac_compile" | 4595 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
5388 | case "(($ac_try" in | 4596 | (eval $ac_compile) 2>conftest.er1 |
5389 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5390 | *) ac_try_echo=$ac_try;; | ||
5391 | esac | ||
5392 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5393 | (eval "$ac_compile") 2>conftest.er1 | ||
5394 | ac_status=$? | 4597 | ac_status=$? |
5395 | grep -v '^ *+' conftest.er1 >conftest.err | 4598 | grep -v '^ *+' conftest.er1 >conftest.err |
5396 | rm -f conftest.er1 | 4599 | rm -f conftest.er1 |
5397 | cat conftest.err >&5 | 4600 | cat conftest.err >&5 |
5398 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4601 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5399 | (exit $ac_status); } && | 4602 | (exit $ac_status); } && |
5400 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 4603 | { ac_try='test -z "$ac_c_werror_flag" |
5401 | { (case "(($ac_try" in | 4604 | || test ! -s conftest.err' |
5402 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 4605 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
5403 | *) ac_try_echo=$ac_try;; | 4606 | (eval $ac_try) 2>&5 |
5404 | esac | ||
5405 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5406 | (eval "$ac_try") 2>&5 | ||
5407 | ac_status=$? | 4607 | ac_status=$? |
5408 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4608 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5409 | (exit $ac_status); }; } && | 4609 | (exit $ac_status); }; } && |
5410 | { ac_try='test -s conftest.$ac_objext' | 4610 | { ac_try='test -s conftest.$ac_objext' |
5411 | { (case "(($ac_try" in | 4611 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
5412 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 4612 | (eval $ac_try) 2>&5 |
5413 | *) ac_try_echo=$ac_try;; | ||
5414 | esac | ||
5415 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5416 | (eval "$ac_try") 2>&5 | ||
5417 | ac_status=$? | 4613 | ac_status=$? |
5418 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4614 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5419 | (exit $ac_status); }; }; then | 4615 | (exit $ac_status); }; }; then |
@@ -5422,10 +4618,9 @@ else | |||
5422 | echo "$as_me: failed program was:" >&5 | 4618 | echo "$as_me: failed program was:" >&5 |
5423 | sed 's/^/| /' conftest.$ac_ext >&5 | 4619 | sed 's/^/| /' conftest.$ac_ext >&5 |
5424 | 4620 | ||
5425 | ac_cv_header_stdc=no | 4621 | ac_cv_header_stdc=no |
5426 | fi | 4622 | fi |
5427 | 4623 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
5428 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5429 | 4624 | ||
5430 | if test $ac_cv_header_stdc = yes; then | 4625 | if test $ac_cv_header_stdc = yes; then |
5431 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | 4626 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. |
@@ -5481,7 +4676,6 @@ cat confdefs.h >>conftest.$ac_ext | |||
5481 | cat >>conftest.$ac_ext <<_ACEOF | 4676 | cat >>conftest.$ac_ext <<_ACEOF |
5482 | /* end confdefs.h. */ | 4677 | /* end confdefs.h. */ |
5483 | #include <ctype.h> | 4678 | #include <ctype.h> |
5484 | #include <stdlib.h> | ||
5485 | #if ((' ' & 0x0FF) == 0x020) | 4679 | #if ((' ' & 0x0FF) == 0x020) |
5486 | # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | 4680 | # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') |
5487 | # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | 4681 | # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) |
@@ -5501,27 +4695,18 @@ main () | |||
5501 | for (i = 0; i < 256; i++) | 4695 | for (i = 0; i < 256; i++) |
5502 | if (XOR (islower (i), ISLOWER (i)) | 4696 | if (XOR (islower (i), ISLOWER (i)) |
5503 | || toupper (i) != TOUPPER (i)) | 4697 | || toupper (i) != TOUPPER (i)) |
5504 | return 2; | 4698 | exit(2); |
5505 | return 0; | 4699 | exit (0); |
5506 | } | 4700 | } |
5507 | _ACEOF | 4701 | _ACEOF |
5508 | rm -f conftest$ac_exeext | 4702 | rm -f conftest$ac_exeext |
5509 | if { (ac_try="$ac_link" | 4703 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5510 | case "(($ac_try" in | 4704 | (eval $ac_link) 2>&5 |
5511 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5512 | *) ac_try_echo=$ac_try;; | ||
5513 | esac | ||
5514 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5515 | (eval "$ac_link") 2>&5 | ||
5516 | ac_status=$? | 4705 | ac_status=$? |
5517 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4706 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5518 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 4707 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
5519 | { (case "(($ac_try" in | 4708 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
5520 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 4709 | (eval $ac_try) 2>&5 |
5521 | *) ac_try_echo=$ac_try;; | ||
5522 | esac | ||
5523 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5524 | (eval "$ac_try") 2>&5 | ||
5525 | ac_status=$? | 4710 | ac_status=$? |
5526 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4711 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5527 | (exit $ac_status); }; }; then | 4712 | (exit $ac_status); }; }; then |
@@ -5534,14 +4719,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
5534 | ( exit $ac_status ) | 4719 | ( exit $ac_status ) |
5535 | ac_cv_header_stdc=no | 4720 | ac_cv_header_stdc=no |
5536 | fi | 4721 | fi |
5537 | rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 4722 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
5538 | fi | 4723 | fi |
5539 | |||
5540 | |||
5541 | fi | 4724 | fi |
5542 | fi | 4725 | fi |
5543 | { echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 | 4726 | echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 |
5544 | echo "${ECHO_T}$ac_cv_header_stdc" >&6; } | 4727 | echo "${ECHO_T}$ac_cv_header_stdc" >&6 |
5545 | if test $ac_cv_header_stdc = yes; then | 4728 | if test $ac_cv_header_stdc = yes; then |
5546 | 4729 | ||
5547 | cat >>confdefs.h <<\_ACEOF | 4730 | cat >>confdefs.h <<\_ACEOF |
@@ -5564,9 +4747,9 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ | |||
5564 | inttypes.h stdint.h unistd.h | 4747 | inttypes.h stdint.h unistd.h |
5565 | do | 4748 | do |
5566 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 4749 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
5567 | { echo "$as_me:$LINENO: checking for $ac_header" >&5 | 4750 | echo "$as_me:$LINENO: checking for $ac_header" >&5 |
5568 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | 4751 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
5569 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 4752 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
5570 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4753 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
5571 | else | 4754 | else |
5572 | cat >conftest.$ac_ext <<_ACEOF | 4755 | cat >conftest.$ac_ext <<_ACEOF |
@@ -5580,36 +4763,24 @@ $ac_includes_default | |||
5580 | #include <$ac_header> | 4763 | #include <$ac_header> |
5581 | _ACEOF | 4764 | _ACEOF |
5582 | rm -f conftest.$ac_objext | 4765 | rm -f conftest.$ac_objext |
5583 | if { (ac_try="$ac_compile" | 4766 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
5584 | case "(($ac_try" in | 4767 | (eval $ac_compile) 2>conftest.er1 |
5585 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5586 | *) ac_try_echo=$ac_try;; | ||
5587 | esac | ||
5588 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5589 | (eval "$ac_compile") 2>conftest.er1 | ||
5590 | ac_status=$? | 4768 | ac_status=$? |
5591 | grep -v '^ *+' conftest.er1 >conftest.err | 4769 | grep -v '^ *+' conftest.er1 >conftest.err |
5592 | rm -f conftest.er1 | 4770 | rm -f conftest.er1 |
5593 | cat conftest.err >&5 | 4771 | cat conftest.err >&5 |
5594 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4772 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5595 | (exit $ac_status); } && | 4773 | (exit $ac_status); } && |
5596 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 4774 | { ac_try='test -z "$ac_c_werror_flag" |
5597 | { (case "(($ac_try" in | 4775 | || test ! -s conftest.err' |
5598 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 4776 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
5599 | *) ac_try_echo=$ac_try;; | 4777 | (eval $ac_try) 2>&5 |
5600 | esac | ||
5601 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5602 | (eval "$ac_try") 2>&5 | ||
5603 | ac_status=$? | 4778 | ac_status=$? |
5604 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4779 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5605 | (exit $ac_status); }; } && | 4780 | (exit $ac_status); }; } && |
5606 | { ac_try='test -s conftest.$ac_objext' | 4781 | { ac_try='test -s conftest.$ac_objext' |
5607 | { (case "(($ac_try" in | 4782 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
5608 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 4783 | (eval $ac_try) 2>&5 |
5609 | *) ac_try_echo=$ac_try;; | ||
5610 | esac | ||
5611 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5612 | (eval "$ac_try") 2>&5 | ||
5613 | ac_status=$? | 4784 | ac_status=$? |
5614 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4785 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5615 | (exit $ac_status); }; }; then | 4786 | (exit $ac_status); }; }; then |
@@ -5618,14 +4789,12 @@ else | |||
5618 | echo "$as_me: failed program was:" >&5 | 4789 | echo "$as_me: failed program was:" >&5 |
5619 | sed 's/^/| /' conftest.$ac_ext >&5 | 4790 | sed 's/^/| /' conftest.$ac_ext >&5 |
5620 | 4791 | ||
5621 | eval "$as_ac_Header=no" | 4792 | eval "$as_ac_Header=no" |
5622 | fi | 4793 | fi |
5623 | 4794 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
5624 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5625 | fi | 4795 | fi |
5626 | ac_res=`eval echo '${'$as_ac_Header'}'` | 4796 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
5627 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 4797 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
5628 | echo "${ECHO_T}$ac_res" >&6; } | ||
5629 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 4798 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
5630 | cat >>confdefs.h <<_ACEOF | 4799 | cat >>confdefs.h <<_ACEOF |
5631 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 4800 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
@@ -5640,19 +4809,18 @@ done | |||
5640 | for ac_header in dlfcn.h | 4809 | for ac_header in dlfcn.h |
5641 | do | 4810 | do |
5642 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 4811 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
5643 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 4812 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
5644 | { echo "$as_me:$LINENO: checking for $ac_header" >&5 | 4813 | echo "$as_me:$LINENO: checking for $ac_header" >&5 |
5645 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | 4814 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
5646 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 4815 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
5647 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4816 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
5648 | fi | 4817 | fi |
5649 | ac_res=`eval echo '${'$as_ac_Header'}'` | 4818 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
5650 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 4819 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
5651 | echo "${ECHO_T}$ac_res" >&6; } | ||
5652 | else | 4820 | else |
5653 | # Is the header compilable? | 4821 | # Is the header compilable? |
5654 | { echo "$as_me:$LINENO: checking $ac_header usability" >&5 | 4822 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
5655 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | 4823 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 |
5656 | cat >conftest.$ac_ext <<_ACEOF | 4824 | cat >conftest.$ac_ext <<_ACEOF |
5657 | /* confdefs.h. */ | 4825 | /* confdefs.h. */ |
5658 | _ACEOF | 4826 | _ACEOF |
@@ -5663,36 +4831,24 @@ $ac_includes_default | |||
5663 | #include <$ac_header> | 4831 | #include <$ac_header> |
5664 | _ACEOF | 4832 | _ACEOF |
5665 | rm -f conftest.$ac_objext | 4833 | rm -f conftest.$ac_objext |
5666 | if { (ac_try="$ac_compile" | 4834 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
5667 | case "(($ac_try" in | 4835 | (eval $ac_compile) 2>conftest.er1 |
5668 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5669 | *) ac_try_echo=$ac_try;; | ||
5670 | esac | ||
5671 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5672 | (eval "$ac_compile") 2>conftest.er1 | ||
5673 | ac_status=$? | 4836 | ac_status=$? |
5674 | grep -v '^ *+' conftest.er1 >conftest.err | 4837 | grep -v '^ *+' conftest.er1 >conftest.err |
5675 | rm -f conftest.er1 | 4838 | rm -f conftest.er1 |
5676 | cat conftest.err >&5 | 4839 | cat conftest.err >&5 |
5677 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4840 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5678 | (exit $ac_status); } && | 4841 | (exit $ac_status); } && |
5679 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 4842 | { ac_try='test -z "$ac_c_werror_flag" |
5680 | { (case "(($ac_try" in | 4843 | || test ! -s conftest.err' |
5681 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 4844 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
5682 | *) ac_try_echo=$ac_try;; | 4845 | (eval $ac_try) 2>&5 |
5683 | esac | ||
5684 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5685 | (eval "$ac_try") 2>&5 | ||
5686 | ac_status=$? | 4846 | ac_status=$? |
5687 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4847 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5688 | (exit $ac_status); }; } && | 4848 | (exit $ac_status); }; } && |
5689 | { ac_try='test -s conftest.$ac_objext' | 4849 | { ac_try='test -s conftest.$ac_objext' |
5690 | { (case "(($ac_try" in | 4850 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
5691 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 4851 | (eval $ac_try) 2>&5 |
5692 | *) ac_try_echo=$ac_try;; | ||
5693 | esac | ||
5694 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5695 | (eval "$ac_try") 2>&5 | ||
5696 | ac_status=$? | 4852 | ac_status=$? |
5697 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 4853 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5698 | (exit $ac_status); }; }; then | 4854 | (exit $ac_status); }; }; then |
@@ -5701,16 +4857,15 @@ else | |||
5701 | echo "$as_me: failed program was:" >&5 | 4857 | echo "$as_me: failed program was:" >&5 |
5702 | sed 's/^/| /' conftest.$ac_ext >&5 | 4858 | sed 's/^/| /' conftest.$ac_ext >&5 |
5703 | 4859 | ||
5704 | ac_header_compiler=no | 4860 | ac_header_compiler=no |
5705 | fi | 4861 | fi |
5706 | 4862 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
5707 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 4863 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 |
5708 | { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | 4864 | echo "${ECHO_T}$ac_header_compiler" >&6 |
5709 | echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
5710 | 4865 | ||
5711 | # Is the header present? | 4866 | # Is the header present? |
5712 | { echo "$as_me:$LINENO: checking $ac_header presence" >&5 | 4867 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 |
5713 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | 4868 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 |
5714 | cat >conftest.$ac_ext <<_ACEOF | 4869 | cat >conftest.$ac_ext <<_ACEOF |
5715 | /* confdefs.h. */ | 4870 | /* confdefs.h. */ |
5716 | _ACEOF | 4871 | _ACEOF |
@@ -5719,13 +4874,8 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
5719 | /* end confdefs.h. */ | 4874 | /* end confdefs.h. */ |
5720 | #include <$ac_header> | 4875 | #include <$ac_header> |
5721 | _ACEOF | 4876 | _ACEOF |
5722 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 4877 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
5723 | case "(($ac_try" in | 4878 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
5724 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5725 | *) ac_try_echo=$ac_try;; | ||
5726 | esac | ||
5727 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5728 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
5729 | ac_status=$? | 4879 | ac_status=$? |
5730 | grep -v '^ *+' conftest.er1 >conftest.err | 4880 | grep -v '^ *+' conftest.er1 >conftest.err |
5731 | rm -f conftest.er1 | 4881 | rm -f conftest.er1 |
@@ -5749,10 +4899,9 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
5749 | 4899 | ||
5750 | ac_header_preproc=no | 4900 | ac_header_preproc=no |
5751 | fi | 4901 | fi |
5752 | |||
5753 | rm -f conftest.err conftest.$ac_ext | 4902 | rm -f conftest.err conftest.$ac_ext |
5754 | { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | 4903 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 |
5755 | echo "${ECHO_T}$ac_header_preproc" >&6; } | 4904 | echo "${ECHO_T}$ac_header_preproc" >&6 |
5756 | 4905 | ||
5757 | # So? What about this header? | 4906 | # So? What about this header? |
5758 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | 4907 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in |
@@ -5776,24 +4925,25 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ | |||
5776 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | 4925 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} |
5777 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | 4926 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 |
5778 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | 4927 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} |
5779 | ( cat <<\_ASBOX | 4928 | ( |
4929 | cat <<\_ASBOX | ||
5780 | ## ---------------------------------- ## | 4930 | ## ---------------------------------- ## |
5781 | ## Report this to bug-libtool@gnu.org ## | 4931 | ## Report this to bug-libtool@gnu.org ## |
5782 | ## ---------------------------------- ## | 4932 | ## ---------------------------------- ## |
5783 | _ASBOX | 4933 | _ASBOX |
5784 | ) | sed "s/^/$as_me: WARNING: /" >&2 | 4934 | ) | |
4935 | sed "s/^/$as_me: WARNING: /" >&2 | ||
5785 | ;; | 4936 | ;; |
5786 | esac | 4937 | esac |
5787 | { echo "$as_me:$LINENO: checking for $ac_header" >&5 | 4938 | echo "$as_me:$LINENO: checking for $ac_header" >&5 |
5788 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | 4939 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
5789 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 4940 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
5790 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4941 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
5791 | else | 4942 | else |
5792 | eval "$as_ac_Header=\$ac_header_preproc" | 4943 | eval "$as_ac_Header=\$ac_header_preproc" |
5793 | fi | 4944 | fi |
5794 | ac_res=`eval echo '${'$as_ac_Header'}'` | 4945 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
5795 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 4946 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
5796 | echo "${ECHO_T}$ac_res" >&6; } | ||
5797 | 4947 | ||
5798 | fi | 4948 | fi |
5799 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 4949 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
@@ -5805,22 +4955,18 @@ fi | |||
5805 | 4955 | ||
5806 | done | 4956 | done |
5807 | 4957 | ||
5808 | ac_ext=cpp | 4958 | ac_ext=cc |
5809 | ac_cpp='$CXXCPP $CPPFLAGS' | 4959 | ac_cpp='$CXXCPP $CPPFLAGS' |
5810 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 4960 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
5811 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 4961 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
5812 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | 4962 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
5813 | if test -z "$CXX"; then | 4963 | if test -n "$ac_tool_prefix"; then |
5814 | if test -n "$CCC"; then | 4964 | for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC |
5815 | CXX=$CCC | ||
5816 | else | ||
5817 | if test -n "$ac_tool_prefix"; then | ||
5818 | for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC | ||
5819 | do | 4965 | do |
5820 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | 4966 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
5821 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | 4967 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
5822 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 4968 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
5823 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 4969 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
5824 | if test "${ac_cv_prog_CXX+set}" = set; then | 4970 | if test "${ac_cv_prog_CXX+set}" = set; then |
5825 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4971 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
5826 | else | 4972 | else |
@@ -5833,38 +4979,36 @@ do | |||
5833 | IFS=$as_save_IFS | 4979 | IFS=$as_save_IFS |
5834 | test -z "$as_dir" && as_dir=. | 4980 | test -z "$as_dir" && as_dir=. |
5835 | for ac_exec_ext in '' $ac_executable_extensions; do | 4981 | for ac_exec_ext in '' $ac_executable_extensions; do |
5836 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 4982 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
5837 | ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" | 4983 | ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" |
5838 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4984 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
5839 | break 2 | 4985 | break 2 |
5840 | fi | 4986 | fi |
5841 | done | 4987 | done |
5842 | done | 4988 | done |
5843 | IFS=$as_save_IFS | ||
5844 | 4989 | ||
5845 | fi | 4990 | fi |
5846 | fi | 4991 | fi |
5847 | CXX=$ac_cv_prog_CXX | 4992 | CXX=$ac_cv_prog_CXX |
5848 | if test -n "$CXX"; then | 4993 | if test -n "$CXX"; then |
5849 | { echo "$as_me:$LINENO: result: $CXX" >&5 | 4994 | echo "$as_me:$LINENO: result: $CXX" >&5 |
5850 | echo "${ECHO_T}$CXX" >&6; } | 4995 | echo "${ECHO_T}$CXX" >&6 |
5851 | else | 4996 | else |
5852 | { echo "$as_me:$LINENO: result: no" >&5 | 4997 | echo "$as_me:$LINENO: result: no" >&5 |
5853 | echo "${ECHO_T}no" >&6; } | 4998 | echo "${ECHO_T}no" >&6 |
5854 | fi | 4999 | fi |
5855 | 5000 | ||
5856 | |||
5857 | test -n "$CXX" && break | 5001 | test -n "$CXX" && break |
5858 | done | 5002 | done |
5859 | fi | 5003 | fi |
5860 | if test -z "$CXX"; then | 5004 | if test -z "$CXX"; then |
5861 | ac_ct_CXX=$CXX | 5005 | ac_ct_CXX=$CXX |
5862 | for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC | 5006 | for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC |
5863 | do | 5007 | do |
5864 | # Extract the first word of "$ac_prog", so it can be a program name with args. | 5008 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
5865 | set dummy $ac_prog; ac_word=$2 | 5009 | set dummy $ac_prog; ac_word=$2 |
5866 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 5010 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
5867 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 5011 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
5868 | if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then | 5012 | if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then |
5869 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 5013 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
5870 | else | 5014 | else |
@@ -5877,85 +5021,55 @@ do | |||
5877 | IFS=$as_save_IFS | 5021 | IFS=$as_save_IFS |
5878 | test -z "$as_dir" && as_dir=. | 5022 | test -z "$as_dir" && as_dir=. |
5879 | for ac_exec_ext in '' $ac_executable_extensions; do | 5023 | for ac_exec_ext in '' $ac_executable_extensions; do |
5880 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 5024 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
5881 | ac_cv_prog_ac_ct_CXX="$ac_prog" | 5025 | ac_cv_prog_ac_ct_CXX="$ac_prog" |
5882 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 5026 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
5883 | break 2 | 5027 | break 2 |
5884 | fi | 5028 | fi |
5885 | done | 5029 | done |
5886 | done | 5030 | done |
5887 | IFS=$as_save_IFS | ||
5888 | 5031 | ||
5889 | fi | 5032 | fi |
5890 | fi | 5033 | fi |
5891 | ac_ct_CXX=$ac_cv_prog_ac_ct_CXX | 5034 | ac_ct_CXX=$ac_cv_prog_ac_ct_CXX |
5892 | if test -n "$ac_ct_CXX"; then | 5035 | if test -n "$ac_ct_CXX"; then |
5893 | { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 | 5036 | echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 |
5894 | echo "${ECHO_T}$ac_ct_CXX" >&6; } | 5037 | echo "${ECHO_T}$ac_ct_CXX" >&6 |
5895 | else | 5038 | else |
5896 | { echo "$as_me:$LINENO: result: no" >&5 | 5039 | echo "$as_me:$LINENO: result: no" >&5 |
5897 | echo "${ECHO_T}no" >&6; } | 5040 | echo "${ECHO_T}no" >&6 |
5898 | fi | 5041 | fi |
5899 | 5042 | ||
5900 | |||
5901 | test -n "$ac_ct_CXX" && break | 5043 | test -n "$ac_ct_CXX" && break |
5902 | done | 5044 | done |
5045 | test -n "$ac_ct_CXX" || ac_ct_CXX="g++" | ||
5903 | 5046 | ||
5904 | if test "x$ac_ct_CXX" = x; then | 5047 | CXX=$ac_ct_CXX |
5905 | CXX="g++" | ||
5906 | else | ||
5907 | case $cross_compiling:$ac_tool_warned in | ||
5908 | yes:) | ||
5909 | { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
5910 | whose name does not start with the host triplet. If you think this | ||
5911 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
5912 | echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
5913 | whose name does not start with the host triplet. If you think this | ||
5914 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
5915 | ac_tool_warned=yes ;; | ||
5916 | esac | ||
5917 | CXX=$ac_ct_CXX | ||
5918 | fi | ||
5919 | fi | 5048 | fi |
5920 | 5049 | ||
5921 | fi | 5050 | |
5922 | fi | ||
5923 | # Provide some information about the compiler. | 5051 | # Provide some information about the compiler. |
5924 | echo "$as_me:$LINENO: checking for C++ compiler version" >&5 | 5052 | echo "$as_me:$LINENO:" \ |
5053 | "checking for C++ compiler version" >&5 | ||
5925 | ac_compiler=`set X $ac_compile; echo $2` | 5054 | ac_compiler=`set X $ac_compile; echo $2` |
5926 | { (ac_try="$ac_compiler --version >&5" | 5055 | { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 |
5927 | case "(($ac_try" in | 5056 | (eval $ac_compiler --version </dev/null >&5) 2>&5 |
5928 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5929 | *) ac_try_echo=$ac_try;; | ||
5930 | esac | ||
5931 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5932 | (eval "$ac_compiler --version >&5") 2>&5 | ||
5933 | ac_status=$? | 5057 | ac_status=$? |
5934 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5058 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5935 | (exit $ac_status); } | 5059 | (exit $ac_status); } |
5936 | { (ac_try="$ac_compiler -v >&5" | 5060 | { (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 |
5937 | case "(($ac_try" in | 5061 | (eval $ac_compiler -v </dev/null >&5) 2>&5 |
5938 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5939 | *) ac_try_echo=$ac_try;; | ||
5940 | esac | ||
5941 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5942 | (eval "$ac_compiler -v >&5") 2>&5 | ||
5943 | ac_status=$? | 5062 | ac_status=$? |
5944 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5063 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5945 | (exit $ac_status); } | 5064 | (exit $ac_status); } |
5946 | { (ac_try="$ac_compiler -V >&5" | 5065 | { (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 |
5947 | case "(($ac_try" in | 5066 | (eval $ac_compiler -V </dev/null >&5) 2>&5 |
5948 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5949 | *) ac_try_echo=$ac_try;; | ||
5950 | esac | ||
5951 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5952 | (eval "$ac_compiler -V >&5") 2>&5 | ||
5953 | ac_status=$? | 5067 | ac_status=$? |
5954 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5068 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5955 | (exit $ac_status); } | 5069 | (exit $ac_status); } |
5956 | 5070 | ||
5957 | { echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 | 5071 | echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 |
5958 | echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } | 5072 | echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 |
5959 | if test "${ac_cv_cxx_compiler_gnu+set}" = set; then | 5073 | if test "${ac_cv_cxx_compiler_gnu+set}" = set; then |
5960 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 5074 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
5961 | else | 5075 | else |
@@ -5978,36 +5092,24 @@ main () | |||
5978 | } | 5092 | } |
5979 | _ACEOF | 5093 | _ACEOF |
5980 | rm -f conftest.$ac_objext | 5094 | rm -f conftest.$ac_objext |
5981 | if { (ac_try="$ac_compile" | 5095 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
5982 | case "(($ac_try" in | 5096 | (eval $ac_compile) 2>conftest.er1 |
5983 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
5984 | *) ac_try_echo=$ac_try;; | ||
5985 | esac | ||
5986 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
5987 | (eval "$ac_compile") 2>conftest.er1 | ||
5988 | ac_status=$? | 5097 | ac_status=$? |
5989 | grep -v '^ *+' conftest.er1 >conftest.err | 5098 | grep -v '^ *+' conftest.er1 >conftest.err |
5990 | rm -f conftest.er1 | 5099 | rm -f conftest.er1 |
5991 | cat conftest.err >&5 | 5100 | cat conftest.err >&5 |
5992 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5101 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5993 | (exit $ac_status); } && | 5102 | (exit $ac_status); } && |
5994 | { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | 5103 | { ac_try='test -z "$ac_cxx_werror_flag" |
5995 | { (case "(($ac_try" in | 5104 | || test ! -s conftest.err' |
5996 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 5105 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
5997 | *) ac_try_echo=$ac_try;; | 5106 | (eval $ac_try) 2>&5 |
5998 | esac | ||
5999 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6000 | (eval "$ac_try") 2>&5 | ||
6001 | ac_status=$? | 5107 | ac_status=$? |
6002 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5108 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6003 | (exit $ac_status); }; } && | 5109 | (exit $ac_status); }; } && |
6004 | { ac_try='test -s conftest.$ac_objext' | 5110 | { ac_try='test -s conftest.$ac_objext' |
6005 | { (case "(($ac_try" in | 5111 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
6006 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 5112 | (eval $ac_try) 2>&5 |
6007 | *) ac_try_echo=$ac_try;; | ||
6008 | esac | ||
6009 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6010 | (eval "$ac_try") 2>&5 | ||
6011 | ac_status=$? | 5113 | ac_status=$? |
6012 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5114 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6013 | (exit $ac_status); }; }; then | 5115 | (exit $ac_status); }; }; then |
@@ -6016,28 +5118,24 @@ else | |||
6016 | echo "$as_me: failed program was:" >&5 | 5118 | echo "$as_me: failed program was:" >&5 |
6017 | sed 's/^/| /' conftest.$ac_ext >&5 | 5119 | sed 's/^/| /' conftest.$ac_ext >&5 |
6018 | 5120 | ||
6019 | ac_compiler_gnu=no | 5121 | ac_compiler_gnu=no |
6020 | fi | 5122 | fi |
6021 | 5123 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
6022 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6023 | ac_cv_cxx_compiler_gnu=$ac_compiler_gnu | 5124 | ac_cv_cxx_compiler_gnu=$ac_compiler_gnu |
6024 | 5125 | ||
6025 | fi | 5126 | fi |
6026 | { echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 | 5127 | echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 |
6027 | echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } | 5128 | echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 |
6028 | GXX=`test $ac_compiler_gnu = yes && echo yes` | 5129 | GXX=`test $ac_compiler_gnu = yes && echo yes` |
6029 | ac_test_CXXFLAGS=${CXXFLAGS+set} | 5130 | ac_test_CXXFLAGS=${CXXFLAGS+set} |
6030 | ac_save_CXXFLAGS=$CXXFLAGS | 5131 | ac_save_CXXFLAGS=$CXXFLAGS |
6031 | { echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 | 5132 | CXXFLAGS="-g" |
6032 | echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } | 5133 | echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 |
5134 | echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 | ||
6033 | if test "${ac_cv_prog_cxx_g+set}" = set; then | 5135 | if test "${ac_cv_prog_cxx_g+set}" = set; then |
6034 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 5136 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
6035 | else | 5137 | else |
6036 | ac_save_cxx_werror_flag=$ac_cxx_werror_flag | 5138 | cat >conftest.$ac_ext <<_ACEOF |
6037 | ac_cxx_werror_flag=yes | ||
6038 | ac_cv_prog_cxx_g=no | ||
6039 | CXXFLAGS="-g" | ||
6040 | cat >conftest.$ac_ext <<_ACEOF | ||
6041 | /* confdefs.h. */ | 5139 | /* confdefs.h. */ |
6042 | _ACEOF | 5140 | _ACEOF |
6043 | cat confdefs.h >>conftest.$ac_ext | 5141 | cat confdefs.h >>conftest.$ac_ext |
@@ -6053,36 +5151,24 @@ main () | |||
6053 | } | 5151 | } |
6054 | _ACEOF | 5152 | _ACEOF |
6055 | rm -f conftest.$ac_objext | 5153 | rm -f conftest.$ac_objext |
6056 | if { (ac_try="$ac_compile" | 5154 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
6057 | case "(($ac_try" in | 5155 | (eval $ac_compile) 2>conftest.er1 |
6058 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6059 | *) ac_try_echo=$ac_try;; | ||
6060 | esac | ||
6061 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6062 | (eval "$ac_compile") 2>conftest.er1 | ||
6063 | ac_status=$? | 5156 | ac_status=$? |
6064 | grep -v '^ *+' conftest.er1 >conftest.err | 5157 | grep -v '^ *+' conftest.er1 >conftest.err |
6065 | rm -f conftest.er1 | 5158 | rm -f conftest.er1 |
6066 | cat conftest.err >&5 | 5159 | cat conftest.err >&5 |
6067 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5160 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6068 | (exit $ac_status); } && | 5161 | (exit $ac_status); } && |
6069 | { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | 5162 | { ac_try='test -z "$ac_cxx_werror_flag" |
6070 | { (case "(($ac_try" in | 5163 | || test ! -s conftest.err' |
6071 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 5164 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
6072 | *) ac_try_echo=$ac_try;; | 5165 | (eval $ac_try) 2>&5 |
6073 | esac | ||
6074 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6075 | (eval "$ac_try") 2>&5 | ||
6076 | ac_status=$? | 5166 | ac_status=$? |
6077 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5167 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6078 | (exit $ac_status); }; } && | 5168 | (exit $ac_status); }; } && |
6079 | { ac_try='test -s conftest.$ac_objext' | 5169 | { ac_try='test -s conftest.$ac_objext' |
6080 | { (case "(($ac_try" in | 5170 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
6081 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 5171 | (eval $ac_try) 2>&5 |
6082 | *) ac_try_echo=$ac_try;; | ||
6083 | esac | ||
6084 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6085 | (eval "$ac_try") 2>&5 | ||
6086 | ac_status=$? | 5172 | ac_status=$? |
6087 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5173 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6088 | (exit $ac_status); }; }; then | 5174 | (exit $ac_status); }; }; then |
@@ -6091,53 +5177,70 @@ else | |||
6091 | echo "$as_me: failed program was:" >&5 | 5177 | echo "$as_me: failed program was:" >&5 |
6092 | sed 's/^/| /' conftest.$ac_ext >&5 | 5178 | sed 's/^/| /' conftest.$ac_ext >&5 |
6093 | 5179 | ||
6094 | CXXFLAGS="" | 5180 | ac_cv_prog_cxx_g=no |
6095 | cat >conftest.$ac_ext <<_ACEOF | 5181 | fi |
5182 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
5183 | fi | ||
5184 | echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 | ||
5185 | echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 | ||
5186 | if test "$ac_test_CXXFLAGS" = set; then | ||
5187 | CXXFLAGS=$ac_save_CXXFLAGS | ||
5188 | elif test $ac_cv_prog_cxx_g = yes; then | ||
5189 | if test "$GXX" = yes; then | ||
5190 | CXXFLAGS="-g -O2" | ||
5191 | else | ||
5192 | CXXFLAGS="-g" | ||
5193 | fi | ||
5194 | else | ||
5195 | if test "$GXX" = yes; then | ||
5196 | CXXFLAGS="-O2" | ||
5197 | else | ||
5198 | CXXFLAGS= | ||
5199 | fi | ||
5200 | fi | ||
5201 | for ac_declaration in \ | ||
5202 | '' \ | ||
5203 | 'extern "C" void std::exit (int) throw (); using std::exit;' \ | ||
5204 | 'extern "C" void std::exit (int); using std::exit;' \ | ||
5205 | 'extern "C" void exit (int) throw ();' \ | ||
5206 | 'extern "C" void exit (int);' \ | ||
5207 | 'void exit (int);' | ||
5208 | do | ||
5209 | cat >conftest.$ac_ext <<_ACEOF | ||
6096 | /* confdefs.h. */ | 5210 | /* confdefs.h. */ |
6097 | _ACEOF | 5211 | _ACEOF |
6098 | cat confdefs.h >>conftest.$ac_ext | 5212 | cat confdefs.h >>conftest.$ac_ext |
6099 | cat >>conftest.$ac_ext <<_ACEOF | 5213 | cat >>conftest.$ac_ext <<_ACEOF |
6100 | /* end confdefs.h. */ | 5214 | /* end confdefs.h. */ |
6101 | 5215 | $ac_declaration | |
5216 | #include <stdlib.h> | ||
6102 | int | 5217 | int |
6103 | main () | 5218 | main () |
6104 | { | 5219 | { |
6105 | 5220 | exit (42); | |
6106 | ; | 5221 | ; |
6107 | return 0; | 5222 | return 0; |
6108 | } | 5223 | } |
6109 | _ACEOF | 5224 | _ACEOF |
6110 | rm -f conftest.$ac_objext | 5225 | rm -f conftest.$ac_objext |
6111 | if { (ac_try="$ac_compile" | 5226 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
6112 | case "(($ac_try" in | 5227 | (eval $ac_compile) 2>conftest.er1 |
6113 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6114 | *) ac_try_echo=$ac_try;; | ||
6115 | esac | ||
6116 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6117 | (eval "$ac_compile") 2>conftest.er1 | ||
6118 | ac_status=$? | 5228 | ac_status=$? |
6119 | grep -v '^ *+' conftest.er1 >conftest.err | 5229 | grep -v '^ *+' conftest.er1 >conftest.err |
6120 | rm -f conftest.er1 | 5230 | rm -f conftest.er1 |
6121 | cat conftest.err >&5 | 5231 | cat conftest.err >&5 |
6122 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5232 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6123 | (exit $ac_status); } && | 5233 | (exit $ac_status); } && |
6124 | { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | 5234 | { ac_try='test -z "$ac_cxx_werror_flag" |
6125 | { (case "(($ac_try" in | 5235 | || test ! -s conftest.err' |
6126 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 5236 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
6127 | *) ac_try_echo=$ac_try;; | 5237 | (eval $ac_try) 2>&5 |
6128 | esac | ||
6129 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6130 | (eval "$ac_try") 2>&5 | ||
6131 | ac_status=$? | 5238 | ac_status=$? |
6132 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5239 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6133 | (exit $ac_status); }; } && | 5240 | (exit $ac_status); }; } && |
6134 | { ac_try='test -s conftest.$ac_objext' | 5241 | { ac_try='test -s conftest.$ac_objext' |
6135 | { (case "(($ac_try" in | 5242 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
6136 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 5243 | (eval $ac_try) 2>&5 |
6137 | *) ac_try_echo=$ac_try;; | ||
6138 | esac | ||
6139 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6140 | (eval "$ac_try") 2>&5 | ||
6141 | ac_status=$? | 5244 | ac_status=$? |
6142 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5245 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6143 | (exit $ac_status); }; }; then | 5246 | (exit $ac_status); }; }; then |
@@ -6146,92 +5249,62 @@ else | |||
6146 | echo "$as_me: failed program was:" >&5 | 5249 | echo "$as_me: failed program was:" >&5 |
6147 | sed 's/^/| /' conftest.$ac_ext >&5 | 5250 | sed 's/^/| /' conftest.$ac_ext >&5 |
6148 | 5251 | ||
6149 | ac_cxx_werror_flag=$ac_save_cxx_werror_flag | 5252 | continue |
6150 | CXXFLAGS="-g" | 5253 | fi |
6151 | cat >conftest.$ac_ext <<_ACEOF | 5254 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
5255 | cat >conftest.$ac_ext <<_ACEOF | ||
6152 | /* confdefs.h. */ | 5256 | /* confdefs.h. */ |
6153 | _ACEOF | 5257 | _ACEOF |
6154 | cat confdefs.h >>conftest.$ac_ext | 5258 | cat confdefs.h >>conftest.$ac_ext |
6155 | cat >>conftest.$ac_ext <<_ACEOF | 5259 | cat >>conftest.$ac_ext <<_ACEOF |
6156 | /* end confdefs.h. */ | 5260 | /* end confdefs.h. */ |
6157 | 5261 | $ac_declaration | |
6158 | int | 5262 | int |
6159 | main () | 5263 | main () |
6160 | { | 5264 | { |
6161 | 5265 | exit (42); | |
6162 | ; | 5266 | ; |
6163 | return 0; | 5267 | return 0; |
6164 | } | 5268 | } |
6165 | _ACEOF | 5269 | _ACEOF |
6166 | rm -f conftest.$ac_objext | 5270 | rm -f conftest.$ac_objext |
6167 | if { (ac_try="$ac_compile" | 5271 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
6168 | case "(($ac_try" in | 5272 | (eval $ac_compile) 2>conftest.er1 |
6169 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6170 | *) ac_try_echo=$ac_try;; | ||
6171 | esac | ||
6172 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6173 | (eval "$ac_compile") 2>conftest.er1 | ||
6174 | ac_status=$? | 5273 | ac_status=$? |
6175 | grep -v '^ *+' conftest.er1 >conftest.err | 5274 | grep -v '^ *+' conftest.er1 >conftest.err |
6176 | rm -f conftest.er1 | 5275 | rm -f conftest.er1 |
6177 | cat conftest.err >&5 | 5276 | cat conftest.err >&5 |
6178 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5277 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6179 | (exit $ac_status); } && | 5278 | (exit $ac_status); } && |
6180 | { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | 5279 | { ac_try='test -z "$ac_cxx_werror_flag" |
6181 | { (case "(($ac_try" in | 5280 | || test ! -s conftest.err' |
6182 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 5281 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
6183 | *) ac_try_echo=$ac_try;; | 5282 | (eval $ac_try) 2>&5 |
6184 | esac | ||
6185 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6186 | (eval "$ac_try") 2>&5 | ||
6187 | ac_status=$? | 5283 | ac_status=$? |
6188 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5284 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6189 | (exit $ac_status); }; } && | 5285 | (exit $ac_status); }; } && |
6190 | { ac_try='test -s conftest.$ac_objext' | 5286 | { ac_try='test -s conftest.$ac_objext' |
6191 | { (case "(($ac_try" in | 5287 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
6192 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 5288 | (eval $ac_try) 2>&5 |
6193 | *) ac_try_echo=$ac_try;; | ||
6194 | esac | ||
6195 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6196 | (eval "$ac_try") 2>&5 | ||
6197 | ac_status=$? | 5289 | ac_status=$? |
6198 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5290 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6199 | (exit $ac_status); }; }; then | 5291 | (exit $ac_status); }; }; then |
6200 | ac_cv_prog_cxx_g=yes | 5292 | break |
6201 | else | 5293 | else |
6202 | echo "$as_me: failed program was:" >&5 | 5294 | echo "$as_me: failed program was:" >&5 |
6203 | sed 's/^/| /' conftest.$ac_ext >&5 | 5295 | sed 's/^/| /' conftest.$ac_ext >&5 |
6204 | 5296 | ||
6205 | |||
6206 | fi | ||
6207 | |||
6208 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6209 | fi | 5297 | fi |
6210 | 5298 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
6211 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 5299 | done |
5300 | rm -f conftest* | ||
5301 | if test -n "$ac_declaration"; then | ||
5302 | echo '#ifdef __cplusplus' >>confdefs.h | ||
5303 | echo $ac_declaration >>confdefs.h | ||
5304 | echo '#endif' >>confdefs.h | ||
6212 | fi | 5305 | fi |
6213 | 5306 | ||
6214 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 5307 | ac_ext=cc |
6215 | ac_cxx_werror_flag=$ac_save_cxx_werror_flag | ||
6216 | fi | ||
6217 | { echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 | ||
6218 | echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } | ||
6219 | if test "$ac_test_CXXFLAGS" = set; then | ||
6220 | CXXFLAGS=$ac_save_CXXFLAGS | ||
6221 | elif test $ac_cv_prog_cxx_g = yes; then | ||
6222 | if test "$GXX" = yes; then | ||
6223 | CXXFLAGS="-g -O2" | ||
6224 | else | ||
6225 | CXXFLAGS="-g" | ||
6226 | fi | ||
6227 | else | ||
6228 | if test "$GXX" = yes; then | ||
6229 | CXXFLAGS="-O2" | ||
6230 | else | ||
6231 | CXXFLAGS= | ||
6232 | fi | ||
6233 | fi | ||
6234 | ac_ext=cpp | ||
6235 | ac_cpp='$CXXCPP $CPPFLAGS' | 5308 | ac_cpp='$CXXCPP $CPPFLAGS' |
6236 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 5309 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
6237 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 5310 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
@@ -6239,8 +5312,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | |||
6239 | 5312 | ||
6240 | depcc="$CXX" am_compiler_list= | 5313 | depcc="$CXX" am_compiler_list= |
6241 | 5314 | ||
6242 | { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | 5315 | echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 |
6243 | echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } | 5316 | echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 |
6244 | if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then | 5317 | if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then |
6245 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 5318 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
6246 | else | 5319 | else |
@@ -6329,8 +5402,8 @@ else | |||
6329 | fi | 5402 | fi |
6330 | 5403 | ||
6331 | fi | 5404 | fi |
6332 | { echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 | 5405 | echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 |
6333 | echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } | 5406 | echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 |
6334 | CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type | 5407 | CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type |
6335 | 5408 | ||
6336 | 5409 | ||
@@ -6351,13 +5424,13 @@ fi | |||
6351 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && | 5424 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
6352 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || | 5425 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
6353 | (test "X$CXX" != "Xg++"))) ; then | 5426 | (test "X$CXX" != "Xg++"))) ; then |
6354 | ac_ext=cpp | 5427 | ac_ext=cc |
6355 | ac_cpp='$CXXCPP $CPPFLAGS' | 5428 | ac_cpp='$CXXCPP $CPPFLAGS' |
6356 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 5429 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
6357 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 5430 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
6358 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | 5431 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
6359 | { echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 | 5432 | echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 |
6360 | echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } | 5433 | echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 |
6361 | if test -z "$CXXCPP"; then | 5434 | if test -z "$CXXCPP"; then |
6362 | if test "${ac_cv_prog_CXXCPP+set}" = set; then | 5435 | if test "${ac_cv_prog_CXXCPP+set}" = set; then |
6363 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 5436 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -6387,13 +5460,8 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
6387 | #endif | 5460 | #endif |
6388 | Syntax error | 5461 | Syntax error |
6389 | _ACEOF | 5462 | _ACEOF |
6390 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 5463 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
6391 | case "(($ac_try" in | 5464 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
6392 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6393 | *) ac_try_echo=$ac_try;; | ||
6394 | esac | ||
6395 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6396 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
6397 | ac_status=$? | 5465 | ac_status=$? |
6398 | grep -v '^ *+' conftest.er1 >conftest.err | 5466 | grep -v '^ *+' conftest.er1 >conftest.err |
6399 | rm -f conftest.er1 | 5467 | rm -f conftest.er1 |
@@ -6418,10 +5486,9 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
6418 | # Broken: fails on valid input. | 5486 | # Broken: fails on valid input. |
6419 | continue | 5487 | continue |
6420 | fi | 5488 | fi |
6421 | |||
6422 | rm -f conftest.err conftest.$ac_ext | 5489 | rm -f conftest.err conftest.$ac_ext |
6423 | 5490 | ||
6424 | # OK, works on sane cases. Now check whether nonexistent headers | 5491 | # OK, works on sane cases. Now check whether non-existent headers |
6425 | # can be detected and how. | 5492 | # can be detected and how. |
6426 | cat >conftest.$ac_ext <<_ACEOF | 5493 | cat >conftest.$ac_ext <<_ACEOF |
6427 | /* confdefs.h. */ | 5494 | /* confdefs.h. */ |
@@ -6431,13 +5498,8 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
6431 | /* end confdefs.h. */ | 5498 | /* end confdefs.h. */ |
6432 | #include <ac_nonexistent.h> | 5499 | #include <ac_nonexistent.h> |
6433 | _ACEOF | 5500 | _ACEOF |
6434 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 5501 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
6435 | case "(($ac_try" in | 5502 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
6436 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6437 | *) ac_try_echo=$ac_try;; | ||
6438 | esac | ||
6439 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6440 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
6441 | ac_status=$? | 5503 | ac_status=$? |
6442 | grep -v '^ *+' conftest.er1 >conftest.err | 5504 | grep -v '^ *+' conftest.er1 >conftest.err |
6443 | rm -f conftest.er1 | 5505 | rm -f conftest.er1 |
@@ -6464,7 +5526,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
6464 | ac_preproc_ok=: | 5526 | ac_preproc_ok=: |
6465 | break | 5527 | break |
6466 | fi | 5528 | fi |
6467 | |||
6468 | rm -f conftest.err conftest.$ac_ext | 5529 | rm -f conftest.err conftest.$ac_ext |
6469 | 5530 | ||
6470 | done | 5531 | done |
@@ -6482,8 +5543,8 @@ fi | |||
6482 | else | 5543 | else |
6483 | ac_cv_prog_CXXCPP=$CXXCPP | 5544 | ac_cv_prog_CXXCPP=$CXXCPP |
6484 | fi | 5545 | fi |
6485 | { echo "$as_me:$LINENO: result: $CXXCPP" >&5 | 5546 | echo "$as_me:$LINENO: result: $CXXCPP" >&5 |
6486 | echo "${ECHO_T}$CXXCPP" >&6; } | 5547 | echo "${ECHO_T}$CXXCPP" >&6 |
6487 | ac_preproc_ok=false | 5548 | ac_preproc_ok=false |
6488 | for ac_cxx_preproc_warn_flag in '' yes | 5549 | for ac_cxx_preproc_warn_flag in '' yes |
6489 | do | 5550 | do |
@@ -6506,13 +5567,8 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
6506 | #endif | 5567 | #endif |
6507 | Syntax error | 5568 | Syntax error |
6508 | _ACEOF | 5569 | _ACEOF |
6509 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 5570 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
6510 | case "(($ac_try" in | 5571 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
6511 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6512 | *) ac_try_echo=$ac_try;; | ||
6513 | esac | ||
6514 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6515 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
6516 | ac_status=$? | 5572 | ac_status=$? |
6517 | grep -v '^ *+' conftest.er1 >conftest.err | 5573 | grep -v '^ *+' conftest.er1 >conftest.err |
6518 | rm -f conftest.er1 | 5574 | rm -f conftest.er1 |
@@ -6537,10 +5593,9 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
6537 | # Broken: fails on valid input. | 5593 | # Broken: fails on valid input. |
6538 | continue | 5594 | continue |
6539 | fi | 5595 | fi |
6540 | |||
6541 | rm -f conftest.err conftest.$ac_ext | 5596 | rm -f conftest.err conftest.$ac_ext |
6542 | 5597 | ||
6543 | # OK, works on sane cases. Now check whether nonexistent headers | 5598 | # OK, works on sane cases. Now check whether non-existent headers |
6544 | # can be detected and how. | 5599 | # can be detected and how. |
6545 | cat >conftest.$ac_ext <<_ACEOF | 5600 | cat >conftest.$ac_ext <<_ACEOF |
6546 | /* confdefs.h. */ | 5601 | /* confdefs.h. */ |
@@ -6550,13 +5605,8 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
6550 | /* end confdefs.h. */ | 5605 | /* end confdefs.h. */ |
6551 | #include <ac_nonexistent.h> | 5606 | #include <ac_nonexistent.h> |
6552 | _ACEOF | 5607 | _ACEOF |
6553 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 5608 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
6554 | case "(($ac_try" in | 5609 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
6555 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6556 | *) ac_try_echo=$ac_try;; | ||
6557 | esac | ||
6558 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6559 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
6560 | ac_status=$? | 5610 | ac_status=$? |
6561 | grep -v '^ *+' conftest.er1 >conftest.err | 5611 | grep -v '^ *+' conftest.er1 >conftest.err |
6562 | rm -f conftest.er1 | 5612 | rm -f conftest.er1 |
@@ -6583,7 +5633,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
6583 | ac_preproc_ok=: | 5633 | ac_preproc_ok=: |
6584 | break | 5634 | break |
6585 | fi | 5635 | fi |
6586 | |||
6587 | rm -f conftest.err conftest.$ac_ext | 5636 | rm -f conftest.err conftest.$ac_ext |
6588 | 5637 | ||
6589 | done | 5638 | done |
@@ -6599,7 +5648,7 @@ See \`config.log' for more details." >&2;} | |||
6599 | { (exit 1); exit 1; }; } | 5648 | { (exit 1); exit 1; }; } |
6600 | fi | 5649 | fi |
6601 | 5650 | ||
6602 | ac_ext=cpp | 5651 | ac_ext=cc |
6603 | ac_cpp='$CXXCPP $CPPFLAGS' | 5652 | ac_cpp='$CXXCPP $CPPFLAGS' |
6604 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 5653 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
6605 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 5654 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
@@ -6613,12 +5662,12 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' | |||
6613 | ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 5662 | ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
6614 | ac_compiler_gnu=$ac_cv_f77_compiler_gnu | 5663 | ac_compiler_gnu=$ac_cv_f77_compiler_gnu |
6615 | if test -n "$ac_tool_prefix"; then | 5664 | if test -n "$ac_tool_prefix"; then |
6616 | for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn | 5665 | for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran |
6617 | do | 5666 | do |
6618 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | 5667 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
6619 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | 5668 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
6620 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 5669 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
6621 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 5670 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
6622 | if test "${ac_cv_prog_F77+set}" = set; then | 5671 | if test "${ac_cv_prog_F77+set}" = set; then |
6623 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 5672 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
6624 | else | 5673 | else |
@@ -6631,38 +5680,36 @@ do | |||
6631 | IFS=$as_save_IFS | 5680 | IFS=$as_save_IFS |
6632 | test -z "$as_dir" && as_dir=. | 5681 | test -z "$as_dir" && as_dir=. |
6633 | for ac_exec_ext in '' $ac_executable_extensions; do | 5682 | for ac_exec_ext in '' $ac_executable_extensions; do |
6634 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 5683 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
6635 | ac_cv_prog_F77="$ac_tool_prefix$ac_prog" | 5684 | ac_cv_prog_F77="$ac_tool_prefix$ac_prog" |
6636 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 5685 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6637 | break 2 | 5686 | break 2 |
6638 | fi | 5687 | fi |
6639 | done | 5688 | done |
6640 | done | 5689 | done |
6641 | IFS=$as_save_IFS | ||
6642 | 5690 | ||
6643 | fi | 5691 | fi |
6644 | fi | 5692 | fi |
6645 | F77=$ac_cv_prog_F77 | 5693 | F77=$ac_cv_prog_F77 |
6646 | if test -n "$F77"; then | 5694 | if test -n "$F77"; then |
6647 | { echo "$as_me:$LINENO: result: $F77" >&5 | 5695 | echo "$as_me:$LINENO: result: $F77" >&5 |
6648 | echo "${ECHO_T}$F77" >&6; } | 5696 | echo "${ECHO_T}$F77" >&6 |
6649 | else | 5697 | else |
6650 | { echo "$as_me:$LINENO: result: no" >&5 | 5698 | echo "$as_me:$LINENO: result: no" >&5 |
6651 | echo "${ECHO_T}no" >&6; } | 5699 | echo "${ECHO_T}no" >&6 |
6652 | fi | 5700 | fi |
6653 | 5701 | ||
6654 | |||
6655 | test -n "$F77" && break | 5702 | test -n "$F77" && break |
6656 | done | 5703 | done |
6657 | fi | 5704 | fi |
6658 | if test -z "$F77"; then | 5705 | if test -z "$F77"; then |
6659 | ac_ct_F77=$F77 | 5706 | ac_ct_F77=$F77 |
6660 | for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn | 5707 | for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran |
6661 | do | 5708 | do |
6662 | # Extract the first word of "$ac_prog", so it can be a program name with args. | 5709 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
6663 | set dummy $ac_prog; ac_word=$2 | 5710 | set dummy $ac_prog; ac_word=$2 |
6664 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 5711 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
6665 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 5712 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
6666 | if test "${ac_cv_prog_ac_ct_F77+set}" = set; then | 5713 | if test "${ac_cv_prog_ac_ct_F77+set}" = set; then |
6667 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 5714 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
6668 | else | 5715 | else |
@@ -6675,78 +5722,48 @@ do | |||
6675 | IFS=$as_save_IFS | 5722 | IFS=$as_save_IFS |
6676 | test -z "$as_dir" && as_dir=. | 5723 | test -z "$as_dir" && as_dir=. |
6677 | for ac_exec_ext in '' $ac_executable_extensions; do | 5724 | for ac_exec_ext in '' $ac_executable_extensions; do |
6678 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 5725 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
6679 | ac_cv_prog_ac_ct_F77="$ac_prog" | 5726 | ac_cv_prog_ac_ct_F77="$ac_prog" |
6680 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 5727 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6681 | break 2 | 5728 | break 2 |
6682 | fi | 5729 | fi |
6683 | done | 5730 | done |
6684 | done | 5731 | done |
6685 | IFS=$as_save_IFS | ||
6686 | 5732 | ||
6687 | fi | 5733 | fi |
6688 | fi | 5734 | fi |
6689 | ac_ct_F77=$ac_cv_prog_ac_ct_F77 | 5735 | ac_ct_F77=$ac_cv_prog_ac_ct_F77 |
6690 | if test -n "$ac_ct_F77"; then | 5736 | if test -n "$ac_ct_F77"; then |
6691 | { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 | 5737 | echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 |
6692 | echo "${ECHO_T}$ac_ct_F77" >&6; } | 5738 | echo "${ECHO_T}$ac_ct_F77" >&6 |
6693 | else | 5739 | else |
6694 | { echo "$as_me:$LINENO: result: no" >&5 | 5740 | echo "$as_me:$LINENO: result: no" >&5 |
6695 | echo "${ECHO_T}no" >&6; } | 5741 | echo "${ECHO_T}no" >&6 |
6696 | fi | 5742 | fi |
6697 | 5743 | ||
6698 | |||
6699 | test -n "$ac_ct_F77" && break | 5744 | test -n "$ac_ct_F77" && break |
6700 | done | 5745 | done |
6701 | 5746 | ||
6702 | if test "x$ac_ct_F77" = x; then | 5747 | F77=$ac_ct_F77 |
6703 | F77="" | ||
6704 | else | ||
6705 | case $cross_compiling:$ac_tool_warned in | ||
6706 | yes:) | ||
6707 | { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
6708 | whose name does not start with the host triplet. If you think this | ||
6709 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
6710 | echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
6711 | whose name does not start with the host triplet. If you think this | ||
6712 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
6713 | ac_tool_warned=yes ;; | ||
6714 | esac | ||
6715 | F77=$ac_ct_F77 | ||
6716 | fi | ||
6717 | fi | 5748 | fi |
6718 | 5749 | ||
6719 | 5750 | ||
6720 | # Provide some information about the compiler. | 5751 | # Provide some information about the compiler. |
6721 | echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 | 5752 | echo "$as_me:5752:" \ |
5753 | "checking for Fortran 77 compiler version" >&5 | ||
6722 | ac_compiler=`set X $ac_compile; echo $2` | 5754 | ac_compiler=`set X $ac_compile; echo $2` |
6723 | { (ac_try="$ac_compiler --version >&5" | 5755 | { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 |
6724 | case "(($ac_try" in | 5756 | (eval $ac_compiler --version </dev/null >&5) 2>&5 |
6725 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6726 | *) ac_try_echo=$ac_try;; | ||
6727 | esac | ||
6728 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6729 | (eval "$ac_compiler --version >&5") 2>&5 | ||
6730 | ac_status=$? | 5757 | ac_status=$? |
6731 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5758 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6732 | (exit $ac_status); } | 5759 | (exit $ac_status); } |
6733 | { (ac_try="$ac_compiler -v >&5" | 5760 | { (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 |
6734 | case "(($ac_try" in | 5761 | (eval $ac_compiler -v </dev/null >&5) 2>&5 |
6735 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6736 | *) ac_try_echo=$ac_try;; | ||
6737 | esac | ||
6738 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6739 | (eval "$ac_compiler -v >&5") 2>&5 | ||
6740 | ac_status=$? | 5762 | ac_status=$? |
6741 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5763 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6742 | (exit $ac_status); } | 5764 | (exit $ac_status); } |
6743 | { (ac_try="$ac_compiler -V >&5" | 5765 | { (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 |
6744 | case "(($ac_try" in | 5766 | (eval $ac_compiler -V </dev/null >&5) 2>&5 |
6745 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6746 | *) ac_try_echo=$ac_try;; | ||
6747 | esac | ||
6748 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6749 | (eval "$ac_compiler -V >&5") 2>&5 | ||
6750 | ac_status=$? | 5767 | ac_status=$? |
6751 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5768 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6752 | (exit $ac_status); } | 5769 | (exit $ac_status); } |
@@ -6756,8 +5773,8 @@ rm -f a.out | |||
6756 | # input file. (Note that this only needs to work for GNU compilers.) | 5773 | # input file. (Note that this only needs to work for GNU compilers.) |
6757 | ac_save_ext=$ac_ext | 5774 | ac_save_ext=$ac_ext |
6758 | ac_ext=F | 5775 | ac_ext=F |
6759 | { echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 | 5776 | echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 |
6760 | echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } | 5777 | echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 |
6761 | if test "${ac_cv_f77_compiler_gnu+set}" = set; then | 5778 | if test "${ac_cv_f77_compiler_gnu+set}" = set; then |
6762 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 5779 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
6763 | else | 5780 | else |
@@ -6770,36 +5787,24 @@ else | |||
6770 | end | 5787 | end |
6771 | _ACEOF | 5788 | _ACEOF |
6772 | rm -f conftest.$ac_objext | 5789 | rm -f conftest.$ac_objext |
6773 | if { (ac_try="$ac_compile" | 5790 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
6774 | case "(($ac_try" in | 5791 | (eval $ac_compile) 2>conftest.er1 |
6775 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6776 | *) ac_try_echo=$ac_try;; | ||
6777 | esac | ||
6778 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6779 | (eval "$ac_compile") 2>conftest.er1 | ||
6780 | ac_status=$? | 5792 | ac_status=$? |
6781 | grep -v '^ *+' conftest.er1 >conftest.err | 5793 | grep -v '^ *+' conftest.er1 >conftest.err |
6782 | rm -f conftest.er1 | 5794 | rm -f conftest.er1 |
6783 | cat conftest.err >&5 | 5795 | cat conftest.err >&5 |
6784 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5796 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6785 | (exit $ac_status); } && | 5797 | (exit $ac_status); } && |
6786 | { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | 5798 | { ac_try='test -z "$ac_f77_werror_flag" |
6787 | { (case "(($ac_try" in | 5799 | || test ! -s conftest.err' |
6788 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 5800 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
6789 | *) ac_try_echo=$ac_try;; | 5801 | (eval $ac_try) 2>&5 |
6790 | esac | ||
6791 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6792 | (eval "$ac_try") 2>&5 | ||
6793 | ac_status=$? | 5802 | ac_status=$? |
6794 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5803 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6795 | (exit $ac_status); }; } && | 5804 | (exit $ac_status); }; } && |
6796 | { ac_try='test -s conftest.$ac_objext' | 5805 | { ac_try='test -s conftest.$ac_objext' |
6797 | { (case "(($ac_try" in | 5806 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
6798 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 5807 | (eval $ac_try) 2>&5 |
6799 | *) ac_try_echo=$ac_try;; | ||
6800 | esac | ||
6801 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6802 | (eval "$ac_try") 2>&5 | ||
6803 | ac_status=$? | 5808 | ac_status=$? |
6804 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5809 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6805 | (exit $ac_status); }; }; then | 5810 | (exit $ac_status); }; }; then |
@@ -6808,21 +5813,20 @@ else | |||
6808 | echo "$as_me: failed program was:" >&5 | 5813 | echo "$as_me: failed program was:" >&5 |
6809 | sed 's/^/| /' conftest.$ac_ext >&5 | 5814 | sed 's/^/| /' conftest.$ac_ext >&5 |
6810 | 5815 | ||
6811 | ac_compiler_gnu=no | 5816 | ac_compiler_gnu=no |
6812 | fi | 5817 | fi |
6813 | 5818 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
6814 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6815 | ac_cv_f77_compiler_gnu=$ac_compiler_gnu | 5819 | ac_cv_f77_compiler_gnu=$ac_compiler_gnu |
6816 | 5820 | ||
6817 | fi | 5821 | fi |
6818 | { echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 | 5822 | echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 |
6819 | echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } | 5823 | echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 |
6820 | ac_ext=$ac_save_ext | 5824 | ac_ext=$ac_save_ext |
6821 | ac_test_FFLAGS=${FFLAGS+set} | 5825 | ac_test_FFLAGS=${FFLAGS+set} |
6822 | ac_save_FFLAGS=$FFLAGS | 5826 | ac_save_FFLAGS=$FFLAGS |
6823 | FFLAGS= | 5827 | FFLAGS= |
6824 | { echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 | 5828 | echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 |
6825 | echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } | 5829 | echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 |
6826 | if test "${ac_cv_prog_f77_g+set}" = set; then | 5830 | if test "${ac_cv_prog_f77_g+set}" = set; then |
6827 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 5831 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
6828 | else | 5832 | else |
@@ -6833,36 +5837,24 @@ cat >conftest.$ac_ext <<_ACEOF | |||
6833 | end | 5837 | end |
6834 | _ACEOF | 5838 | _ACEOF |
6835 | rm -f conftest.$ac_objext | 5839 | rm -f conftest.$ac_objext |
6836 | if { (ac_try="$ac_compile" | 5840 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
6837 | case "(($ac_try" in | 5841 | (eval $ac_compile) 2>conftest.er1 |
6838 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
6839 | *) ac_try_echo=$ac_try;; | ||
6840 | esac | ||
6841 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6842 | (eval "$ac_compile") 2>conftest.er1 | ||
6843 | ac_status=$? | 5842 | ac_status=$? |
6844 | grep -v '^ *+' conftest.er1 >conftest.err | 5843 | grep -v '^ *+' conftest.er1 >conftest.err |
6845 | rm -f conftest.er1 | 5844 | rm -f conftest.er1 |
6846 | cat conftest.err >&5 | 5845 | cat conftest.err >&5 |
6847 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5846 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6848 | (exit $ac_status); } && | 5847 | (exit $ac_status); } && |
6849 | { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | 5848 | { ac_try='test -z "$ac_f77_werror_flag" |
6850 | { (case "(($ac_try" in | 5849 | || test ! -s conftest.err' |
6851 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 5850 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
6852 | *) ac_try_echo=$ac_try;; | 5851 | (eval $ac_try) 2>&5 |
6853 | esac | ||
6854 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6855 | (eval "$ac_try") 2>&5 | ||
6856 | ac_status=$? | 5852 | ac_status=$? |
6857 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5853 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6858 | (exit $ac_status); }; } && | 5854 | (exit $ac_status); }; } && |
6859 | { ac_try='test -s conftest.$ac_objext' | 5855 | { ac_try='test -s conftest.$ac_objext' |
6860 | { (case "(($ac_try" in | 5856 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
6861 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 5857 | (eval $ac_try) 2>&5 |
6862 | *) ac_try_echo=$ac_try;; | ||
6863 | esac | ||
6864 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
6865 | (eval "$ac_try") 2>&5 | ||
6866 | ac_status=$? | 5858 | ac_status=$? |
6867 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 5859 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6868 | (exit $ac_status); }; }; then | 5860 | (exit $ac_status); }; }; then |
@@ -6871,14 +5863,13 @@ else | |||
6871 | echo "$as_me: failed program was:" >&5 | 5863 | echo "$as_me: failed program was:" >&5 |
6872 | sed 's/^/| /' conftest.$ac_ext >&5 | 5864 | sed 's/^/| /' conftest.$ac_ext >&5 |
6873 | 5865 | ||
6874 | ac_cv_prog_f77_g=no | 5866 | ac_cv_prog_f77_g=no |
6875 | fi | 5867 | fi |
6876 | 5868 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
6877 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6878 | 5869 | ||
6879 | fi | 5870 | fi |
6880 | { echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 | 5871 | echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 |
6881 | echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } | 5872 | echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 |
6882 | if test "$ac_test_FFLAGS" = set; then | 5873 | if test "$ac_test_FFLAGS" = set; then |
6883 | FFLAGS=$ac_save_FFLAGS | 5874 | FFLAGS=$ac_save_FFLAGS |
6884 | elif test $ac_cv_prog_f77_g = yes; then | 5875 | elif test $ac_cv_prog_f77_g = yes; then |
@@ -6907,8 +5898,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
6907 | # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! | 5898 | # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! |
6908 | 5899 | ||
6909 | # find the maximum length of command line arguments | 5900 | # find the maximum length of command line arguments |
6910 | { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 | 5901 | echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 |
6911 | echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } | 5902 | echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 |
6912 | if test "${lt_cv_sys_max_cmd_len+set}" = set; then | 5903 | if test "${lt_cv_sys_max_cmd_len+set}" = set; then |
6913 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 5904 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
6914 | else | 5905 | else |
@@ -7016,19 +6007,19 @@ else | |||
7016 | fi | 6007 | fi |
7017 | 6008 | ||
7018 | if test -n $lt_cv_sys_max_cmd_len ; then | 6009 | if test -n $lt_cv_sys_max_cmd_len ; then |
7019 | { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 | 6010 | echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 |
7020 | echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } | 6011 | echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 |
7021 | else | 6012 | else |
7022 | { echo "$as_me:$LINENO: result: none" >&5 | 6013 | echo "$as_me:$LINENO: result: none" >&5 |
7023 | echo "${ECHO_T}none" >&6; } | 6014 | echo "${ECHO_T}none" >&6 |
7024 | fi | 6015 | fi |
7025 | 6016 | ||
7026 | 6017 | ||
7027 | 6018 | ||
7028 | 6019 | ||
7029 | # Check for command to grab the raw symbol name followed by C symbol from nm. | 6020 | # Check for command to grab the raw symbol name followed by C symbol from nm. |
7030 | { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 | 6021 | echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 |
7031 | echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } | 6022 | echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 |
7032 | if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then | 6023 | if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then |
7033 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6024 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7034 | else | 6025 | else |
@@ -7063,7 +6054,7 @@ hpux*) # Its linker distinguishes data from code symbols | |||
7063 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 6054 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
7064 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" | 6055 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" |
7065 | ;; | 6056 | ;; |
7066 | linux* | k*bsd*-gnu) | 6057 | linux*) |
7067 | if test "$host_cpu" = ia64; then | 6058 | if test "$host_cpu" = ia64; then |
7068 | symcode='[ABCDGIRSTW]' | 6059 | symcode='[ABCDGIRSTW]' |
7069 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 6060 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
@@ -7232,15 +6223,15 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then | |||
7232 | lt_cv_sys_global_symbol_to_cdecl= | 6223 | lt_cv_sys_global_symbol_to_cdecl= |
7233 | fi | 6224 | fi |
7234 | if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then | 6225 | if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then |
7235 | { echo "$as_me:$LINENO: result: failed" >&5 | 6226 | echo "$as_me:$LINENO: result: failed" >&5 |
7236 | echo "${ECHO_T}failed" >&6; } | 6227 | echo "${ECHO_T}failed" >&6 |
7237 | else | 6228 | else |
7238 | { echo "$as_me:$LINENO: result: ok" >&5 | 6229 | echo "$as_me:$LINENO: result: ok" >&5 |
7239 | echo "${ECHO_T}ok" >&6; } | 6230 | echo "${ECHO_T}ok" >&6 |
7240 | fi | 6231 | fi |
7241 | 6232 | ||
7242 | { echo "$as_me:$LINENO: checking for objdir" >&5 | 6233 | echo "$as_me:$LINENO: checking for objdir" >&5 |
7243 | echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } | 6234 | echo $ECHO_N "checking for objdir... $ECHO_C" >&6 |
7244 | if test "${lt_cv_objdir+set}" = set; then | 6235 | if test "${lt_cv_objdir+set}" = set; then |
7245 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6236 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7246 | else | 6237 | else |
@@ -7254,8 +6245,8 @@ else | |||
7254 | fi | 6245 | fi |
7255 | rmdir .libs 2>/dev/null | 6246 | rmdir .libs 2>/dev/null |
7256 | fi | 6247 | fi |
7257 | { echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 | 6248 | echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 |
7258 | echo "${ECHO_T}$lt_cv_objdir" >&6; } | 6249 | echo "${ECHO_T}$lt_cv_objdir" >&6 |
7259 | objdir=$lt_cv_objdir | 6250 | objdir=$lt_cv_objdir |
7260 | 6251 | ||
7261 | 6252 | ||
@@ -7306,8 +6297,8 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" | |||
7306 | if test -n "$ac_tool_prefix"; then | 6297 | if test -n "$ac_tool_prefix"; then |
7307 | # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | 6298 | # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
7308 | set dummy ${ac_tool_prefix}ar; ac_word=$2 | 6299 | set dummy ${ac_tool_prefix}ar; ac_word=$2 |
7309 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 6300 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
7310 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 6301 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
7311 | if test "${ac_cv_prog_AR+set}" = set; then | 6302 | if test "${ac_cv_prog_AR+set}" = set; then |
7312 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6303 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7313 | else | 6304 | else |
@@ -7320,34 +6311,32 @@ do | |||
7320 | IFS=$as_save_IFS | 6311 | IFS=$as_save_IFS |
7321 | test -z "$as_dir" && as_dir=. | 6312 | test -z "$as_dir" && as_dir=. |
7322 | for ac_exec_ext in '' $ac_executable_extensions; do | 6313 | for ac_exec_ext in '' $ac_executable_extensions; do |
7323 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 6314 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
7324 | ac_cv_prog_AR="${ac_tool_prefix}ar" | 6315 | ac_cv_prog_AR="${ac_tool_prefix}ar" |
7325 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6316 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7326 | break 2 | 6317 | break 2 |
7327 | fi | 6318 | fi |
7328 | done | 6319 | done |
7329 | done | 6320 | done |
7330 | IFS=$as_save_IFS | ||
7331 | 6321 | ||
7332 | fi | 6322 | fi |
7333 | fi | 6323 | fi |
7334 | AR=$ac_cv_prog_AR | 6324 | AR=$ac_cv_prog_AR |
7335 | if test -n "$AR"; then | 6325 | if test -n "$AR"; then |
7336 | { echo "$as_me:$LINENO: result: $AR" >&5 | 6326 | echo "$as_me:$LINENO: result: $AR" >&5 |
7337 | echo "${ECHO_T}$AR" >&6; } | 6327 | echo "${ECHO_T}$AR" >&6 |
7338 | else | 6328 | else |
7339 | { echo "$as_me:$LINENO: result: no" >&5 | 6329 | echo "$as_me:$LINENO: result: no" >&5 |
7340 | echo "${ECHO_T}no" >&6; } | 6330 | echo "${ECHO_T}no" >&6 |
7341 | fi | 6331 | fi |
7342 | 6332 | ||
7343 | |||
7344 | fi | 6333 | fi |
7345 | if test -z "$ac_cv_prog_AR"; then | 6334 | if test -z "$ac_cv_prog_AR"; then |
7346 | ac_ct_AR=$AR | 6335 | ac_ct_AR=$AR |
7347 | # Extract the first word of "ar", so it can be a program name with args. | 6336 | # Extract the first word of "ar", so it can be a program name with args. |
7348 | set dummy ar; ac_word=$2 | 6337 | set dummy ar; ac_word=$2 |
7349 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 6338 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
7350 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 6339 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
7351 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then | 6340 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then |
7352 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6341 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7353 | else | 6342 | else |
@@ -7360,41 +6349,27 @@ do | |||
7360 | IFS=$as_save_IFS | 6349 | IFS=$as_save_IFS |
7361 | test -z "$as_dir" && as_dir=. | 6350 | test -z "$as_dir" && as_dir=. |
7362 | for ac_exec_ext in '' $ac_executable_extensions; do | 6351 | for ac_exec_ext in '' $ac_executable_extensions; do |
7363 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 6352 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
7364 | ac_cv_prog_ac_ct_AR="ar" | 6353 | ac_cv_prog_ac_ct_AR="ar" |
7365 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6354 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7366 | break 2 | 6355 | break 2 |
7367 | fi | 6356 | fi |
7368 | done | 6357 | done |
7369 | done | 6358 | done |
7370 | IFS=$as_save_IFS | ||
7371 | 6359 | ||
6360 | test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" | ||
7372 | fi | 6361 | fi |
7373 | fi | 6362 | fi |
7374 | ac_ct_AR=$ac_cv_prog_ac_ct_AR | 6363 | ac_ct_AR=$ac_cv_prog_ac_ct_AR |
7375 | if test -n "$ac_ct_AR"; then | 6364 | if test -n "$ac_ct_AR"; then |
7376 | { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 | 6365 | echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 |
7377 | echo "${ECHO_T}$ac_ct_AR" >&6; } | 6366 | echo "${ECHO_T}$ac_ct_AR" >&6 |
7378 | else | 6367 | else |
7379 | { echo "$as_me:$LINENO: result: no" >&5 | 6368 | echo "$as_me:$LINENO: result: no" >&5 |
7380 | echo "${ECHO_T}no" >&6; } | 6369 | echo "${ECHO_T}no" >&6 |
7381 | fi | 6370 | fi |
7382 | 6371 | ||
7383 | if test "x$ac_ct_AR" = x; then | 6372 | AR=$ac_ct_AR |
7384 | AR="false" | ||
7385 | else | ||
7386 | case $cross_compiling:$ac_tool_warned in | ||
7387 | yes:) | ||
7388 | { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
7389 | whose name does not start with the host triplet. If you think this | ||
7390 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
7391 | echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
7392 | whose name does not start with the host triplet. If you think this | ||
7393 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
7394 | ac_tool_warned=yes ;; | ||
7395 | esac | ||
7396 | AR=$ac_ct_AR | ||
7397 | fi | ||
7398 | else | 6373 | else |
7399 | AR="$ac_cv_prog_AR" | 6374 | AR="$ac_cv_prog_AR" |
7400 | fi | 6375 | fi |
@@ -7402,8 +6377,8 @@ fi | |||
7402 | if test -n "$ac_tool_prefix"; then | 6377 | if test -n "$ac_tool_prefix"; then |
7403 | # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. | 6378 | # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. |
7404 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 | 6379 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 |
7405 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 6380 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
7406 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 6381 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
7407 | if test "${ac_cv_prog_RANLIB+set}" = set; then | 6382 | if test "${ac_cv_prog_RANLIB+set}" = set; then |
7408 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6383 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7409 | else | 6384 | else |
@@ -7416,34 +6391,32 @@ do | |||
7416 | IFS=$as_save_IFS | 6391 | IFS=$as_save_IFS |
7417 | test -z "$as_dir" && as_dir=. | 6392 | test -z "$as_dir" && as_dir=. |
7418 | for ac_exec_ext in '' $ac_executable_extensions; do | 6393 | for ac_exec_ext in '' $ac_executable_extensions; do |
7419 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 6394 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
7420 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" | 6395 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" |
7421 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6396 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7422 | break 2 | 6397 | break 2 |
7423 | fi | 6398 | fi |
7424 | done | 6399 | done |
7425 | done | 6400 | done |
7426 | IFS=$as_save_IFS | ||
7427 | 6401 | ||
7428 | fi | 6402 | fi |
7429 | fi | 6403 | fi |
7430 | RANLIB=$ac_cv_prog_RANLIB | 6404 | RANLIB=$ac_cv_prog_RANLIB |
7431 | if test -n "$RANLIB"; then | 6405 | if test -n "$RANLIB"; then |
7432 | { echo "$as_me:$LINENO: result: $RANLIB" >&5 | 6406 | echo "$as_me:$LINENO: result: $RANLIB" >&5 |
7433 | echo "${ECHO_T}$RANLIB" >&6; } | 6407 | echo "${ECHO_T}$RANLIB" >&6 |
7434 | else | 6408 | else |
7435 | { echo "$as_me:$LINENO: result: no" >&5 | 6409 | echo "$as_me:$LINENO: result: no" >&5 |
7436 | echo "${ECHO_T}no" >&6; } | 6410 | echo "${ECHO_T}no" >&6 |
7437 | fi | 6411 | fi |
7438 | 6412 | ||
7439 | |||
7440 | fi | 6413 | fi |
7441 | if test -z "$ac_cv_prog_RANLIB"; then | 6414 | if test -z "$ac_cv_prog_RANLIB"; then |
7442 | ac_ct_RANLIB=$RANLIB | 6415 | ac_ct_RANLIB=$RANLIB |
7443 | # Extract the first word of "ranlib", so it can be a program name with args. | 6416 | # Extract the first word of "ranlib", so it can be a program name with args. |
7444 | set dummy ranlib; ac_word=$2 | 6417 | set dummy ranlib; ac_word=$2 |
7445 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 6418 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
7446 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 6419 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
7447 | if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then | 6420 | if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then |
7448 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6421 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7449 | else | 6422 | else |
@@ -7456,41 +6429,27 @@ do | |||
7456 | IFS=$as_save_IFS | 6429 | IFS=$as_save_IFS |
7457 | test -z "$as_dir" && as_dir=. | 6430 | test -z "$as_dir" && as_dir=. |
7458 | for ac_exec_ext in '' $ac_executable_extensions; do | 6431 | for ac_exec_ext in '' $ac_executable_extensions; do |
7459 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 6432 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
7460 | ac_cv_prog_ac_ct_RANLIB="ranlib" | 6433 | ac_cv_prog_ac_ct_RANLIB="ranlib" |
7461 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6434 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7462 | break 2 | 6435 | break 2 |
7463 | fi | 6436 | fi |
7464 | done | 6437 | done |
7465 | done | 6438 | done |
7466 | IFS=$as_save_IFS | ||
7467 | 6439 | ||
6440 | test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" | ||
7468 | fi | 6441 | fi |
7469 | fi | 6442 | fi |
7470 | ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB | 6443 | ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB |
7471 | if test -n "$ac_ct_RANLIB"; then | 6444 | if test -n "$ac_ct_RANLIB"; then |
7472 | { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 | 6445 | echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 |
7473 | echo "${ECHO_T}$ac_ct_RANLIB" >&6; } | 6446 | echo "${ECHO_T}$ac_ct_RANLIB" >&6 |
7474 | else | 6447 | else |
7475 | { echo "$as_me:$LINENO: result: no" >&5 | 6448 | echo "$as_me:$LINENO: result: no" >&5 |
7476 | echo "${ECHO_T}no" >&6; } | 6449 | echo "${ECHO_T}no" >&6 |
7477 | fi | 6450 | fi |
7478 | 6451 | ||
7479 | if test "x$ac_ct_RANLIB" = x; then | 6452 | RANLIB=$ac_ct_RANLIB |
7480 | RANLIB=":" | ||
7481 | else | ||
7482 | case $cross_compiling:$ac_tool_warned in | ||
7483 | yes:) | ||
7484 | { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
7485 | whose name does not start with the host triplet. If you think this | ||
7486 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
7487 | echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
7488 | whose name does not start with the host triplet. If you think this | ||
7489 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
7490 | ac_tool_warned=yes ;; | ||
7491 | esac | ||
7492 | RANLIB=$ac_ct_RANLIB | ||
7493 | fi | ||
7494 | else | 6453 | else |
7495 | RANLIB="$ac_cv_prog_RANLIB" | 6454 | RANLIB="$ac_cv_prog_RANLIB" |
7496 | fi | 6455 | fi |
@@ -7498,8 +6457,8 @@ fi | |||
7498 | if test -n "$ac_tool_prefix"; then | 6457 | if test -n "$ac_tool_prefix"; then |
7499 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | 6458 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
7500 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | 6459 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
7501 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 6460 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
7502 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 6461 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
7503 | if test "${ac_cv_prog_STRIP+set}" = set; then | 6462 | if test "${ac_cv_prog_STRIP+set}" = set; then |
7504 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6463 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7505 | else | 6464 | else |
@@ -7512,34 +6471,32 @@ do | |||
7512 | IFS=$as_save_IFS | 6471 | IFS=$as_save_IFS |
7513 | test -z "$as_dir" && as_dir=. | 6472 | test -z "$as_dir" && as_dir=. |
7514 | for ac_exec_ext in '' $ac_executable_extensions; do | 6473 | for ac_exec_ext in '' $ac_executable_extensions; do |
7515 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 6474 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
7516 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" | 6475 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
7517 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6476 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7518 | break 2 | 6477 | break 2 |
7519 | fi | 6478 | fi |
7520 | done | 6479 | done |
7521 | done | 6480 | done |
7522 | IFS=$as_save_IFS | ||
7523 | 6481 | ||
7524 | fi | 6482 | fi |
7525 | fi | 6483 | fi |
7526 | STRIP=$ac_cv_prog_STRIP | 6484 | STRIP=$ac_cv_prog_STRIP |
7527 | if test -n "$STRIP"; then | 6485 | if test -n "$STRIP"; then |
7528 | { echo "$as_me:$LINENO: result: $STRIP" >&5 | 6486 | echo "$as_me:$LINENO: result: $STRIP" >&5 |
7529 | echo "${ECHO_T}$STRIP" >&6; } | 6487 | echo "${ECHO_T}$STRIP" >&6 |
7530 | else | 6488 | else |
7531 | { echo "$as_me:$LINENO: result: no" >&5 | 6489 | echo "$as_me:$LINENO: result: no" >&5 |
7532 | echo "${ECHO_T}no" >&6; } | 6490 | echo "${ECHO_T}no" >&6 |
7533 | fi | 6491 | fi |
7534 | 6492 | ||
7535 | |||
7536 | fi | 6493 | fi |
7537 | if test -z "$ac_cv_prog_STRIP"; then | 6494 | if test -z "$ac_cv_prog_STRIP"; then |
7538 | ac_ct_STRIP=$STRIP | 6495 | ac_ct_STRIP=$STRIP |
7539 | # Extract the first word of "strip", so it can be a program name with args. | 6496 | # Extract the first word of "strip", so it can be a program name with args. |
7540 | set dummy strip; ac_word=$2 | 6497 | set dummy strip; ac_word=$2 |
7541 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | 6498 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
7542 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | 6499 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
7543 | if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then | 6500 | if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then |
7544 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6501 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7545 | else | 6502 | else |
@@ -7552,41 +6509,27 @@ do | |||
7552 | IFS=$as_save_IFS | 6509 | IFS=$as_save_IFS |
7553 | test -z "$as_dir" && as_dir=. | 6510 | test -z "$as_dir" && as_dir=. |
7554 | for ac_exec_ext in '' $ac_executable_extensions; do | 6511 | for ac_exec_ext in '' $ac_executable_extensions; do |
7555 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then | 6512 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
7556 | ac_cv_prog_ac_ct_STRIP="strip" | 6513 | ac_cv_prog_ac_ct_STRIP="strip" |
7557 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6514 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7558 | break 2 | 6515 | break 2 |
7559 | fi | 6516 | fi |
7560 | done | 6517 | done |
7561 | done | 6518 | done |
7562 | IFS=$as_save_IFS | ||
7563 | 6519 | ||
6520 | test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" | ||
7564 | fi | 6521 | fi |
7565 | fi | 6522 | fi |
7566 | ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP | 6523 | ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP |
7567 | if test -n "$ac_ct_STRIP"; then | 6524 | if test -n "$ac_ct_STRIP"; then |
7568 | { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 | 6525 | echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 |
7569 | echo "${ECHO_T}$ac_ct_STRIP" >&6; } | 6526 | echo "${ECHO_T}$ac_ct_STRIP" >&6 |
7570 | else | 6527 | else |
7571 | { echo "$as_me:$LINENO: result: no" >&5 | 6528 | echo "$as_me:$LINENO: result: no" >&5 |
7572 | echo "${ECHO_T}no" >&6; } | 6529 | echo "${ECHO_T}no" >&6 |
7573 | fi | 6530 | fi |
7574 | 6531 | ||
7575 | if test "x$ac_ct_STRIP" = x; then | 6532 | STRIP=$ac_ct_STRIP |
7576 | STRIP=":" | ||
7577 | else | ||
7578 | case $cross_compiling:$ac_tool_warned in | ||
7579 | yes:) | ||
7580 | { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | ||
7581 | whose name does not start with the host triplet. If you think this | ||
7582 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
7583 | echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
7584 | whose name does not start with the host triplet. If you think this | ||
7585 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
7586 | ac_tool_warned=yes ;; | ||
7587 | esac | ||
7588 | STRIP=$ac_ct_STRIP | ||
7589 | fi | ||
7590 | else | 6533 | else |
7591 | STRIP="$ac_cv_prog_STRIP" | 6534 | STRIP="$ac_cv_prog_STRIP" |
7592 | fi | 6535 | fi |
@@ -7645,8 +6588,8 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` | |||
7645 | case $deplibs_check_method in | 6588 | case $deplibs_check_method in |
7646 | file_magic*) | 6589 | file_magic*) |
7647 | if test "$file_magic_cmd" = '$MAGIC_CMD'; then | 6590 | if test "$file_magic_cmd" = '$MAGIC_CMD'; then |
7648 | { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 | 6591 | echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 |
7649 | echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } | 6592 | echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 |
7650 | if test "${lt_cv_path_MAGIC_CMD+set}" = set; then | 6593 | if test "${lt_cv_path_MAGIC_CMD+set}" = set; then |
7651 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6594 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7652 | else | 6595 | else |
@@ -7698,17 +6641,17 @@ fi | |||
7698 | 6641 | ||
7699 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" | 6642 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" |
7700 | if test -n "$MAGIC_CMD"; then | 6643 | if test -n "$MAGIC_CMD"; then |
7701 | { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 | 6644 | echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 |
7702 | echo "${ECHO_T}$MAGIC_CMD" >&6; } | 6645 | echo "${ECHO_T}$MAGIC_CMD" >&6 |
7703 | else | 6646 | else |
7704 | { echo "$as_me:$LINENO: result: no" >&5 | 6647 | echo "$as_me:$LINENO: result: no" >&5 |
7705 | echo "${ECHO_T}no" >&6; } | 6648 | echo "${ECHO_T}no" >&6 |
7706 | fi | 6649 | fi |
7707 | 6650 | ||
7708 | if test -z "$lt_cv_path_MAGIC_CMD"; then | 6651 | if test -z "$lt_cv_path_MAGIC_CMD"; then |
7709 | if test -n "$ac_tool_prefix"; then | 6652 | if test -n "$ac_tool_prefix"; then |
7710 | { echo "$as_me:$LINENO: checking for file" >&5 | 6653 | echo "$as_me:$LINENO: checking for file" >&5 |
7711 | echo $ECHO_N "checking for file... $ECHO_C" >&6; } | 6654 | echo $ECHO_N "checking for file... $ECHO_C" >&6 |
7712 | if test "${lt_cv_path_MAGIC_CMD+set}" = set; then | 6655 | if test "${lt_cv_path_MAGIC_CMD+set}" = set; then |
7713 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6656 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7714 | else | 6657 | else |
@@ -7760,11 +6703,11 @@ fi | |||
7760 | 6703 | ||
7761 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" | 6704 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" |
7762 | if test -n "$MAGIC_CMD"; then | 6705 | if test -n "$MAGIC_CMD"; then |
7763 | { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 | 6706 | echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 |
7764 | echo "${ECHO_T}$MAGIC_CMD" >&6; } | 6707 | echo "${ECHO_T}$MAGIC_CMD" >&6 |
7765 | else | 6708 | else |
7766 | { echo "$as_me:$LINENO: result: no" >&5 | 6709 | echo "$as_me:$LINENO: result: no" >&5 |
7767 | echo "${ECHO_T}no" >&6; } | 6710 | echo "${ECHO_T}no" >&6 |
7768 | fi | 6711 | fi |
7769 | 6712 | ||
7770 | else | 6713 | else |
@@ -7779,21 +6722,21 @@ esac | |||
7779 | enable_dlopen=no | 6722 | enable_dlopen=no |
7780 | enable_win32_dll=yes | 6723 | enable_win32_dll=yes |
7781 | 6724 | ||
7782 | # Check whether --enable-libtool-lock was given. | 6725 | # Check whether --enable-libtool-lock or --disable-libtool-lock was given. |
7783 | if test "${enable_libtool_lock+set}" = set; then | 6726 | if test "${enable_libtool_lock+set}" = set; then |
7784 | enableval=$enable_libtool_lock; | 6727 | enableval="$enable_libtool_lock" |
7785 | fi | ||
7786 | 6728 | ||
6729 | fi; | ||
7787 | test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes | 6730 | test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes |
7788 | 6731 | ||
7789 | 6732 | ||
7790 | # Check whether --with-pic was given. | 6733 | # Check whether --with-pic or --without-pic was given. |
7791 | if test "${with_pic+set}" = set; then | 6734 | if test "${with_pic+set}" = set; then |
7792 | withval=$with_pic; pic_mode="$withval" | 6735 | withval="$with_pic" |
6736 | pic_mode="$withval" | ||
7793 | else | 6737 | else |
7794 | pic_mode=default | 6738 | pic_mode=default |
7795 | fi | 6739 | fi; |
7796 | |||
7797 | test -z "$pic_mode" && pic_mode=default | 6740 | test -z "$pic_mode" && pic_mode=default |
7798 | 6741 | ||
7799 | # Use C for the default configuration in the libtool script | 6742 | # Use C for the default configuration in the libtool script |
@@ -7851,8 +6794,8 @@ if test "$GCC" = yes; then | |||
7851 | lt_prog_compiler_no_builtin_flag=' -fno-builtin' | 6794 | lt_prog_compiler_no_builtin_flag=' -fno-builtin' |
7852 | 6795 | ||
7853 | 6796 | ||
7854 | { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | 6797 | echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 |
7855 | echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } | 6798 | echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 |
7856 | if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then | 6799 | if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then |
7857 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6800 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7858 | else | 6801 | else |
@@ -7869,11 +6812,11 @@ else | |||
7869 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 6812 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
7870 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 6813 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
7871 | -e 's:$: $lt_compiler_flag:'` | 6814 | -e 's:$: $lt_compiler_flag:'` |
7872 | (eval echo "\"\$as_me:7872: $lt_compile\"" >&5) | 6815 | (eval echo "\"\$as_me:6815: $lt_compile\"" >&5) |
7873 | (eval "$lt_compile" 2>conftest.err) | 6816 | (eval "$lt_compile" 2>conftest.err) |
7874 | ac_status=$? | 6817 | ac_status=$? |
7875 | cat conftest.err >&5 | 6818 | cat conftest.err >&5 |
7876 | echo "$as_me:7876: \$? = $ac_status" >&5 | 6819 | echo "$as_me:6819: \$? = $ac_status" >&5 |
7877 | if (exit $ac_status) && test -s "$ac_outfile"; then | 6820 | if (exit $ac_status) && test -s "$ac_outfile"; then |
7878 | # The compiler can only warn and ignore the option if not recognized | 6821 | # The compiler can only warn and ignore the option if not recognized |
7879 | # So say no if there are warnings other than the usual output. | 6822 | # So say no if there are warnings other than the usual output. |
@@ -7886,8 +6829,8 @@ else | |||
7886 | $rm conftest* | 6829 | $rm conftest* |
7887 | 6830 | ||
7888 | fi | 6831 | fi |
7889 | { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 | 6832 | echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 |
7890 | echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } | 6833 | echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 |
7891 | 6834 | ||
7892 | if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then | 6835 | if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then |
7893 | lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" | 6836 | lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" |
@@ -7901,8 +6844,8 @@ lt_prog_compiler_wl= | |||
7901 | lt_prog_compiler_pic= | 6844 | lt_prog_compiler_pic= |
7902 | lt_prog_compiler_static= | 6845 | lt_prog_compiler_static= |
7903 | 6846 | ||
7904 | { echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | 6847 | echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 |
7905 | echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | 6848 | echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 |
7906 | 6849 | ||
7907 | if test "$GCC" = yes; then | 6850 | if test "$GCC" = yes; then |
7908 | lt_prog_compiler_wl='-Wl,' | 6851 | lt_prog_compiler_wl='-Wl,' |
@@ -8031,7 +6974,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | |||
8031 | lt_prog_compiler_static='-Bstatic' | 6974 | lt_prog_compiler_static='-Bstatic' |
8032 | ;; | 6975 | ;; |
8033 | 6976 | ||
8034 | linux* | k*bsd*-gnu) | 6977 | linux*) |
8035 | case $cc_basename in | 6978 | case $cc_basename in |
8036 | icc* | ecc*) | 6979 | icc* | ecc*) |
8037 | lt_prog_compiler_wl='-Wl,' | 6980 | lt_prog_compiler_wl='-Wl,' |
@@ -8111,16 +7054,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | |||
8111 | esac | 7054 | esac |
8112 | fi | 7055 | fi |
8113 | 7056 | ||
8114 | { echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 | 7057 | echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 |
8115 | echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } | 7058 | echo "${ECHO_T}$lt_prog_compiler_pic" >&6 |
8116 | 7059 | ||
8117 | # | 7060 | # |
8118 | # Check to make sure the PIC flag actually works. | 7061 | # Check to make sure the PIC flag actually works. |
8119 | # | 7062 | # |
8120 | if test -n "$lt_prog_compiler_pic"; then | 7063 | if test -n "$lt_prog_compiler_pic"; then |
8121 | 7064 | ||
8122 | { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 | 7065 | echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 |
8123 | echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } | 7066 | echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 |
8124 | if test "${lt_prog_compiler_pic_works+set}" = set; then | 7067 | if test "${lt_prog_compiler_pic_works+set}" = set; then |
8125 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 7068 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
8126 | else | 7069 | else |
@@ -8137,11 +7080,11 @@ else | |||
8137 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 7080 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
8138 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 7081 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
8139 | -e 's:$: $lt_compiler_flag:'` | 7082 | -e 's:$: $lt_compiler_flag:'` |
8140 | (eval echo "\"\$as_me:8140: $lt_compile\"" >&5) | 7083 | (eval echo "\"\$as_me:7083: $lt_compile\"" >&5) |
8141 | (eval "$lt_compile" 2>conftest.err) | 7084 | (eval "$lt_compile" 2>conftest.err) |
8142 | ac_status=$? | 7085 | ac_status=$? |
8143 | cat conftest.err >&5 | 7086 | cat conftest.err >&5 |
8144 | echo "$as_me:8144: \$? = $ac_status" >&5 | 7087 | echo "$as_me:7087: \$? = $ac_status" >&5 |
8145 | if (exit $ac_status) && test -s "$ac_outfile"; then | 7088 | if (exit $ac_status) && test -s "$ac_outfile"; then |
8146 | # The compiler can only warn and ignore the option if not recognized | 7089 | # The compiler can only warn and ignore the option if not recognized |
8147 | # So say no if there are warnings other than the usual output. | 7090 | # So say no if there are warnings other than the usual output. |
@@ -8154,8 +7097,8 @@ else | |||
8154 | $rm conftest* | 7097 | $rm conftest* |
8155 | 7098 | ||
8156 | fi | 7099 | fi |
8157 | { echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 | 7100 | echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 |
8158 | echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } | 7101 | echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 |
8159 | 7102 | ||
8160 | if test x"$lt_prog_compiler_pic_works" = xyes; then | 7103 | if test x"$lt_prog_compiler_pic_works" = xyes; then |
8161 | case $lt_prog_compiler_pic in | 7104 | case $lt_prog_compiler_pic in |
@@ -8182,8 +7125,8 @@ esac | |||
8182 | # Check to make sure the static flag actually works. | 7125 | # Check to make sure the static flag actually works. |
8183 | # | 7126 | # |
8184 | wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" | 7127 | wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" |
8185 | { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | 7128 | echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
8186 | echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } | 7129 | echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 |
8187 | if test "${lt_prog_compiler_static_works+set}" = set; then | 7130 | if test "${lt_prog_compiler_static_works+set}" = set; then |
8188 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 7131 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
8189 | else | 7132 | else |
@@ -8210,8 +7153,8 @@ else | |||
8210 | LDFLAGS="$save_LDFLAGS" | 7153 | LDFLAGS="$save_LDFLAGS" |
8211 | 7154 | ||
8212 | fi | 7155 | fi |
8213 | { echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 | 7156 | echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 |
8214 | echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } | 7157 | echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 |
8215 | 7158 | ||
8216 | if test x"$lt_prog_compiler_static_works" = xyes; then | 7159 | if test x"$lt_prog_compiler_static_works" = xyes; then |
8217 | : | 7160 | : |
@@ -8220,8 +7163,8 @@ else | |||
8220 | fi | 7163 | fi |
8221 | 7164 | ||
8222 | 7165 | ||
8223 | { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | 7166 | echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
8224 | echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } | 7167 | echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 |
8225 | if test "${lt_cv_prog_compiler_c_o+set}" = set; then | 7168 | if test "${lt_cv_prog_compiler_c_o+set}" = set; then |
8226 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 7169 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
8227 | else | 7170 | else |
@@ -8241,11 +7184,11 @@ else | |||
8241 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 7184 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
8242 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 7185 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
8243 | -e 's:$: $lt_compiler_flag:'` | 7186 | -e 's:$: $lt_compiler_flag:'` |
8244 | (eval echo "\"\$as_me:8244: $lt_compile\"" >&5) | 7187 | (eval echo "\"\$as_me:7187: $lt_compile\"" >&5) |
8245 | (eval "$lt_compile" 2>out/conftest.err) | 7188 | (eval "$lt_compile" 2>out/conftest.err) |
8246 | ac_status=$? | 7189 | ac_status=$? |
8247 | cat out/conftest.err >&5 | 7190 | cat out/conftest.err >&5 |
8248 | echo "$as_me:8248: \$? = $ac_status" >&5 | 7191 | echo "$as_me:7191: \$? = $ac_status" >&5 |
8249 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 7192 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
8250 | then | 7193 | then |
8251 | # The compiler can only warn and ignore the option if not recognized | 7194 | # The compiler can only warn and ignore the option if not recognized |
@@ -8267,23 +7210,23 @@ else | |||
8267 | $rm conftest* | 7210 | $rm conftest* |
8268 | 7211 | ||
8269 | fi | 7212 | fi |
8270 | { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 | 7213 | echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 |
8271 | echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } | 7214 | echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 |
8272 | 7215 | ||
8273 | 7216 | ||
8274 | hard_links="nottested" | 7217 | hard_links="nottested" |
8275 | if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then | 7218 | if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then |
8276 | # do not overwrite the value of need_locks provided by the user | 7219 | # do not overwrite the value of need_locks provided by the user |
8277 | { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | 7220 | echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 |
8278 | echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } | 7221 | echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 |
8279 | hard_links=yes | 7222 | hard_links=yes |
8280 | $rm conftest* | 7223 | $rm conftest* |
8281 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | 7224 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
8282 | touch conftest.a | 7225 | touch conftest.a |
8283 | ln conftest.a conftest.b 2>&5 || hard_links=no | 7226 | ln conftest.a conftest.b 2>&5 || hard_links=no |
8284 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | 7227 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
8285 | { echo "$as_me:$LINENO: result: $hard_links" >&5 | 7228 | echo "$as_me:$LINENO: result: $hard_links" >&5 |
8286 | echo "${ECHO_T}$hard_links" >&6; } | 7229 | echo "${ECHO_T}$hard_links" >&6 |
8287 | if test "$hard_links" = no; then | 7230 | if test "$hard_links" = no; then |
8288 | { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | 7231 | { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 |
8289 | echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} | 7232 | echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} |
@@ -8293,8 +7236,8 @@ else | |||
8293 | need_locks=no | 7236 | need_locks=no |
8294 | fi | 7237 | fi |
8295 | 7238 | ||
8296 | { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | 7239 | echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 |
8297 | echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } | 7240 | echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 |
8298 | 7241 | ||
8299 | runpath_var= | 7242 | runpath_var= |
8300 | allow_undefined_flag= | 7243 | allow_undefined_flag= |
@@ -8470,7 +7413,7 @@ EOF | |||
8470 | 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' | 7413 | 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' |
8471 | ;; | 7414 | ;; |
8472 | 7415 | ||
8473 | linux* | k*bsd*-gnu) | 7416 | linux*) |
8474 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | 7417 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
8475 | tmp_addflag= | 7418 | tmp_addflag= |
8476 | case $cc_basename,$host_cpu in | 7419 | case $cc_basename,$host_cpu in |
@@ -8496,13 +7439,12 @@ EOF | |||
8496 | $echo "local: *; };" >> $output_objdir/$libname.ver~ | 7439 | $echo "local: *; };" >> $output_objdir/$libname.ver~ |
8497 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | 7440 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
8498 | fi | 7441 | fi |
8499 | link_all_deplibs=no | ||
8500 | else | 7442 | else |
8501 | ld_shlibs=no | 7443 | ld_shlibs=no |
8502 | fi | 7444 | fi |
8503 | ;; | 7445 | ;; |
8504 | 7446 | ||
8505 | netbsd* | netbsdelf*-gnu) | 7447 | netbsd*) |
8506 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 7448 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
8507 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 7449 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
8508 | wlarc= | 7450 | wlarc= |
@@ -8710,36 +7652,24 @@ main () | |||
8710 | } | 7652 | } |
8711 | _ACEOF | 7653 | _ACEOF |
8712 | rm -f conftest.$ac_objext conftest$ac_exeext | 7654 | rm -f conftest.$ac_objext conftest$ac_exeext |
8713 | if { (ac_try="$ac_link" | 7655 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
8714 | case "(($ac_try" in | 7656 | (eval $ac_link) 2>conftest.er1 |
8715 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8716 | *) ac_try_echo=$ac_try;; | ||
8717 | esac | ||
8718 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8719 | (eval "$ac_link") 2>conftest.er1 | ||
8720 | ac_status=$? | 7657 | ac_status=$? |
8721 | grep -v '^ *+' conftest.er1 >conftest.err | 7658 | grep -v '^ *+' conftest.er1 >conftest.err |
8722 | rm -f conftest.er1 | 7659 | rm -f conftest.er1 |
8723 | cat conftest.err >&5 | 7660 | cat conftest.err >&5 |
8724 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 7661 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8725 | (exit $ac_status); } && | 7662 | (exit $ac_status); } && |
8726 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 7663 | { ac_try='test -z "$ac_c_werror_flag" |
8727 | { (case "(($ac_try" in | 7664 | || test ! -s conftest.err' |
8728 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 7665 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
8729 | *) ac_try_echo=$ac_try;; | 7666 | (eval $ac_try) 2>&5 |
8730 | esac | ||
8731 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8732 | (eval "$ac_try") 2>&5 | ||
8733 | ac_status=$? | 7667 | ac_status=$? |
8734 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 7668 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8735 | (exit $ac_status); }; } && | 7669 | (exit $ac_status); }; } && |
8736 | { ac_try='test -s conftest$ac_exeext' | 7670 | { ac_try='test -s conftest$ac_exeext' |
8737 | { (case "(($ac_try" in | 7671 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
8738 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 7672 | (eval $ac_try) 2>&5 |
8739 | *) ac_try_echo=$ac_try;; | ||
8740 | esac | ||
8741 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8742 | (eval "$ac_try") 2>&5 | ||
8743 | ac_status=$? | 7673 | ac_status=$? |
8744 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 7674 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8745 | (exit $ac_status); }; }; then | 7675 | (exit $ac_status); }; }; then |
@@ -8753,10 +7683,8 @@ else | |||
8753 | echo "$as_me: failed program was:" >&5 | 7683 | echo "$as_me: failed program was:" >&5 |
8754 | sed 's/^/| /' conftest.$ac_ext >&5 | 7684 | sed 's/^/| /' conftest.$ac_ext >&5 |
8755 | 7685 | ||
8756 | |||
8757 | fi | 7686 | fi |
8758 | 7687 | rm -f conftest.err conftest.$ac_objext \ | |
8759 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
8760 | conftest$ac_exeext conftest.$ac_ext | 7688 | conftest$ac_exeext conftest.$ac_ext |
8761 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 7689 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8762 | 7690 | ||
@@ -8785,36 +7713,24 @@ main () | |||
8785 | } | 7713 | } |
8786 | _ACEOF | 7714 | _ACEOF |
8787 | rm -f conftest.$ac_objext conftest$ac_exeext | 7715 | rm -f conftest.$ac_objext conftest$ac_exeext |
8788 | if { (ac_try="$ac_link" | 7716 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
8789 | case "(($ac_try" in | 7717 | (eval $ac_link) 2>conftest.er1 |
8790 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
8791 | *) ac_try_echo=$ac_try;; | ||
8792 | esac | ||
8793 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8794 | (eval "$ac_link") 2>conftest.er1 | ||
8795 | ac_status=$? | 7718 | ac_status=$? |
8796 | grep -v '^ *+' conftest.er1 >conftest.err | 7719 | grep -v '^ *+' conftest.er1 >conftest.err |
8797 | rm -f conftest.er1 | 7720 | rm -f conftest.er1 |
8798 | cat conftest.err >&5 | 7721 | cat conftest.err >&5 |
8799 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 7722 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8800 | (exit $ac_status); } && | 7723 | (exit $ac_status); } && |
8801 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 7724 | { ac_try='test -z "$ac_c_werror_flag" |
8802 | { (case "(($ac_try" in | 7725 | || test ! -s conftest.err' |
8803 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 7726 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
8804 | *) ac_try_echo=$ac_try;; | 7727 | (eval $ac_try) 2>&5 |
8805 | esac | ||
8806 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8807 | (eval "$ac_try") 2>&5 | ||
8808 | ac_status=$? | 7728 | ac_status=$? |
8809 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 7729 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8810 | (exit $ac_status); }; } && | 7730 | (exit $ac_status); }; } && |
8811 | { ac_try='test -s conftest$ac_exeext' | 7731 | { ac_try='test -s conftest$ac_exeext' |
8812 | { (case "(($ac_try" in | 7732 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
8813 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 7733 | (eval $ac_try) 2>&5 |
8814 | *) ac_try_echo=$ac_try;; | ||
8815 | esac | ||
8816 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
8817 | (eval "$ac_try") 2>&5 | ||
8818 | ac_status=$? | 7734 | ac_status=$? |
8819 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 7735 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8820 | (exit $ac_status); }; }; then | 7736 | (exit $ac_status); }; }; then |
@@ -8828,10 +7744,8 @@ else | |||
8828 | echo "$as_me: failed program was:" >&5 | 7744 | echo "$as_me: failed program was:" >&5 |
8829 | sed 's/^/| /' conftest.$ac_ext >&5 | 7745 | sed 's/^/| /' conftest.$ac_ext >&5 |
8830 | 7746 | ||
8831 | |||
8832 | fi | 7747 | fi |
8833 | 7748 | rm -f conftest.err conftest.$ac_objext \ | |
8834 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
8835 | conftest$ac_exeext conftest.$ac_ext | 7749 | conftest$ac_exeext conftest.$ac_ext |
8836 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 7750 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8837 | 7751 | ||
@@ -8962,7 +7876,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
8962 | ;; | 7876 | ;; |
8963 | 7877 | ||
8964 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 7878 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
8965 | freebsd* | dragonfly*) | 7879 | freebsd* | kfreebsd*-gnu | dragonfly*) |
8966 | archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | 7880 | archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
8967 | hardcode_libdir_flag_spec='-R$libdir' | 7881 | hardcode_libdir_flag_spec='-R$libdir' |
8968 | hardcode_direct=yes | 7882 | hardcode_direct=yes |
@@ -9064,7 +7978,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
9064 | link_all_deplibs=yes | 7978 | link_all_deplibs=yes |
9065 | ;; | 7979 | ;; |
9066 | 7980 | ||
9067 | netbsd* | netbsdelf*-gnu) | 7981 | netbsd*) |
9068 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 7982 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
9069 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 7983 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
9070 | else | 7984 | else |
@@ -9280,8 +8194,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
9280 | esac | 8194 | esac |
9281 | fi | 8195 | fi |
9282 | 8196 | ||
9283 | { echo "$as_me:$LINENO: result: $ld_shlibs" >&5 | 8197 | echo "$as_me:$LINENO: result: $ld_shlibs" >&5 |
9284 | echo "${ECHO_T}$ld_shlibs" >&6; } | 8198 | echo "${ECHO_T}$ld_shlibs" >&6 |
9285 | test "$ld_shlibs" = no && can_build_shared=no | 8199 | test "$ld_shlibs" = no && can_build_shared=no |
9286 | 8200 | ||
9287 | # | 8201 | # |
@@ -9301,8 +8215,8 @@ x|xyes) | |||
9301 | # Test whether the compiler implicitly links with -lc since on some | 8215 | # Test whether the compiler implicitly links with -lc since on some |
9302 | # systems, -lgcc has to come before -lc. If gcc already passes -lc | 8216 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
9303 | # to ld, don't add -lc before -lgcc. | 8217 | # to ld, don't add -lc before -lgcc. |
9304 | { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | 8218 | echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 |
9305 | echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } | 8219 | echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 |
9306 | $rm conftest* | 8220 | $rm conftest* |
9307 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext | 8221 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
9308 | 8222 | ||
@@ -9339,16 +8253,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& | |||
9339 | cat conftest.err 1>&5 | 8253 | cat conftest.err 1>&5 |
9340 | fi | 8254 | fi |
9341 | $rm conftest* | 8255 | $rm conftest* |
9342 | { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 | 8256 | echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 |
9343 | echo "${ECHO_T}$archive_cmds_need_lc" >&6; } | 8257 | echo "${ECHO_T}$archive_cmds_need_lc" >&6 |
9344 | ;; | 8258 | ;; |
9345 | esac | 8259 | esac |
9346 | fi | 8260 | fi |
9347 | ;; | 8261 | ;; |
9348 | esac | 8262 | esac |
9349 | 8263 | ||
9350 | { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | 8264 | echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 |
9351 | echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } | 8265 | echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 |
9352 | library_names_spec= | 8266 | library_names_spec= |
9353 | libname_spec='lib$name' | 8267 | libname_spec='lib$name' |
9354 | soname_spec= | 8268 | soname_spec= |
@@ -9554,6 +8468,18 @@ freebsd1*) | |||
9554 | dynamic_linker=no | 8468 | dynamic_linker=no |
9555 | ;; | 8469 | ;; |
9556 | 8470 | ||
8471 | kfreebsd*-gnu) | ||
8472 | version_type=linux | ||
8473 | need_lib_prefix=no | ||
8474 | need_version=no | ||
8475 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
8476 | soname_spec='${libname}${release}${shared_ext}$major' | ||
8477 | shlibpath_var=LD_LIBRARY_PATH | ||
8478 | shlibpath_overrides_runpath=no | ||
8479 | hardcode_into_libs=yes | ||
8480 | dynamic_linker='GNU ld.so' | ||
8481 | ;; | ||
8482 | |||
9557 | freebsd* | dragonfly*) | 8483 | freebsd* | dragonfly*) |
9558 | # DragonFly does not have aout. When/if they implement a new | 8484 | # DragonFly does not have aout. When/if they implement a new |
9559 | # versioning mechanism, adjust this. | 8485 | # versioning mechanism, adjust this. |
@@ -9709,7 +8635,7 @@ linux*oldld* | linux*aout* | linux*coff*) | |||
9709 | ;; | 8635 | ;; |
9710 | 8636 | ||
9711 | # This must be Linux ELF. | 8637 | # This must be Linux ELF. |
9712 | linux* | k*bsd*-gnu) | 8638 | linux*) |
9713 | version_type=linux | 8639 | version_type=linux |
9714 | need_lib_prefix=no | 8640 | need_lib_prefix=no |
9715 | need_version=no | 8641 | need_version=no |
@@ -9723,10 +8649,31 @@ linux* | k*bsd*-gnu) | |||
9723 | # before this can be enabled. | 8649 | # before this can be enabled. |
9724 | hardcode_into_libs=yes | 8650 | hardcode_into_libs=yes |
9725 | 8651 | ||
8652 | # find out which ABI we are using | ||
8653 | libsuff= | ||
8654 | case "$host_cpu" in | ||
8655 | x86_64*|s390x*|powerpc64*) | ||
8656 | echo '#line 8656 "configure"' > conftest.$ac_ext | ||
8657 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8658 | (eval $ac_compile) 2>&5 | ||
8659 | ac_status=$? | ||
8660 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8661 | (exit $ac_status); }; then | ||
8662 | case `/usr/bin/file conftest.$ac_objext` in | ||
8663 | *64-bit*) | ||
8664 | libsuff=64 | ||
8665 | sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | ||
8666 | ;; | ||
8667 | esac | ||
8668 | fi | ||
8669 | rm -rf conftest* | ||
8670 | ;; | ||
8671 | esac | ||
8672 | |||
9726 | # Append ld.so.conf contents to the search path | 8673 | # Append ld.so.conf contents to the search path |
9727 | if test -f /etc/ld.so.conf; then | 8674 | if test -f /etc/ld.so.conf; then |
9728 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | 8675 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
9729 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | 8676 | sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" |
9730 | fi | 8677 | fi |
9731 | 8678 | ||
9732 | # We used to test for /lib/ld.so.1 and disable shared libraries on | 8679 | # We used to test for /lib/ld.so.1 and disable shared libraries on |
@@ -9738,7 +8685,7 @@ linux* | k*bsd*-gnu) | |||
9738 | dynamic_linker='GNU/Linux ld.so' | 8685 | dynamic_linker='GNU/Linux ld.so' |
9739 | ;; | 8686 | ;; |
9740 | 8687 | ||
9741 | netbsdelf*-gnu) | 8688 | knetbsd*-gnu) |
9742 | version_type=linux | 8689 | version_type=linux |
9743 | need_lib_prefix=no | 8690 | need_lib_prefix=no |
9744 | need_version=no | 8691 | need_version=no |
@@ -9747,7 +8694,7 @@ netbsdelf*-gnu) | |||
9747 | shlibpath_var=LD_LIBRARY_PATH | 8694 | shlibpath_var=LD_LIBRARY_PATH |
9748 | shlibpath_overrides_runpath=no | 8695 | shlibpath_overrides_runpath=no |
9749 | hardcode_into_libs=yes | 8696 | hardcode_into_libs=yes |
9750 | dynamic_linker='NetBSD ld.elf_so' | 8697 | dynamic_linker='GNU ld.so' |
9751 | ;; | 8698 | ;; |
9752 | 8699 | ||
9753 | netbsd*) | 8700 | netbsd*) |
@@ -9923,8 +8870,8 @@ uts4*) | |||
9923 | dynamic_linker=no | 8870 | dynamic_linker=no |
9924 | ;; | 8871 | ;; |
9925 | esac | 8872 | esac |
9926 | { echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | 8873 | echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
9927 | echo "${ECHO_T}$dynamic_linker" >&6; } | 8874 | echo "${ECHO_T}$dynamic_linker" >&6 |
9928 | test "$dynamic_linker" = no && can_build_shared=no | 8875 | test "$dynamic_linker" = no && can_build_shared=no |
9929 | 8876 | ||
9930 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | 8877 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
@@ -9932,8 +8879,8 @@ if test "$GCC" = yes; then | |||
9932 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | 8879 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
9933 | fi | 8880 | fi |
9934 | 8881 | ||
9935 | { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | 8882 | echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
9936 | echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } | 8883 | echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 |
9937 | hardcode_action= | 8884 | hardcode_action= |
9938 | if test -n "$hardcode_libdir_flag_spec" || \ | 8885 | if test -n "$hardcode_libdir_flag_spec" || \ |
9939 | test -n "$runpath_var" || \ | 8886 | test -n "$runpath_var" || \ |
@@ -9957,8 +8904,8 @@ else | |||
9957 | # directories. | 8904 | # directories. |
9958 | hardcode_action=unsupported | 8905 | hardcode_action=unsupported |
9959 | fi | 8906 | fi |
9960 | { echo "$as_me:$LINENO: result: $hardcode_action" >&5 | 8907 | echo "$as_me:$LINENO: result: $hardcode_action" >&5 |
9961 | echo "${ECHO_T}$hardcode_action" >&6; } | 8908 | echo "${ECHO_T}$hardcode_action" >&6 |
9962 | 8909 | ||
9963 | if test "$hardcode_action" = relink; then | 8910 | if test "$hardcode_action" = relink; then |
9964 | # Fast installation is not supported | 8911 | # Fast installation is not supported |
@@ -9971,29 +8918,29 @@ fi | |||
9971 | 8918 | ||
9972 | striplib= | 8919 | striplib= |
9973 | old_striplib= | 8920 | old_striplib= |
9974 | { echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 | 8921 | echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 |
9975 | echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } | 8922 | echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 |
9976 | if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then | 8923 | if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then |
9977 | test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" | 8924 | test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" |
9978 | test -z "$striplib" && striplib="$STRIP --strip-unneeded" | 8925 | test -z "$striplib" && striplib="$STRIP --strip-unneeded" |
9979 | { echo "$as_me:$LINENO: result: yes" >&5 | 8926 | echo "$as_me:$LINENO: result: yes" >&5 |
9980 | echo "${ECHO_T}yes" >&6; } | 8927 | echo "${ECHO_T}yes" >&6 |
9981 | else | 8928 | else |
9982 | # FIXME - insert some real tests, host_os isn't really good enough | 8929 | # FIXME - insert some real tests, host_os isn't really good enough |
9983 | case $host_os in | 8930 | case $host_os in |
9984 | darwin*) | 8931 | darwin*) |
9985 | if test -n "$STRIP" ; then | 8932 | if test -n "$STRIP" ; then |
9986 | striplib="$STRIP -x" | 8933 | striplib="$STRIP -x" |
9987 | { echo "$as_me:$LINENO: result: yes" >&5 | 8934 | echo "$as_me:$LINENO: result: yes" >&5 |
9988 | echo "${ECHO_T}yes" >&6; } | 8935 | echo "${ECHO_T}yes" >&6 |
9989 | else | 8936 | else |
9990 | { echo "$as_me:$LINENO: result: no" >&5 | 8937 | echo "$as_me:$LINENO: result: no" >&5 |
9991 | echo "${ECHO_T}no" >&6; } | 8938 | echo "${ECHO_T}no" >&6 |
9992 | fi | 8939 | fi |
9993 | ;; | 8940 | ;; |
9994 | *) | 8941 | *) |
9995 | { echo "$as_me:$LINENO: result: no" >&5 | 8942 | echo "$as_me:$LINENO: result: no" >&5 |
9996 | echo "${ECHO_T}no" >&6; } | 8943 | echo "${ECHO_T}no" >&6 |
9997 | ;; | 8944 | ;; |
9998 | esac | 8945 | esac |
9999 | fi | 8946 | fi |
@@ -10025,8 +8972,8 @@ else | |||
10025 | 8972 | ||
10026 | darwin*) | 8973 | darwin*) |
10027 | # if libdl is installed we need to link against it | 8974 | # if libdl is installed we need to link against it |
10028 | { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 | 8975 | echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 |
10029 | echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } | 8976 | echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 |
10030 | if test "${ac_cv_lib_dl_dlopen+set}" = set; then | 8977 | if test "${ac_cv_lib_dl_dlopen+set}" = set; then |
10031 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 8978 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
10032 | else | 8979 | else |
@@ -10039,52 +8986,40 @@ cat confdefs.h >>conftest.$ac_ext | |||
10039 | cat >>conftest.$ac_ext <<_ACEOF | 8986 | cat >>conftest.$ac_ext <<_ACEOF |
10040 | /* end confdefs.h. */ | 8987 | /* end confdefs.h. */ |
10041 | 8988 | ||
10042 | /* Override any GCC internal prototype to avoid an error. | 8989 | /* Override any gcc2 internal prototype to avoid an error. */ |
10043 | Use char because int might match the return type of a GCC | ||
10044 | builtin and then its argument prototype would still apply. */ | ||
10045 | #ifdef __cplusplus | 8990 | #ifdef __cplusplus |
10046 | extern "C" | 8991 | extern "C" |
10047 | #endif | 8992 | #endif |
8993 | /* We use char because int might match the return type of a gcc2 | ||
8994 | builtin and then its argument prototype would still apply. */ | ||
10048 | char dlopen (); | 8995 | char dlopen (); |
10049 | int | 8996 | int |
10050 | main () | 8997 | main () |
10051 | { | 8998 | { |
10052 | return dlopen (); | 8999 | dlopen (); |
10053 | ; | 9000 | ; |
10054 | return 0; | 9001 | return 0; |
10055 | } | 9002 | } |
10056 | _ACEOF | 9003 | _ACEOF |
10057 | rm -f conftest.$ac_objext conftest$ac_exeext | 9004 | rm -f conftest.$ac_objext conftest$ac_exeext |
10058 | if { (ac_try="$ac_link" | 9005 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
10059 | case "(($ac_try" in | 9006 | (eval $ac_link) 2>conftest.er1 |
10060 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10061 | *) ac_try_echo=$ac_try;; | ||
10062 | esac | ||
10063 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10064 | (eval "$ac_link") 2>conftest.er1 | ||
10065 | ac_status=$? | 9007 | ac_status=$? |
10066 | grep -v '^ *+' conftest.er1 >conftest.err | 9008 | grep -v '^ *+' conftest.er1 >conftest.err |
10067 | rm -f conftest.er1 | 9009 | rm -f conftest.er1 |
10068 | cat conftest.err >&5 | 9010 | cat conftest.err >&5 |
10069 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9011 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10070 | (exit $ac_status); } && | 9012 | (exit $ac_status); } && |
10071 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 9013 | { ac_try='test -z "$ac_c_werror_flag" |
10072 | { (case "(($ac_try" in | 9014 | || test ! -s conftest.err' |
10073 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 9015 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
10074 | *) ac_try_echo=$ac_try;; | 9016 | (eval $ac_try) 2>&5 |
10075 | esac | ||
10076 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10077 | (eval "$ac_try") 2>&5 | ||
10078 | ac_status=$? | 9017 | ac_status=$? |
10079 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9018 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10080 | (exit $ac_status); }; } && | 9019 | (exit $ac_status); }; } && |
10081 | { ac_try='test -s conftest$ac_exeext' | 9020 | { ac_try='test -s conftest$ac_exeext' |
10082 | { (case "(($ac_try" in | 9021 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
10083 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 9022 | (eval $ac_try) 2>&5 |
10084 | *) ac_try_echo=$ac_try;; | ||
10085 | esac | ||
10086 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10087 | (eval "$ac_try") 2>&5 | ||
10088 | ac_status=$? | 9023 | ac_status=$? |
10089 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9024 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10090 | (exit $ac_status); }; }; then | 9025 | (exit $ac_status); }; }; then |
@@ -10093,15 +9028,14 @@ else | |||
10093 | echo "$as_me: failed program was:" >&5 | 9028 | echo "$as_me: failed program was:" >&5 |
10094 | sed 's/^/| /' conftest.$ac_ext >&5 | 9029 | sed 's/^/| /' conftest.$ac_ext >&5 |
10095 | 9030 | ||
10096 | ac_cv_lib_dl_dlopen=no | 9031 | ac_cv_lib_dl_dlopen=no |
10097 | fi | 9032 | fi |
10098 | 9033 | rm -f conftest.err conftest.$ac_objext \ | |
10099 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10100 | conftest$ac_exeext conftest.$ac_ext | 9034 | conftest$ac_exeext conftest.$ac_ext |
10101 | LIBS=$ac_check_lib_save_LIBS | 9035 | LIBS=$ac_check_lib_save_LIBS |
10102 | fi | 9036 | fi |
10103 | { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 | 9037 | echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 |
10104 | echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } | 9038 | echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 |
10105 | if test $ac_cv_lib_dl_dlopen = yes; then | 9039 | if test $ac_cv_lib_dl_dlopen = yes; then |
10106 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" | 9040 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" |
10107 | else | 9041 | else |
@@ -10115,8 +9049,8 @@ fi | |||
10115 | ;; | 9049 | ;; |
10116 | 9050 | ||
10117 | *) | 9051 | *) |
10118 | { echo "$as_me:$LINENO: checking for shl_load" >&5 | 9052 | echo "$as_me:$LINENO: checking for shl_load" >&5 |
10119 | echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } | 9053 | echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 |
10120 | if test "${ac_cv_func_shl_load+set}" = set; then | 9054 | if test "${ac_cv_func_shl_load+set}" = set; then |
10121 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 9055 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
10122 | else | 9056 | else |
@@ -10143,59 +9077,53 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
10143 | 9077 | ||
10144 | #undef shl_load | 9078 | #undef shl_load |
10145 | 9079 | ||
10146 | /* Override any GCC internal prototype to avoid an error. | 9080 | /* Override any gcc2 internal prototype to avoid an error. */ |
10147 | Use char because int might match the return type of a GCC | ||
10148 | builtin and then its argument prototype would still apply. */ | ||
10149 | #ifdef __cplusplus | 9081 | #ifdef __cplusplus |
10150 | extern "C" | 9082 | extern "C" |
9083 | { | ||
10151 | #endif | 9084 | #endif |
9085 | /* We use char because int might match the return type of a gcc2 | ||
9086 | builtin and then its argument prototype would still apply. */ | ||
10152 | char shl_load (); | 9087 | char shl_load (); |
10153 | /* The GNU C library defines this for functions which it implements | 9088 | /* The GNU C library defines this for functions which it implements |
10154 | to always fail with ENOSYS. Some functions are actually named | 9089 | to always fail with ENOSYS. Some functions are actually named |
10155 | something starting with __ and the normal name is an alias. */ | 9090 | something starting with __ and the normal name is an alias. */ |
10156 | #if defined __stub_shl_load || defined __stub___shl_load | 9091 | #if defined (__stub_shl_load) || defined (__stub___shl_load) |
10157 | choke me | 9092 | choke me |
9093 | #else | ||
9094 | char (*f) () = shl_load; | ||
9095 | #endif | ||
9096 | #ifdef __cplusplus | ||
9097 | } | ||
10158 | #endif | 9098 | #endif |
10159 | 9099 | ||
10160 | int | 9100 | int |
10161 | main () | 9101 | main () |
10162 | { | 9102 | { |
10163 | return shl_load (); | 9103 | return f != shl_load; |
10164 | ; | 9104 | ; |
10165 | return 0; | 9105 | return 0; |
10166 | } | 9106 | } |
10167 | _ACEOF | 9107 | _ACEOF |
10168 | rm -f conftest.$ac_objext conftest$ac_exeext | 9108 | rm -f conftest.$ac_objext conftest$ac_exeext |
10169 | if { (ac_try="$ac_link" | 9109 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
10170 | case "(($ac_try" in | 9110 | (eval $ac_link) 2>conftest.er1 |
10171 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10172 | *) ac_try_echo=$ac_try;; | ||
10173 | esac | ||
10174 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10175 | (eval "$ac_link") 2>conftest.er1 | ||
10176 | ac_status=$? | 9111 | ac_status=$? |
10177 | grep -v '^ *+' conftest.er1 >conftest.err | 9112 | grep -v '^ *+' conftest.er1 >conftest.err |
10178 | rm -f conftest.er1 | 9113 | rm -f conftest.er1 |
10179 | cat conftest.err >&5 | 9114 | cat conftest.err >&5 |
10180 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9115 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10181 | (exit $ac_status); } && | 9116 | (exit $ac_status); } && |
10182 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 9117 | { ac_try='test -z "$ac_c_werror_flag" |
10183 | { (case "(($ac_try" in | 9118 | || test ! -s conftest.err' |
10184 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 9119 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
10185 | *) ac_try_echo=$ac_try;; | 9120 | (eval $ac_try) 2>&5 |
10186 | esac | ||
10187 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10188 | (eval "$ac_try") 2>&5 | ||
10189 | ac_status=$? | 9121 | ac_status=$? |
10190 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9122 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10191 | (exit $ac_status); }; } && | 9123 | (exit $ac_status); }; } && |
10192 | { ac_try='test -s conftest$ac_exeext' | 9124 | { ac_try='test -s conftest$ac_exeext' |
10193 | { (case "(($ac_try" in | 9125 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
10194 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 9126 | (eval $ac_try) 2>&5 |
10195 | *) ac_try_echo=$ac_try;; | ||
10196 | esac | ||
10197 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10198 | (eval "$ac_try") 2>&5 | ||
10199 | ac_status=$? | 9127 | ac_status=$? |
10200 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9128 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10201 | (exit $ac_status); }; }; then | 9129 | (exit $ac_status); }; }; then |
@@ -10204,19 +9132,18 @@ else | |||
10204 | echo "$as_me: failed program was:" >&5 | 9132 | echo "$as_me: failed program was:" >&5 |
10205 | sed 's/^/| /' conftest.$ac_ext >&5 | 9133 | sed 's/^/| /' conftest.$ac_ext >&5 |
10206 | 9134 | ||
10207 | ac_cv_func_shl_load=no | 9135 | ac_cv_func_shl_load=no |
10208 | fi | 9136 | fi |
10209 | 9137 | rm -f conftest.err conftest.$ac_objext \ | |
10210 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10211 | conftest$ac_exeext conftest.$ac_ext | 9138 | conftest$ac_exeext conftest.$ac_ext |
10212 | fi | 9139 | fi |
10213 | { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 | 9140 | echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 |
10214 | echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } | 9141 | echo "${ECHO_T}$ac_cv_func_shl_load" >&6 |
10215 | if test $ac_cv_func_shl_load = yes; then | 9142 | if test $ac_cv_func_shl_load = yes; then |
10216 | lt_cv_dlopen="shl_load" | 9143 | lt_cv_dlopen="shl_load" |
10217 | else | 9144 | else |
10218 | { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 | 9145 | echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 |
10219 | echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } | 9146 | echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 |
10220 | if test "${ac_cv_lib_dld_shl_load+set}" = set; then | 9147 | if test "${ac_cv_lib_dld_shl_load+set}" = set; then |
10221 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 9148 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
10222 | else | 9149 | else |
@@ -10229,52 +9156,40 @@ cat confdefs.h >>conftest.$ac_ext | |||
10229 | cat >>conftest.$ac_ext <<_ACEOF | 9156 | cat >>conftest.$ac_ext <<_ACEOF |
10230 | /* end confdefs.h. */ | 9157 | /* end confdefs.h. */ |
10231 | 9158 | ||
10232 | /* Override any GCC internal prototype to avoid an error. | 9159 | /* Override any gcc2 internal prototype to avoid an error. */ |
10233 | Use char because int might match the return type of a GCC | ||
10234 | builtin and then its argument prototype would still apply. */ | ||
10235 | #ifdef __cplusplus | 9160 | #ifdef __cplusplus |
10236 | extern "C" | 9161 | extern "C" |
10237 | #endif | 9162 | #endif |
9163 | /* We use char because int might match the return type of a gcc2 | ||
9164 | builtin and then its argument prototype would still apply. */ | ||
10238 | char shl_load (); | 9165 | char shl_load (); |
10239 | int | 9166 | int |
10240 | main () | 9167 | main () |
10241 | { | 9168 | { |
10242 | return shl_load (); | 9169 | shl_load (); |
10243 | ; | 9170 | ; |
10244 | return 0; | 9171 | return 0; |
10245 | } | 9172 | } |
10246 | _ACEOF | 9173 | _ACEOF |
10247 | rm -f conftest.$ac_objext conftest$ac_exeext | 9174 | rm -f conftest.$ac_objext conftest$ac_exeext |
10248 | if { (ac_try="$ac_link" | 9175 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
10249 | case "(($ac_try" in | 9176 | (eval $ac_link) 2>conftest.er1 |
10250 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10251 | *) ac_try_echo=$ac_try;; | ||
10252 | esac | ||
10253 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10254 | (eval "$ac_link") 2>conftest.er1 | ||
10255 | ac_status=$? | 9177 | ac_status=$? |
10256 | grep -v '^ *+' conftest.er1 >conftest.err | 9178 | grep -v '^ *+' conftest.er1 >conftest.err |
10257 | rm -f conftest.er1 | 9179 | rm -f conftest.er1 |
10258 | cat conftest.err >&5 | 9180 | cat conftest.err >&5 |
10259 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9181 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10260 | (exit $ac_status); } && | 9182 | (exit $ac_status); } && |
10261 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 9183 | { ac_try='test -z "$ac_c_werror_flag" |
10262 | { (case "(($ac_try" in | 9184 | || test ! -s conftest.err' |
10263 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 9185 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
10264 | *) ac_try_echo=$ac_try;; | 9186 | (eval $ac_try) 2>&5 |
10265 | esac | ||
10266 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10267 | (eval "$ac_try") 2>&5 | ||
10268 | ac_status=$? | 9187 | ac_status=$? |
10269 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9188 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10270 | (exit $ac_status); }; } && | 9189 | (exit $ac_status); }; } && |
10271 | { ac_try='test -s conftest$ac_exeext' | 9190 | { ac_try='test -s conftest$ac_exeext' |
10272 | { (case "(($ac_try" in | 9191 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
10273 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 9192 | (eval $ac_try) 2>&5 |
10274 | *) ac_try_echo=$ac_try;; | ||
10275 | esac | ||
10276 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10277 | (eval "$ac_try") 2>&5 | ||
10278 | ac_status=$? | 9193 | ac_status=$? |
10279 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9194 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10280 | (exit $ac_status); }; }; then | 9195 | (exit $ac_status); }; }; then |
@@ -10283,20 +9198,19 @@ else | |||
10283 | echo "$as_me: failed program was:" >&5 | 9198 | echo "$as_me: failed program was:" >&5 |
10284 | sed 's/^/| /' conftest.$ac_ext >&5 | 9199 | sed 's/^/| /' conftest.$ac_ext >&5 |
10285 | 9200 | ||
10286 | ac_cv_lib_dld_shl_load=no | 9201 | ac_cv_lib_dld_shl_load=no |
10287 | fi | 9202 | fi |
10288 | 9203 | rm -f conftest.err conftest.$ac_objext \ | |
10289 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10290 | conftest$ac_exeext conftest.$ac_ext | 9204 | conftest$ac_exeext conftest.$ac_ext |
10291 | LIBS=$ac_check_lib_save_LIBS | 9205 | LIBS=$ac_check_lib_save_LIBS |
10292 | fi | 9206 | fi |
10293 | { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 | 9207 | echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 |
10294 | echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } | 9208 | echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 |
10295 | if test $ac_cv_lib_dld_shl_load = yes; then | 9209 | if test $ac_cv_lib_dld_shl_load = yes; then |
10296 | lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" | 9210 | lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" |
10297 | else | 9211 | else |
10298 | { echo "$as_me:$LINENO: checking for dlopen" >&5 | 9212 | echo "$as_me:$LINENO: checking for dlopen" >&5 |
10299 | echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } | 9213 | echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 |
10300 | if test "${ac_cv_func_dlopen+set}" = set; then | 9214 | if test "${ac_cv_func_dlopen+set}" = set; then |
10301 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 9215 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
10302 | else | 9216 | else |
@@ -10323,59 +9237,53 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
10323 | 9237 | ||
10324 | #undef dlopen | 9238 | #undef dlopen |
10325 | 9239 | ||
10326 | /* Override any GCC internal prototype to avoid an error. | 9240 | /* Override any gcc2 internal prototype to avoid an error. */ |
10327 | Use char because int might match the return type of a GCC | ||
10328 | builtin and then its argument prototype would still apply. */ | ||
10329 | #ifdef __cplusplus | 9241 | #ifdef __cplusplus |
10330 | extern "C" | 9242 | extern "C" |
9243 | { | ||
10331 | #endif | 9244 | #endif |
9245 | /* We use char because int might match the return type of a gcc2 | ||
9246 | builtin and then its argument prototype would still apply. */ | ||
10332 | char dlopen (); | 9247 | char dlopen (); |
10333 | /* The GNU C library defines this for functions which it implements | 9248 | /* The GNU C library defines this for functions which it implements |
10334 | to always fail with ENOSYS. Some functions are actually named | 9249 | to always fail with ENOSYS. Some functions are actually named |
10335 | something starting with __ and the normal name is an alias. */ | 9250 | something starting with __ and the normal name is an alias. */ |
10336 | #if defined __stub_dlopen || defined __stub___dlopen | 9251 | #if defined (__stub_dlopen) || defined (__stub___dlopen) |
10337 | choke me | 9252 | choke me |
9253 | #else | ||
9254 | char (*f) () = dlopen; | ||
9255 | #endif | ||
9256 | #ifdef __cplusplus | ||
9257 | } | ||
10338 | #endif | 9258 | #endif |
10339 | 9259 | ||
10340 | int | 9260 | int |
10341 | main () | 9261 | main () |
10342 | { | 9262 | { |
10343 | return dlopen (); | 9263 | return f != dlopen; |
10344 | ; | 9264 | ; |
10345 | return 0; | 9265 | return 0; |
10346 | } | 9266 | } |
10347 | _ACEOF | 9267 | _ACEOF |
10348 | rm -f conftest.$ac_objext conftest$ac_exeext | 9268 | rm -f conftest.$ac_objext conftest$ac_exeext |
10349 | if { (ac_try="$ac_link" | 9269 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
10350 | case "(($ac_try" in | 9270 | (eval $ac_link) 2>conftest.er1 |
10351 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10352 | *) ac_try_echo=$ac_try;; | ||
10353 | esac | ||
10354 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10355 | (eval "$ac_link") 2>conftest.er1 | ||
10356 | ac_status=$? | 9271 | ac_status=$? |
10357 | grep -v '^ *+' conftest.er1 >conftest.err | 9272 | grep -v '^ *+' conftest.er1 >conftest.err |
10358 | rm -f conftest.er1 | 9273 | rm -f conftest.er1 |
10359 | cat conftest.err >&5 | 9274 | cat conftest.err >&5 |
10360 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9275 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10361 | (exit $ac_status); } && | 9276 | (exit $ac_status); } && |
10362 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 9277 | { ac_try='test -z "$ac_c_werror_flag" |
10363 | { (case "(($ac_try" in | 9278 | || test ! -s conftest.err' |
10364 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 9279 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
10365 | *) ac_try_echo=$ac_try;; | 9280 | (eval $ac_try) 2>&5 |
10366 | esac | ||
10367 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10368 | (eval "$ac_try") 2>&5 | ||
10369 | ac_status=$? | 9281 | ac_status=$? |
10370 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9282 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10371 | (exit $ac_status); }; } && | 9283 | (exit $ac_status); }; } && |
10372 | { ac_try='test -s conftest$ac_exeext' | 9284 | { ac_try='test -s conftest$ac_exeext' |
10373 | { (case "(($ac_try" in | 9285 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
10374 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 9286 | (eval $ac_try) 2>&5 |
10375 | *) ac_try_echo=$ac_try;; | ||
10376 | esac | ||
10377 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10378 | (eval "$ac_try") 2>&5 | ||
10379 | ac_status=$? | 9287 | ac_status=$? |
10380 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9288 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10381 | (exit $ac_status); }; }; then | 9289 | (exit $ac_status); }; }; then |
@@ -10384,19 +9292,18 @@ else | |||
10384 | echo "$as_me: failed program was:" >&5 | 9292 | echo "$as_me: failed program was:" >&5 |
10385 | sed 's/^/| /' conftest.$ac_ext >&5 | 9293 | sed 's/^/| /' conftest.$ac_ext >&5 |
10386 | 9294 | ||
10387 | ac_cv_func_dlopen=no | 9295 | ac_cv_func_dlopen=no |
10388 | fi | 9296 | fi |
10389 | 9297 | rm -f conftest.err conftest.$ac_objext \ | |
10390 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10391 | conftest$ac_exeext conftest.$ac_ext | 9298 | conftest$ac_exeext conftest.$ac_ext |
10392 | fi | 9299 | fi |
10393 | { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 | 9300 | echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 |
10394 | echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } | 9301 | echo "${ECHO_T}$ac_cv_func_dlopen" >&6 |
10395 | if test $ac_cv_func_dlopen = yes; then | 9302 | if test $ac_cv_func_dlopen = yes; then |
10396 | lt_cv_dlopen="dlopen" | 9303 | lt_cv_dlopen="dlopen" |
10397 | else | 9304 | else |
10398 | { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 | 9305 | echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 |
10399 | echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } | 9306 | echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 |
10400 | if test "${ac_cv_lib_dl_dlopen+set}" = set; then | 9307 | if test "${ac_cv_lib_dl_dlopen+set}" = set; then |
10401 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 9308 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
10402 | else | 9309 | else |
@@ -10409,52 +9316,40 @@ cat confdefs.h >>conftest.$ac_ext | |||
10409 | cat >>conftest.$ac_ext <<_ACEOF | 9316 | cat >>conftest.$ac_ext <<_ACEOF |
10410 | /* end confdefs.h. */ | 9317 | /* end confdefs.h. */ |
10411 | 9318 | ||
10412 | /* Override any GCC internal prototype to avoid an error. | 9319 | /* Override any gcc2 internal prototype to avoid an error. */ |
10413 | Use char because int might match the return type of a GCC | ||
10414 | builtin and then its argument prototype would still apply. */ | ||
10415 | #ifdef __cplusplus | 9320 | #ifdef __cplusplus |
10416 | extern "C" | 9321 | extern "C" |
10417 | #endif | 9322 | #endif |
9323 | /* We use char because int might match the return type of a gcc2 | ||
9324 | builtin and then its argument prototype would still apply. */ | ||
10418 | char dlopen (); | 9325 | char dlopen (); |
10419 | int | 9326 | int |
10420 | main () | 9327 | main () |
10421 | { | 9328 | { |
10422 | return dlopen (); | 9329 | dlopen (); |
10423 | ; | 9330 | ; |
10424 | return 0; | 9331 | return 0; |
10425 | } | 9332 | } |
10426 | _ACEOF | 9333 | _ACEOF |
10427 | rm -f conftest.$ac_objext conftest$ac_exeext | 9334 | rm -f conftest.$ac_objext conftest$ac_exeext |
10428 | if { (ac_try="$ac_link" | 9335 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
10429 | case "(($ac_try" in | 9336 | (eval $ac_link) 2>conftest.er1 |
10430 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10431 | *) ac_try_echo=$ac_try;; | ||
10432 | esac | ||
10433 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10434 | (eval "$ac_link") 2>conftest.er1 | ||
10435 | ac_status=$? | 9337 | ac_status=$? |
10436 | grep -v '^ *+' conftest.er1 >conftest.err | 9338 | grep -v '^ *+' conftest.er1 >conftest.err |
10437 | rm -f conftest.er1 | 9339 | rm -f conftest.er1 |
10438 | cat conftest.err >&5 | 9340 | cat conftest.err >&5 |
10439 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9341 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10440 | (exit $ac_status); } && | 9342 | (exit $ac_status); } && |
10441 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 9343 | { ac_try='test -z "$ac_c_werror_flag" |
10442 | { (case "(($ac_try" in | 9344 | || test ! -s conftest.err' |
10443 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 9345 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
10444 | *) ac_try_echo=$ac_try;; | 9346 | (eval $ac_try) 2>&5 |
10445 | esac | ||
10446 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10447 | (eval "$ac_try") 2>&5 | ||
10448 | ac_status=$? | 9347 | ac_status=$? |
10449 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9348 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10450 | (exit $ac_status); }; } && | 9349 | (exit $ac_status); }; } && |
10451 | { ac_try='test -s conftest$ac_exeext' | 9350 | { ac_try='test -s conftest$ac_exeext' |
10452 | { (case "(($ac_try" in | 9351 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
10453 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 9352 | (eval $ac_try) 2>&5 |
10454 | *) ac_try_echo=$ac_try;; | ||
10455 | esac | ||
10456 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10457 | (eval "$ac_try") 2>&5 | ||
10458 | ac_status=$? | 9353 | ac_status=$? |
10459 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9354 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10460 | (exit $ac_status); }; }; then | 9355 | (exit $ac_status); }; }; then |
@@ -10463,20 +9358,19 @@ else | |||
10463 | echo "$as_me: failed program was:" >&5 | 9358 | echo "$as_me: failed program was:" >&5 |
10464 | sed 's/^/| /' conftest.$ac_ext >&5 | 9359 | sed 's/^/| /' conftest.$ac_ext >&5 |
10465 | 9360 | ||
10466 | ac_cv_lib_dl_dlopen=no | 9361 | ac_cv_lib_dl_dlopen=no |
10467 | fi | 9362 | fi |
10468 | 9363 | rm -f conftest.err conftest.$ac_objext \ | |
10469 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10470 | conftest$ac_exeext conftest.$ac_ext | 9364 | conftest$ac_exeext conftest.$ac_ext |
10471 | LIBS=$ac_check_lib_save_LIBS | 9365 | LIBS=$ac_check_lib_save_LIBS |
10472 | fi | 9366 | fi |
10473 | { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 | 9367 | echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 |
10474 | echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } | 9368 | echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 |
10475 | if test $ac_cv_lib_dl_dlopen = yes; then | 9369 | if test $ac_cv_lib_dl_dlopen = yes; then |
10476 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" | 9370 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" |
10477 | else | 9371 | else |
10478 | { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 | 9372 | echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 |
10479 | echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } | 9373 | echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 |
10480 | if test "${ac_cv_lib_svld_dlopen+set}" = set; then | 9374 | if test "${ac_cv_lib_svld_dlopen+set}" = set; then |
10481 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 9375 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
10482 | else | 9376 | else |
@@ -10489,52 +9383,40 @@ cat confdefs.h >>conftest.$ac_ext | |||
10489 | cat >>conftest.$ac_ext <<_ACEOF | 9383 | cat >>conftest.$ac_ext <<_ACEOF |
10490 | /* end confdefs.h. */ | 9384 | /* end confdefs.h. */ |
10491 | 9385 | ||
10492 | /* Override any GCC internal prototype to avoid an error. | 9386 | /* Override any gcc2 internal prototype to avoid an error. */ |
10493 | Use char because int might match the return type of a GCC | ||
10494 | builtin and then its argument prototype would still apply. */ | ||
10495 | #ifdef __cplusplus | 9387 | #ifdef __cplusplus |
10496 | extern "C" | 9388 | extern "C" |
10497 | #endif | 9389 | #endif |
9390 | /* We use char because int might match the return type of a gcc2 | ||
9391 | builtin and then its argument prototype would still apply. */ | ||
10498 | char dlopen (); | 9392 | char dlopen (); |
10499 | int | 9393 | int |
10500 | main () | 9394 | main () |
10501 | { | 9395 | { |
10502 | return dlopen (); | 9396 | dlopen (); |
10503 | ; | 9397 | ; |
10504 | return 0; | 9398 | return 0; |
10505 | } | 9399 | } |
10506 | _ACEOF | 9400 | _ACEOF |
10507 | rm -f conftest.$ac_objext conftest$ac_exeext | 9401 | rm -f conftest.$ac_objext conftest$ac_exeext |
10508 | if { (ac_try="$ac_link" | 9402 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
10509 | case "(($ac_try" in | 9403 | (eval $ac_link) 2>conftest.er1 |
10510 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10511 | *) ac_try_echo=$ac_try;; | ||
10512 | esac | ||
10513 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10514 | (eval "$ac_link") 2>conftest.er1 | ||
10515 | ac_status=$? | 9404 | ac_status=$? |
10516 | grep -v '^ *+' conftest.er1 >conftest.err | 9405 | grep -v '^ *+' conftest.er1 >conftest.err |
10517 | rm -f conftest.er1 | 9406 | rm -f conftest.er1 |
10518 | cat conftest.err >&5 | 9407 | cat conftest.err >&5 |
10519 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9408 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10520 | (exit $ac_status); } && | 9409 | (exit $ac_status); } && |
10521 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 9410 | { ac_try='test -z "$ac_c_werror_flag" |
10522 | { (case "(($ac_try" in | 9411 | || test ! -s conftest.err' |
10523 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 9412 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
10524 | *) ac_try_echo=$ac_try;; | 9413 | (eval $ac_try) 2>&5 |
10525 | esac | ||
10526 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10527 | (eval "$ac_try") 2>&5 | ||
10528 | ac_status=$? | 9414 | ac_status=$? |
10529 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9415 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10530 | (exit $ac_status); }; } && | 9416 | (exit $ac_status); }; } && |
10531 | { ac_try='test -s conftest$ac_exeext' | 9417 | { ac_try='test -s conftest$ac_exeext' |
10532 | { (case "(($ac_try" in | 9418 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
10533 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 9419 | (eval $ac_try) 2>&5 |
10534 | *) ac_try_echo=$ac_try;; | ||
10535 | esac | ||
10536 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10537 | (eval "$ac_try") 2>&5 | ||
10538 | ac_status=$? | 9420 | ac_status=$? |
10539 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9421 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10540 | (exit $ac_status); }; }; then | 9422 | (exit $ac_status); }; }; then |
@@ -10543,20 +9425,19 @@ else | |||
10543 | echo "$as_me: failed program was:" >&5 | 9425 | echo "$as_me: failed program was:" >&5 |
10544 | sed 's/^/| /' conftest.$ac_ext >&5 | 9426 | sed 's/^/| /' conftest.$ac_ext >&5 |
10545 | 9427 | ||
10546 | ac_cv_lib_svld_dlopen=no | 9428 | ac_cv_lib_svld_dlopen=no |
10547 | fi | 9429 | fi |
10548 | 9430 | rm -f conftest.err conftest.$ac_objext \ | |
10549 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10550 | conftest$ac_exeext conftest.$ac_ext | 9431 | conftest$ac_exeext conftest.$ac_ext |
10551 | LIBS=$ac_check_lib_save_LIBS | 9432 | LIBS=$ac_check_lib_save_LIBS |
10552 | fi | 9433 | fi |
10553 | { echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 | 9434 | echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 |
10554 | echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } | 9435 | echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 |
10555 | if test $ac_cv_lib_svld_dlopen = yes; then | 9436 | if test $ac_cv_lib_svld_dlopen = yes; then |
10556 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" | 9437 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" |
10557 | else | 9438 | else |
10558 | { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 | 9439 | echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 |
10559 | echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } | 9440 | echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 |
10560 | if test "${ac_cv_lib_dld_dld_link+set}" = set; then | 9441 | if test "${ac_cv_lib_dld_dld_link+set}" = set; then |
10561 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 9442 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
10562 | else | 9443 | else |
@@ -10569,52 +9450,40 @@ cat confdefs.h >>conftest.$ac_ext | |||
10569 | cat >>conftest.$ac_ext <<_ACEOF | 9450 | cat >>conftest.$ac_ext <<_ACEOF |
10570 | /* end confdefs.h. */ | 9451 | /* end confdefs.h. */ |
10571 | 9452 | ||
10572 | /* Override any GCC internal prototype to avoid an error. | 9453 | /* Override any gcc2 internal prototype to avoid an error. */ |
10573 | Use char because int might match the return type of a GCC | ||
10574 | builtin and then its argument prototype would still apply. */ | ||
10575 | #ifdef __cplusplus | 9454 | #ifdef __cplusplus |
10576 | extern "C" | 9455 | extern "C" |
10577 | #endif | 9456 | #endif |
9457 | /* We use char because int might match the return type of a gcc2 | ||
9458 | builtin and then its argument prototype would still apply. */ | ||
10578 | char dld_link (); | 9459 | char dld_link (); |
10579 | int | 9460 | int |
10580 | main () | 9461 | main () |
10581 | { | 9462 | { |
10582 | return dld_link (); | 9463 | dld_link (); |
10583 | ; | 9464 | ; |
10584 | return 0; | 9465 | return 0; |
10585 | } | 9466 | } |
10586 | _ACEOF | 9467 | _ACEOF |
10587 | rm -f conftest.$ac_objext conftest$ac_exeext | 9468 | rm -f conftest.$ac_objext conftest$ac_exeext |
10588 | if { (ac_try="$ac_link" | 9469 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
10589 | case "(($ac_try" in | 9470 | (eval $ac_link) 2>conftest.er1 |
10590 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
10591 | *) ac_try_echo=$ac_try;; | ||
10592 | esac | ||
10593 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10594 | (eval "$ac_link") 2>conftest.er1 | ||
10595 | ac_status=$? | 9471 | ac_status=$? |
10596 | grep -v '^ *+' conftest.er1 >conftest.err | 9472 | grep -v '^ *+' conftest.er1 >conftest.err |
10597 | rm -f conftest.er1 | 9473 | rm -f conftest.er1 |
10598 | cat conftest.err >&5 | 9474 | cat conftest.err >&5 |
10599 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9475 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10600 | (exit $ac_status); } && | 9476 | (exit $ac_status); } && |
10601 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 9477 | { ac_try='test -z "$ac_c_werror_flag" |
10602 | { (case "(($ac_try" in | 9478 | || test ! -s conftest.err' |
10603 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 9479 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
10604 | *) ac_try_echo=$ac_try;; | 9480 | (eval $ac_try) 2>&5 |
10605 | esac | ||
10606 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10607 | (eval "$ac_try") 2>&5 | ||
10608 | ac_status=$? | 9481 | ac_status=$? |
10609 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9482 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10610 | (exit $ac_status); }; } && | 9483 | (exit $ac_status); }; } && |
10611 | { ac_try='test -s conftest$ac_exeext' | 9484 | { ac_try='test -s conftest$ac_exeext' |
10612 | { (case "(($ac_try" in | 9485 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
10613 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 9486 | (eval $ac_try) 2>&5 |
10614 | *) ac_try_echo=$ac_try;; | ||
10615 | esac | ||
10616 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
10617 | (eval "$ac_try") 2>&5 | ||
10618 | ac_status=$? | 9487 | ac_status=$? |
10619 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 9488 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10620 | (exit $ac_status); }; }; then | 9489 | (exit $ac_status); }; }; then |
@@ -10623,15 +9492,14 @@ else | |||
10623 | echo "$as_me: failed program was:" >&5 | 9492 | echo "$as_me: failed program was:" >&5 |
10624 | sed 's/^/| /' conftest.$ac_ext >&5 | 9493 | sed 's/^/| /' conftest.$ac_ext >&5 |
10625 | 9494 | ||
10626 | ac_cv_lib_dld_dld_link=no | 9495 | ac_cv_lib_dld_dld_link=no |
10627 | fi | 9496 | fi |
10628 | 9497 | rm -f conftest.err conftest.$ac_objext \ | |
10629 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
10630 | conftest$ac_exeext conftest.$ac_ext | 9498 | conftest$ac_exeext conftest.$ac_ext |
10631 | LIBS=$ac_check_lib_save_LIBS | 9499 | LIBS=$ac_check_lib_save_LIBS |
10632 | fi | 9500 | fi |
10633 | { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 | 9501 | echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 |
10634 | echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } | 9502 | echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 |
10635 | if test $ac_cv_lib_dld_dld_link = yes; then | 9503 | if test $ac_cv_lib_dld_dld_link = yes; then |
10636 | lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" | 9504 | lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" |
10637 | fi | 9505 | fi |
@@ -10671,8 +9539,8 @@ fi | |||
10671 | save_LIBS="$LIBS" | 9539 | save_LIBS="$LIBS" |
10672 | LIBS="$lt_cv_dlopen_libs $LIBS" | 9540 | LIBS="$lt_cv_dlopen_libs $LIBS" |
10673 | 9541 | ||
10674 | { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 | 9542 | echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 |
10675 | echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } | 9543 | echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 |
10676 | if test "${lt_cv_dlopen_self+set}" = set; then | 9544 | if test "${lt_cv_dlopen_self+set}" = set; then |
10677 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 9545 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
10678 | else | 9546 | else |
@@ -10682,7 +9550,7 @@ else | |||
10682 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 9550 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
10683 | lt_status=$lt_dlunknown | 9551 | lt_status=$lt_dlunknown |
10684 | cat > conftest.$ac_ext <<EOF | 9552 | cat > conftest.$ac_ext <<EOF |
10685 | #line 10685 "configure" | 9553 | #line 9553 "configure" |
10686 | #include "confdefs.h" | 9554 | #include "confdefs.h" |
10687 | 9555 | ||
10688 | #if HAVE_DLFCN_H | 9556 | #if HAVE_DLFCN_H |
@@ -10766,13 +9634,13 @@ rm -fr conftest* | |||
10766 | 9634 | ||
10767 | 9635 | ||
10768 | fi | 9636 | fi |
10769 | { echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 | 9637 | echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 |
10770 | echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } | 9638 | echo "${ECHO_T}$lt_cv_dlopen_self" >&6 |
10771 | 9639 | ||
10772 | if test "x$lt_cv_dlopen_self" = xyes; then | 9640 | if test "x$lt_cv_dlopen_self" = xyes; then |
10773 | wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" | 9641 | wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" |
10774 | { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 | 9642 | echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 |
10775 | echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } | 9643 | echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 |
10776 | if test "${lt_cv_dlopen_self_static+set}" = set; then | 9644 | if test "${lt_cv_dlopen_self_static+set}" = set; then |
10777 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 9645 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
10778 | else | 9646 | else |
@@ -10782,7 +9650,7 @@ else | |||
10782 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 9650 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
10783 | lt_status=$lt_dlunknown | 9651 | lt_status=$lt_dlunknown |
10784 | cat > conftest.$ac_ext <<EOF | 9652 | cat > conftest.$ac_ext <<EOF |
10785 | #line 10785 "configure" | 9653 | #line 9653 "configure" |
10786 | #include "confdefs.h" | 9654 | #include "confdefs.h" |
10787 | 9655 | ||
10788 | #if HAVE_DLFCN_H | 9656 | #if HAVE_DLFCN_H |
@@ -10866,8 +9734,8 @@ rm -fr conftest* | |||
10866 | 9734 | ||
10867 | 9735 | ||
10868 | fi | 9736 | fi |
10869 | { echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 | 9737 | echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 |
10870 | echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } | 9738 | echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 |
10871 | fi | 9739 | fi |
10872 | 9740 | ||
10873 | CPPFLAGS="$save_CPPFLAGS" | 9741 | CPPFLAGS="$save_CPPFLAGS" |
@@ -10889,13 +9757,13 @@ fi | |||
10889 | 9757 | ||
10890 | 9758 | ||
10891 | # Report which library types will actually be built | 9759 | # Report which library types will actually be built |
10892 | { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 | 9760 | echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 |
10893 | echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } | 9761 | echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 |
10894 | { echo "$as_me:$LINENO: result: $can_build_shared" >&5 | 9762 | echo "$as_me:$LINENO: result: $can_build_shared" >&5 |
10895 | echo "${ECHO_T}$can_build_shared" >&6; } | 9763 | echo "${ECHO_T}$can_build_shared" >&6 |
10896 | 9764 | ||
10897 | { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 | 9765 | echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 |
10898 | echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } | 9766 | echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 |
10899 | test "$can_build_shared" = "no" && enable_shared=no | 9767 | test "$can_build_shared" = "no" && enable_shared=no |
10900 | 9768 | ||
10901 | # On AIX, shared libraries and static libraries use the same namespace, and | 9769 | # On AIX, shared libraries and static libraries use the same namespace, and |
@@ -10915,15 +9783,15 @@ aix4* | aix5*) | |||
10915 | fi | 9783 | fi |
10916 | ;; | 9784 | ;; |
10917 | esac | 9785 | esac |
10918 | { echo "$as_me:$LINENO: result: $enable_shared" >&5 | 9786 | echo "$as_me:$LINENO: result: $enable_shared" >&5 |
10919 | echo "${ECHO_T}$enable_shared" >&6; } | 9787 | echo "${ECHO_T}$enable_shared" >&6 |
10920 | 9788 | ||
10921 | { echo "$as_me:$LINENO: checking whether to build static libraries" >&5 | 9789 | echo "$as_me:$LINENO: checking whether to build static libraries" >&5 |
10922 | echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } | 9790 | echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 |
10923 | # Make sure either enable_shared or enable_static is yes. | 9791 | # Make sure either enable_shared or enable_static is yes. |
10924 | test "$enable_shared" = yes || enable_static=yes | 9792 | test "$enable_shared" = yes || enable_static=yes |
10925 | { echo "$as_me:$LINENO: result: $enable_static" >&5 | 9793 | echo "$as_me:$LINENO: result: $enable_static" >&5 |
10926 | echo "${ECHO_T}$enable_static" >&6; } | 9794 | echo "${ECHO_T}$enable_static" >&6 |
10927 | 9795 | ||
10928 | # The else clause should only fire when bootstrapping the | 9796 | # The else clause should only fire when bootstrapping the |
10929 | # libtool distribution, otherwise you forgot to ship ltmain.sh | 9797 | # libtool distribution, otherwise you forgot to ship ltmain.sh |
@@ -11415,11 +10283,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
11415 | CC="$lt_save_CC" | 10283 | CC="$lt_save_CC" |
11416 | 10284 | ||
11417 | 10285 | ||
11418 | # Check whether --with-tags was given. | 10286 | # Check whether --with-tags or --without-tags was given. |
11419 | if test "${with_tags+set}" = set; then | 10287 | if test "${with_tags+set}" = set; then |
11420 | withval=$with_tags; tagnames="$withval" | 10288 | withval="$with_tags" |
11421 | fi | 10289 | tagnames="$withval" |
11422 | 10290 | fi; | |
11423 | 10291 | ||
11424 | if test -f "$ltmain" && test -n "$tagnames"; then | 10292 | if test -f "$ltmain" && test -n "$tagnames"; then |
11425 | if test ! -f "${ofile}"; then | 10293 | if test ! -f "${ofile}"; then |
@@ -11473,7 +10341,7 @@ echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} | |||
11473 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && | 10341 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
11474 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || | 10342 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
11475 | (test "X$CXX" != "Xg++"))) ; then | 10343 | (test "X$CXX" != "Xg++"))) ; then |
11476 | ac_ext=cpp | 10344 | ac_ext=cc |
11477 | ac_cpp='$CXXCPP $CPPFLAGS' | 10345 | ac_cpp='$CXXCPP $CPPFLAGS' |
11478 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 10346 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
11479 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 10347 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
@@ -11592,18 +10460,18 @@ if test "$GXX" = yes; then | |||
11592 | # Set up default GNU C++ configuration | 10460 | # Set up default GNU C++ configuration |
11593 | 10461 | ||
11594 | 10462 | ||
11595 | # Check whether --with-gnu-ld was given. | 10463 | # Check whether --with-gnu-ld or --without-gnu-ld was given. |
11596 | if test "${with_gnu_ld+set}" = set; then | 10464 | if test "${with_gnu_ld+set}" = set; then |
11597 | withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes | 10465 | withval="$with_gnu_ld" |
10466 | test "$withval" = no || with_gnu_ld=yes | ||
11598 | else | 10467 | else |
11599 | with_gnu_ld=no | 10468 | with_gnu_ld=no |
11600 | fi | 10469 | fi; |
11601 | |||
11602 | ac_prog=ld | 10470 | ac_prog=ld |
11603 | if test "$GCC" = yes; then | 10471 | if test "$GCC" = yes; then |
11604 | # Check if gcc -print-prog-name=ld gives a path. | 10472 | # Check if gcc -print-prog-name=ld gives a path. |
11605 | { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 | 10473 | echo "$as_me:$LINENO: checking for ld used by $CC" >&5 |
11606 | echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } | 10474 | echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 |
11607 | case $host in | 10475 | case $host in |
11608 | *-*-mingw*) | 10476 | *-*-mingw*) |
11609 | # gcc leaves a trailing carriage return which upsets mingw | 10477 | # gcc leaves a trailing carriage return which upsets mingw |
@@ -11632,11 +10500,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } | |||
11632 | ;; | 10500 | ;; |
11633 | esac | 10501 | esac |
11634 | elif test "$with_gnu_ld" = yes; then | 10502 | elif test "$with_gnu_ld" = yes; then |
11635 | { echo "$as_me:$LINENO: checking for GNU ld" >&5 | 10503 | echo "$as_me:$LINENO: checking for GNU ld" >&5 |
11636 | echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } | 10504 | echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 |
11637 | else | 10505 | else |
11638 | { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 | 10506 | echo "$as_me:$LINENO: checking for non-GNU ld" >&5 |
11639 | echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } | 10507 | echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 |
11640 | fi | 10508 | fi |
11641 | if test "${lt_cv_path_LD+set}" = set; then | 10509 | if test "${lt_cv_path_LD+set}" = set; then |
11642 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 10510 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -11669,17 +10537,17 @@ fi | |||
11669 | 10537 | ||
11670 | LD="$lt_cv_path_LD" | 10538 | LD="$lt_cv_path_LD" |
11671 | if test -n "$LD"; then | 10539 | if test -n "$LD"; then |
11672 | { echo "$as_me:$LINENO: result: $LD" >&5 | 10540 | echo "$as_me:$LINENO: result: $LD" >&5 |
11673 | echo "${ECHO_T}$LD" >&6; } | 10541 | echo "${ECHO_T}$LD" >&6 |
11674 | else | 10542 | else |
11675 | { echo "$as_me:$LINENO: result: no" >&5 | 10543 | echo "$as_me:$LINENO: result: no" >&5 |
11676 | echo "${ECHO_T}no" >&6; } | 10544 | echo "${ECHO_T}no" >&6 |
11677 | fi | 10545 | fi |
11678 | test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 | 10546 | test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 |
11679 | echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} | 10547 | echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} |
11680 | { (exit 1); exit 1; }; } | 10548 | { (exit 1); exit 1; }; } |
11681 | { echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 | 10549 | echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 |
11682 | echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } | 10550 | echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 |
11683 | if test "${lt_cv_prog_gnu_ld+set}" = set; then | 10551 | if test "${lt_cv_prog_gnu_ld+set}" = set; then |
11684 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 10552 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
11685 | else | 10553 | else |
@@ -11693,8 +10561,8 @@ case `$LD -v 2>&1 </dev/null` in | |||
11693 | ;; | 10561 | ;; |
11694 | esac | 10562 | esac |
11695 | fi | 10563 | fi |
11696 | { echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 | 10564 | echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 |
11697 | echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } | 10565 | echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 |
11698 | with_gnu_ld=$lt_cv_prog_gnu_ld | 10566 | with_gnu_ld=$lt_cv_prog_gnu_ld |
11699 | 10567 | ||
11700 | 10568 | ||
@@ -11744,8 +10612,8 @@ else | |||
11744 | fi | 10612 | fi |
11745 | 10613 | ||
11746 | # PORTME: fill in a description of your system's C++ link characteristics | 10614 | # PORTME: fill in a description of your system's C++ link characteristics |
11747 | { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | 10615 | echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 |
11748 | echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } | 10616 | echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 |
11749 | ld_shlibs_CXX=yes | 10617 | ld_shlibs_CXX=yes |
11750 | case $host_os in | 10618 | case $host_os in |
11751 | aix3*) | 10619 | aix3*) |
@@ -11857,36 +10725,24 @@ main () | |||
11857 | } | 10725 | } |
11858 | _ACEOF | 10726 | _ACEOF |
11859 | rm -f conftest.$ac_objext conftest$ac_exeext | 10727 | rm -f conftest.$ac_objext conftest$ac_exeext |
11860 | if { (ac_try="$ac_link" | 10728 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
11861 | case "(($ac_try" in | 10729 | (eval $ac_link) 2>conftest.er1 |
11862 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11863 | *) ac_try_echo=$ac_try;; | ||
11864 | esac | ||
11865 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11866 | (eval "$ac_link") 2>conftest.er1 | ||
11867 | ac_status=$? | 10730 | ac_status=$? |
11868 | grep -v '^ *+' conftest.er1 >conftest.err | 10731 | grep -v '^ *+' conftest.er1 >conftest.err |
11869 | rm -f conftest.er1 | 10732 | rm -f conftest.er1 |
11870 | cat conftest.err >&5 | 10733 | cat conftest.err >&5 |
11871 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 10734 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11872 | (exit $ac_status); } && | 10735 | (exit $ac_status); } && |
11873 | { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | 10736 | { ac_try='test -z "$ac_cxx_werror_flag" |
11874 | { (case "(($ac_try" in | 10737 | || test ! -s conftest.err' |
11875 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 10738 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
11876 | *) ac_try_echo=$ac_try;; | 10739 | (eval $ac_try) 2>&5 |
11877 | esac | ||
11878 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11879 | (eval "$ac_try") 2>&5 | ||
11880 | ac_status=$? | 10740 | ac_status=$? |
11881 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 10741 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11882 | (exit $ac_status); }; } && | 10742 | (exit $ac_status); }; } && |
11883 | { ac_try='test -s conftest$ac_exeext' | 10743 | { ac_try='test -s conftest$ac_exeext' |
11884 | { (case "(($ac_try" in | 10744 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
11885 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 10745 | (eval $ac_try) 2>&5 |
11886 | *) ac_try_echo=$ac_try;; | ||
11887 | esac | ||
11888 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11889 | (eval "$ac_try") 2>&5 | ||
11890 | ac_status=$? | 10746 | ac_status=$? |
11891 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 10747 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11892 | (exit $ac_status); }; }; then | 10748 | (exit $ac_status); }; }; then |
@@ -11900,10 +10756,8 @@ else | |||
11900 | echo "$as_me: failed program was:" >&5 | 10756 | echo "$as_me: failed program was:" >&5 |
11901 | sed 's/^/| /' conftest.$ac_ext >&5 | 10757 | sed 's/^/| /' conftest.$ac_ext >&5 |
11902 | 10758 | ||
11903 | |||
11904 | fi | 10759 | fi |
11905 | 10760 | rm -f conftest.err conftest.$ac_objext \ | |
11906 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
11907 | conftest$ac_exeext conftest.$ac_ext | 10761 | conftest$ac_exeext conftest.$ac_ext |
11908 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 10762 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
11909 | 10763 | ||
@@ -11933,36 +10787,24 @@ main () | |||
11933 | } | 10787 | } |
11934 | _ACEOF | 10788 | _ACEOF |
11935 | rm -f conftest.$ac_objext conftest$ac_exeext | 10789 | rm -f conftest.$ac_objext conftest$ac_exeext |
11936 | if { (ac_try="$ac_link" | 10790 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
11937 | case "(($ac_try" in | 10791 | (eval $ac_link) 2>conftest.er1 |
11938 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
11939 | *) ac_try_echo=$ac_try;; | ||
11940 | esac | ||
11941 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11942 | (eval "$ac_link") 2>conftest.er1 | ||
11943 | ac_status=$? | 10792 | ac_status=$? |
11944 | grep -v '^ *+' conftest.er1 >conftest.err | 10793 | grep -v '^ *+' conftest.er1 >conftest.err |
11945 | rm -f conftest.er1 | 10794 | rm -f conftest.er1 |
11946 | cat conftest.err >&5 | 10795 | cat conftest.err >&5 |
11947 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 10796 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11948 | (exit $ac_status); } && | 10797 | (exit $ac_status); } && |
11949 | { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' | 10798 | { ac_try='test -z "$ac_cxx_werror_flag" |
11950 | { (case "(($ac_try" in | 10799 | || test ! -s conftest.err' |
11951 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 10800 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
11952 | *) ac_try_echo=$ac_try;; | 10801 | (eval $ac_try) 2>&5 |
11953 | esac | ||
11954 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11955 | (eval "$ac_try") 2>&5 | ||
11956 | ac_status=$? | 10802 | ac_status=$? |
11957 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 10803 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11958 | (exit $ac_status); }; } && | 10804 | (exit $ac_status); }; } && |
11959 | { ac_try='test -s conftest$ac_exeext' | 10805 | { ac_try='test -s conftest$ac_exeext' |
11960 | { (case "(($ac_try" in | 10806 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
11961 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 10807 | (eval $ac_try) 2>&5 |
11962 | *) ac_try_echo=$ac_try;; | ||
11963 | esac | ||
11964 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
11965 | (eval "$ac_try") 2>&5 | ||
11966 | ac_status=$? | 10808 | ac_status=$? |
11967 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 10809 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11968 | (exit $ac_status); }; }; then | 10810 | (exit $ac_status); }; }; then |
@@ -11976,10 +10818,8 @@ else | |||
11976 | echo "$as_me: failed program was:" >&5 | 10818 | echo "$as_me: failed program was:" >&5 |
11977 | sed 's/^/| /' conftest.$ac_ext >&5 | 10819 | sed 's/^/| /' conftest.$ac_ext >&5 |
11978 | 10820 | ||
11979 | |||
11980 | fi | 10821 | fi |
11981 | 10822 | rm -f conftest.err conftest.$ac_objext \ | |
11982 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
11983 | conftest$ac_exeext conftest.$ac_ext | 10823 | conftest$ac_exeext conftest.$ac_ext |
11984 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 10824 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
11985 | 10825 | ||
@@ -12127,7 +10967,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
12127 | freebsd-elf*) | 10967 | freebsd-elf*) |
12128 | archive_cmds_need_lc_CXX=no | 10968 | archive_cmds_need_lc_CXX=no |
12129 | ;; | 10969 | ;; |
12130 | freebsd* | dragonfly*) | 10970 | freebsd* | kfreebsd*-gnu | dragonfly*) |
12131 | # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF | 10971 | # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF |
12132 | # conventions | 10972 | # conventions |
12133 | ld_shlibs_CXX=yes | 10973 | ld_shlibs_CXX=yes |
@@ -12286,7 +11126,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
12286 | hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' | 11126 | hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' |
12287 | hardcode_libdir_separator_CXX=: | 11127 | hardcode_libdir_separator_CXX=: |
12288 | ;; | 11128 | ;; |
12289 | linux* | k*bsd*-gnu) | 11129 | linux*) |
12290 | case $cc_basename in | 11130 | case $cc_basename in |
12291 | KCC*) | 11131 | KCC*) |
12292 | # Kuck and Associates, Inc. (KAI) C++ Compiler | 11132 | # Kuck and Associates, Inc. (KAI) C++ Compiler |
@@ -12388,7 +11228,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
12388 | ;; | 11228 | ;; |
12389 | esac | 11229 | esac |
12390 | ;; | 11230 | ;; |
12391 | netbsd* | netbsdelf*-gnu) | 11231 | netbsd*) |
12392 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 11232 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
12393 | archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' | 11233 | archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' |
12394 | wlarc= | 11234 | wlarc= |
@@ -12710,8 +11550,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
12710 | ld_shlibs_CXX=no | 11550 | ld_shlibs_CXX=no |
12711 | ;; | 11551 | ;; |
12712 | esac | 11552 | esac |
12713 | { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 | 11553 | echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 |
12714 | echo "${ECHO_T}$ld_shlibs_CXX" >&6; } | 11554 | echo "${ECHO_T}$ld_shlibs_CXX" >&6 |
12715 | test "$ld_shlibs_CXX" = no && can_build_shared=no | 11555 | test "$ld_shlibs_CXX" = no && can_build_shared=no |
12716 | 11556 | ||
12717 | GCC_CXX="$GXX" | 11557 | GCC_CXX="$GXX" |
@@ -12850,8 +11690,8 @@ lt_prog_compiler_wl_CXX= | |||
12850 | lt_prog_compiler_pic_CXX= | 11690 | lt_prog_compiler_pic_CXX= |
12851 | lt_prog_compiler_static_CXX= | 11691 | lt_prog_compiler_static_CXX= |
12852 | 11692 | ||
12853 | { echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | 11693 | echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 |
12854 | echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | 11694 | echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 |
12855 | 11695 | ||
12856 | # C++ specific cases for pic, static, wl, etc. | 11696 | # C++ specific cases for pic, static, wl, etc. |
12857 | if test "$GXX" = yes; then | 11697 | if test "$GXX" = yes; then |
@@ -12955,7 +11795,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | |||
12955 | ;; | 11795 | ;; |
12956 | esac | 11796 | esac |
12957 | ;; | 11797 | ;; |
12958 | freebsd* | dragonfly*) | 11798 | freebsd* | kfreebsd*-gnu | dragonfly*) |
12959 | # FreeBSD uses GNU C++ | 11799 | # FreeBSD uses GNU C++ |
12960 | ;; | 11800 | ;; |
12961 | hpux9* | hpux10* | hpux11*) | 11801 | hpux9* | hpux10* | hpux11*) |
@@ -12998,7 +11838,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | |||
12998 | ;; | 11838 | ;; |
12999 | esac | 11839 | esac |
13000 | ;; | 11840 | ;; |
13001 | linux* | k*bsd*-gnu) | 11841 | linux*) |
13002 | case $cc_basename in | 11842 | case $cc_basename in |
13003 | KCC*) | 11843 | KCC*) |
13004 | # KAI C++ Compiler | 11844 | # KAI C++ Compiler |
@@ -13041,7 +11881,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | |||
13041 | ;; | 11881 | ;; |
13042 | esac | 11882 | esac |
13043 | ;; | 11883 | ;; |
13044 | netbsd* | netbsdelf*-gnu) | 11884 | netbsd*) |
13045 | ;; | 11885 | ;; |
13046 | osf3* | osf4* | osf5*) | 11886 | osf3* | osf4* | osf5*) |
13047 | case $cc_basename in | 11887 | case $cc_basename in |
@@ -13124,16 +11964,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | |||
13124 | esac | 11964 | esac |
13125 | fi | 11965 | fi |
13126 | 11966 | ||
13127 | { echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 | 11967 | echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 |
13128 | echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } | 11968 | echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 |
13129 | 11969 | ||
13130 | # | 11970 | # |
13131 | # Check to make sure the PIC flag actually works. | 11971 | # Check to make sure the PIC flag actually works. |
13132 | # | 11972 | # |
13133 | if test -n "$lt_prog_compiler_pic_CXX"; then | 11973 | if test -n "$lt_prog_compiler_pic_CXX"; then |
13134 | 11974 | ||
13135 | { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 | 11975 | echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 |
13136 | echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } | 11976 | echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 |
13137 | if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then | 11977 | if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then |
13138 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 11978 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13139 | else | 11979 | else |
@@ -13150,11 +11990,11 @@ else | |||
13150 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 11990 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
13151 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 11991 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
13152 | -e 's:$: $lt_compiler_flag:'` | 11992 | -e 's:$: $lt_compiler_flag:'` |
13153 | (eval echo "\"\$as_me:13153: $lt_compile\"" >&5) | 11993 | (eval echo "\"\$as_me:11993: $lt_compile\"" >&5) |
13154 | (eval "$lt_compile" 2>conftest.err) | 11994 | (eval "$lt_compile" 2>conftest.err) |
13155 | ac_status=$? | 11995 | ac_status=$? |
13156 | cat conftest.err >&5 | 11996 | cat conftest.err >&5 |
13157 | echo "$as_me:13157: \$? = $ac_status" >&5 | 11997 | echo "$as_me:11997: \$? = $ac_status" >&5 |
13158 | if (exit $ac_status) && test -s "$ac_outfile"; then | 11998 | if (exit $ac_status) && test -s "$ac_outfile"; then |
13159 | # The compiler can only warn and ignore the option if not recognized | 11999 | # The compiler can only warn and ignore the option if not recognized |
13160 | # So say no if there are warnings other than the usual output. | 12000 | # So say no if there are warnings other than the usual output. |
@@ -13167,8 +12007,8 @@ else | |||
13167 | $rm conftest* | 12007 | $rm conftest* |
13168 | 12008 | ||
13169 | fi | 12009 | fi |
13170 | { echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 | 12010 | echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 |
13171 | echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } | 12011 | echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 |
13172 | 12012 | ||
13173 | if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then | 12013 | if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then |
13174 | case $lt_prog_compiler_pic_CXX in | 12014 | case $lt_prog_compiler_pic_CXX in |
@@ -13195,8 +12035,8 @@ esac | |||
13195 | # Check to make sure the static flag actually works. | 12035 | # Check to make sure the static flag actually works. |
13196 | # | 12036 | # |
13197 | wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" | 12037 | wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" |
13198 | { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | 12038 | echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
13199 | echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } | 12039 | echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 |
13200 | if test "${lt_prog_compiler_static_works_CXX+set}" = set; then | 12040 | if test "${lt_prog_compiler_static_works_CXX+set}" = set; then |
13201 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 12041 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13202 | else | 12042 | else |
@@ -13223,8 +12063,8 @@ else | |||
13223 | LDFLAGS="$save_LDFLAGS" | 12063 | LDFLAGS="$save_LDFLAGS" |
13224 | 12064 | ||
13225 | fi | 12065 | fi |
13226 | { echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 | 12066 | echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 |
13227 | echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } | 12067 | echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6 |
13228 | 12068 | ||
13229 | if test x"$lt_prog_compiler_static_works_CXX" = xyes; then | 12069 | if test x"$lt_prog_compiler_static_works_CXX" = xyes; then |
13230 | : | 12070 | : |
@@ -13233,8 +12073,8 @@ else | |||
13233 | fi | 12073 | fi |
13234 | 12074 | ||
13235 | 12075 | ||
13236 | { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | 12076 | echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
13237 | echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } | 12077 | echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 |
13238 | if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then | 12078 | if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then |
13239 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 12079 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13240 | else | 12080 | else |
@@ -13254,11 +12094,11 @@ else | |||
13254 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 12094 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
13255 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 12095 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
13256 | -e 's:$: $lt_compiler_flag:'` | 12096 | -e 's:$: $lt_compiler_flag:'` |
13257 | (eval echo "\"\$as_me:13257: $lt_compile\"" >&5) | 12097 | (eval echo "\"\$as_me:12097: $lt_compile\"" >&5) |
13258 | (eval "$lt_compile" 2>out/conftest.err) | 12098 | (eval "$lt_compile" 2>out/conftest.err) |
13259 | ac_status=$? | 12099 | ac_status=$? |
13260 | cat out/conftest.err >&5 | 12100 | cat out/conftest.err >&5 |
13261 | echo "$as_me:13261: \$? = $ac_status" >&5 | 12101 | echo "$as_me:12101: \$? = $ac_status" >&5 |
13262 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 12102 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
13263 | then | 12103 | then |
13264 | # The compiler can only warn and ignore the option if not recognized | 12104 | # The compiler can only warn and ignore the option if not recognized |
@@ -13280,23 +12120,23 @@ else | |||
13280 | $rm conftest* | 12120 | $rm conftest* |
13281 | 12121 | ||
13282 | fi | 12122 | fi |
13283 | { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 | 12123 | echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 |
13284 | echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } | 12124 | echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 |
13285 | 12125 | ||
13286 | 12126 | ||
13287 | hard_links="nottested" | 12127 | hard_links="nottested" |
13288 | if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then | 12128 | if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then |
13289 | # do not overwrite the value of need_locks provided by the user | 12129 | # do not overwrite the value of need_locks provided by the user |
13290 | { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | 12130 | echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 |
13291 | echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } | 12131 | echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 |
13292 | hard_links=yes | 12132 | hard_links=yes |
13293 | $rm conftest* | 12133 | $rm conftest* |
13294 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | 12134 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
13295 | touch conftest.a | 12135 | touch conftest.a |
13296 | ln conftest.a conftest.b 2>&5 || hard_links=no | 12136 | ln conftest.a conftest.b 2>&5 || hard_links=no |
13297 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | 12137 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
13298 | { echo "$as_me:$LINENO: result: $hard_links" >&5 | 12138 | echo "$as_me:$LINENO: result: $hard_links" >&5 |
13299 | echo "${ECHO_T}$hard_links" >&6; } | 12139 | echo "${ECHO_T}$hard_links" >&6 |
13300 | if test "$hard_links" = no; then | 12140 | if test "$hard_links" = no; then |
13301 | { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | 12141 | { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 |
13302 | echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} | 12142 | echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} |
@@ -13306,8 +12146,8 @@ else | |||
13306 | need_locks=no | 12146 | need_locks=no |
13307 | fi | 12147 | fi |
13308 | 12148 | ||
13309 | { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | 12149 | echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 |
13310 | echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } | 12150 | echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 |
13311 | 12151 | ||
13312 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 12152 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
13313 | case $host_os in | 12153 | case $host_os in |
@@ -13326,16 +12166,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar | |||
13326 | cygwin* | mingw*) | 12166 | cygwin* | mingw*) |
13327 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' | 12167 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' |
13328 | ;; | 12168 | ;; |
13329 | linux* | k*bsd*-gnu) | ||
13330 | link_all_deplibs_CXX=no | ||
13331 | ;; | ||
13332 | *) | 12169 | *) |
13333 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 12170 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
13334 | ;; | 12171 | ;; |
13335 | esac | 12172 | esac |
13336 | 12173 | ||
13337 | { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 | 12174 | echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 |
13338 | echo "${ECHO_T}$ld_shlibs_CXX" >&6; } | 12175 | echo "${ECHO_T}$ld_shlibs_CXX" >&6 |
13339 | test "$ld_shlibs_CXX" = no && can_build_shared=no | 12176 | test "$ld_shlibs_CXX" = no && can_build_shared=no |
13340 | 12177 | ||
13341 | # | 12178 | # |
@@ -13355,8 +12192,8 @@ x|xyes) | |||
13355 | # Test whether the compiler implicitly links with -lc since on some | 12192 | # Test whether the compiler implicitly links with -lc since on some |
13356 | # systems, -lgcc has to come before -lc. If gcc already passes -lc | 12193 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
13357 | # to ld, don't add -lc before -lgcc. | 12194 | # to ld, don't add -lc before -lgcc. |
13358 | { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | 12195 | echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 |
13359 | echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } | 12196 | echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 |
13360 | $rm conftest* | 12197 | $rm conftest* |
13361 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext | 12198 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
13362 | 12199 | ||
@@ -13393,16 +12230,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& | |||
13393 | cat conftest.err 1>&5 | 12230 | cat conftest.err 1>&5 |
13394 | fi | 12231 | fi |
13395 | $rm conftest* | 12232 | $rm conftest* |
13396 | { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 | 12233 | echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 |
13397 | echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } | 12234 | echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 |
13398 | ;; | 12235 | ;; |
13399 | esac | 12236 | esac |
13400 | fi | 12237 | fi |
13401 | ;; | 12238 | ;; |
13402 | esac | 12239 | esac |
13403 | 12240 | ||
13404 | { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | 12241 | echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 |
13405 | echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } | 12242 | echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 |
13406 | library_names_spec= | 12243 | library_names_spec= |
13407 | libname_spec='lib$name' | 12244 | libname_spec='lib$name' |
13408 | soname_spec= | 12245 | soname_spec= |
@@ -13608,6 +12445,18 @@ freebsd1*) | |||
13608 | dynamic_linker=no | 12445 | dynamic_linker=no |
13609 | ;; | 12446 | ;; |
13610 | 12447 | ||
12448 | kfreebsd*-gnu) | ||
12449 | version_type=linux | ||
12450 | need_lib_prefix=no | ||
12451 | need_version=no | ||
12452 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
12453 | soname_spec='${libname}${release}${shared_ext}$major' | ||
12454 | shlibpath_var=LD_LIBRARY_PATH | ||
12455 | shlibpath_overrides_runpath=no | ||
12456 | hardcode_into_libs=yes | ||
12457 | dynamic_linker='GNU ld.so' | ||
12458 | ;; | ||
12459 | |||
13611 | freebsd* | dragonfly*) | 12460 | freebsd* | dragonfly*) |
13612 | # DragonFly does not have aout. When/if they implement a new | 12461 | # DragonFly does not have aout. When/if they implement a new |
13613 | # versioning mechanism, adjust this. | 12462 | # versioning mechanism, adjust this. |
@@ -13763,7 +12612,7 @@ linux*oldld* | linux*aout* | linux*coff*) | |||
13763 | ;; | 12612 | ;; |
13764 | 12613 | ||
13765 | # This must be Linux ELF. | 12614 | # This must be Linux ELF. |
13766 | linux* | k*bsd*-gnu) | 12615 | linux*) |
13767 | version_type=linux | 12616 | version_type=linux |
13768 | need_lib_prefix=no | 12617 | need_lib_prefix=no |
13769 | need_version=no | 12618 | need_version=no |
@@ -13777,10 +12626,31 @@ linux* | k*bsd*-gnu) | |||
13777 | # before this can be enabled. | 12626 | # before this can be enabled. |
13778 | hardcode_into_libs=yes | 12627 | hardcode_into_libs=yes |
13779 | 12628 | ||
12629 | # find out which ABI we are using | ||
12630 | libsuff= | ||
12631 | case "$host_cpu" in | ||
12632 | x86_64*|s390x*|powerpc64*) | ||
12633 | echo '#line 12633 "configure"' > conftest.$ac_ext | ||
12634 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
12635 | (eval $ac_compile) 2>&5 | ||
12636 | ac_status=$? | ||
12637 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12638 | (exit $ac_status); }; then | ||
12639 | case `/usr/bin/file conftest.$ac_objext` in | ||
12640 | *64-bit*) | ||
12641 | libsuff=64 | ||
12642 | sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | ||
12643 | ;; | ||
12644 | esac | ||
12645 | fi | ||
12646 | rm -rf conftest* | ||
12647 | ;; | ||
12648 | esac | ||
12649 | |||
13780 | # Append ld.so.conf contents to the search path | 12650 | # Append ld.so.conf contents to the search path |
13781 | if test -f /etc/ld.so.conf; then | 12651 | if test -f /etc/ld.so.conf; then |
13782 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | 12652 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
13783 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | 12653 | sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" |
13784 | fi | 12654 | fi |
13785 | 12655 | ||
13786 | # We used to test for /lib/ld.so.1 and disable shared libraries on | 12656 | # We used to test for /lib/ld.so.1 and disable shared libraries on |
@@ -13792,7 +12662,7 @@ linux* | k*bsd*-gnu) | |||
13792 | dynamic_linker='GNU/Linux ld.so' | 12662 | dynamic_linker='GNU/Linux ld.so' |
13793 | ;; | 12663 | ;; |
13794 | 12664 | ||
13795 | netbsdelf*-gnu) | 12665 | knetbsd*-gnu) |
13796 | version_type=linux | 12666 | version_type=linux |
13797 | need_lib_prefix=no | 12667 | need_lib_prefix=no |
13798 | need_version=no | 12668 | need_version=no |
@@ -13801,7 +12671,7 @@ netbsdelf*-gnu) | |||
13801 | shlibpath_var=LD_LIBRARY_PATH | 12671 | shlibpath_var=LD_LIBRARY_PATH |
13802 | shlibpath_overrides_runpath=no | 12672 | shlibpath_overrides_runpath=no |
13803 | hardcode_into_libs=yes | 12673 | hardcode_into_libs=yes |
13804 | dynamic_linker='NetBSD ld.elf_so' | 12674 | dynamic_linker='GNU ld.so' |
13805 | ;; | 12675 | ;; |
13806 | 12676 | ||
13807 | netbsd*) | 12677 | netbsd*) |
@@ -13977,8 +12847,8 @@ uts4*) | |||
13977 | dynamic_linker=no | 12847 | dynamic_linker=no |
13978 | ;; | 12848 | ;; |
13979 | esac | 12849 | esac |
13980 | { echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | 12850 | echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
13981 | echo "${ECHO_T}$dynamic_linker" >&6; } | 12851 | echo "${ECHO_T}$dynamic_linker" >&6 |
13982 | test "$dynamic_linker" = no && can_build_shared=no | 12852 | test "$dynamic_linker" = no && can_build_shared=no |
13983 | 12853 | ||
13984 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | 12854 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
@@ -13986,8 +12856,8 @@ if test "$GCC" = yes; then | |||
13986 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | 12856 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
13987 | fi | 12857 | fi |
13988 | 12858 | ||
13989 | { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | 12859 | echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
13990 | echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } | 12860 | echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 |
13991 | hardcode_action_CXX= | 12861 | hardcode_action_CXX= |
13992 | if test -n "$hardcode_libdir_flag_spec_CXX" || \ | 12862 | if test -n "$hardcode_libdir_flag_spec_CXX" || \ |
13993 | test -n "$runpath_var_CXX" || \ | 12863 | test -n "$runpath_var_CXX" || \ |
@@ -14011,8 +12881,8 @@ else | |||
14011 | # directories. | 12881 | # directories. |
14012 | hardcode_action_CXX=unsupported | 12882 | hardcode_action_CXX=unsupported |
14013 | fi | 12883 | fi |
14014 | { echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 | 12884 | echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 |
14015 | echo "${ECHO_T}$hardcode_action_CXX" >&6; } | 12885 | echo "${ECHO_T}$hardcode_action_CXX" >&6 |
14016 | 12886 | ||
14017 | if test "$hardcode_action_CXX" = relink; then | 12887 | if test "$hardcode_action_CXX" = relink; then |
14018 | # Fast installation is not supported | 12888 | # Fast installation is not supported |
@@ -14537,13 +13407,13 @@ done | |||
14537 | cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` | 13407 | cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
14538 | 13408 | ||
14539 | 13409 | ||
14540 | { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 | 13410 | echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 |
14541 | echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } | 13411 | echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 |
14542 | { echo "$as_me:$LINENO: result: $can_build_shared" >&5 | 13412 | echo "$as_me:$LINENO: result: $can_build_shared" >&5 |
14543 | echo "${ECHO_T}$can_build_shared" >&6; } | 13413 | echo "${ECHO_T}$can_build_shared" >&6 |
14544 | 13414 | ||
14545 | { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 | 13415 | echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 |
14546 | echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } | 13416 | echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 |
14547 | test "$can_build_shared" = "no" && enable_shared=no | 13417 | test "$can_build_shared" = "no" && enable_shared=no |
14548 | 13418 | ||
14549 | # On AIX, shared libraries and static libraries use the same namespace, and | 13419 | # On AIX, shared libraries and static libraries use the same namespace, and |
@@ -14562,15 +13432,15 @@ aix4* | aix5*) | |||
14562 | fi | 13432 | fi |
14563 | ;; | 13433 | ;; |
14564 | esac | 13434 | esac |
14565 | { echo "$as_me:$LINENO: result: $enable_shared" >&5 | 13435 | echo "$as_me:$LINENO: result: $enable_shared" >&5 |
14566 | echo "${ECHO_T}$enable_shared" >&6; } | 13436 | echo "${ECHO_T}$enable_shared" >&6 |
14567 | 13437 | ||
14568 | { echo "$as_me:$LINENO: checking whether to build static libraries" >&5 | 13438 | echo "$as_me:$LINENO: checking whether to build static libraries" >&5 |
14569 | echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } | 13439 | echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 |
14570 | # Make sure either enable_shared or enable_static is yes. | 13440 | # Make sure either enable_shared or enable_static is yes. |
14571 | test "$enable_shared" = yes || enable_static=yes | 13441 | test "$enable_shared" = yes || enable_static=yes |
14572 | { echo "$as_me:$LINENO: result: $enable_static" >&5 | 13442 | echo "$as_me:$LINENO: result: $enable_static" >&5 |
14573 | echo "${ECHO_T}$enable_static" >&6; } | 13443 | echo "${ECHO_T}$enable_static" >&6 |
14574 | 13444 | ||
14575 | GCC_F77="$G77" | 13445 | GCC_F77="$G77" |
14576 | LD_F77="$LD" | 13446 | LD_F77="$LD" |
@@ -14579,8 +13449,8 @@ lt_prog_compiler_wl_F77= | |||
14579 | lt_prog_compiler_pic_F77= | 13449 | lt_prog_compiler_pic_F77= |
14580 | lt_prog_compiler_static_F77= | 13450 | lt_prog_compiler_static_F77= |
14581 | 13451 | ||
14582 | { echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | 13452 | echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 |
14583 | echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | 13453 | echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 |
14584 | 13454 | ||
14585 | if test "$GCC" = yes; then | 13455 | if test "$GCC" = yes; then |
14586 | lt_prog_compiler_wl_F77='-Wl,' | 13456 | lt_prog_compiler_wl_F77='-Wl,' |
@@ -14709,7 +13579,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | |||
14709 | lt_prog_compiler_static_F77='-Bstatic' | 13579 | lt_prog_compiler_static_F77='-Bstatic' |
14710 | ;; | 13580 | ;; |
14711 | 13581 | ||
14712 | linux* | k*bsd*-gnu) | 13582 | linux*) |
14713 | case $cc_basename in | 13583 | case $cc_basename in |
14714 | icc* | ecc*) | 13584 | icc* | ecc*) |
14715 | lt_prog_compiler_wl_F77='-Wl,' | 13585 | lt_prog_compiler_wl_F77='-Wl,' |
@@ -14789,16 +13659,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | |||
14789 | esac | 13659 | esac |
14790 | fi | 13660 | fi |
14791 | 13661 | ||
14792 | { echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 | 13662 | echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 |
14793 | echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } | 13663 | echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 |
14794 | 13664 | ||
14795 | # | 13665 | # |
14796 | # Check to make sure the PIC flag actually works. | 13666 | # Check to make sure the PIC flag actually works. |
14797 | # | 13667 | # |
14798 | if test -n "$lt_prog_compiler_pic_F77"; then | 13668 | if test -n "$lt_prog_compiler_pic_F77"; then |
14799 | 13669 | ||
14800 | { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 | 13670 | echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 |
14801 | echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } | 13671 | echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 |
14802 | if test "${lt_prog_compiler_pic_works_F77+set}" = set; then | 13672 | if test "${lt_prog_compiler_pic_works_F77+set}" = set; then |
14803 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13673 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14804 | else | 13674 | else |
@@ -14815,11 +13685,11 @@ else | |||
14815 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 13685 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
14816 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 13686 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
14817 | -e 's:$: $lt_compiler_flag:'` | 13687 | -e 's:$: $lt_compiler_flag:'` |
14818 | (eval echo "\"\$as_me:14818: $lt_compile\"" >&5) | 13688 | (eval echo "\"\$as_me:13688: $lt_compile\"" >&5) |
14819 | (eval "$lt_compile" 2>conftest.err) | 13689 | (eval "$lt_compile" 2>conftest.err) |
14820 | ac_status=$? | 13690 | ac_status=$? |
14821 | cat conftest.err >&5 | 13691 | cat conftest.err >&5 |
14822 | echo "$as_me:14822: \$? = $ac_status" >&5 | 13692 | echo "$as_me:13692: \$? = $ac_status" >&5 |
14823 | if (exit $ac_status) && test -s "$ac_outfile"; then | 13693 | if (exit $ac_status) && test -s "$ac_outfile"; then |
14824 | # The compiler can only warn and ignore the option if not recognized | 13694 | # The compiler can only warn and ignore the option if not recognized |
14825 | # So say no if there are warnings other than the usual output. | 13695 | # So say no if there are warnings other than the usual output. |
@@ -14832,8 +13702,8 @@ else | |||
14832 | $rm conftest* | 13702 | $rm conftest* |
14833 | 13703 | ||
14834 | fi | 13704 | fi |
14835 | { echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 | 13705 | echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 |
14836 | echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } | 13706 | echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 |
14837 | 13707 | ||
14838 | if test x"$lt_prog_compiler_pic_works_F77" = xyes; then | 13708 | if test x"$lt_prog_compiler_pic_works_F77" = xyes; then |
14839 | case $lt_prog_compiler_pic_F77 in | 13709 | case $lt_prog_compiler_pic_F77 in |
@@ -14860,8 +13730,8 @@ esac | |||
14860 | # Check to make sure the static flag actually works. | 13730 | # Check to make sure the static flag actually works. |
14861 | # | 13731 | # |
14862 | wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" | 13732 | wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" |
14863 | { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | 13733 | echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
14864 | echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } | 13734 | echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 |
14865 | if test "${lt_prog_compiler_static_works_F77+set}" = set; then | 13735 | if test "${lt_prog_compiler_static_works_F77+set}" = set; then |
14866 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13736 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14867 | else | 13737 | else |
@@ -14888,8 +13758,8 @@ else | |||
14888 | LDFLAGS="$save_LDFLAGS" | 13758 | LDFLAGS="$save_LDFLAGS" |
14889 | 13759 | ||
14890 | fi | 13760 | fi |
14891 | { echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 | 13761 | echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 |
14892 | echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } | 13762 | echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6 |
14893 | 13763 | ||
14894 | if test x"$lt_prog_compiler_static_works_F77" = xyes; then | 13764 | if test x"$lt_prog_compiler_static_works_F77" = xyes; then |
14895 | : | 13765 | : |
@@ -14898,8 +13768,8 @@ else | |||
14898 | fi | 13768 | fi |
14899 | 13769 | ||
14900 | 13770 | ||
14901 | { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | 13771 | echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
14902 | echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } | 13772 | echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 |
14903 | if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then | 13773 | if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then |
14904 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13774 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14905 | else | 13775 | else |
@@ -14919,11 +13789,11 @@ else | |||
14919 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 13789 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
14920 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 13790 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
14921 | -e 's:$: $lt_compiler_flag:'` | 13791 | -e 's:$: $lt_compiler_flag:'` |
14922 | (eval echo "\"\$as_me:14922: $lt_compile\"" >&5) | 13792 | (eval echo "\"\$as_me:13792: $lt_compile\"" >&5) |
14923 | (eval "$lt_compile" 2>out/conftest.err) | 13793 | (eval "$lt_compile" 2>out/conftest.err) |
14924 | ac_status=$? | 13794 | ac_status=$? |
14925 | cat out/conftest.err >&5 | 13795 | cat out/conftest.err >&5 |
14926 | echo "$as_me:14926: \$? = $ac_status" >&5 | 13796 | echo "$as_me:13796: \$? = $ac_status" >&5 |
14927 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 13797 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
14928 | then | 13798 | then |
14929 | # The compiler can only warn and ignore the option if not recognized | 13799 | # The compiler can only warn and ignore the option if not recognized |
@@ -14945,23 +13815,23 @@ else | |||
14945 | $rm conftest* | 13815 | $rm conftest* |
14946 | 13816 | ||
14947 | fi | 13817 | fi |
14948 | { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 | 13818 | echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 |
14949 | echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } | 13819 | echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 |
14950 | 13820 | ||
14951 | 13821 | ||
14952 | hard_links="nottested" | 13822 | hard_links="nottested" |
14953 | if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then | 13823 | if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then |
14954 | # do not overwrite the value of need_locks provided by the user | 13824 | # do not overwrite the value of need_locks provided by the user |
14955 | { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | 13825 | echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 |
14956 | echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } | 13826 | echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 |
14957 | hard_links=yes | 13827 | hard_links=yes |
14958 | $rm conftest* | 13828 | $rm conftest* |
14959 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | 13829 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
14960 | touch conftest.a | 13830 | touch conftest.a |
14961 | ln conftest.a conftest.b 2>&5 || hard_links=no | 13831 | ln conftest.a conftest.b 2>&5 || hard_links=no |
14962 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | 13832 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
14963 | { echo "$as_me:$LINENO: result: $hard_links" >&5 | 13833 | echo "$as_me:$LINENO: result: $hard_links" >&5 |
14964 | echo "${ECHO_T}$hard_links" >&6; } | 13834 | echo "${ECHO_T}$hard_links" >&6 |
14965 | if test "$hard_links" = no; then | 13835 | if test "$hard_links" = no; then |
14966 | { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | 13836 | { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 |
14967 | echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} | 13837 | echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} |
@@ -14971,8 +13841,8 @@ else | |||
14971 | need_locks=no | 13841 | need_locks=no |
14972 | fi | 13842 | fi |
14973 | 13843 | ||
14974 | { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | 13844 | echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 |
14975 | echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } | 13845 | echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 |
14976 | 13846 | ||
14977 | runpath_var= | 13847 | runpath_var= |
14978 | allow_undefined_flag_F77= | 13848 | allow_undefined_flag_F77= |
@@ -15148,7 +14018,7 @@ EOF | |||
15148 | archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' | 14018 | archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
15149 | ;; | 14019 | ;; |
15150 | 14020 | ||
15151 | linux* | k*bsd*-gnu) | 14021 | linux*) |
15152 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | 14022 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
15153 | tmp_addflag= | 14023 | tmp_addflag= |
15154 | case $cc_basename,$host_cpu in | 14024 | case $cc_basename,$host_cpu in |
@@ -15174,13 +14044,12 @@ EOF | |||
15174 | $echo "local: *; };" >> $output_objdir/$libname.ver~ | 14044 | $echo "local: *; };" >> $output_objdir/$libname.ver~ |
15175 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | 14045 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
15176 | fi | 14046 | fi |
15177 | link_all_deplibs_F77=no | ||
15178 | else | 14047 | else |
15179 | ld_shlibs_F77=no | 14048 | ld_shlibs_F77=no |
15180 | fi | 14049 | fi |
15181 | ;; | 14050 | ;; |
15182 | 14051 | ||
15183 | netbsd* | netbsdelf*-gnu) | 14052 | netbsd*) |
15184 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 14053 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
15185 | archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 14054 | archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
15186 | wlarc= | 14055 | wlarc= |
@@ -15378,36 +14247,24 @@ _LT_EOF | |||
15378 | end | 14247 | end |
15379 | _ACEOF | 14248 | _ACEOF |
15380 | rm -f conftest.$ac_objext conftest$ac_exeext | 14249 | rm -f conftest.$ac_objext conftest$ac_exeext |
15381 | if { (ac_try="$ac_link" | 14250 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15382 | case "(($ac_try" in | 14251 | (eval $ac_link) 2>conftest.er1 |
15383 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15384 | *) ac_try_echo=$ac_try;; | ||
15385 | esac | ||
15386 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15387 | (eval "$ac_link") 2>conftest.er1 | ||
15388 | ac_status=$? | 14252 | ac_status=$? |
15389 | grep -v '^ *+' conftest.er1 >conftest.err | 14253 | grep -v '^ *+' conftest.er1 >conftest.err |
15390 | rm -f conftest.er1 | 14254 | rm -f conftest.er1 |
15391 | cat conftest.err >&5 | 14255 | cat conftest.err >&5 |
15392 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 14256 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15393 | (exit $ac_status); } && | 14257 | (exit $ac_status); } && |
15394 | { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | 14258 | { ac_try='test -z "$ac_f77_werror_flag" |
15395 | { (case "(($ac_try" in | 14259 | || test ! -s conftest.err' |
15396 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 14260 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
15397 | *) ac_try_echo=$ac_try;; | 14261 | (eval $ac_try) 2>&5 |
15398 | esac | ||
15399 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15400 | (eval "$ac_try") 2>&5 | ||
15401 | ac_status=$? | 14262 | ac_status=$? |
15402 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 14263 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15403 | (exit $ac_status); }; } && | 14264 | (exit $ac_status); }; } && |
15404 | { ac_try='test -s conftest$ac_exeext' | 14265 | { ac_try='test -s conftest$ac_exeext' |
15405 | { (case "(($ac_try" in | 14266 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
15406 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 14267 | (eval $ac_try) 2>&5 |
15407 | *) ac_try_echo=$ac_try;; | ||
15408 | esac | ||
15409 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15410 | (eval "$ac_try") 2>&5 | ||
15411 | ac_status=$? | 14268 | ac_status=$? |
15412 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 14269 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15413 | (exit $ac_status); }; }; then | 14270 | (exit $ac_status); }; }; then |
@@ -15421,10 +14278,8 @@ else | |||
15421 | echo "$as_me: failed program was:" >&5 | 14278 | echo "$as_me: failed program was:" >&5 |
15422 | sed 's/^/| /' conftest.$ac_ext >&5 | 14279 | sed 's/^/| /' conftest.$ac_ext >&5 |
15423 | 14280 | ||
15424 | |||
15425 | fi | 14281 | fi |
15426 | 14282 | rm -f conftest.err conftest.$ac_objext \ | |
15427 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
15428 | conftest$ac_exeext conftest.$ac_ext | 14283 | conftest$ac_exeext conftest.$ac_ext |
15429 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14284 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
15430 | 14285 | ||
@@ -15443,36 +14298,24 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
15443 | end | 14298 | end |
15444 | _ACEOF | 14299 | _ACEOF |
15445 | rm -f conftest.$ac_objext conftest$ac_exeext | 14300 | rm -f conftest.$ac_objext conftest$ac_exeext |
15446 | if { (ac_try="$ac_link" | 14301 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15447 | case "(($ac_try" in | 14302 | (eval $ac_link) 2>conftest.er1 |
15448 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
15449 | *) ac_try_echo=$ac_try;; | ||
15450 | esac | ||
15451 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15452 | (eval "$ac_link") 2>conftest.er1 | ||
15453 | ac_status=$? | 14303 | ac_status=$? |
15454 | grep -v '^ *+' conftest.er1 >conftest.err | 14304 | grep -v '^ *+' conftest.er1 >conftest.err |
15455 | rm -f conftest.er1 | 14305 | rm -f conftest.er1 |
15456 | cat conftest.err >&5 | 14306 | cat conftest.err >&5 |
15457 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 14307 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15458 | (exit $ac_status); } && | 14308 | (exit $ac_status); } && |
15459 | { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' | 14309 | { ac_try='test -z "$ac_f77_werror_flag" |
15460 | { (case "(($ac_try" in | 14310 | || test ! -s conftest.err' |
15461 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 14311 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
15462 | *) ac_try_echo=$ac_try;; | 14312 | (eval $ac_try) 2>&5 |
15463 | esac | ||
15464 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15465 | (eval "$ac_try") 2>&5 | ||
15466 | ac_status=$? | 14313 | ac_status=$? |
15467 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 14314 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15468 | (exit $ac_status); }; } && | 14315 | (exit $ac_status); }; } && |
15469 | { ac_try='test -s conftest$ac_exeext' | 14316 | { ac_try='test -s conftest$ac_exeext' |
15470 | { (case "(($ac_try" in | 14317 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
15471 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 14318 | (eval $ac_try) 2>&5 |
15472 | *) ac_try_echo=$ac_try;; | ||
15473 | esac | ||
15474 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
15475 | (eval "$ac_try") 2>&5 | ||
15476 | ac_status=$? | 14319 | ac_status=$? |
15477 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 14320 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15478 | (exit $ac_status); }; }; then | 14321 | (exit $ac_status); }; }; then |
@@ -15486,10 +14329,8 @@ else | |||
15486 | echo "$as_me: failed program was:" >&5 | 14329 | echo "$as_me: failed program was:" >&5 |
15487 | sed 's/^/| /' conftest.$ac_ext >&5 | 14330 | sed 's/^/| /' conftest.$ac_ext >&5 |
15488 | 14331 | ||
15489 | |||
15490 | fi | 14332 | fi |
15491 | 14333 | rm -f conftest.err conftest.$ac_objext \ | |
15492 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
15493 | conftest$ac_exeext conftest.$ac_ext | 14334 | conftest$ac_exeext conftest.$ac_ext |
15494 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 14335 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
15495 | 14336 | ||
@@ -15620,7 +14461,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
15620 | ;; | 14461 | ;; |
15621 | 14462 | ||
15622 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 14463 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
15623 | freebsd* | dragonfly*) | 14464 | freebsd* | kfreebsd*-gnu | dragonfly*) |
15624 | archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | 14465 | archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
15625 | hardcode_libdir_flag_spec_F77='-R$libdir' | 14466 | hardcode_libdir_flag_spec_F77='-R$libdir' |
15626 | hardcode_direct_F77=yes | 14467 | hardcode_direct_F77=yes |
@@ -15722,7 +14563,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
15722 | link_all_deplibs_F77=yes | 14563 | link_all_deplibs_F77=yes |
15723 | ;; | 14564 | ;; |
15724 | 14565 | ||
15725 | netbsd* | netbsdelf*-gnu) | 14566 | netbsd*) |
15726 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 14567 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
15727 | archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 14568 | archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
15728 | else | 14569 | else |
@@ -15938,8 +14779,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
15938 | esac | 14779 | esac |
15939 | fi | 14780 | fi |
15940 | 14781 | ||
15941 | { echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 | 14782 | echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 |
15942 | echo "${ECHO_T}$ld_shlibs_F77" >&6; } | 14783 | echo "${ECHO_T}$ld_shlibs_F77" >&6 |
15943 | test "$ld_shlibs_F77" = no && can_build_shared=no | 14784 | test "$ld_shlibs_F77" = no && can_build_shared=no |
15944 | 14785 | ||
15945 | # | 14786 | # |
@@ -15959,8 +14800,8 @@ x|xyes) | |||
15959 | # Test whether the compiler implicitly links with -lc since on some | 14800 | # Test whether the compiler implicitly links with -lc since on some |
15960 | # systems, -lgcc has to come before -lc. If gcc already passes -lc | 14801 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
15961 | # to ld, don't add -lc before -lgcc. | 14802 | # to ld, don't add -lc before -lgcc. |
15962 | { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | 14803 | echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 |
15963 | echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } | 14804 | echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 |
15964 | $rm conftest* | 14805 | $rm conftest* |
15965 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext | 14806 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
15966 | 14807 | ||
@@ -15997,16 +14838,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& | |||
15997 | cat conftest.err 1>&5 | 14838 | cat conftest.err 1>&5 |
15998 | fi | 14839 | fi |
15999 | $rm conftest* | 14840 | $rm conftest* |
16000 | { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 | 14841 | echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 |
16001 | echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } | 14842 | echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 |
16002 | ;; | 14843 | ;; |
16003 | esac | 14844 | esac |
16004 | fi | 14845 | fi |
16005 | ;; | 14846 | ;; |
16006 | esac | 14847 | esac |
16007 | 14848 | ||
16008 | { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | 14849 | echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 |
16009 | echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } | 14850 | echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 |
16010 | library_names_spec= | 14851 | library_names_spec= |
16011 | libname_spec='lib$name' | 14852 | libname_spec='lib$name' |
16012 | soname_spec= | 14853 | soname_spec= |
@@ -16212,6 +15053,18 @@ freebsd1*) | |||
16212 | dynamic_linker=no | 15053 | dynamic_linker=no |
16213 | ;; | 15054 | ;; |
16214 | 15055 | ||
15056 | kfreebsd*-gnu) | ||
15057 | version_type=linux | ||
15058 | need_lib_prefix=no | ||
15059 | need_version=no | ||
15060 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
15061 | soname_spec='${libname}${release}${shared_ext}$major' | ||
15062 | shlibpath_var=LD_LIBRARY_PATH | ||
15063 | shlibpath_overrides_runpath=no | ||
15064 | hardcode_into_libs=yes | ||
15065 | dynamic_linker='GNU ld.so' | ||
15066 | ;; | ||
15067 | |||
16215 | freebsd* | dragonfly*) | 15068 | freebsd* | dragonfly*) |
16216 | # DragonFly does not have aout. When/if they implement a new | 15069 | # DragonFly does not have aout. When/if they implement a new |
16217 | # versioning mechanism, adjust this. | 15070 | # versioning mechanism, adjust this. |
@@ -16367,7 +15220,7 @@ linux*oldld* | linux*aout* | linux*coff*) | |||
16367 | ;; | 15220 | ;; |
16368 | 15221 | ||
16369 | # This must be Linux ELF. | 15222 | # This must be Linux ELF. |
16370 | linux* | k*bsd*-gnu) | 15223 | linux*) |
16371 | version_type=linux | 15224 | version_type=linux |
16372 | need_lib_prefix=no | 15225 | need_lib_prefix=no |
16373 | need_version=no | 15226 | need_version=no |
@@ -16381,10 +15234,31 @@ linux* | k*bsd*-gnu) | |||
16381 | # before this can be enabled. | 15234 | # before this can be enabled. |
16382 | hardcode_into_libs=yes | 15235 | hardcode_into_libs=yes |
16383 | 15236 | ||
15237 | # find out which ABI we are using | ||
15238 | libsuff= | ||
15239 | case "$host_cpu" in | ||
15240 | x86_64*|s390x*|powerpc64*) | ||
15241 | echo '#line 15241 "configure"' > conftest.$ac_ext | ||
15242 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
15243 | (eval $ac_compile) 2>&5 | ||
15244 | ac_status=$? | ||
15245 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15246 | (exit $ac_status); }; then | ||
15247 | case `/usr/bin/file conftest.$ac_objext` in | ||
15248 | *64-bit*) | ||
15249 | libsuff=64 | ||
15250 | sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | ||
15251 | ;; | ||
15252 | esac | ||
15253 | fi | ||
15254 | rm -rf conftest* | ||
15255 | ;; | ||
15256 | esac | ||
15257 | |||
16384 | # Append ld.so.conf contents to the search path | 15258 | # Append ld.so.conf contents to the search path |
16385 | if test -f /etc/ld.so.conf; then | 15259 | if test -f /etc/ld.so.conf; then |
16386 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | 15260 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
16387 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | 15261 | sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" |
16388 | fi | 15262 | fi |
16389 | 15263 | ||
16390 | # We used to test for /lib/ld.so.1 and disable shared libraries on | 15264 | # We used to test for /lib/ld.so.1 and disable shared libraries on |
@@ -16396,7 +15270,7 @@ linux* | k*bsd*-gnu) | |||
16396 | dynamic_linker='GNU/Linux ld.so' | 15270 | dynamic_linker='GNU/Linux ld.so' |
16397 | ;; | 15271 | ;; |
16398 | 15272 | ||
16399 | netbsdelf*-gnu) | 15273 | knetbsd*-gnu) |
16400 | version_type=linux | 15274 | version_type=linux |
16401 | need_lib_prefix=no | 15275 | need_lib_prefix=no |
16402 | need_version=no | 15276 | need_version=no |
@@ -16405,7 +15279,7 @@ netbsdelf*-gnu) | |||
16405 | shlibpath_var=LD_LIBRARY_PATH | 15279 | shlibpath_var=LD_LIBRARY_PATH |
16406 | shlibpath_overrides_runpath=no | 15280 | shlibpath_overrides_runpath=no |
16407 | hardcode_into_libs=yes | 15281 | hardcode_into_libs=yes |
16408 | dynamic_linker='NetBSD ld.elf_so' | 15282 | dynamic_linker='GNU ld.so' |
16409 | ;; | 15283 | ;; |
16410 | 15284 | ||
16411 | netbsd*) | 15285 | netbsd*) |
@@ -16581,8 +15455,8 @@ uts4*) | |||
16581 | dynamic_linker=no | 15455 | dynamic_linker=no |
16582 | ;; | 15456 | ;; |
16583 | esac | 15457 | esac |
16584 | { echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | 15458 | echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
16585 | echo "${ECHO_T}$dynamic_linker" >&6; } | 15459 | echo "${ECHO_T}$dynamic_linker" >&6 |
16586 | test "$dynamic_linker" = no && can_build_shared=no | 15460 | test "$dynamic_linker" = no && can_build_shared=no |
16587 | 15461 | ||
16588 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | 15462 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
@@ -16590,8 +15464,8 @@ if test "$GCC" = yes; then | |||
16590 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | 15464 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
16591 | fi | 15465 | fi |
16592 | 15466 | ||
16593 | { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | 15467 | echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
16594 | echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } | 15468 | echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 |
16595 | hardcode_action_F77= | 15469 | hardcode_action_F77= |
16596 | if test -n "$hardcode_libdir_flag_spec_F77" || \ | 15470 | if test -n "$hardcode_libdir_flag_spec_F77" || \ |
16597 | test -n "$runpath_var_F77" || \ | 15471 | test -n "$runpath_var_F77" || \ |
@@ -16615,8 +15489,8 @@ else | |||
16615 | # directories. | 15489 | # directories. |
16616 | hardcode_action_F77=unsupported | 15490 | hardcode_action_F77=unsupported |
16617 | fi | 15491 | fi |
16618 | { echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 | 15492 | echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 |
16619 | echo "${ECHO_T}$hardcode_action_F77" >&6; } | 15493 | echo "${ECHO_T}$hardcode_action_F77" >&6 |
16620 | 15494 | ||
16621 | if test "$hardcode_action_F77" = relink; then | 15495 | if test "$hardcode_action_F77" = relink; then |
16622 | # Fast installation is not supported | 15496 | # Fast installation is not supported |
@@ -17053,6 +15927,7 @@ CC="$lt_save_CC" | |||
17053 | if test -n "$GCJ" && test "X$GCJ" != "Xno"; then | 15927 | if test -n "$GCJ" && test "X$GCJ" != "Xno"; then |
17054 | 15928 | ||
17055 | 15929 | ||
15930 | |||
17056 | # Source file extension for Java test sources. | 15931 | # Source file extension for Java test sources. |
17057 | ac_ext=java | 15932 | ac_ext=java |
17058 | 15933 | ||
@@ -17120,8 +15995,8 @@ if test "$GCC" = yes; then | |||
17120 | lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' | 15995 | lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' |
17121 | 15996 | ||
17122 | 15997 | ||
17123 | { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | 15998 | echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 |
17124 | echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } | 15999 | echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 |
17125 | if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then | 16000 | if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then |
17126 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 16001 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
17127 | else | 16002 | else |
@@ -17138,11 +16013,11 @@ else | |||
17138 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 16013 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
17139 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 16014 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
17140 | -e 's:$: $lt_compiler_flag:'` | 16015 | -e 's:$: $lt_compiler_flag:'` |
17141 | (eval echo "\"\$as_me:17141: $lt_compile\"" >&5) | 16016 | (eval echo "\"\$as_me:16016: $lt_compile\"" >&5) |
17142 | (eval "$lt_compile" 2>conftest.err) | 16017 | (eval "$lt_compile" 2>conftest.err) |
17143 | ac_status=$? | 16018 | ac_status=$? |
17144 | cat conftest.err >&5 | 16019 | cat conftest.err >&5 |
17145 | echo "$as_me:17145: \$? = $ac_status" >&5 | 16020 | echo "$as_me:16020: \$? = $ac_status" >&5 |
17146 | if (exit $ac_status) && test -s "$ac_outfile"; then | 16021 | if (exit $ac_status) && test -s "$ac_outfile"; then |
17147 | # The compiler can only warn and ignore the option if not recognized | 16022 | # The compiler can only warn and ignore the option if not recognized |
17148 | # So say no if there are warnings other than the usual output. | 16023 | # So say no if there are warnings other than the usual output. |
@@ -17155,8 +16030,8 @@ else | |||
17155 | $rm conftest* | 16030 | $rm conftest* |
17156 | 16031 | ||
17157 | fi | 16032 | fi |
17158 | { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 | 16033 | echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 |
17159 | echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } | 16034 | echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 |
17160 | 16035 | ||
17161 | if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then | 16036 | if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then |
17162 | lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" | 16037 | lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" |
@@ -17170,8 +16045,8 @@ lt_prog_compiler_wl_GCJ= | |||
17170 | lt_prog_compiler_pic_GCJ= | 16045 | lt_prog_compiler_pic_GCJ= |
17171 | lt_prog_compiler_static_GCJ= | 16046 | lt_prog_compiler_static_GCJ= |
17172 | 16047 | ||
17173 | { echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | 16048 | echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 |
17174 | echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | 16049 | echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 |
17175 | 16050 | ||
17176 | if test "$GCC" = yes; then | 16051 | if test "$GCC" = yes; then |
17177 | lt_prog_compiler_wl_GCJ='-Wl,' | 16052 | lt_prog_compiler_wl_GCJ='-Wl,' |
@@ -17300,7 +16175,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | |||
17300 | lt_prog_compiler_static_GCJ='-Bstatic' | 16175 | lt_prog_compiler_static_GCJ='-Bstatic' |
17301 | ;; | 16176 | ;; |
17302 | 16177 | ||
17303 | linux* | k*bsd*-gnu) | 16178 | linux*) |
17304 | case $cc_basename in | 16179 | case $cc_basename in |
17305 | icc* | ecc*) | 16180 | icc* | ecc*) |
17306 | lt_prog_compiler_wl_GCJ='-Wl,' | 16181 | lt_prog_compiler_wl_GCJ='-Wl,' |
@@ -17380,16 +16255,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | |||
17380 | esac | 16255 | esac |
17381 | fi | 16256 | fi |
17382 | 16257 | ||
17383 | { echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 | 16258 | echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 |
17384 | echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } | 16259 | echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 |
17385 | 16260 | ||
17386 | # | 16261 | # |
17387 | # Check to make sure the PIC flag actually works. | 16262 | # Check to make sure the PIC flag actually works. |
17388 | # | 16263 | # |
17389 | if test -n "$lt_prog_compiler_pic_GCJ"; then | 16264 | if test -n "$lt_prog_compiler_pic_GCJ"; then |
17390 | 16265 | ||
17391 | { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 | 16266 | echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 |
17392 | echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } | 16267 | echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 |
17393 | if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then | 16268 | if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then |
17394 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 16269 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
17395 | else | 16270 | else |
@@ -17406,11 +16281,11 @@ else | |||
17406 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 16281 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
17407 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 16282 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
17408 | -e 's:$: $lt_compiler_flag:'` | 16283 | -e 's:$: $lt_compiler_flag:'` |
17409 | (eval echo "\"\$as_me:17409: $lt_compile\"" >&5) | 16284 | (eval echo "\"\$as_me:16284: $lt_compile\"" >&5) |
17410 | (eval "$lt_compile" 2>conftest.err) | 16285 | (eval "$lt_compile" 2>conftest.err) |
17411 | ac_status=$? | 16286 | ac_status=$? |
17412 | cat conftest.err >&5 | 16287 | cat conftest.err >&5 |
17413 | echo "$as_me:17413: \$? = $ac_status" >&5 | 16288 | echo "$as_me:16288: \$? = $ac_status" >&5 |
17414 | if (exit $ac_status) && test -s "$ac_outfile"; then | 16289 | if (exit $ac_status) && test -s "$ac_outfile"; then |
17415 | # The compiler can only warn and ignore the option if not recognized | 16290 | # The compiler can only warn and ignore the option if not recognized |
17416 | # So say no if there are warnings other than the usual output. | 16291 | # So say no if there are warnings other than the usual output. |
@@ -17423,8 +16298,8 @@ else | |||
17423 | $rm conftest* | 16298 | $rm conftest* |
17424 | 16299 | ||
17425 | fi | 16300 | fi |
17426 | { echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 | 16301 | echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 |
17427 | echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } | 16302 | echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 |
17428 | 16303 | ||
17429 | if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then | 16304 | if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then |
17430 | case $lt_prog_compiler_pic_GCJ in | 16305 | case $lt_prog_compiler_pic_GCJ in |
@@ -17451,8 +16326,8 @@ esac | |||
17451 | # Check to make sure the static flag actually works. | 16326 | # Check to make sure the static flag actually works. |
17452 | # | 16327 | # |
17453 | wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" | 16328 | wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" |
17454 | { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | 16329 | echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
17455 | echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } | 16330 | echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 |
17456 | if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then | 16331 | if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then |
17457 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 16332 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
17458 | else | 16333 | else |
@@ -17479,8 +16354,8 @@ else | |||
17479 | LDFLAGS="$save_LDFLAGS" | 16354 | LDFLAGS="$save_LDFLAGS" |
17480 | 16355 | ||
17481 | fi | 16356 | fi |
17482 | { echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 | 16357 | echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 |
17483 | echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } | 16358 | echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6 |
17484 | 16359 | ||
17485 | if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then | 16360 | if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then |
17486 | : | 16361 | : |
@@ -17489,8 +16364,8 @@ else | |||
17489 | fi | 16364 | fi |
17490 | 16365 | ||
17491 | 16366 | ||
17492 | { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | 16367 | echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
17493 | echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } | 16368 | echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 |
17494 | if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then | 16369 | if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then |
17495 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 16370 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
17496 | else | 16371 | else |
@@ -17510,11 +16385,11 @@ else | |||
17510 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 16385 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
17511 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 16386 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
17512 | -e 's:$: $lt_compiler_flag:'` | 16387 | -e 's:$: $lt_compiler_flag:'` |
17513 | (eval echo "\"\$as_me:17513: $lt_compile\"" >&5) | 16388 | (eval echo "\"\$as_me:16388: $lt_compile\"" >&5) |
17514 | (eval "$lt_compile" 2>out/conftest.err) | 16389 | (eval "$lt_compile" 2>out/conftest.err) |
17515 | ac_status=$? | 16390 | ac_status=$? |
17516 | cat out/conftest.err >&5 | 16391 | cat out/conftest.err >&5 |
17517 | echo "$as_me:17517: \$? = $ac_status" >&5 | 16392 | echo "$as_me:16392: \$? = $ac_status" >&5 |
17518 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 16393 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
17519 | then | 16394 | then |
17520 | # The compiler can only warn and ignore the option if not recognized | 16395 | # The compiler can only warn and ignore the option if not recognized |
@@ -17536,23 +16411,23 @@ else | |||
17536 | $rm conftest* | 16411 | $rm conftest* |
17537 | 16412 | ||
17538 | fi | 16413 | fi |
17539 | { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 | 16414 | echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 |
17540 | echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } | 16415 | echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 |
17541 | 16416 | ||
17542 | 16417 | ||
17543 | hard_links="nottested" | 16418 | hard_links="nottested" |
17544 | if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then | 16419 | if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then |
17545 | # do not overwrite the value of need_locks provided by the user | 16420 | # do not overwrite the value of need_locks provided by the user |
17546 | { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | 16421 | echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 |
17547 | echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } | 16422 | echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 |
17548 | hard_links=yes | 16423 | hard_links=yes |
17549 | $rm conftest* | 16424 | $rm conftest* |
17550 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | 16425 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
17551 | touch conftest.a | 16426 | touch conftest.a |
17552 | ln conftest.a conftest.b 2>&5 || hard_links=no | 16427 | ln conftest.a conftest.b 2>&5 || hard_links=no |
17553 | ln conftest.a conftest.b 2>/dev/null && hard_links=no | 16428 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
17554 | { echo "$as_me:$LINENO: result: $hard_links" >&5 | 16429 | echo "$as_me:$LINENO: result: $hard_links" >&5 |
17555 | echo "${ECHO_T}$hard_links" >&6; } | 16430 | echo "${ECHO_T}$hard_links" >&6 |
17556 | if test "$hard_links" = no; then | 16431 | if test "$hard_links" = no; then |
17557 | { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | 16432 | { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 |
17558 | echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} | 16433 | echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} |
@@ -17562,8 +16437,8 @@ else | |||
17562 | need_locks=no | 16437 | need_locks=no |
17563 | fi | 16438 | fi |
17564 | 16439 | ||
17565 | { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | 16440 | echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 |
17566 | echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } | 16441 | echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 |
17567 | 16442 | ||
17568 | runpath_var= | 16443 | runpath_var= |
17569 | allow_undefined_flag_GCJ= | 16444 | allow_undefined_flag_GCJ= |
@@ -17739,7 +16614,7 @@ EOF | |||
17739 | archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' | 16614 | archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
17740 | ;; | 16615 | ;; |
17741 | 16616 | ||
17742 | linux* | k*bsd*-gnu) | 16617 | linux*) |
17743 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | 16618 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
17744 | tmp_addflag= | 16619 | tmp_addflag= |
17745 | case $cc_basename,$host_cpu in | 16620 | case $cc_basename,$host_cpu in |
@@ -17765,13 +16640,12 @@ EOF | |||
17765 | $echo "local: *; };" >> $output_objdir/$libname.ver~ | 16640 | $echo "local: *; };" >> $output_objdir/$libname.ver~ |
17766 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | 16641 | $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' |
17767 | fi | 16642 | fi |
17768 | link_all_deplibs_GCJ=no | ||
17769 | else | 16643 | else |
17770 | ld_shlibs_GCJ=no | 16644 | ld_shlibs_GCJ=no |
17771 | fi | 16645 | fi |
17772 | ;; | 16646 | ;; |
17773 | 16647 | ||
17774 | netbsd* | netbsdelf*-gnu) | 16648 | netbsd*) |
17775 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 16649 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
17776 | archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 16650 | archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
17777 | wlarc= | 16651 | wlarc= |
@@ -17979,36 +16853,24 @@ main () | |||
17979 | } | 16853 | } |
17980 | _ACEOF | 16854 | _ACEOF |
17981 | rm -f conftest.$ac_objext conftest$ac_exeext | 16855 | rm -f conftest.$ac_objext conftest$ac_exeext |
17982 | if { (ac_try="$ac_link" | 16856 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
17983 | case "(($ac_try" in | 16857 | (eval $ac_link) 2>conftest.er1 |
17984 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
17985 | *) ac_try_echo=$ac_try;; | ||
17986 | esac | ||
17987 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
17988 | (eval "$ac_link") 2>conftest.er1 | ||
17989 | ac_status=$? | 16858 | ac_status=$? |
17990 | grep -v '^ *+' conftest.er1 >conftest.err | 16859 | grep -v '^ *+' conftest.er1 >conftest.err |
17991 | rm -f conftest.er1 | 16860 | rm -f conftest.er1 |
17992 | cat conftest.err >&5 | 16861 | cat conftest.err >&5 |
17993 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 16862 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
17994 | (exit $ac_status); } && | 16863 | (exit $ac_status); } && |
17995 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 16864 | { ac_try='test -z "$ac_c_werror_flag" |
17996 | { (case "(($ac_try" in | 16865 | || test ! -s conftest.err' |
17997 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 16866 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
17998 | *) ac_try_echo=$ac_try;; | 16867 | (eval $ac_try) 2>&5 |
17999 | esac | ||
18000 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18001 | (eval "$ac_try") 2>&5 | ||
18002 | ac_status=$? | 16868 | ac_status=$? |
18003 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 16869 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
18004 | (exit $ac_status); }; } && | 16870 | (exit $ac_status); }; } && |
18005 | { ac_try='test -s conftest$ac_exeext' | 16871 | { ac_try='test -s conftest$ac_exeext' |
18006 | { (case "(($ac_try" in | 16872 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
18007 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 16873 | (eval $ac_try) 2>&5 |
18008 | *) ac_try_echo=$ac_try;; | ||
18009 | esac | ||
18010 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18011 | (eval "$ac_try") 2>&5 | ||
18012 | ac_status=$? | 16874 | ac_status=$? |
18013 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 16875 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
18014 | (exit $ac_status); }; }; then | 16876 | (exit $ac_status); }; }; then |
@@ -18022,10 +16884,8 @@ else | |||
18022 | echo "$as_me: failed program was:" >&5 | 16884 | echo "$as_me: failed program was:" >&5 |
18023 | sed 's/^/| /' conftest.$ac_ext >&5 | 16885 | sed 's/^/| /' conftest.$ac_ext >&5 |
18024 | 16886 | ||
18025 | |||
18026 | fi | 16887 | fi |
18027 | 16888 | rm -f conftest.err conftest.$ac_objext \ | |
18028 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
18029 | conftest$ac_exeext conftest.$ac_ext | 16889 | conftest$ac_exeext conftest.$ac_ext |
18030 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 16890 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
18031 | 16891 | ||
@@ -18054,36 +16914,24 @@ main () | |||
18054 | } | 16914 | } |
18055 | _ACEOF | 16915 | _ACEOF |
18056 | rm -f conftest.$ac_objext conftest$ac_exeext | 16916 | rm -f conftest.$ac_objext conftest$ac_exeext |
18057 | if { (ac_try="$ac_link" | 16917 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
18058 | case "(($ac_try" in | 16918 | (eval $ac_link) 2>conftest.er1 |
18059 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
18060 | *) ac_try_echo=$ac_try;; | ||
18061 | esac | ||
18062 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18063 | (eval "$ac_link") 2>conftest.er1 | ||
18064 | ac_status=$? | 16919 | ac_status=$? |
18065 | grep -v '^ *+' conftest.er1 >conftest.err | 16920 | grep -v '^ *+' conftest.er1 >conftest.err |
18066 | rm -f conftest.er1 | 16921 | rm -f conftest.er1 |
18067 | cat conftest.err >&5 | 16922 | cat conftest.err >&5 |
18068 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 16923 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
18069 | (exit $ac_status); } && | 16924 | (exit $ac_status); } && |
18070 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 16925 | { ac_try='test -z "$ac_c_werror_flag" |
18071 | { (case "(($ac_try" in | 16926 | || test ! -s conftest.err' |
18072 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 16927 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
18073 | *) ac_try_echo=$ac_try;; | 16928 | (eval $ac_try) 2>&5 |
18074 | esac | ||
18075 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18076 | (eval "$ac_try") 2>&5 | ||
18077 | ac_status=$? | 16929 | ac_status=$? |
18078 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 16930 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
18079 | (exit $ac_status); }; } && | 16931 | (exit $ac_status); }; } && |
18080 | { ac_try='test -s conftest$ac_exeext' | 16932 | { ac_try='test -s conftest$ac_exeext' |
18081 | { (case "(($ac_try" in | 16933 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
18082 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 16934 | (eval $ac_try) 2>&5 |
18083 | *) ac_try_echo=$ac_try;; | ||
18084 | esac | ||
18085 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
18086 | (eval "$ac_try") 2>&5 | ||
18087 | ac_status=$? | 16935 | ac_status=$? |
18088 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 16936 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
18089 | (exit $ac_status); }; }; then | 16937 | (exit $ac_status); }; }; then |
@@ -18097,10 +16945,8 @@ else | |||
18097 | echo "$as_me: failed program was:" >&5 | 16945 | echo "$as_me: failed program was:" >&5 |
18098 | sed 's/^/| /' conftest.$ac_ext >&5 | 16946 | sed 's/^/| /' conftest.$ac_ext >&5 |
18099 | 16947 | ||
18100 | |||
18101 | fi | 16948 | fi |
18102 | 16949 | rm -f conftest.err conftest.$ac_objext \ | |
18103 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
18104 | conftest$ac_exeext conftest.$ac_ext | 16950 | conftest$ac_exeext conftest.$ac_ext |
18105 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 16951 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
18106 | 16952 | ||
@@ -18231,7 +17077,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
18231 | ;; | 17077 | ;; |
18232 | 17078 | ||
18233 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 17079 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
18234 | freebsd* | dragonfly*) | 17080 | freebsd* | kfreebsd*-gnu | dragonfly*) |
18235 | archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | 17081 | archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
18236 | hardcode_libdir_flag_spec_GCJ='-R$libdir' | 17082 | hardcode_libdir_flag_spec_GCJ='-R$libdir' |
18237 | hardcode_direct_GCJ=yes | 17083 | hardcode_direct_GCJ=yes |
@@ -18333,7 +17179,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
18333 | link_all_deplibs_GCJ=yes | 17179 | link_all_deplibs_GCJ=yes |
18334 | ;; | 17180 | ;; |
18335 | 17181 | ||
18336 | netbsd* | netbsdelf*-gnu) | 17182 | netbsd*) |
18337 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 17183 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
18338 | archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 17184 | archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
18339 | else | 17185 | else |
@@ -18549,8 +17395,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
18549 | esac | 17395 | esac |
18550 | fi | 17396 | fi |
18551 | 17397 | ||
18552 | { echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 | 17398 | echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 |
18553 | echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } | 17399 | echo "${ECHO_T}$ld_shlibs_GCJ" >&6 |
18554 | test "$ld_shlibs_GCJ" = no && can_build_shared=no | 17400 | test "$ld_shlibs_GCJ" = no && can_build_shared=no |
18555 | 17401 | ||
18556 | # | 17402 | # |
@@ -18570,8 +17416,8 @@ x|xyes) | |||
18570 | # Test whether the compiler implicitly links with -lc since on some | 17416 | # Test whether the compiler implicitly links with -lc since on some |
18571 | # systems, -lgcc has to come before -lc. If gcc already passes -lc | 17417 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
18572 | # to ld, don't add -lc before -lgcc. | 17418 | # to ld, don't add -lc before -lgcc. |
18573 | { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | 17419 | echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 |
18574 | echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } | 17420 | echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 |
18575 | $rm conftest* | 17421 | $rm conftest* |
18576 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext | 17422 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
18577 | 17423 | ||
@@ -18608,16 +17454,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& | |||
18608 | cat conftest.err 1>&5 | 17454 | cat conftest.err 1>&5 |
18609 | fi | 17455 | fi |
18610 | $rm conftest* | 17456 | $rm conftest* |
18611 | { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 | 17457 | echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 |
18612 | echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } | 17458 | echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 |
18613 | ;; | 17459 | ;; |
18614 | esac | 17460 | esac |
18615 | fi | 17461 | fi |
18616 | ;; | 17462 | ;; |
18617 | esac | 17463 | esac |
18618 | 17464 | ||
18619 | { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | 17465 | echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 |
18620 | echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } | 17466 | echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 |
18621 | library_names_spec= | 17467 | library_names_spec= |
18622 | libname_spec='lib$name' | 17468 | libname_spec='lib$name' |
18623 | soname_spec= | 17469 | soname_spec= |
@@ -18823,6 +17669,18 @@ freebsd1*) | |||
18823 | dynamic_linker=no | 17669 | dynamic_linker=no |
18824 | ;; | 17670 | ;; |
18825 | 17671 | ||
17672 | kfreebsd*-gnu) | ||
17673 | version_type=linux | ||
17674 | need_lib_prefix=no | ||
17675 | need_version=no | ||
17676 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
17677 | soname_spec='${libname}${release}${shared_ext}$major' | ||
17678 | shlibpath_var=LD_LIBRARY_PATH | ||
17679 | shlibpath_overrides_runpath=no | ||
17680 | hardcode_into_libs=yes | ||
17681 | dynamic_linker='GNU ld.so' | ||
17682 | ;; | ||
17683 | |||
18826 | freebsd* | dragonfly*) | 17684 | freebsd* | dragonfly*) |
18827 | # DragonFly does not have aout. When/if they implement a new | 17685 | # DragonFly does not have aout. When/if they implement a new |
18828 | # versioning mechanism, adjust this. | 17686 | # versioning mechanism, adjust this. |
@@ -18978,7 +17836,7 @@ linux*oldld* | linux*aout* | linux*coff*) | |||
18978 | ;; | 17836 | ;; |
18979 | 17837 | ||
18980 | # This must be Linux ELF. | 17838 | # This must be Linux ELF. |
18981 | linux* | k*bsd*-gnu) | 17839 | linux*) |
18982 | version_type=linux | 17840 | version_type=linux |
18983 | need_lib_prefix=no | 17841 | need_lib_prefix=no |
18984 | need_version=no | 17842 | need_version=no |
@@ -18992,10 +17850,31 @@ linux* | k*bsd*-gnu) | |||
18992 | # before this can be enabled. | 17850 | # before this can be enabled. |
18993 | hardcode_into_libs=yes | 17851 | hardcode_into_libs=yes |
18994 | 17852 | ||
17853 | # find out which ABI we are using | ||
17854 | libsuff= | ||
17855 | case "$host_cpu" in | ||
17856 | x86_64*|s390x*|powerpc64*) | ||
17857 | echo '#line 17857 "configure"' > conftest.$ac_ext | ||
17858 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
17859 | (eval $ac_compile) 2>&5 | ||
17860 | ac_status=$? | ||
17861 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17862 | (exit $ac_status); }; then | ||
17863 | case `/usr/bin/file conftest.$ac_objext` in | ||
17864 | *64-bit*) | ||
17865 | libsuff=64 | ||
17866 | sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | ||
17867 | ;; | ||
17868 | esac | ||
17869 | fi | ||
17870 | rm -rf conftest* | ||
17871 | ;; | ||
17872 | esac | ||
17873 | |||
18995 | # Append ld.so.conf contents to the search path | 17874 | # Append ld.so.conf contents to the search path |
18996 | if test -f /etc/ld.so.conf; then | 17875 | if test -f /etc/ld.so.conf; then |
18997 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | 17876 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
18998 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | 17877 | sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" |
18999 | fi | 17878 | fi |
19000 | 17879 | ||
19001 | # We used to test for /lib/ld.so.1 and disable shared libraries on | 17880 | # We used to test for /lib/ld.so.1 and disable shared libraries on |
@@ -19007,7 +17886,7 @@ linux* | k*bsd*-gnu) | |||
19007 | dynamic_linker='GNU/Linux ld.so' | 17886 | dynamic_linker='GNU/Linux ld.so' |
19008 | ;; | 17887 | ;; |
19009 | 17888 | ||
19010 | netbsdelf*-gnu) | 17889 | knetbsd*-gnu) |
19011 | version_type=linux | 17890 | version_type=linux |
19012 | need_lib_prefix=no | 17891 | need_lib_prefix=no |
19013 | need_version=no | 17892 | need_version=no |
@@ -19016,7 +17895,7 @@ netbsdelf*-gnu) | |||
19016 | shlibpath_var=LD_LIBRARY_PATH | 17895 | shlibpath_var=LD_LIBRARY_PATH |
19017 | shlibpath_overrides_runpath=no | 17896 | shlibpath_overrides_runpath=no |
19018 | hardcode_into_libs=yes | 17897 | hardcode_into_libs=yes |
19019 | dynamic_linker='NetBSD ld.elf_so' | 17898 | dynamic_linker='GNU ld.so' |
19020 | ;; | 17899 | ;; |
19021 | 17900 | ||
19022 | netbsd*) | 17901 | netbsd*) |
@@ -19192,8 +18071,8 @@ uts4*) | |||
19192 | dynamic_linker=no | 18071 | dynamic_linker=no |
19193 | ;; | 18072 | ;; |
19194 | esac | 18073 | esac |
19195 | { echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | 18074 | echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
19196 | echo "${ECHO_T}$dynamic_linker" >&6; } | 18075 | echo "${ECHO_T}$dynamic_linker" >&6 |
19197 | test "$dynamic_linker" = no && can_build_shared=no | 18076 | test "$dynamic_linker" = no && can_build_shared=no |
19198 | 18077 | ||
19199 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | 18078 | variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
@@ -19201,8 +18080,8 @@ if test "$GCC" = yes; then | |||
19201 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | 18080 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
19202 | fi | 18081 | fi |
19203 | 18082 | ||
19204 | { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | 18083 | echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
19205 | echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } | 18084 | echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 |
19206 | hardcode_action_GCJ= | 18085 | hardcode_action_GCJ= |
19207 | if test -n "$hardcode_libdir_flag_spec_GCJ" || \ | 18086 | if test -n "$hardcode_libdir_flag_spec_GCJ" || \ |
19208 | test -n "$runpath_var_GCJ" || \ | 18087 | test -n "$runpath_var_GCJ" || \ |
@@ -19226,8 +18105,8 @@ else | |||
19226 | # directories. | 18105 | # directories. |
19227 | hardcode_action_GCJ=unsupported | 18106 | hardcode_action_GCJ=unsupported |
19228 | fi | 18107 | fi |
19229 | { echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 | 18108 | echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 |
19230 | echo "${ECHO_T}$hardcode_action_GCJ" >&6; } | 18109 | echo "${ECHO_T}$hardcode_action_GCJ" >&6 |
19231 | 18110 | ||
19232 | if test "$hardcode_action_GCJ" = relink; then | 18111 | if test "$hardcode_action_GCJ" = relink; then |
19233 | # Fast installation is not supported | 18112 | # Fast installation is not supported |
@@ -19663,6 +18542,7 @@ CC="$lt_save_CC" | |||
19663 | RC) | 18542 | RC) |
19664 | 18543 | ||
19665 | 18544 | ||
18545 | |||
19666 | # Source file extension for RC test sources. | 18546 | # Source file extension for RC test sources. |
19667 | ac_ext=rc | 18547 | ac_ext=rc |
19668 | 18548 | ||
@@ -20203,9 +19083,9 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' | |||
20203 | ac_header_dirent=no | 19083 | ac_header_dirent=no |
20204 | for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do | 19084 | for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do |
20205 | as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` | 19085 | as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` |
20206 | { echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 | 19086 | echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 |
20207 | echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; } | 19087 | echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 |
20208 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 19088 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
20209 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19089 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
20210 | else | 19090 | else |
20211 | cat >conftest.$ac_ext <<_ACEOF | 19091 | cat >conftest.$ac_ext <<_ACEOF |
@@ -20227,36 +19107,24 @@ return 0; | |||
20227 | } | 19107 | } |
20228 | _ACEOF | 19108 | _ACEOF |
20229 | rm -f conftest.$ac_objext | 19109 | rm -f conftest.$ac_objext |
20230 | if { (ac_try="$ac_compile" | 19110 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
20231 | case "(($ac_try" in | 19111 | (eval $ac_compile) 2>conftest.er1 |
20232 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20233 | *) ac_try_echo=$ac_try;; | ||
20234 | esac | ||
20235 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20236 | (eval "$ac_compile") 2>conftest.er1 | ||
20237 | ac_status=$? | 19112 | ac_status=$? |
20238 | grep -v '^ *+' conftest.er1 >conftest.err | 19113 | grep -v '^ *+' conftest.er1 >conftest.err |
20239 | rm -f conftest.er1 | 19114 | rm -f conftest.er1 |
20240 | cat conftest.err >&5 | 19115 | cat conftest.err >&5 |
20241 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19116 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20242 | (exit $ac_status); } && | 19117 | (exit $ac_status); } && |
20243 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 19118 | { ac_try='test -z "$ac_c_werror_flag" |
20244 | { (case "(($ac_try" in | 19119 | || test ! -s conftest.err' |
20245 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19120 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
20246 | *) ac_try_echo=$ac_try;; | 19121 | (eval $ac_try) 2>&5 |
20247 | esac | ||
20248 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20249 | (eval "$ac_try") 2>&5 | ||
20250 | ac_status=$? | 19122 | ac_status=$? |
20251 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19123 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20252 | (exit $ac_status); }; } && | 19124 | (exit $ac_status); }; } && |
20253 | { ac_try='test -s conftest.$ac_objext' | 19125 | { ac_try='test -s conftest.$ac_objext' |
20254 | { (case "(($ac_try" in | 19126 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
20255 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19127 | (eval $ac_try) 2>&5 |
20256 | *) ac_try_echo=$ac_try;; | ||
20257 | esac | ||
20258 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20259 | (eval "$ac_try") 2>&5 | ||
20260 | ac_status=$? | 19128 | ac_status=$? |
20261 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19129 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20262 | (exit $ac_status); }; }; then | 19130 | (exit $ac_status); }; }; then |
@@ -20265,14 +19133,12 @@ else | |||
20265 | echo "$as_me: failed program was:" >&5 | 19133 | echo "$as_me: failed program was:" >&5 |
20266 | sed 's/^/| /' conftest.$ac_ext >&5 | 19134 | sed 's/^/| /' conftest.$ac_ext >&5 |
20267 | 19135 | ||
20268 | eval "$as_ac_Header=no" | 19136 | eval "$as_ac_Header=no" |
20269 | fi | 19137 | fi |
20270 | 19138 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
20271 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
20272 | fi | 19139 | fi |
20273 | ac_res=`eval echo '${'$as_ac_Header'}'` | 19140 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
20274 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 19141 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
20275 | echo "${ECHO_T}$ac_res" >&6; } | ||
20276 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 19142 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
20277 | cat >>confdefs.h <<_ACEOF | 19143 | cat >>confdefs.h <<_ACEOF |
20278 | #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 | 19144 | #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 |
@@ -20284,12 +19150,13 @@ fi | |||
20284 | done | 19150 | done |
20285 | # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. | 19151 | # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. |
20286 | if test $ac_header_dirent = dirent.h; then | 19152 | if test $ac_header_dirent = dirent.h; then |
20287 | { echo "$as_me:$LINENO: checking for library containing opendir" >&5 | 19153 | echo "$as_me:$LINENO: checking for library containing opendir" >&5 |
20288 | echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } | 19154 | echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 |
20289 | if test "${ac_cv_search_opendir+set}" = set; then | 19155 | if test "${ac_cv_search_opendir+set}" = set; then |
20290 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19156 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
20291 | else | 19157 | else |
20292 | ac_func_search_save_LIBS=$LIBS | 19158 | ac_func_search_save_LIBS=$LIBS |
19159 | ac_cv_search_opendir=no | ||
20293 | cat >conftest.$ac_ext <<_ACEOF | 19160 | cat >conftest.$ac_ext <<_ACEOF |
20294 | /* confdefs.h. */ | 19161 | /* confdefs.h. */ |
20295 | _ACEOF | 19162 | _ACEOF |
@@ -20297,99 +19164,126 @@ cat confdefs.h >>conftest.$ac_ext | |||
20297 | cat >>conftest.$ac_ext <<_ACEOF | 19164 | cat >>conftest.$ac_ext <<_ACEOF |
20298 | /* end confdefs.h. */ | 19165 | /* end confdefs.h. */ |
20299 | 19166 | ||
20300 | /* Override any GCC internal prototype to avoid an error. | 19167 | /* Override any gcc2 internal prototype to avoid an error. */ |
20301 | Use char because int might match the return type of a GCC | ||
20302 | builtin and then its argument prototype would still apply. */ | ||
20303 | #ifdef __cplusplus | 19168 | #ifdef __cplusplus |
20304 | extern "C" | 19169 | extern "C" |
20305 | #endif | 19170 | #endif |
19171 | /* We use char because int might match the return type of a gcc2 | ||
19172 | builtin and then its argument prototype would still apply. */ | ||
20306 | char opendir (); | 19173 | char opendir (); |
20307 | int | 19174 | int |
20308 | main () | 19175 | main () |
20309 | { | 19176 | { |
20310 | return opendir (); | 19177 | opendir (); |
20311 | ; | 19178 | ; |
20312 | return 0; | 19179 | return 0; |
20313 | } | 19180 | } |
20314 | _ACEOF | 19181 | _ACEOF |
20315 | for ac_lib in '' dir; do | 19182 | rm -f conftest.$ac_objext conftest$ac_exeext |
20316 | if test -z "$ac_lib"; then | 19183 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
20317 | ac_res="none required" | 19184 | (eval $ac_link) 2>conftest.er1 |
20318 | else | ||
20319 | ac_res=-l$ac_lib | ||
20320 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
20321 | fi | ||
20322 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
20323 | if { (ac_try="$ac_link" | ||
20324 | case "(($ac_try" in | ||
20325 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20326 | *) ac_try_echo=$ac_try;; | ||
20327 | esac | ||
20328 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20329 | (eval "$ac_link") 2>conftest.er1 | ||
20330 | ac_status=$? | 19185 | ac_status=$? |
20331 | grep -v '^ *+' conftest.er1 >conftest.err | 19186 | grep -v '^ *+' conftest.er1 >conftest.err |
20332 | rm -f conftest.er1 | 19187 | rm -f conftest.er1 |
20333 | cat conftest.err >&5 | 19188 | cat conftest.err >&5 |
20334 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19189 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20335 | (exit $ac_status); } && | 19190 | (exit $ac_status); } && |
20336 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 19191 | { ac_try='test -z "$ac_c_werror_flag" |
20337 | { (case "(($ac_try" in | 19192 | || test ! -s conftest.err' |
20338 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19193 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
20339 | *) ac_try_echo=$ac_try;; | 19194 | (eval $ac_try) 2>&5 |
20340 | esac | ||
20341 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20342 | (eval "$ac_try") 2>&5 | ||
20343 | ac_status=$? | 19195 | ac_status=$? |
20344 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19196 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20345 | (exit $ac_status); }; } && | 19197 | (exit $ac_status); }; } && |
20346 | { ac_try='test -s conftest$ac_exeext' | 19198 | { ac_try='test -s conftest$ac_exeext' |
20347 | { (case "(($ac_try" in | 19199 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
20348 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19200 | (eval $ac_try) 2>&5 |
20349 | *) ac_try_echo=$ac_try;; | ||
20350 | esac | ||
20351 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20352 | (eval "$ac_try") 2>&5 | ||
20353 | ac_status=$? | 19201 | ac_status=$? |
20354 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19202 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20355 | (exit $ac_status); }; }; then | 19203 | (exit $ac_status); }; }; then |
20356 | ac_cv_search_opendir=$ac_res | 19204 | ac_cv_search_opendir="none required" |
20357 | else | 19205 | else |
20358 | echo "$as_me: failed program was:" >&5 | 19206 | echo "$as_me: failed program was:" >&5 |
20359 | sed 's/^/| /' conftest.$ac_ext >&5 | 19207 | sed 's/^/| /' conftest.$ac_ext >&5 |
20360 | 19208 | ||
20361 | |||
20362 | fi | 19209 | fi |
19210 | rm -f conftest.err conftest.$ac_objext \ | ||
19211 | conftest$ac_exeext conftest.$ac_ext | ||
19212 | if test "$ac_cv_search_opendir" = no; then | ||
19213 | for ac_lib in dir; do | ||
19214 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
19215 | cat >conftest.$ac_ext <<_ACEOF | ||
19216 | /* confdefs.h. */ | ||
19217 | _ACEOF | ||
19218 | cat confdefs.h >>conftest.$ac_ext | ||
19219 | cat >>conftest.$ac_ext <<_ACEOF | ||
19220 | /* end confdefs.h. */ | ||
20363 | 19221 | ||
20364 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | 19222 | /* Override any gcc2 internal prototype to avoid an error. */ |
20365 | conftest$ac_exeext | 19223 | #ifdef __cplusplus |
20366 | if test "${ac_cv_search_opendir+set}" = set; then | 19224 | extern "C" |
20367 | break | 19225 | #endif |
20368 | fi | 19226 | /* We use char because int might match the return type of a gcc2 |
20369 | done | 19227 | builtin and then its argument prototype would still apply. */ |
20370 | if test "${ac_cv_search_opendir+set}" = set; then | 19228 | char opendir (); |
20371 | : | 19229 | int |
19230 | main () | ||
19231 | { | ||
19232 | opendir (); | ||
19233 | ; | ||
19234 | return 0; | ||
19235 | } | ||
19236 | _ACEOF | ||
19237 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
19238 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
19239 | (eval $ac_link) 2>conftest.er1 | ||
19240 | ac_status=$? | ||
19241 | grep -v '^ *+' conftest.er1 >conftest.err | ||
19242 | rm -f conftest.er1 | ||
19243 | cat conftest.err >&5 | ||
19244 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19245 | (exit $ac_status); } && | ||
19246 | { ac_try='test -z "$ac_c_werror_flag" | ||
19247 | || test ! -s conftest.err' | ||
19248 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19249 | (eval $ac_try) 2>&5 | ||
19250 | ac_status=$? | ||
19251 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19252 | (exit $ac_status); }; } && | ||
19253 | { ac_try='test -s conftest$ac_exeext' | ||
19254 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19255 | (eval $ac_try) 2>&5 | ||
19256 | ac_status=$? | ||
19257 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19258 | (exit $ac_status); }; }; then | ||
19259 | ac_cv_search_opendir="-l$ac_lib" | ||
19260 | break | ||
20372 | else | 19261 | else |
20373 | ac_cv_search_opendir=no | 19262 | echo "$as_me: failed program was:" >&5 |
19263 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
19264 | |||
19265 | fi | ||
19266 | rm -f conftest.err conftest.$ac_objext \ | ||
19267 | conftest$ac_exeext conftest.$ac_ext | ||
19268 | done | ||
20374 | fi | 19269 | fi |
20375 | rm conftest.$ac_ext | ||
20376 | LIBS=$ac_func_search_save_LIBS | 19270 | LIBS=$ac_func_search_save_LIBS |
20377 | fi | 19271 | fi |
20378 | { echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 | 19272 | echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 |
20379 | echo "${ECHO_T}$ac_cv_search_opendir" >&6; } | 19273 | echo "${ECHO_T}$ac_cv_search_opendir" >&6 |
20380 | ac_res=$ac_cv_search_opendir | 19274 | if test "$ac_cv_search_opendir" != no; then |
20381 | if test "$ac_res" != no; then | 19275 | test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" |
20382 | test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" | ||
20383 | 19276 | ||
20384 | fi | 19277 | fi |
20385 | 19278 | ||
20386 | else | 19279 | else |
20387 | { echo "$as_me:$LINENO: checking for library containing opendir" >&5 | 19280 | echo "$as_me:$LINENO: checking for library containing opendir" >&5 |
20388 | echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } | 19281 | echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 |
20389 | if test "${ac_cv_search_opendir+set}" = set; then | 19282 | if test "${ac_cv_search_opendir+set}" = set; then |
20390 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19283 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
20391 | else | 19284 | else |
20392 | ac_func_search_save_LIBS=$LIBS | 19285 | ac_func_search_save_LIBS=$LIBS |
19286 | ac_cv_search_opendir=no | ||
20393 | cat >conftest.$ac_ext <<_ACEOF | 19287 | cat >conftest.$ac_ext <<_ACEOF |
20394 | /* confdefs.h. */ | 19288 | /* confdefs.h. */ |
20395 | _ACEOF | 19289 | _ACEOF |
@@ -20397,99 +19291,125 @@ cat confdefs.h >>conftest.$ac_ext | |||
20397 | cat >>conftest.$ac_ext <<_ACEOF | 19291 | cat >>conftest.$ac_ext <<_ACEOF |
20398 | /* end confdefs.h. */ | 19292 | /* end confdefs.h. */ |
20399 | 19293 | ||
20400 | /* Override any GCC internal prototype to avoid an error. | 19294 | /* Override any gcc2 internal prototype to avoid an error. */ |
20401 | Use char because int might match the return type of a GCC | ||
20402 | builtin and then its argument prototype would still apply. */ | ||
20403 | #ifdef __cplusplus | 19295 | #ifdef __cplusplus |
20404 | extern "C" | 19296 | extern "C" |
20405 | #endif | 19297 | #endif |
19298 | /* We use char because int might match the return type of a gcc2 | ||
19299 | builtin and then its argument prototype would still apply. */ | ||
20406 | char opendir (); | 19300 | char opendir (); |
20407 | int | 19301 | int |
20408 | main () | 19302 | main () |
20409 | { | 19303 | { |
20410 | return opendir (); | 19304 | opendir (); |
20411 | ; | 19305 | ; |
20412 | return 0; | 19306 | return 0; |
20413 | } | 19307 | } |
20414 | _ACEOF | 19308 | _ACEOF |
20415 | for ac_lib in '' x; do | 19309 | rm -f conftest.$ac_objext conftest$ac_exeext |
20416 | if test -z "$ac_lib"; then | 19310 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
20417 | ac_res="none required" | 19311 | (eval $ac_link) 2>conftest.er1 |
20418 | else | ||
20419 | ac_res=-l$ac_lib | ||
20420 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
20421 | fi | ||
20422 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
20423 | if { (ac_try="$ac_link" | ||
20424 | case "(($ac_try" in | ||
20425 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20426 | *) ac_try_echo=$ac_try;; | ||
20427 | esac | ||
20428 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20429 | (eval "$ac_link") 2>conftest.er1 | ||
20430 | ac_status=$? | 19312 | ac_status=$? |
20431 | grep -v '^ *+' conftest.er1 >conftest.err | 19313 | grep -v '^ *+' conftest.er1 >conftest.err |
20432 | rm -f conftest.er1 | 19314 | rm -f conftest.er1 |
20433 | cat conftest.err >&5 | 19315 | cat conftest.err >&5 |
20434 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19316 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20435 | (exit $ac_status); } && | 19317 | (exit $ac_status); } && |
20436 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 19318 | { ac_try='test -z "$ac_c_werror_flag" |
20437 | { (case "(($ac_try" in | 19319 | || test ! -s conftest.err' |
20438 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19320 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
20439 | *) ac_try_echo=$ac_try;; | 19321 | (eval $ac_try) 2>&5 |
20440 | esac | ||
20441 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20442 | (eval "$ac_try") 2>&5 | ||
20443 | ac_status=$? | 19322 | ac_status=$? |
20444 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19323 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20445 | (exit $ac_status); }; } && | 19324 | (exit $ac_status); }; } && |
20446 | { ac_try='test -s conftest$ac_exeext' | 19325 | { ac_try='test -s conftest$ac_exeext' |
20447 | { (case "(($ac_try" in | 19326 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
20448 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19327 | (eval $ac_try) 2>&5 |
20449 | *) ac_try_echo=$ac_try;; | ||
20450 | esac | ||
20451 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20452 | (eval "$ac_try") 2>&5 | ||
20453 | ac_status=$? | 19328 | ac_status=$? |
20454 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19329 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20455 | (exit $ac_status); }; }; then | 19330 | (exit $ac_status); }; }; then |
20456 | ac_cv_search_opendir=$ac_res | 19331 | ac_cv_search_opendir="none required" |
20457 | else | 19332 | else |
20458 | echo "$as_me: failed program was:" >&5 | 19333 | echo "$as_me: failed program was:" >&5 |
20459 | sed 's/^/| /' conftest.$ac_ext >&5 | 19334 | sed 's/^/| /' conftest.$ac_ext >&5 |
20460 | 19335 | ||
20461 | |||
20462 | fi | 19336 | fi |
19337 | rm -f conftest.err conftest.$ac_objext \ | ||
19338 | conftest$ac_exeext conftest.$ac_ext | ||
19339 | if test "$ac_cv_search_opendir" = no; then | ||
19340 | for ac_lib in x; do | ||
19341 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
19342 | cat >conftest.$ac_ext <<_ACEOF | ||
19343 | /* confdefs.h. */ | ||
19344 | _ACEOF | ||
19345 | cat confdefs.h >>conftest.$ac_ext | ||
19346 | cat >>conftest.$ac_ext <<_ACEOF | ||
19347 | /* end confdefs.h. */ | ||
20463 | 19348 | ||
20464 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | 19349 | /* Override any gcc2 internal prototype to avoid an error. */ |
20465 | conftest$ac_exeext | 19350 | #ifdef __cplusplus |
20466 | if test "${ac_cv_search_opendir+set}" = set; then | 19351 | extern "C" |
20467 | break | 19352 | #endif |
20468 | fi | 19353 | /* We use char because int might match the return type of a gcc2 |
20469 | done | 19354 | builtin and then its argument prototype would still apply. */ |
20470 | if test "${ac_cv_search_opendir+set}" = set; then | 19355 | char opendir (); |
20471 | : | 19356 | int |
19357 | main () | ||
19358 | { | ||
19359 | opendir (); | ||
19360 | ; | ||
19361 | return 0; | ||
19362 | } | ||
19363 | _ACEOF | ||
19364 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
19365 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
19366 | (eval $ac_link) 2>conftest.er1 | ||
19367 | ac_status=$? | ||
19368 | grep -v '^ *+' conftest.er1 >conftest.err | ||
19369 | rm -f conftest.er1 | ||
19370 | cat conftest.err >&5 | ||
19371 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19372 | (exit $ac_status); } && | ||
19373 | { ac_try='test -z "$ac_c_werror_flag" | ||
19374 | || test ! -s conftest.err' | ||
19375 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19376 | (eval $ac_try) 2>&5 | ||
19377 | ac_status=$? | ||
19378 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19379 | (exit $ac_status); }; } && | ||
19380 | { ac_try='test -s conftest$ac_exeext' | ||
19381 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19382 | (eval $ac_try) 2>&5 | ||
19383 | ac_status=$? | ||
19384 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19385 | (exit $ac_status); }; }; then | ||
19386 | ac_cv_search_opendir="-l$ac_lib" | ||
19387 | break | ||
20472 | else | 19388 | else |
20473 | ac_cv_search_opendir=no | 19389 | echo "$as_me: failed program was:" >&5 |
19390 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
19391 | |||
19392 | fi | ||
19393 | rm -f conftest.err conftest.$ac_objext \ | ||
19394 | conftest$ac_exeext conftest.$ac_ext | ||
19395 | done | ||
20474 | fi | 19396 | fi |
20475 | rm conftest.$ac_ext | ||
20476 | LIBS=$ac_func_search_save_LIBS | 19397 | LIBS=$ac_func_search_save_LIBS |
20477 | fi | 19398 | fi |
20478 | { echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 | 19399 | echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 |
20479 | echo "${ECHO_T}$ac_cv_search_opendir" >&6; } | 19400 | echo "${ECHO_T}$ac_cv_search_opendir" >&6 |
20480 | ac_res=$ac_cv_search_opendir | 19401 | if test "$ac_cv_search_opendir" != no; then |
20481 | if test "$ac_res" != no; then | 19402 | test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" |
20482 | test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" | ||
20483 | 19403 | ||
20484 | fi | 19404 | fi |
20485 | 19405 | ||
20486 | fi | 19406 | fi |
20487 | 19407 | ||
20488 | # Check whether --enable-ltdl-install was given. | 19408 | # Check whether --enable-ltdl-install or --disable-ltdl-install was given. |
20489 | if test "${enable_ltdl_install+set}" = set; then | 19409 | if test "${enable_ltdl_install+set}" = set; then |
20490 | enableval=$enable_ltdl_install; | 19410 | enableval="$enable_ltdl_install" |
20491 | fi | ||
20492 | 19411 | ||
19412 | fi; | ||
20493 | 19413 | ||
20494 | 19414 | ||
20495 | 19415 | ||
@@ -20513,8 +19433,8 @@ fi | |||
20513 | 19433 | ||
20514 | 19434 | ||
20515 | 19435 | ||
20516 | { echo "$as_me:$LINENO: checking which extension is used for loadable modules" >&5 | 19436 | echo "$as_me:$LINENO: checking which extension is used for loadable modules" >&5 |
20517 | echo $ECHO_N "checking which extension is used for loadable modules... $ECHO_C" >&6; } | 19437 | echo $ECHO_N "checking which extension is used for loadable modules... $ECHO_C" >&6 |
20518 | if test "${libltdl_cv_shlibext+set}" = set; then | 19438 | if test "${libltdl_cv_shlibext+set}" = set; then |
20519 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19439 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
20520 | else | 19440 | else |
@@ -20523,8 +19443,8 @@ module=yes | |||
20523 | eval libltdl_cv_shlibext=$shrext_cmds | 19443 | eval libltdl_cv_shlibext=$shrext_cmds |
20524 | 19444 | ||
20525 | fi | 19445 | fi |
20526 | { echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5 | 19446 | echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5 |
20527 | echo "${ECHO_T}$libltdl_cv_shlibext" >&6; } | 19447 | echo "${ECHO_T}$libltdl_cv_shlibext" >&6 |
20528 | if test -n "$libltdl_cv_shlibext"; then | 19448 | if test -n "$libltdl_cv_shlibext"; then |
20529 | 19449 | ||
20530 | cat >>confdefs.h <<_ACEOF | 19450 | cat >>confdefs.h <<_ACEOF |
@@ -20534,15 +19454,15 @@ _ACEOF | |||
20534 | fi | 19454 | fi |
20535 | 19455 | ||
20536 | 19456 | ||
20537 | { echo "$as_me:$LINENO: checking which variable specifies run-time library path" >&5 | 19457 | echo "$as_me:$LINENO: checking which variable specifies run-time library path" >&5 |
20538 | echo $ECHO_N "checking which variable specifies run-time library path... $ECHO_C" >&6; } | 19458 | echo $ECHO_N "checking which variable specifies run-time library path... $ECHO_C" >&6 |
20539 | if test "${libltdl_cv_shlibpath_var+set}" = set; then | 19459 | if test "${libltdl_cv_shlibpath_var+set}" = set; then |
20540 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19460 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
20541 | else | 19461 | else |
20542 | libltdl_cv_shlibpath_var="$shlibpath_var" | 19462 | libltdl_cv_shlibpath_var="$shlibpath_var" |
20543 | fi | 19463 | fi |
20544 | { echo "$as_me:$LINENO: result: $libltdl_cv_shlibpath_var" >&5 | 19464 | echo "$as_me:$LINENO: result: $libltdl_cv_shlibpath_var" >&5 |
20545 | echo "${ECHO_T}$libltdl_cv_shlibpath_var" >&6; } | 19465 | echo "${ECHO_T}$libltdl_cv_shlibpath_var" >&6 |
20546 | if test -n "$libltdl_cv_shlibpath_var"; then | 19466 | if test -n "$libltdl_cv_shlibpath_var"; then |
20547 | 19467 | ||
20548 | cat >>confdefs.h <<_ACEOF | 19468 | cat >>confdefs.h <<_ACEOF |
@@ -20552,15 +19472,15 @@ _ACEOF | |||
20552 | fi | 19472 | fi |
20553 | 19473 | ||
20554 | 19474 | ||
20555 | { echo "$as_me:$LINENO: checking for the default library search path" >&5 | 19475 | echo "$as_me:$LINENO: checking for the default library search path" >&5 |
20556 | echo $ECHO_N "checking for the default library search path... $ECHO_C" >&6; } | 19476 | echo $ECHO_N "checking for the default library search path... $ECHO_C" >&6 |
20557 | if test "${libltdl_cv_sys_search_path+set}" = set; then | 19477 | if test "${libltdl_cv_sys_search_path+set}" = set; then |
20558 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19478 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
20559 | else | 19479 | else |
20560 | libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec" | 19480 | libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec" |
20561 | fi | 19481 | fi |
20562 | { echo "$as_me:$LINENO: result: $libltdl_cv_sys_search_path" >&5 | 19482 | echo "$as_me:$LINENO: result: $libltdl_cv_sys_search_path" >&5 |
20563 | echo "${ECHO_T}$libltdl_cv_sys_search_path" >&6; } | 19483 | echo "${ECHO_T}$libltdl_cv_sys_search_path" >&6 |
20564 | if test -n "$libltdl_cv_sys_search_path"; then | 19484 | if test -n "$libltdl_cv_sys_search_path"; then |
20565 | sys_search_path= | 19485 | sys_search_path= |
20566 | for dir in $libltdl_cv_sys_search_path; do | 19486 | for dir in $libltdl_cv_sys_search_path; do |
@@ -20577,8 +19497,8 @@ _ACEOF | |||
20577 | 19497 | ||
20578 | fi | 19498 | fi |
20579 | 19499 | ||
20580 | { echo "$as_me:$LINENO: checking for objdir" >&5 | 19500 | echo "$as_me:$LINENO: checking for objdir" >&5 |
20581 | echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } | 19501 | echo $ECHO_N "checking for objdir... $ECHO_C" >&6 |
20582 | if test "${libltdl_cv_objdir+set}" = set; then | 19502 | if test "${libltdl_cv_objdir+set}" = set; then |
20583 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19503 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
20584 | else | 19504 | else |
@@ -20598,8 +19518,8 @@ else | |||
20598 | fi | 19518 | fi |
20599 | 19519 | ||
20600 | fi | 19520 | fi |
20601 | { echo "$as_me:$LINENO: result: $libltdl_cv_objdir" >&5 | 19521 | echo "$as_me:$LINENO: result: $libltdl_cv_objdir" >&5 |
20602 | echo "${ECHO_T}$libltdl_cv_objdir" >&6; } | 19522 | echo "${ECHO_T}$libltdl_cv_objdir" >&6 |
20603 | 19523 | ||
20604 | cat >>confdefs.h <<_ACEOF | 19524 | cat >>confdefs.h <<_ACEOF |
20605 | #define LTDL_OBJDIR "$libltdl_cv_objdir/" | 19525 | #define LTDL_OBJDIR "$libltdl_cv_objdir/" |
@@ -20607,8 +19527,8 @@ _ACEOF | |||
20607 | 19527 | ||
20608 | 19528 | ||
20609 | 19529 | ||
20610 | { echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5 | 19530 | echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5 |
20611 | echo $ECHO_N "checking whether libtool supports -dlopen/-dlpreopen... $ECHO_C" >&6; } | 19531 | echo $ECHO_N "checking whether libtool supports -dlopen/-dlpreopen... $ECHO_C" >&6 |
20612 | if test "${libltdl_cv_preloaded_symbols+set}" = set; then | 19532 | if test "${libltdl_cv_preloaded_symbols+set}" = set; then |
20613 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19533 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
20614 | else | 19534 | else |
@@ -20619,8 +19539,8 @@ else | |||
20619 | fi | 19539 | fi |
20620 | 19540 | ||
20621 | fi | 19541 | fi |
20622 | { echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5 | 19542 | echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5 |
20623 | echo "${ECHO_T}$libltdl_cv_preloaded_symbols" >&6; } | 19543 | echo "${ECHO_T}$libltdl_cv_preloaded_symbols" >&6 |
20624 | if test x"$libltdl_cv_preloaded_symbols" = xyes; then | 19544 | if test x"$libltdl_cv_preloaded_symbols" = xyes; then |
20625 | 19545 | ||
20626 | cat >>confdefs.h <<\_ACEOF | 19546 | cat >>confdefs.h <<\_ACEOF |
@@ -20638,8 +19558,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ | |||
20638 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 19558 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
20639 | 19559 | ||
20640 | 19560 | ||
20641 | { echo "$as_me:$LINENO: checking for shl_load" >&5 | 19561 | echo "$as_me:$LINENO: checking for shl_load" >&5 |
20642 | echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } | 19562 | echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 |
20643 | if test "${ac_cv_func_shl_load+set}" = set; then | 19563 | if test "${ac_cv_func_shl_load+set}" = set; then |
20644 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19564 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
20645 | else | 19565 | else |
@@ -20666,59 +19586,53 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
20666 | 19586 | ||
20667 | #undef shl_load | 19587 | #undef shl_load |
20668 | 19588 | ||
20669 | /* Override any GCC internal prototype to avoid an error. | 19589 | /* Override any gcc2 internal prototype to avoid an error. */ |
20670 | Use char because int might match the return type of a GCC | ||
20671 | builtin and then its argument prototype would still apply. */ | ||
20672 | #ifdef __cplusplus | 19590 | #ifdef __cplusplus |
20673 | extern "C" | 19591 | extern "C" |
19592 | { | ||
20674 | #endif | 19593 | #endif |
19594 | /* We use char because int might match the return type of a gcc2 | ||
19595 | builtin and then its argument prototype would still apply. */ | ||
20675 | char shl_load (); | 19596 | char shl_load (); |
20676 | /* The GNU C library defines this for functions which it implements | 19597 | /* The GNU C library defines this for functions which it implements |
20677 | to always fail with ENOSYS. Some functions are actually named | 19598 | to always fail with ENOSYS. Some functions are actually named |
20678 | something starting with __ and the normal name is an alias. */ | 19599 | something starting with __ and the normal name is an alias. */ |
20679 | #if defined __stub_shl_load || defined __stub___shl_load | 19600 | #if defined (__stub_shl_load) || defined (__stub___shl_load) |
20680 | choke me | 19601 | choke me |
19602 | #else | ||
19603 | char (*f) () = shl_load; | ||
19604 | #endif | ||
19605 | #ifdef __cplusplus | ||
19606 | } | ||
20681 | #endif | 19607 | #endif |
20682 | 19608 | ||
20683 | int | 19609 | int |
20684 | main () | 19610 | main () |
20685 | { | 19611 | { |
20686 | return shl_load (); | 19612 | return f != shl_load; |
20687 | ; | 19613 | ; |
20688 | return 0; | 19614 | return 0; |
20689 | } | 19615 | } |
20690 | _ACEOF | 19616 | _ACEOF |
20691 | rm -f conftest.$ac_objext conftest$ac_exeext | 19617 | rm -f conftest.$ac_objext conftest$ac_exeext |
20692 | if { (ac_try="$ac_link" | 19618 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
20693 | case "(($ac_try" in | 19619 | (eval $ac_link) 2>conftest.er1 |
20694 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20695 | *) ac_try_echo=$ac_try;; | ||
20696 | esac | ||
20697 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20698 | (eval "$ac_link") 2>conftest.er1 | ||
20699 | ac_status=$? | 19620 | ac_status=$? |
20700 | grep -v '^ *+' conftest.er1 >conftest.err | 19621 | grep -v '^ *+' conftest.er1 >conftest.err |
20701 | rm -f conftest.er1 | 19622 | rm -f conftest.er1 |
20702 | cat conftest.err >&5 | 19623 | cat conftest.err >&5 |
20703 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19624 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20704 | (exit $ac_status); } && | 19625 | (exit $ac_status); } && |
20705 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 19626 | { ac_try='test -z "$ac_c_werror_flag" |
20706 | { (case "(($ac_try" in | 19627 | || test ! -s conftest.err' |
20707 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19628 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
20708 | *) ac_try_echo=$ac_try;; | 19629 | (eval $ac_try) 2>&5 |
20709 | esac | ||
20710 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20711 | (eval "$ac_try") 2>&5 | ||
20712 | ac_status=$? | 19630 | ac_status=$? |
20713 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19631 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20714 | (exit $ac_status); }; } && | 19632 | (exit $ac_status); }; } && |
20715 | { ac_try='test -s conftest$ac_exeext' | 19633 | { ac_try='test -s conftest$ac_exeext' |
20716 | { (case "(($ac_try" in | 19634 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
20717 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19635 | (eval $ac_try) 2>&5 |
20718 | *) ac_try_echo=$ac_try;; | ||
20719 | esac | ||
20720 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20721 | (eval "$ac_try") 2>&5 | ||
20722 | ac_status=$? | 19636 | ac_status=$? |
20723 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19637 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20724 | (exit $ac_status); }; }; then | 19638 | (exit $ac_status); }; }; then |
@@ -20727,14 +19641,13 @@ else | |||
20727 | echo "$as_me: failed program was:" >&5 | 19641 | echo "$as_me: failed program was:" >&5 |
20728 | sed 's/^/| /' conftest.$ac_ext >&5 | 19642 | sed 's/^/| /' conftest.$ac_ext >&5 |
20729 | 19643 | ||
20730 | ac_cv_func_shl_load=no | 19644 | ac_cv_func_shl_load=no |
20731 | fi | 19645 | fi |
20732 | 19646 | rm -f conftest.err conftest.$ac_objext \ | |
20733 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
20734 | conftest$ac_exeext conftest.$ac_ext | 19647 | conftest$ac_exeext conftest.$ac_ext |
20735 | fi | 19648 | fi |
20736 | { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 | 19649 | echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 |
20737 | echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } | 19650 | echo "${ECHO_T}$ac_cv_func_shl_load" >&6 |
20738 | if test $ac_cv_func_shl_load = yes; then | 19651 | if test $ac_cv_func_shl_load = yes; then |
20739 | 19652 | ||
20740 | cat >>confdefs.h <<\_ACEOF | 19653 | cat >>confdefs.h <<\_ACEOF |
@@ -20742,8 +19655,8 @@ cat >>confdefs.h <<\_ACEOF | |||
20742 | _ACEOF | 19655 | _ACEOF |
20743 | 19656 | ||
20744 | else | 19657 | else |
20745 | { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 | 19658 | echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 |
20746 | echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } | 19659 | echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 |
20747 | if test "${ac_cv_lib_dld_shl_load+set}" = set; then | 19660 | if test "${ac_cv_lib_dld_shl_load+set}" = set; then |
20748 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19661 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
20749 | else | 19662 | else |
@@ -20756,52 +19669,40 @@ cat confdefs.h >>conftest.$ac_ext | |||
20756 | cat >>conftest.$ac_ext <<_ACEOF | 19669 | cat >>conftest.$ac_ext <<_ACEOF |
20757 | /* end confdefs.h. */ | 19670 | /* end confdefs.h. */ |
20758 | 19671 | ||
20759 | /* Override any GCC internal prototype to avoid an error. | 19672 | /* Override any gcc2 internal prototype to avoid an error. */ |
20760 | Use char because int might match the return type of a GCC | ||
20761 | builtin and then its argument prototype would still apply. */ | ||
20762 | #ifdef __cplusplus | 19673 | #ifdef __cplusplus |
20763 | extern "C" | 19674 | extern "C" |
20764 | #endif | 19675 | #endif |
19676 | /* We use char because int might match the return type of a gcc2 | ||
19677 | builtin and then its argument prototype would still apply. */ | ||
20765 | char shl_load (); | 19678 | char shl_load (); |
20766 | int | 19679 | int |
20767 | main () | 19680 | main () |
20768 | { | 19681 | { |
20769 | return shl_load (); | 19682 | shl_load (); |
20770 | ; | 19683 | ; |
20771 | return 0; | 19684 | return 0; |
20772 | } | 19685 | } |
20773 | _ACEOF | 19686 | _ACEOF |
20774 | rm -f conftest.$ac_objext conftest$ac_exeext | 19687 | rm -f conftest.$ac_objext conftest$ac_exeext |
20775 | if { (ac_try="$ac_link" | 19688 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
20776 | case "(($ac_try" in | 19689 | (eval $ac_link) 2>conftest.er1 |
20777 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20778 | *) ac_try_echo=$ac_try;; | ||
20779 | esac | ||
20780 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20781 | (eval "$ac_link") 2>conftest.er1 | ||
20782 | ac_status=$? | 19690 | ac_status=$? |
20783 | grep -v '^ *+' conftest.er1 >conftest.err | 19691 | grep -v '^ *+' conftest.er1 >conftest.err |
20784 | rm -f conftest.er1 | 19692 | rm -f conftest.er1 |
20785 | cat conftest.err >&5 | 19693 | cat conftest.err >&5 |
20786 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19694 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20787 | (exit $ac_status); } && | 19695 | (exit $ac_status); } && |
20788 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 19696 | { ac_try='test -z "$ac_c_werror_flag" |
20789 | { (case "(($ac_try" in | 19697 | || test ! -s conftest.err' |
20790 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19698 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
20791 | *) ac_try_echo=$ac_try;; | 19699 | (eval $ac_try) 2>&5 |
20792 | esac | ||
20793 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20794 | (eval "$ac_try") 2>&5 | ||
20795 | ac_status=$? | 19700 | ac_status=$? |
20796 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19701 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20797 | (exit $ac_status); }; } && | 19702 | (exit $ac_status); }; } && |
20798 | { ac_try='test -s conftest$ac_exeext' | 19703 | { ac_try='test -s conftest$ac_exeext' |
20799 | { (case "(($ac_try" in | 19704 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
20800 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19705 | (eval $ac_try) 2>&5 |
20801 | *) ac_try_echo=$ac_try;; | ||
20802 | esac | ||
20803 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20804 | (eval "$ac_try") 2>&5 | ||
20805 | ac_status=$? | 19706 | ac_status=$? |
20806 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19707 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20807 | (exit $ac_status); }; }; then | 19708 | (exit $ac_status); }; }; then |
@@ -20810,15 +19711,14 @@ else | |||
20810 | echo "$as_me: failed program was:" >&5 | 19711 | echo "$as_me: failed program was:" >&5 |
20811 | sed 's/^/| /' conftest.$ac_ext >&5 | 19712 | sed 's/^/| /' conftest.$ac_ext >&5 |
20812 | 19713 | ||
20813 | ac_cv_lib_dld_shl_load=no | 19714 | ac_cv_lib_dld_shl_load=no |
20814 | fi | 19715 | fi |
20815 | 19716 | rm -f conftest.err conftest.$ac_objext \ | |
20816 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
20817 | conftest$ac_exeext conftest.$ac_ext | 19717 | conftest$ac_exeext conftest.$ac_ext |
20818 | LIBS=$ac_check_lib_save_LIBS | 19718 | LIBS=$ac_check_lib_save_LIBS |
20819 | fi | 19719 | fi |
20820 | { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 | 19720 | echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 |
20821 | echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } | 19721 | echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 |
20822 | if test $ac_cv_lib_dld_shl_load = yes; then | 19722 | if test $ac_cv_lib_dld_shl_load = yes; then |
20823 | 19723 | ||
20824 | cat >>confdefs.h <<\_ACEOF | 19724 | cat >>confdefs.h <<\_ACEOF |
@@ -20827,8 +19727,8 @@ _ACEOF | |||
20827 | 19727 | ||
20828 | LIBADD_DL="$LIBADD_DL -ldld" | 19728 | LIBADD_DL="$LIBADD_DL -ldld" |
20829 | else | 19729 | else |
20830 | { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 | 19730 | echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 |
20831 | echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } | 19731 | echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 |
20832 | if test "${ac_cv_lib_dl_dlopen+set}" = set; then | 19732 | if test "${ac_cv_lib_dl_dlopen+set}" = set; then |
20833 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19733 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
20834 | else | 19734 | else |
@@ -20841,52 +19741,40 @@ cat confdefs.h >>conftest.$ac_ext | |||
20841 | cat >>conftest.$ac_ext <<_ACEOF | 19741 | cat >>conftest.$ac_ext <<_ACEOF |
20842 | /* end confdefs.h. */ | 19742 | /* end confdefs.h. */ |
20843 | 19743 | ||
20844 | /* Override any GCC internal prototype to avoid an error. | 19744 | /* Override any gcc2 internal prototype to avoid an error. */ |
20845 | Use char because int might match the return type of a GCC | ||
20846 | builtin and then its argument prototype would still apply. */ | ||
20847 | #ifdef __cplusplus | 19745 | #ifdef __cplusplus |
20848 | extern "C" | 19746 | extern "C" |
20849 | #endif | 19747 | #endif |
19748 | /* We use char because int might match the return type of a gcc2 | ||
19749 | builtin and then its argument prototype would still apply. */ | ||
20850 | char dlopen (); | 19750 | char dlopen (); |
20851 | int | 19751 | int |
20852 | main () | 19752 | main () |
20853 | { | 19753 | { |
20854 | return dlopen (); | 19754 | dlopen (); |
20855 | ; | 19755 | ; |
20856 | return 0; | 19756 | return 0; |
20857 | } | 19757 | } |
20858 | _ACEOF | 19758 | _ACEOF |
20859 | rm -f conftest.$ac_objext conftest$ac_exeext | 19759 | rm -f conftest.$ac_objext conftest$ac_exeext |
20860 | if { (ac_try="$ac_link" | 19760 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
20861 | case "(($ac_try" in | 19761 | (eval $ac_link) 2>conftest.er1 |
20862 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20863 | *) ac_try_echo=$ac_try;; | ||
20864 | esac | ||
20865 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20866 | (eval "$ac_link") 2>conftest.er1 | ||
20867 | ac_status=$? | 19762 | ac_status=$? |
20868 | grep -v '^ *+' conftest.er1 >conftest.err | 19763 | grep -v '^ *+' conftest.er1 >conftest.err |
20869 | rm -f conftest.er1 | 19764 | rm -f conftest.er1 |
20870 | cat conftest.err >&5 | 19765 | cat conftest.err >&5 |
20871 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19766 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20872 | (exit $ac_status); } && | 19767 | (exit $ac_status); } && |
20873 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 19768 | { ac_try='test -z "$ac_c_werror_flag" |
20874 | { (case "(($ac_try" in | 19769 | || test ! -s conftest.err' |
20875 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19770 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
20876 | *) ac_try_echo=$ac_try;; | 19771 | (eval $ac_try) 2>&5 |
20877 | esac | ||
20878 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20879 | (eval "$ac_try") 2>&5 | ||
20880 | ac_status=$? | 19772 | ac_status=$? |
20881 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19773 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20882 | (exit $ac_status); }; } && | 19774 | (exit $ac_status); }; } && |
20883 | { ac_try='test -s conftest$ac_exeext' | 19775 | { ac_try='test -s conftest$ac_exeext' |
20884 | { (case "(($ac_try" in | 19776 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
20885 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19777 | (eval $ac_try) 2>&5 |
20886 | *) ac_try_echo=$ac_try;; | ||
20887 | esac | ||
20888 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20889 | (eval "$ac_try") 2>&5 | ||
20890 | ac_status=$? | 19778 | ac_status=$? |
20891 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19779 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20892 | (exit $ac_status); }; }; then | 19780 | (exit $ac_status); }; }; then |
@@ -20895,15 +19783,14 @@ else | |||
20895 | echo "$as_me: failed program was:" >&5 | 19783 | echo "$as_me: failed program was:" >&5 |
20896 | sed 's/^/| /' conftest.$ac_ext >&5 | 19784 | sed 's/^/| /' conftest.$ac_ext >&5 |
20897 | 19785 | ||
20898 | ac_cv_lib_dl_dlopen=no | 19786 | ac_cv_lib_dl_dlopen=no |
20899 | fi | 19787 | fi |
20900 | 19788 | rm -f conftest.err conftest.$ac_objext \ | |
20901 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
20902 | conftest$ac_exeext conftest.$ac_ext | 19789 | conftest$ac_exeext conftest.$ac_ext |
20903 | LIBS=$ac_check_lib_save_LIBS | 19790 | LIBS=$ac_check_lib_save_LIBS |
20904 | fi | 19791 | fi |
20905 | { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 | 19792 | echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 |
20906 | echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } | 19793 | echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 |
20907 | if test $ac_cv_lib_dl_dlopen = yes; then | 19794 | if test $ac_cv_lib_dl_dlopen = yes; then |
20908 | 19795 | ||
20909 | cat >>confdefs.h <<\_ACEOF | 19796 | cat >>confdefs.h <<\_ACEOF |
@@ -20931,36 +19818,24 @@ dlopen(0, 0); | |||
20931 | } | 19818 | } |
20932 | _ACEOF | 19819 | _ACEOF |
20933 | rm -f conftest.$ac_objext conftest$ac_exeext | 19820 | rm -f conftest.$ac_objext conftest$ac_exeext |
20934 | if { (ac_try="$ac_link" | 19821 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
20935 | case "(($ac_try" in | 19822 | (eval $ac_link) 2>conftest.er1 |
20936 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
20937 | *) ac_try_echo=$ac_try;; | ||
20938 | esac | ||
20939 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20940 | (eval "$ac_link") 2>conftest.er1 | ||
20941 | ac_status=$? | 19823 | ac_status=$? |
20942 | grep -v '^ *+' conftest.er1 >conftest.err | 19824 | grep -v '^ *+' conftest.er1 >conftest.err |
20943 | rm -f conftest.er1 | 19825 | rm -f conftest.er1 |
20944 | cat conftest.err >&5 | 19826 | cat conftest.err >&5 |
20945 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19827 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20946 | (exit $ac_status); } && | 19828 | (exit $ac_status); } && |
20947 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 19829 | { ac_try='test -z "$ac_c_werror_flag" |
20948 | { (case "(($ac_try" in | 19830 | || test ! -s conftest.err' |
20949 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19831 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
20950 | *) ac_try_echo=$ac_try;; | 19832 | (eval $ac_try) 2>&5 |
20951 | esac | ||
20952 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20953 | (eval "$ac_try") 2>&5 | ||
20954 | ac_status=$? | 19833 | ac_status=$? |
20955 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19834 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20956 | (exit $ac_status); }; } && | 19835 | (exit $ac_status); }; } && |
20957 | { ac_try='test -s conftest$ac_exeext' | 19836 | { ac_try='test -s conftest$ac_exeext' |
20958 | { (case "(($ac_try" in | 19837 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
20959 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19838 | (eval $ac_try) 2>&5 |
20960 | *) ac_try_echo=$ac_try;; | ||
20961 | esac | ||
20962 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
20963 | (eval "$ac_try") 2>&5 | ||
20964 | ac_status=$? | 19839 | ac_status=$? |
20965 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19840 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20966 | (exit $ac_status); }; }; then | 19841 | (exit $ac_status); }; }; then |
@@ -20973,8 +19848,8 @@ else | |||
20973 | echo "$as_me: failed program was:" >&5 | 19848 | echo "$as_me: failed program was:" >&5 |
20974 | sed 's/^/| /' conftest.$ac_ext >&5 | 19849 | sed 's/^/| /' conftest.$ac_ext >&5 |
20975 | 19850 | ||
20976 | { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 | 19851 | echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 |
20977 | echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } | 19852 | echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 |
20978 | if test "${ac_cv_lib_svld_dlopen+set}" = set; then | 19853 | if test "${ac_cv_lib_svld_dlopen+set}" = set; then |
20979 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19854 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
20980 | else | 19855 | else |
@@ -20987,52 +19862,40 @@ cat confdefs.h >>conftest.$ac_ext | |||
20987 | cat >>conftest.$ac_ext <<_ACEOF | 19862 | cat >>conftest.$ac_ext <<_ACEOF |
20988 | /* end confdefs.h. */ | 19863 | /* end confdefs.h. */ |
20989 | 19864 | ||
20990 | /* Override any GCC internal prototype to avoid an error. | 19865 | /* Override any gcc2 internal prototype to avoid an error. */ |
20991 | Use char because int might match the return type of a GCC | ||
20992 | builtin and then its argument prototype would still apply. */ | ||
20993 | #ifdef __cplusplus | 19866 | #ifdef __cplusplus |
20994 | extern "C" | 19867 | extern "C" |
20995 | #endif | 19868 | #endif |
19869 | /* We use char because int might match the return type of a gcc2 | ||
19870 | builtin and then its argument prototype would still apply. */ | ||
20996 | char dlopen (); | 19871 | char dlopen (); |
20997 | int | 19872 | int |
20998 | main () | 19873 | main () |
20999 | { | 19874 | { |
21000 | return dlopen (); | 19875 | dlopen (); |
21001 | ; | 19876 | ; |
21002 | return 0; | 19877 | return 0; |
21003 | } | 19878 | } |
21004 | _ACEOF | 19879 | _ACEOF |
21005 | rm -f conftest.$ac_objext conftest$ac_exeext | 19880 | rm -f conftest.$ac_objext conftest$ac_exeext |
21006 | if { (ac_try="$ac_link" | 19881 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
21007 | case "(($ac_try" in | 19882 | (eval $ac_link) 2>conftest.er1 |
21008 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21009 | *) ac_try_echo=$ac_try;; | ||
21010 | esac | ||
21011 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21012 | (eval "$ac_link") 2>conftest.er1 | ||
21013 | ac_status=$? | 19883 | ac_status=$? |
21014 | grep -v '^ *+' conftest.er1 >conftest.err | 19884 | grep -v '^ *+' conftest.er1 >conftest.err |
21015 | rm -f conftest.er1 | 19885 | rm -f conftest.er1 |
21016 | cat conftest.err >&5 | 19886 | cat conftest.err >&5 |
21017 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19887 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21018 | (exit $ac_status); } && | 19888 | (exit $ac_status); } && |
21019 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 19889 | { ac_try='test -z "$ac_c_werror_flag" |
21020 | { (case "(($ac_try" in | 19890 | || test ! -s conftest.err' |
21021 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19891 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
21022 | *) ac_try_echo=$ac_try;; | 19892 | (eval $ac_try) 2>&5 |
21023 | esac | ||
21024 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21025 | (eval "$ac_try") 2>&5 | ||
21026 | ac_status=$? | 19893 | ac_status=$? |
21027 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19894 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21028 | (exit $ac_status); }; } && | 19895 | (exit $ac_status); }; } && |
21029 | { ac_try='test -s conftest$ac_exeext' | 19896 | { ac_try='test -s conftest$ac_exeext' |
21030 | { (case "(($ac_try" in | 19897 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
21031 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19898 | (eval $ac_try) 2>&5 |
21032 | *) ac_try_echo=$ac_try;; | ||
21033 | esac | ||
21034 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21035 | (eval "$ac_try") 2>&5 | ||
21036 | ac_status=$? | 19899 | ac_status=$? |
21037 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19900 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21038 | (exit $ac_status); }; }; then | 19901 | (exit $ac_status); }; }; then |
@@ -21041,15 +19904,14 @@ else | |||
21041 | echo "$as_me: failed program was:" >&5 | 19904 | echo "$as_me: failed program was:" >&5 |
21042 | sed 's/^/| /' conftest.$ac_ext >&5 | 19905 | sed 's/^/| /' conftest.$ac_ext >&5 |
21043 | 19906 | ||
21044 | ac_cv_lib_svld_dlopen=no | 19907 | ac_cv_lib_svld_dlopen=no |
21045 | fi | 19908 | fi |
21046 | 19909 | rm -f conftest.err conftest.$ac_objext \ | |
21047 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
21048 | conftest$ac_exeext conftest.$ac_ext | 19910 | conftest$ac_exeext conftest.$ac_ext |
21049 | LIBS=$ac_check_lib_save_LIBS | 19911 | LIBS=$ac_check_lib_save_LIBS |
21050 | fi | 19912 | fi |
21051 | { echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 | 19913 | echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 |
21052 | echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } | 19914 | echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 |
21053 | if test $ac_cv_lib_svld_dlopen = yes; then | 19915 | if test $ac_cv_lib_svld_dlopen = yes; then |
21054 | 19916 | ||
21055 | cat >>confdefs.h <<\_ACEOF | 19917 | cat >>confdefs.h <<\_ACEOF |
@@ -21058,8 +19920,8 @@ _ACEOF | |||
21058 | 19920 | ||
21059 | LIBADD_DL="-lsvld" libltdl_cv_func_dlopen="yes" | 19921 | LIBADD_DL="-lsvld" libltdl_cv_func_dlopen="yes" |
21060 | else | 19922 | else |
21061 | { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 | 19923 | echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 |
21062 | echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } | 19924 | echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 |
21063 | if test "${ac_cv_lib_dld_dld_link+set}" = set; then | 19925 | if test "${ac_cv_lib_dld_dld_link+set}" = set; then |
21064 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19926 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
21065 | else | 19927 | else |
@@ -21072,52 +19934,40 @@ cat confdefs.h >>conftest.$ac_ext | |||
21072 | cat >>conftest.$ac_ext <<_ACEOF | 19934 | cat >>conftest.$ac_ext <<_ACEOF |
21073 | /* end confdefs.h. */ | 19935 | /* end confdefs.h. */ |
21074 | 19936 | ||
21075 | /* Override any GCC internal prototype to avoid an error. | 19937 | /* Override any gcc2 internal prototype to avoid an error. */ |
21076 | Use char because int might match the return type of a GCC | ||
21077 | builtin and then its argument prototype would still apply. */ | ||
21078 | #ifdef __cplusplus | 19938 | #ifdef __cplusplus |
21079 | extern "C" | 19939 | extern "C" |
21080 | #endif | 19940 | #endif |
19941 | /* We use char because int might match the return type of a gcc2 | ||
19942 | builtin and then its argument prototype would still apply. */ | ||
21081 | char dld_link (); | 19943 | char dld_link (); |
21082 | int | 19944 | int |
21083 | main () | 19945 | main () |
21084 | { | 19946 | { |
21085 | return dld_link (); | 19947 | dld_link (); |
21086 | ; | 19948 | ; |
21087 | return 0; | 19949 | return 0; |
21088 | } | 19950 | } |
21089 | _ACEOF | 19951 | _ACEOF |
21090 | rm -f conftest.$ac_objext conftest$ac_exeext | 19952 | rm -f conftest.$ac_objext conftest$ac_exeext |
21091 | if { (ac_try="$ac_link" | 19953 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
21092 | case "(($ac_try" in | 19954 | (eval $ac_link) 2>conftest.er1 |
21093 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21094 | *) ac_try_echo=$ac_try;; | ||
21095 | esac | ||
21096 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21097 | (eval "$ac_link") 2>conftest.er1 | ||
21098 | ac_status=$? | 19955 | ac_status=$? |
21099 | grep -v '^ *+' conftest.er1 >conftest.err | 19956 | grep -v '^ *+' conftest.er1 >conftest.err |
21100 | rm -f conftest.er1 | 19957 | rm -f conftest.er1 |
21101 | cat conftest.err >&5 | 19958 | cat conftest.err >&5 |
21102 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19959 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21103 | (exit $ac_status); } && | 19960 | (exit $ac_status); } && |
21104 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 19961 | { ac_try='test -z "$ac_c_werror_flag" |
21105 | { (case "(($ac_try" in | 19962 | || test ! -s conftest.err' |
21106 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19963 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
21107 | *) ac_try_echo=$ac_try;; | 19964 | (eval $ac_try) 2>&5 |
21108 | esac | ||
21109 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21110 | (eval "$ac_try") 2>&5 | ||
21111 | ac_status=$? | 19965 | ac_status=$? |
21112 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19966 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21113 | (exit $ac_status); }; } && | 19967 | (exit $ac_status); }; } && |
21114 | { ac_try='test -s conftest$ac_exeext' | 19968 | { ac_try='test -s conftest$ac_exeext' |
21115 | { (case "(($ac_try" in | 19969 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
21116 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 19970 | (eval $ac_try) 2>&5 |
21117 | *) ac_try_echo=$ac_try;; | ||
21118 | esac | ||
21119 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21120 | (eval "$ac_try") 2>&5 | ||
21121 | ac_status=$? | 19971 | ac_status=$? |
21122 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 19972 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21123 | (exit $ac_status); }; }; then | 19973 | (exit $ac_status); }; }; then |
@@ -21126,15 +19976,14 @@ else | |||
21126 | echo "$as_me: failed program was:" >&5 | 19976 | echo "$as_me: failed program was:" >&5 |
21127 | sed 's/^/| /' conftest.$ac_ext >&5 | 19977 | sed 's/^/| /' conftest.$ac_ext >&5 |
21128 | 19978 | ||
21129 | ac_cv_lib_dld_dld_link=no | 19979 | ac_cv_lib_dld_dld_link=no |
21130 | fi | 19980 | fi |
21131 | 19981 | rm -f conftest.err conftest.$ac_objext \ | |
21132 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
21133 | conftest$ac_exeext conftest.$ac_ext | 19982 | conftest$ac_exeext conftest.$ac_ext |
21134 | LIBS=$ac_check_lib_save_LIBS | 19983 | LIBS=$ac_check_lib_save_LIBS |
21135 | fi | 19984 | fi |
21136 | { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 | 19985 | echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 |
21137 | echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } | 19986 | echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 |
21138 | if test $ac_cv_lib_dld_dld_link = yes; then | 19987 | if test $ac_cv_lib_dld_dld_link = yes; then |
21139 | 19988 | ||
21140 | cat >>confdefs.h <<\_ACEOF | 19989 | cat >>confdefs.h <<\_ACEOF |
@@ -21143,8 +19992,8 @@ _ACEOF | |||
21143 | 19992 | ||
21144 | LIBADD_DL="$LIBADD_DL -ldld" | 19993 | LIBADD_DL="$LIBADD_DL -ldld" |
21145 | else | 19994 | else |
21146 | { echo "$as_me:$LINENO: checking for _dyld_func_lookup" >&5 | 19995 | echo "$as_me:$LINENO: checking for _dyld_func_lookup" >&5 |
21147 | echo $ECHO_N "checking for _dyld_func_lookup... $ECHO_C" >&6; } | 19996 | echo $ECHO_N "checking for _dyld_func_lookup... $ECHO_C" >&6 |
21148 | if test "${ac_cv_func__dyld_func_lookup+set}" = set; then | 19997 | if test "${ac_cv_func__dyld_func_lookup+set}" = set; then |
21149 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19998 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
21150 | else | 19999 | else |
@@ -21171,59 +20020,53 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
21171 | 20020 | ||
21172 | #undef _dyld_func_lookup | 20021 | #undef _dyld_func_lookup |
21173 | 20022 | ||
21174 | /* Override any GCC internal prototype to avoid an error. | 20023 | /* Override any gcc2 internal prototype to avoid an error. */ |
21175 | Use char because int might match the return type of a GCC | ||
21176 | builtin and then its argument prototype would still apply. */ | ||
21177 | #ifdef __cplusplus | 20024 | #ifdef __cplusplus |
21178 | extern "C" | 20025 | extern "C" |
20026 | { | ||
21179 | #endif | 20027 | #endif |
20028 | /* We use char because int might match the return type of a gcc2 | ||
20029 | builtin and then its argument prototype would still apply. */ | ||
21180 | char _dyld_func_lookup (); | 20030 | char _dyld_func_lookup (); |
21181 | /* The GNU C library defines this for functions which it implements | 20031 | /* The GNU C library defines this for functions which it implements |
21182 | to always fail with ENOSYS. Some functions are actually named | 20032 | to always fail with ENOSYS. Some functions are actually named |
21183 | something starting with __ and the normal name is an alias. */ | 20033 | something starting with __ and the normal name is an alias. */ |
21184 | #if defined __stub__dyld_func_lookup || defined __stub____dyld_func_lookup | 20034 | #if defined (__stub__dyld_func_lookup) || defined (__stub____dyld_func_lookup) |
21185 | choke me | 20035 | choke me |
20036 | #else | ||
20037 | char (*f) () = _dyld_func_lookup; | ||
20038 | #endif | ||
20039 | #ifdef __cplusplus | ||
20040 | } | ||
21186 | #endif | 20041 | #endif |
21187 | 20042 | ||
21188 | int | 20043 | int |
21189 | main () | 20044 | main () |
21190 | { | 20045 | { |
21191 | return _dyld_func_lookup (); | 20046 | return f != _dyld_func_lookup; |
21192 | ; | 20047 | ; |
21193 | return 0; | 20048 | return 0; |
21194 | } | 20049 | } |
21195 | _ACEOF | 20050 | _ACEOF |
21196 | rm -f conftest.$ac_objext conftest$ac_exeext | 20051 | rm -f conftest.$ac_objext conftest$ac_exeext |
21197 | if { (ac_try="$ac_link" | 20052 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
21198 | case "(($ac_try" in | 20053 | (eval $ac_link) 2>conftest.er1 |
21199 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21200 | *) ac_try_echo=$ac_try;; | ||
21201 | esac | ||
21202 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21203 | (eval "$ac_link") 2>conftest.er1 | ||
21204 | ac_status=$? | 20054 | ac_status=$? |
21205 | grep -v '^ *+' conftest.er1 >conftest.err | 20055 | grep -v '^ *+' conftest.er1 >conftest.err |
21206 | rm -f conftest.er1 | 20056 | rm -f conftest.er1 |
21207 | cat conftest.err >&5 | 20057 | cat conftest.err >&5 |
21208 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20058 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21209 | (exit $ac_status); } && | 20059 | (exit $ac_status); } && |
21210 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 20060 | { ac_try='test -z "$ac_c_werror_flag" |
21211 | { (case "(($ac_try" in | 20061 | || test ! -s conftest.err' |
21212 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 20062 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
21213 | *) ac_try_echo=$ac_try;; | 20063 | (eval $ac_try) 2>&5 |
21214 | esac | ||
21215 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21216 | (eval "$ac_try") 2>&5 | ||
21217 | ac_status=$? | 20064 | ac_status=$? |
21218 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20065 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21219 | (exit $ac_status); }; } && | 20066 | (exit $ac_status); }; } && |
21220 | { ac_try='test -s conftest$ac_exeext' | 20067 | { ac_try='test -s conftest$ac_exeext' |
21221 | { (case "(($ac_try" in | 20068 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
21222 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 20069 | (eval $ac_try) 2>&5 |
21223 | *) ac_try_echo=$ac_try;; | ||
21224 | esac | ||
21225 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21226 | (eval "$ac_try") 2>&5 | ||
21227 | ac_status=$? | 20070 | ac_status=$? |
21228 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20071 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21229 | (exit $ac_status); }; }; then | 20072 | (exit $ac_status); }; }; then |
@@ -21232,14 +20075,13 @@ else | |||
21232 | echo "$as_me: failed program was:" >&5 | 20075 | echo "$as_me: failed program was:" >&5 |
21233 | sed 's/^/| /' conftest.$ac_ext >&5 | 20076 | sed 's/^/| /' conftest.$ac_ext >&5 |
21234 | 20077 | ||
21235 | ac_cv_func__dyld_func_lookup=no | 20078 | ac_cv_func__dyld_func_lookup=no |
21236 | fi | 20079 | fi |
21237 | 20080 | rm -f conftest.err conftest.$ac_objext \ | |
21238 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
21239 | conftest$ac_exeext conftest.$ac_ext | 20081 | conftest$ac_exeext conftest.$ac_ext |
21240 | fi | 20082 | fi |
21241 | { echo "$as_me:$LINENO: result: $ac_cv_func__dyld_func_lookup" >&5 | 20083 | echo "$as_me:$LINENO: result: $ac_cv_func__dyld_func_lookup" >&5 |
21242 | echo "${ECHO_T}$ac_cv_func__dyld_func_lookup" >&6; } | 20084 | echo "${ECHO_T}$ac_cv_func__dyld_func_lookup" >&6 |
21243 | if test $ac_cv_func__dyld_func_lookup = yes; then | 20085 | if test $ac_cv_func__dyld_func_lookup = yes; then |
21244 | 20086 | ||
21245 | cat >>confdefs.h <<\_ACEOF | 20087 | cat >>confdefs.h <<\_ACEOF |
@@ -21256,8 +20098,7 @@ fi | |||
21256 | 20098 | ||
21257 | 20099 | ||
21258 | fi | 20100 | fi |
21259 | 20101 | rm -f conftest.err conftest.$ac_objext \ | |
21260 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
21261 | conftest$ac_exeext conftest.$ac_ext | 20102 | conftest$ac_exeext conftest.$ac_ext |
21262 | 20103 | ||
21263 | fi | 20104 | fi |
@@ -21277,9 +20118,9 @@ then | |||
21277 | for ac_func in dlerror | 20118 | for ac_func in dlerror |
21278 | do | 20119 | do |
21279 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 20120 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
21280 | { echo "$as_me:$LINENO: checking for $ac_func" >&5 | 20121 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
21281 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } | 20122 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
21282 | if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | 20123 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
21283 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20124 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
21284 | else | 20125 | else |
21285 | cat >conftest.$ac_ext <<_ACEOF | 20126 | cat >conftest.$ac_ext <<_ACEOF |
@@ -21305,59 +20146,53 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
21305 | 20146 | ||
21306 | #undef $ac_func | 20147 | #undef $ac_func |
21307 | 20148 | ||
21308 | /* Override any GCC internal prototype to avoid an error. | 20149 | /* Override any gcc2 internal prototype to avoid an error. */ |
21309 | Use char because int might match the return type of a GCC | ||
21310 | builtin and then its argument prototype would still apply. */ | ||
21311 | #ifdef __cplusplus | 20150 | #ifdef __cplusplus |
21312 | extern "C" | 20151 | extern "C" |
20152 | { | ||
21313 | #endif | 20153 | #endif |
20154 | /* We use char because int might match the return type of a gcc2 | ||
20155 | builtin and then its argument prototype would still apply. */ | ||
21314 | char $ac_func (); | 20156 | char $ac_func (); |
21315 | /* The GNU C library defines this for functions which it implements | 20157 | /* The GNU C library defines this for functions which it implements |
21316 | to always fail with ENOSYS. Some functions are actually named | 20158 | to always fail with ENOSYS. Some functions are actually named |
21317 | something starting with __ and the normal name is an alias. */ | 20159 | something starting with __ and the normal name is an alias. */ |
21318 | #if defined __stub_$ac_func || defined __stub___$ac_func | 20160 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
21319 | choke me | 20161 | choke me |
20162 | #else | ||
20163 | char (*f) () = $ac_func; | ||
20164 | #endif | ||
20165 | #ifdef __cplusplus | ||
20166 | } | ||
21320 | #endif | 20167 | #endif |
21321 | 20168 | ||
21322 | int | 20169 | int |
21323 | main () | 20170 | main () |
21324 | { | 20171 | { |
21325 | return $ac_func (); | 20172 | return f != $ac_func; |
21326 | ; | 20173 | ; |
21327 | return 0; | 20174 | return 0; |
21328 | } | 20175 | } |
21329 | _ACEOF | 20176 | _ACEOF |
21330 | rm -f conftest.$ac_objext conftest$ac_exeext | 20177 | rm -f conftest.$ac_objext conftest$ac_exeext |
21331 | if { (ac_try="$ac_link" | 20178 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
21332 | case "(($ac_try" in | 20179 | (eval $ac_link) 2>conftest.er1 |
21333 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21334 | *) ac_try_echo=$ac_try;; | ||
21335 | esac | ||
21336 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21337 | (eval "$ac_link") 2>conftest.er1 | ||
21338 | ac_status=$? | 20180 | ac_status=$? |
21339 | grep -v '^ *+' conftest.er1 >conftest.err | 20181 | grep -v '^ *+' conftest.er1 >conftest.err |
21340 | rm -f conftest.er1 | 20182 | rm -f conftest.er1 |
21341 | cat conftest.err >&5 | 20183 | cat conftest.err >&5 |
21342 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20184 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21343 | (exit $ac_status); } && | 20185 | (exit $ac_status); } && |
21344 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 20186 | { ac_try='test -z "$ac_c_werror_flag" |
21345 | { (case "(($ac_try" in | 20187 | || test ! -s conftest.err' |
21346 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 20188 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
21347 | *) ac_try_echo=$ac_try;; | 20189 | (eval $ac_try) 2>&5 |
21348 | esac | ||
21349 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21350 | (eval "$ac_try") 2>&5 | ||
21351 | ac_status=$? | 20190 | ac_status=$? |
21352 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20191 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21353 | (exit $ac_status); }; } && | 20192 | (exit $ac_status); }; } && |
21354 | { ac_try='test -s conftest$ac_exeext' | 20193 | { ac_try='test -s conftest$ac_exeext' |
21355 | { (case "(($ac_try" in | 20194 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
21356 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 20195 | (eval $ac_try) 2>&5 |
21357 | *) ac_try_echo=$ac_try;; | ||
21358 | esac | ||
21359 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21360 | (eval "$ac_try") 2>&5 | ||
21361 | ac_status=$? | 20196 | ac_status=$? |
21362 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20197 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21363 | (exit $ac_status); }; }; then | 20198 | (exit $ac_status); }; }; then |
@@ -21366,15 +20201,13 @@ else | |||
21366 | echo "$as_me: failed program was:" >&5 | 20201 | echo "$as_me: failed program was:" >&5 |
21367 | sed 's/^/| /' conftest.$ac_ext >&5 | 20202 | sed 's/^/| /' conftest.$ac_ext >&5 |
21368 | 20203 | ||
21369 | eval "$as_ac_var=no" | 20204 | eval "$as_ac_var=no" |
21370 | fi | 20205 | fi |
21371 | 20206 | rm -f conftest.err conftest.$ac_objext \ | |
21372 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
21373 | conftest$ac_exeext conftest.$ac_ext | 20207 | conftest$ac_exeext conftest.$ac_ext |
21374 | fi | 20208 | fi |
21375 | ac_res=`eval echo '${'$as_ac_var'}'` | 20209 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
21376 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 20210 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
21377 | echo "${ECHO_T}$ac_res" >&6; } | ||
21378 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 20211 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
21379 | cat >>confdefs.h <<_ACEOF | 20212 | cat >>confdefs.h <<_ACEOF |
21380 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 20213 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
@@ -21393,8 +20226,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
21393 | 20226 | ||
21394 | 20227 | ||
21395 | 20228 | ||
21396 | { echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5 | 20229 | echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5 |
21397 | echo $ECHO_N "checking for _ prefix in compiled symbols... $ECHO_C" >&6; } | 20230 | echo $ECHO_N "checking for _ prefix in compiled symbols... $ECHO_C" >&6 |
21398 | if test "${ac_cv_sys_symbol_underscore+set}" = set; then | 20231 | if test "${ac_cv_sys_symbol_underscore+set}" = set; then |
21399 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20232 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
21400 | else | 20233 | else |
@@ -21435,15 +20268,15 @@ EOF | |||
21435 | rm -rf conftest* | 20268 | rm -rf conftest* |
21436 | 20269 | ||
21437 | fi | 20270 | fi |
21438 | { echo "$as_me:$LINENO: result: $ac_cv_sys_symbol_underscore" >&5 | 20271 | echo "$as_me:$LINENO: result: $ac_cv_sys_symbol_underscore" >&5 |
21439 | echo "${ECHO_T}$ac_cv_sys_symbol_underscore" >&6; } | 20272 | echo "${ECHO_T}$ac_cv_sys_symbol_underscore" >&6 |
21440 | 20273 | ||
21441 | 20274 | ||
21442 | if test x"$ac_cv_sys_symbol_underscore" = xyes; then | 20275 | if test x"$ac_cv_sys_symbol_underscore" = xyes; then |
21443 | if test x"$libltdl_cv_func_dlopen" = xyes || | 20276 | if test x"$libltdl_cv_func_dlopen" = xyes || |
21444 | test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then | 20277 | test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then |
21445 | { echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5 | 20278 | echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5 |
21446 | echo $ECHO_N "checking whether we have to add an underscore for dlsym... $ECHO_C" >&6; } | 20279 | echo $ECHO_N "checking whether we have to add an underscore for dlsym... $ECHO_C" >&6 |
21447 | if test "${libltdl_cv_need_uscore+set}" = set; then | 20280 | if test "${libltdl_cv_need_uscore+set}" = set; then |
21448 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20281 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
21449 | else | 20282 | else |
@@ -21456,7 +20289,7 @@ else | |||
21456 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 20289 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
21457 | lt_status=$lt_dlunknown | 20290 | lt_status=$lt_dlunknown |
21458 | cat > conftest.$ac_ext <<EOF | 20291 | cat > conftest.$ac_ext <<EOF |
21459 | #line 21459 "configure" | 20292 | #line 20292 "configure" |
21460 | #include "confdefs.h" | 20293 | #include "confdefs.h" |
21461 | 20294 | ||
21462 | #if HAVE_DLFCN_H | 20295 | #if HAVE_DLFCN_H |
@@ -21541,8 +20374,8 @@ rm -fr conftest* | |||
21541 | LIBS="$save_LIBS" | 20374 | LIBS="$save_LIBS" |
21542 | 20375 | ||
21543 | fi | 20376 | fi |
21544 | { echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5 | 20377 | echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5 |
21545 | echo "${ECHO_T}$libltdl_cv_need_uscore" >&6; } | 20378 | echo "${ECHO_T}$libltdl_cv_need_uscore" >&6 |
21546 | fi | 20379 | fi |
21547 | fi | 20380 | fi |
21548 | 20381 | ||
@@ -21555,8 +20388,8 @@ _ACEOF | |||
21555 | fi | 20388 | fi |
21556 | 20389 | ||
21557 | 20390 | ||
21558 | { echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5 | 20391 | echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5 |
21559 | echo $ECHO_N "checking whether deplibs are loaded by dlopen... $ECHO_C" >&6; } | 20392 | echo $ECHO_N "checking whether deplibs are loaded by dlopen... $ECHO_C" >&6 |
21560 | if test "${libltdl_cv_sys_dlopen_deplibs+set}" = set; then | 20393 | if test "${libltdl_cv_sys_dlopen_deplibs+set}" = set; then |
21561 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20394 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
21562 | else | 20395 | else |
@@ -21579,7 +20412,7 @@ else | |||
21579 | # If you are looking for one http://www.opendarwin.org/projects/dlcompat | 20412 | # If you are looking for one http://www.opendarwin.org/projects/dlcompat |
21580 | libltdl_cv_sys_dlopen_deplibs=yes | 20413 | libltdl_cv_sys_dlopen_deplibs=yes |
21581 | ;; | 20414 | ;; |
21582 | gnu* | linux* | k*bsd*-gnu) | 20415 | gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) |
21583 | # GNU and its variants, using gnu ld.so (Glibc) | 20416 | # GNU and its variants, using gnu ld.so (Glibc) |
21584 | libltdl_cv_sys_dlopen_deplibs=yes | 20417 | libltdl_cv_sys_dlopen_deplibs=yes |
21585 | ;; | 20418 | ;; |
@@ -21599,7 +20432,7 @@ else | |||
21599 | # at 6.2 and later dlopen does load deplibs. | 20432 | # at 6.2 and later dlopen does load deplibs. |
21600 | libltdl_cv_sys_dlopen_deplibs=yes | 20433 | libltdl_cv_sys_dlopen_deplibs=yes |
21601 | ;; | 20434 | ;; |
21602 | netbsd* | netbsdelf*-gnu) | 20435 | netbsd*) |
21603 | libltdl_cv_sys_dlopen_deplibs=yes | 20436 | libltdl_cv_sys_dlopen_deplibs=yes |
21604 | ;; | 20437 | ;; |
21605 | openbsd*) | 20438 | openbsd*) |
@@ -21636,8 +20469,8 @@ else | |||
21636 | esac | 20469 | esac |
21637 | 20470 | ||
21638 | fi | 20471 | fi |
21639 | { echo "$as_me:$LINENO: result: $libltdl_cv_sys_dlopen_deplibs" >&5 | 20472 | echo "$as_me:$LINENO: result: $libltdl_cv_sys_dlopen_deplibs" >&5 |
21640 | echo "${ECHO_T}$libltdl_cv_sys_dlopen_deplibs" >&6; } | 20473 | echo "${ECHO_T}$libltdl_cv_sys_dlopen_deplibs" >&6 |
21641 | if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then | 20474 | if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then |
21642 | 20475 | ||
21643 | cat >>confdefs.h <<\_ACEOF | 20476 | cat >>confdefs.h <<\_ACEOF |
@@ -21650,19 +20483,18 @@ fi | |||
21650 | for ac_header in argz.h | 20483 | for ac_header in argz.h |
21651 | do | 20484 | do |
21652 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 20485 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
21653 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 20486 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
21654 | { echo "$as_me:$LINENO: checking for $ac_header" >&5 | 20487 | echo "$as_me:$LINENO: checking for $ac_header" >&5 |
21655 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | 20488 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
21656 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 20489 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
21657 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20490 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
21658 | fi | 20491 | fi |
21659 | ac_res=`eval echo '${'$as_ac_Header'}'` | 20492 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
21660 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 20493 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
21661 | echo "${ECHO_T}$ac_res" >&6; } | ||
21662 | else | 20494 | else |
21663 | # Is the header compilable? | 20495 | # Is the header compilable? |
21664 | { echo "$as_me:$LINENO: checking $ac_header usability" >&5 | 20496 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
21665 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | 20497 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 |
21666 | cat >conftest.$ac_ext <<_ACEOF | 20498 | cat >conftest.$ac_ext <<_ACEOF |
21667 | /* confdefs.h. */ | 20499 | /* confdefs.h. */ |
21668 | _ACEOF | 20500 | _ACEOF |
@@ -21673,36 +20505,24 @@ $ac_includes_default | |||
21673 | #include <$ac_header> | 20505 | #include <$ac_header> |
21674 | _ACEOF | 20506 | _ACEOF |
21675 | rm -f conftest.$ac_objext | 20507 | rm -f conftest.$ac_objext |
21676 | if { (ac_try="$ac_compile" | 20508 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
21677 | case "(($ac_try" in | 20509 | (eval $ac_compile) 2>conftest.er1 |
21678 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21679 | *) ac_try_echo=$ac_try;; | ||
21680 | esac | ||
21681 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21682 | (eval "$ac_compile") 2>conftest.er1 | ||
21683 | ac_status=$? | 20510 | ac_status=$? |
21684 | grep -v '^ *+' conftest.er1 >conftest.err | 20511 | grep -v '^ *+' conftest.er1 >conftest.err |
21685 | rm -f conftest.er1 | 20512 | rm -f conftest.er1 |
21686 | cat conftest.err >&5 | 20513 | cat conftest.err >&5 |
21687 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20514 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21688 | (exit $ac_status); } && | 20515 | (exit $ac_status); } && |
21689 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 20516 | { ac_try='test -z "$ac_c_werror_flag" |
21690 | { (case "(($ac_try" in | 20517 | || test ! -s conftest.err' |
21691 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 20518 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
21692 | *) ac_try_echo=$ac_try;; | 20519 | (eval $ac_try) 2>&5 |
21693 | esac | ||
21694 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21695 | (eval "$ac_try") 2>&5 | ||
21696 | ac_status=$? | 20520 | ac_status=$? |
21697 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20521 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21698 | (exit $ac_status); }; } && | 20522 | (exit $ac_status); }; } && |
21699 | { ac_try='test -s conftest.$ac_objext' | 20523 | { ac_try='test -s conftest.$ac_objext' |
21700 | { (case "(($ac_try" in | 20524 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
21701 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 20525 | (eval $ac_try) 2>&5 |
21702 | *) ac_try_echo=$ac_try;; | ||
21703 | esac | ||
21704 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21705 | (eval "$ac_try") 2>&5 | ||
21706 | ac_status=$? | 20526 | ac_status=$? |
21707 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20527 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21708 | (exit $ac_status); }; }; then | 20528 | (exit $ac_status); }; }; then |
@@ -21711,16 +20531,15 @@ else | |||
21711 | echo "$as_me: failed program was:" >&5 | 20531 | echo "$as_me: failed program was:" >&5 |
21712 | sed 's/^/| /' conftest.$ac_ext >&5 | 20532 | sed 's/^/| /' conftest.$ac_ext >&5 |
21713 | 20533 | ||
21714 | ac_header_compiler=no | 20534 | ac_header_compiler=no |
21715 | fi | 20535 | fi |
21716 | 20536 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
21717 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 20537 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 |
21718 | { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | 20538 | echo "${ECHO_T}$ac_header_compiler" >&6 |
21719 | echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
21720 | 20539 | ||
21721 | # Is the header present? | 20540 | # Is the header present? |
21722 | { echo "$as_me:$LINENO: checking $ac_header presence" >&5 | 20541 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 |
21723 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | 20542 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 |
21724 | cat >conftest.$ac_ext <<_ACEOF | 20543 | cat >conftest.$ac_ext <<_ACEOF |
21725 | /* confdefs.h. */ | 20544 | /* confdefs.h. */ |
21726 | _ACEOF | 20545 | _ACEOF |
@@ -21729,13 +20548,8 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
21729 | /* end confdefs.h. */ | 20548 | /* end confdefs.h. */ |
21730 | #include <$ac_header> | 20549 | #include <$ac_header> |
21731 | _ACEOF | 20550 | _ACEOF |
21732 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 20551 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
21733 | case "(($ac_try" in | 20552 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
21734 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21735 | *) ac_try_echo=$ac_try;; | ||
21736 | esac | ||
21737 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21738 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
21739 | ac_status=$? | 20553 | ac_status=$? |
21740 | grep -v '^ *+' conftest.er1 >conftest.err | 20554 | grep -v '^ *+' conftest.er1 >conftest.err |
21741 | rm -f conftest.er1 | 20555 | rm -f conftest.er1 |
@@ -21759,10 +20573,9 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
21759 | 20573 | ||
21760 | ac_header_preproc=no | 20574 | ac_header_preproc=no |
21761 | fi | 20575 | fi |
21762 | |||
21763 | rm -f conftest.err conftest.$ac_ext | 20576 | rm -f conftest.err conftest.$ac_ext |
21764 | { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | 20577 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 |
21765 | echo "${ECHO_T}$ac_header_preproc" >&6; } | 20578 | echo "${ECHO_T}$ac_header_preproc" >&6 |
21766 | 20579 | ||
21767 | # So? What about this header? | 20580 | # So? What about this header? |
21768 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | 20581 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in |
@@ -21786,24 +20599,25 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ | |||
21786 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | 20599 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} |
21787 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | 20600 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 |
21788 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | 20601 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} |
21789 | ( cat <<\_ASBOX | 20602 | ( |
20603 | cat <<\_ASBOX | ||
21790 | ## ---------------------------------- ## | 20604 | ## ---------------------------------- ## |
21791 | ## Report this to bug-libtool@gnu.org ## | 20605 | ## Report this to bug-libtool@gnu.org ## |
21792 | ## ---------------------------------- ## | 20606 | ## ---------------------------------- ## |
21793 | _ASBOX | 20607 | _ASBOX |
21794 | ) | sed "s/^/$as_me: WARNING: /" >&2 | 20608 | ) | |
20609 | sed "s/^/$as_me: WARNING: /" >&2 | ||
21795 | ;; | 20610 | ;; |
21796 | esac | 20611 | esac |
21797 | { echo "$as_me:$LINENO: checking for $ac_header" >&5 | 20612 | echo "$as_me:$LINENO: checking for $ac_header" >&5 |
21798 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | 20613 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
21799 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 20614 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
21800 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20615 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
21801 | else | 20616 | else |
21802 | eval "$as_ac_Header=\$ac_header_preproc" | 20617 | eval "$as_ac_Header=\$ac_header_preproc" |
21803 | fi | 20618 | fi |
21804 | ac_res=`eval echo '${'$as_ac_Header'}'` | 20619 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
21805 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 20620 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
21806 | echo "${ECHO_T}$ac_res" >&6; } | ||
21807 | 20621 | ||
21808 | fi | 20622 | fi |
21809 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 20623 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
@@ -21816,8 +20630,8 @@ fi | |||
21816 | done | 20630 | done |
21817 | 20631 | ||
21818 | 20632 | ||
21819 | { echo "$as_me:$LINENO: checking for error_t" >&5 | 20633 | echo "$as_me:$LINENO: checking for error_t" >&5 |
21820 | echo $ECHO_N "checking for error_t... $ECHO_C" >&6; } | 20634 | echo $ECHO_N "checking for error_t... $ECHO_C" >&6 |
21821 | if test "${ac_cv_type_error_t+set}" = set; then | 20635 | if test "${ac_cv_type_error_t+set}" = set; then |
21822 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20636 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
21823 | else | 20637 | else |
@@ -21831,49 +20645,36 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
21831 | # include <argz.h> | 20645 | # include <argz.h> |
21832 | #endif | 20646 | #endif |
21833 | 20647 | ||
21834 | typedef error_t ac__type_new_; | ||
21835 | int | 20648 | int |
21836 | main () | 20649 | main () |
21837 | { | 20650 | { |
21838 | if ((ac__type_new_ *) 0) | 20651 | if ((error_t *) 0) |
21839 | return 0; | 20652 | return 0; |
21840 | if (sizeof (ac__type_new_)) | 20653 | if (sizeof (error_t)) |
21841 | return 0; | 20654 | return 0; |
21842 | ; | 20655 | ; |
21843 | return 0; | 20656 | return 0; |
21844 | } | 20657 | } |
21845 | _ACEOF | 20658 | _ACEOF |
21846 | rm -f conftest.$ac_objext | 20659 | rm -f conftest.$ac_objext |
21847 | if { (ac_try="$ac_compile" | 20660 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
21848 | case "(($ac_try" in | 20661 | (eval $ac_compile) 2>conftest.er1 |
21849 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21850 | *) ac_try_echo=$ac_try;; | ||
21851 | esac | ||
21852 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21853 | (eval "$ac_compile") 2>conftest.er1 | ||
21854 | ac_status=$? | 20662 | ac_status=$? |
21855 | grep -v '^ *+' conftest.er1 >conftest.err | 20663 | grep -v '^ *+' conftest.er1 >conftest.err |
21856 | rm -f conftest.er1 | 20664 | rm -f conftest.er1 |
21857 | cat conftest.err >&5 | 20665 | cat conftest.err >&5 |
21858 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20666 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21859 | (exit $ac_status); } && | 20667 | (exit $ac_status); } && |
21860 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 20668 | { ac_try='test -z "$ac_c_werror_flag" |
21861 | { (case "(($ac_try" in | 20669 | || test ! -s conftest.err' |
21862 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 20670 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
21863 | *) ac_try_echo=$ac_try;; | 20671 | (eval $ac_try) 2>&5 |
21864 | esac | ||
21865 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21866 | (eval "$ac_try") 2>&5 | ||
21867 | ac_status=$? | 20672 | ac_status=$? |
21868 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20673 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21869 | (exit $ac_status); }; } && | 20674 | (exit $ac_status); }; } && |
21870 | { ac_try='test -s conftest.$ac_objext' | 20675 | { ac_try='test -s conftest.$ac_objext' |
21871 | { (case "(($ac_try" in | 20676 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
21872 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 20677 | (eval $ac_try) 2>&5 |
21873 | *) ac_try_echo=$ac_try;; | ||
21874 | esac | ||
21875 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21876 | (eval "$ac_try") 2>&5 | ||
21877 | ac_status=$? | 20678 | ac_status=$? |
21878 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20679 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21879 | (exit $ac_status); }; }; then | 20680 | (exit $ac_status); }; }; then |
@@ -21882,13 +20683,12 @@ else | |||
21882 | echo "$as_me: failed program was:" >&5 | 20683 | echo "$as_me: failed program was:" >&5 |
21883 | sed 's/^/| /' conftest.$ac_ext >&5 | 20684 | sed 's/^/| /' conftest.$ac_ext >&5 |
21884 | 20685 | ||
21885 | ac_cv_type_error_t=no | 20686 | ac_cv_type_error_t=no |
21886 | fi | 20687 | fi |
21887 | 20688 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
21888 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
21889 | fi | 20689 | fi |
21890 | { echo "$as_me:$LINENO: result: $ac_cv_type_error_t" >&5 | 20690 | echo "$as_me:$LINENO: result: $ac_cv_type_error_t" >&5 |
21891 | echo "${ECHO_T}$ac_cv_type_error_t" >&6; } | 20691 | echo "${ECHO_T}$ac_cv_type_error_t" >&6 |
21892 | if test $ac_cv_type_error_t = yes; then | 20692 | if test $ac_cv_type_error_t = yes; then |
21893 | 20693 | ||
21894 | cat >>confdefs.h <<_ACEOF | 20694 | cat >>confdefs.h <<_ACEOF |
@@ -21913,9 +20713,9 @@ fi | |||
21913 | for ac_func in argz_append argz_create_sep argz_insert argz_next argz_stringify | 20713 | for ac_func in argz_append argz_create_sep argz_insert argz_next argz_stringify |
21914 | do | 20714 | do |
21915 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 20715 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
21916 | { echo "$as_me:$LINENO: checking for $ac_func" >&5 | 20716 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
21917 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } | 20717 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
21918 | if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | 20718 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
21919 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20719 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
21920 | else | 20720 | else |
21921 | cat >conftest.$ac_ext <<_ACEOF | 20721 | cat >conftest.$ac_ext <<_ACEOF |
@@ -21941,59 +20741,53 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
21941 | 20741 | ||
21942 | #undef $ac_func | 20742 | #undef $ac_func |
21943 | 20743 | ||
21944 | /* Override any GCC internal prototype to avoid an error. | 20744 | /* Override any gcc2 internal prototype to avoid an error. */ |
21945 | Use char because int might match the return type of a GCC | ||
21946 | builtin and then its argument prototype would still apply. */ | ||
21947 | #ifdef __cplusplus | 20745 | #ifdef __cplusplus |
21948 | extern "C" | 20746 | extern "C" |
20747 | { | ||
21949 | #endif | 20748 | #endif |
20749 | /* We use char because int might match the return type of a gcc2 | ||
20750 | builtin and then its argument prototype would still apply. */ | ||
21950 | char $ac_func (); | 20751 | char $ac_func (); |
21951 | /* The GNU C library defines this for functions which it implements | 20752 | /* The GNU C library defines this for functions which it implements |
21952 | to always fail with ENOSYS. Some functions are actually named | 20753 | to always fail with ENOSYS. Some functions are actually named |
21953 | something starting with __ and the normal name is an alias. */ | 20754 | something starting with __ and the normal name is an alias. */ |
21954 | #if defined __stub_$ac_func || defined __stub___$ac_func | 20755 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
21955 | choke me | 20756 | choke me |
20757 | #else | ||
20758 | char (*f) () = $ac_func; | ||
20759 | #endif | ||
20760 | #ifdef __cplusplus | ||
20761 | } | ||
21956 | #endif | 20762 | #endif |
21957 | 20763 | ||
21958 | int | 20764 | int |
21959 | main () | 20765 | main () |
21960 | { | 20766 | { |
21961 | return $ac_func (); | 20767 | return f != $ac_func; |
21962 | ; | 20768 | ; |
21963 | return 0; | 20769 | return 0; |
21964 | } | 20770 | } |
21965 | _ACEOF | 20771 | _ACEOF |
21966 | rm -f conftest.$ac_objext conftest$ac_exeext | 20772 | rm -f conftest.$ac_objext conftest$ac_exeext |
21967 | if { (ac_try="$ac_link" | 20773 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
21968 | case "(($ac_try" in | 20774 | (eval $ac_link) 2>conftest.er1 |
21969 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
21970 | *) ac_try_echo=$ac_try;; | ||
21971 | esac | ||
21972 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21973 | (eval "$ac_link") 2>conftest.er1 | ||
21974 | ac_status=$? | 20775 | ac_status=$? |
21975 | grep -v '^ *+' conftest.er1 >conftest.err | 20776 | grep -v '^ *+' conftest.er1 >conftest.err |
21976 | rm -f conftest.er1 | 20777 | rm -f conftest.er1 |
21977 | cat conftest.err >&5 | 20778 | cat conftest.err >&5 |
21978 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20779 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21979 | (exit $ac_status); } && | 20780 | (exit $ac_status); } && |
21980 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 20781 | { ac_try='test -z "$ac_c_werror_flag" |
21981 | { (case "(($ac_try" in | 20782 | || test ! -s conftest.err' |
21982 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 20783 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
21983 | *) ac_try_echo=$ac_try;; | 20784 | (eval $ac_try) 2>&5 |
21984 | esac | ||
21985 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21986 | (eval "$ac_try") 2>&5 | ||
21987 | ac_status=$? | 20785 | ac_status=$? |
21988 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20786 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21989 | (exit $ac_status); }; } && | 20787 | (exit $ac_status); }; } && |
21990 | { ac_try='test -s conftest$ac_exeext' | 20788 | { ac_try='test -s conftest$ac_exeext' |
21991 | { (case "(($ac_try" in | 20789 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
21992 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 20790 | (eval $ac_try) 2>&5 |
21993 | *) ac_try_echo=$ac_try;; | ||
21994 | esac | ||
21995 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
21996 | (eval "$ac_try") 2>&5 | ||
21997 | ac_status=$? | 20791 | ac_status=$? |
21998 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20792 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21999 | (exit $ac_status); }; }; then | 20793 | (exit $ac_status); }; }; then |
@@ -22002,15 +20796,13 @@ else | |||
22002 | echo "$as_me: failed program was:" >&5 | 20796 | echo "$as_me: failed program was:" >&5 |
22003 | sed 's/^/| /' conftest.$ac_ext >&5 | 20797 | sed 's/^/| /' conftest.$ac_ext >&5 |
22004 | 20798 | ||
22005 | eval "$as_ac_var=no" | 20799 | eval "$as_ac_var=no" |
22006 | fi | 20800 | fi |
22007 | 20801 | rm -f conftest.err conftest.$ac_objext \ | |
22008 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
22009 | conftest$ac_exeext conftest.$ac_ext | 20802 | conftest$ac_exeext conftest.$ac_ext |
22010 | fi | 20803 | fi |
22011 | ac_res=`eval echo '${'$as_ac_var'}'` | 20804 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
22012 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 20805 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
22013 | echo "${ECHO_T}$ac_res" >&6; } | ||
22014 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 20806 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
22015 | cat >>confdefs.h <<_ACEOF | 20807 | cat >>confdefs.h <<_ACEOF |
22016 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 20808 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
@@ -22050,19 +20842,18 @@ for ac_header in assert.h ctype.h errno.h malloc.h memory.h stdlib.h \ | |||
22050 | stdio.h unistd.h | 20842 | stdio.h unistd.h |
22051 | do | 20843 | do |
22052 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 20844 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
22053 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 20845 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
22054 | { echo "$as_me:$LINENO: checking for $ac_header" >&5 | 20846 | echo "$as_me:$LINENO: checking for $ac_header" >&5 |
22055 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | 20847 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
22056 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 20848 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
22057 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20849 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
22058 | fi | 20850 | fi |
22059 | ac_res=`eval echo '${'$as_ac_Header'}'` | 20851 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
22060 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 20852 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
22061 | echo "${ECHO_T}$ac_res" >&6; } | ||
22062 | else | 20853 | else |
22063 | # Is the header compilable? | 20854 | # Is the header compilable? |
22064 | { echo "$as_me:$LINENO: checking $ac_header usability" >&5 | 20855 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
22065 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | 20856 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 |
22066 | cat >conftest.$ac_ext <<_ACEOF | 20857 | cat >conftest.$ac_ext <<_ACEOF |
22067 | /* confdefs.h. */ | 20858 | /* confdefs.h. */ |
22068 | _ACEOF | 20859 | _ACEOF |
@@ -22073,36 +20864,24 @@ $ac_includes_default | |||
22073 | #include <$ac_header> | 20864 | #include <$ac_header> |
22074 | _ACEOF | 20865 | _ACEOF |
22075 | rm -f conftest.$ac_objext | 20866 | rm -f conftest.$ac_objext |
22076 | if { (ac_try="$ac_compile" | 20867 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
22077 | case "(($ac_try" in | 20868 | (eval $ac_compile) 2>conftest.er1 |
22078 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
22079 | *) ac_try_echo=$ac_try;; | ||
22080 | esac | ||
22081 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22082 | (eval "$ac_compile") 2>conftest.er1 | ||
22083 | ac_status=$? | 20869 | ac_status=$? |
22084 | grep -v '^ *+' conftest.er1 >conftest.err | 20870 | grep -v '^ *+' conftest.er1 >conftest.err |
22085 | rm -f conftest.er1 | 20871 | rm -f conftest.er1 |
22086 | cat conftest.err >&5 | 20872 | cat conftest.err >&5 |
22087 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20873 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22088 | (exit $ac_status); } && | 20874 | (exit $ac_status); } && |
22089 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 20875 | { ac_try='test -z "$ac_c_werror_flag" |
22090 | { (case "(($ac_try" in | 20876 | || test ! -s conftest.err' |
22091 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 20877 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
22092 | *) ac_try_echo=$ac_try;; | 20878 | (eval $ac_try) 2>&5 |
22093 | esac | ||
22094 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22095 | (eval "$ac_try") 2>&5 | ||
22096 | ac_status=$? | 20879 | ac_status=$? |
22097 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20880 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22098 | (exit $ac_status); }; } && | 20881 | (exit $ac_status); }; } && |
22099 | { ac_try='test -s conftest.$ac_objext' | 20882 | { ac_try='test -s conftest.$ac_objext' |
22100 | { (case "(($ac_try" in | 20883 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
22101 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 20884 | (eval $ac_try) 2>&5 |
22102 | *) ac_try_echo=$ac_try;; | ||
22103 | esac | ||
22104 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22105 | (eval "$ac_try") 2>&5 | ||
22106 | ac_status=$? | 20885 | ac_status=$? |
22107 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 20886 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22108 | (exit $ac_status); }; }; then | 20887 | (exit $ac_status); }; }; then |
@@ -22111,16 +20890,15 @@ else | |||
22111 | echo "$as_me: failed program was:" >&5 | 20890 | echo "$as_me: failed program was:" >&5 |
22112 | sed 's/^/| /' conftest.$ac_ext >&5 | 20891 | sed 's/^/| /' conftest.$ac_ext >&5 |
22113 | 20892 | ||
22114 | ac_header_compiler=no | 20893 | ac_header_compiler=no |
22115 | fi | 20894 | fi |
22116 | 20895 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
22117 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 20896 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 |
22118 | { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | 20897 | echo "${ECHO_T}$ac_header_compiler" >&6 |
22119 | echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
22120 | 20898 | ||
22121 | # Is the header present? | 20899 | # Is the header present? |
22122 | { echo "$as_me:$LINENO: checking $ac_header presence" >&5 | 20900 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 |
22123 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | 20901 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 |
22124 | cat >conftest.$ac_ext <<_ACEOF | 20902 | cat >conftest.$ac_ext <<_ACEOF |
22125 | /* confdefs.h. */ | 20903 | /* confdefs.h. */ |
22126 | _ACEOF | 20904 | _ACEOF |
@@ -22129,13 +20907,8 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
22129 | /* end confdefs.h. */ | 20907 | /* end confdefs.h. */ |
22130 | #include <$ac_header> | 20908 | #include <$ac_header> |
22131 | _ACEOF | 20909 | _ACEOF |
22132 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 20910 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
22133 | case "(($ac_try" in | 20911 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
22134 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
22135 | *) ac_try_echo=$ac_try;; | ||
22136 | esac | ||
22137 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22138 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
22139 | ac_status=$? | 20912 | ac_status=$? |
22140 | grep -v '^ *+' conftest.er1 >conftest.err | 20913 | grep -v '^ *+' conftest.er1 >conftest.err |
22141 | rm -f conftest.er1 | 20914 | rm -f conftest.er1 |
@@ -22159,10 +20932,9 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
22159 | 20932 | ||
22160 | ac_header_preproc=no | 20933 | ac_header_preproc=no |
22161 | fi | 20934 | fi |
22162 | |||
22163 | rm -f conftest.err conftest.$ac_ext | 20935 | rm -f conftest.err conftest.$ac_ext |
22164 | { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | 20936 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 |
22165 | echo "${ECHO_T}$ac_header_preproc" >&6; } | 20937 | echo "${ECHO_T}$ac_header_preproc" >&6 |
22166 | 20938 | ||
22167 | # So? What about this header? | 20939 | # So? What about this header? |
22168 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | 20940 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in |
@@ -22186,24 +20958,25 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ | |||
22186 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | 20958 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} |
22187 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | 20959 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 |
22188 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | 20960 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} |
22189 | ( cat <<\_ASBOX | 20961 | ( |
20962 | cat <<\_ASBOX | ||
22190 | ## ---------------------------------- ## | 20963 | ## ---------------------------------- ## |
22191 | ## Report this to bug-libtool@gnu.org ## | 20964 | ## Report this to bug-libtool@gnu.org ## |
22192 | ## ---------------------------------- ## | 20965 | ## ---------------------------------- ## |
22193 | _ASBOX | 20966 | _ASBOX |
22194 | ) | sed "s/^/$as_me: WARNING: /" >&2 | 20967 | ) | |
20968 | sed "s/^/$as_me: WARNING: /" >&2 | ||
22195 | ;; | 20969 | ;; |
22196 | esac | 20970 | esac |
22197 | { echo "$as_me:$LINENO: checking for $ac_header" >&5 | 20971 | echo "$as_me:$LINENO: checking for $ac_header" >&5 |
22198 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | 20972 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
22199 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 20973 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
22200 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20974 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
22201 | else | 20975 | else |
22202 | eval "$as_ac_Header=\$ac_header_preproc" | 20976 | eval "$as_ac_Header=\$ac_header_preproc" |
22203 | fi | 20977 | fi |
22204 | ac_res=`eval echo '${'$as_ac_Header'}'` | 20978 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
22205 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 20979 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
22206 | echo "${ECHO_T}$ac_res" >&6; } | ||
22207 | 20980 | ||
22208 | fi | 20981 | fi |
22209 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 20982 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
@@ -22222,19 +20995,18 @@ done | |||
22222 | for ac_header in dl.h sys/dl.h dld.h mach-o/dyld.h | 20995 | for ac_header in dl.h sys/dl.h dld.h mach-o/dyld.h |
22223 | do | 20996 | do |
22224 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 20997 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
22225 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 20998 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
22226 | { echo "$as_me:$LINENO: checking for $ac_header" >&5 | 20999 | echo "$as_me:$LINENO: checking for $ac_header" >&5 |
22227 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | 21000 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
22228 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 21001 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
22229 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21002 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
22230 | fi | 21003 | fi |
22231 | ac_res=`eval echo '${'$as_ac_Header'}'` | 21004 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
22232 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 21005 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
22233 | echo "${ECHO_T}$ac_res" >&6; } | ||
22234 | else | 21006 | else |
22235 | # Is the header compilable? | 21007 | # Is the header compilable? |
22236 | { echo "$as_me:$LINENO: checking $ac_header usability" >&5 | 21008 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
22237 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | 21009 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 |
22238 | cat >conftest.$ac_ext <<_ACEOF | 21010 | cat >conftest.$ac_ext <<_ACEOF |
22239 | /* confdefs.h. */ | 21011 | /* confdefs.h. */ |
22240 | _ACEOF | 21012 | _ACEOF |
@@ -22245,36 +21017,24 @@ $ac_includes_default | |||
22245 | #include <$ac_header> | 21017 | #include <$ac_header> |
22246 | _ACEOF | 21018 | _ACEOF |
22247 | rm -f conftest.$ac_objext | 21019 | rm -f conftest.$ac_objext |
22248 | if { (ac_try="$ac_compile" | 21020 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
22249 | case "(($ac_try" in | 21021 | (eval $ac_compile) 2>conftest.er1 |
22250 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
22251 | *) ac_try_echo=$ac_try;; | ||
22252 | esac | ||
22253 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22254 | (eval "$ac_compile") 2>conftest.er1 | ||
22255 | ac_status=$? | 21022 | ac_status=$? |
22256 | grep -v '^ *+' conftest.er1 >conftest.err | 21023 | grep -v '^ *+' conftest.er1 >conftest.err |
22257 | rm -f conftest.er1 | 21024 | rm -f conftest.er1 |
22258 | cat conftest.err >&5 | 21025 | cat conftest.err >&5 |
22259 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21026 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22260 | (exit $ac_status); } && | 21027 | (exit $ac_status); } && |
22261 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 21028 | { ac_try='test -z "$ac_c_werror_flag" |
22262 | { (case "(($ac_try" in | 21029 | || test ! -s conftest.err' |
22263 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 21030 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
22264 | *) ac_try_echo=$ac_try;; | 21031 | (eval $ac_try) 2>&5 |
22265 | esac | ||
22266 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22267 | (eval "$ac_try") 2>&5 | ||
22268 | ac_status=$? | 21032 | ac_status=$? |
22269 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21033 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22270 | (exit $ac_status); }; } && | 21034 | (exit $ac_status); }; } && |
22271 | { ac_try='test -s conftest.$ac_objext' | 21035 | { ac_try='test -s conftest.$ac_objext' |
22272 | { (case "(($ac_try" in | 21036 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
22273 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 21037 | (eval $ac_try) 2>&5 |
22274 | *) ac_try_echo=$ac_try;; | ||
22275 | esac | ||
22276 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22277 | (eval "$ac_try") 2>&5 | ||
22278 | ac_status=$? | 21038 | ac_status=$? |
22279 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21039 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22280 | (exit $ac_status); }; }; then | 21040 | (exit $ac_status); }; }; then |
@@ -22283,16 +21043,15 @@ else | |||
22283 | echo "$as_me: failed program was:" >&5 | 21043 | echo "$as_me: failed program was:" >&5 |
22284 | sed 's/^/| /' conftest.$ac_ext >&5 | 21044 | sed 's/^/| /' conftest.$ac_ext >&5 |
22285 | 21045 | ||
22286 | ac_header_compiler=no | 21046 | ac_header_compiler=no |
22287 | fi | 21047 | fi |
22288 | 21048 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
22289 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 21049 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 |
22290 | { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | 21050 | echo "${ECHO_T}$ac_header_compiler" >&6 |
22291 | echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
22292 | 21051 | ||
22293 | # Is the header present? | 21052 | # Is the header present? |
22294 | { echo "$as_me:$LINENO: checking $ac_header presence" >&5 | 21053 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 |
22295 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | 21054 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 |
22296 | cat >conftest.$ac_ext <<_ACEOF | 21055 | cat >conftest.$ac_ext <<_ACEOF |
22297 | /* confdefs.h. */ | 21056 | /* confdefs.h. */ |
22298 | _ACEOF | 21057 | _ACEOF |
@@ -22301,13 +21060,8 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
22301 | /* end confdefs.h. */ | 21060 | /* end confdefs.h. */ |
22302 | #include <$ac_header> | 21061 | #include <$ac_header> |
22303 | _ACEOF | 21062 | _ACEOF |
22304 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 21063 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
22305 | case "(($ac_try" in | 21064 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
22306 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
22307 | *) ac_try_echo=$ac_try;; | ||
22308 | esac | ||
22309 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22310 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
22311 | ac_status=$? | 21065 | ac_status=$? |
22312 | grep -v '^ *+' conftest.er1 >conftest.err | 21066 | grep -v '^ *+' conftest.er1 >conftest.err |
22313 | rm -f conftest.er1 | 21067 | rm -f conftest.er1 |
@@ -22331,10 +21085,9 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
22331 | 21085 | ||
22332 | ac_header_preproc=no | 21086 | ac_header_preproc=no |
22333 | fi | 21087 | fi |
22334 | |||
22335 | rm -f conftest.err conftest.$ac_ext | 21088 | rm -f conftest.err conftest.$ac_ext |
22336 | { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | 21089 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 |
22337 | echo "${ECHO_T}$ac_header_preproc" >&6; } | 21090 | echo "${ECHO_T}$ac_header_preproc" >&6 |
22338 | 21091 | ||
22339 | # So? What about this header? | 21092 | # So? What about this header? |
22340 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | 21093 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in |
@@ -22358,24 +21111,25 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ | |||
22358 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | 21111 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} |
22359 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | 21112 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 |
22360 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | 21113 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} |
22361 | ( cat <<\_ASBOX | 21114 | ( |
21115 | cat <<\_ASBOX | ||
22362 | ## ---------------------------------- ## | 21116 | ## ---------------------------------- ## |
22363 | ## Report this to bug-libtool@gnu.org ## | 21117 | ## Report this to bug-libtool@gnu.org ## |
22364 | ## ---------------------------------- ## | 21118 | ## ---------------------------------- ## |
22365 | _ASBOX | 21119 | _ASBOX |
22366 | ) | sed "s/^/$as_me: WARNING: /" >&2 | 21120 | ) | |
21121 | sed "s/^/$as_me: WARNING: /" >&2 | ||
22367 | ;; | 21122 | ;; |
22368 | esac | 21123 | esac |
22369 | { echo "$as_me:$LINENO: checking for $ac_header" >&5 | 21124 | echo "$as_me:$LINENO: checking for $ac_header" >&5 |
22370 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | 21125 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
22371 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 21126 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
22372 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21127 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
22373 | else | 21128 | else |
22374 | eval "$as_ac_Header=\$ac_header_preproc" | 21129 | eval "$as_ac_Header=\$ac_header_preproc" |
22375 | fi | 21130 | fi |
22376 | ac_res=`eval echo '${'$as_ac_Header'}'` | 21131 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
22377 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 21132 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
22378 | echo "${ECHO_T}$ac_res" >&6; } | ||
22379 | 21133 | ||
22380 | fi | 21134 | fi |
22381 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 21135 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
@@ -22392,19 +21146,18 @@ done | |||
22392 | for ac_header in string.h strings.h | 21146 | for ac_header in string.h strings.h |
22393 | do | 21147 | do |
22394 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 21148 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
22395 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 21149 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
22396 | { echo "$as_me:$LINENO: checking for $ac_header" >&5 | 21150 | echo "$as_me:$LINENO: checking for $ac_header" >&5 |
22397 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | 21151 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
22398 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 21152 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
22399 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21153 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
22400 | fi | 21154 | fi |
22401 | ac_res=`eval echo '${'$as_ac_Header'}'` | 21155 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
22402 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 21156 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
22403 | echo "${ECHO_T}$ac_res" >&6; } | ||
22404 | else | 21157 | else |
22405 | # Is the header compilable? | 21158 | # Is the header compilable? |
22406 | { echo "$as_me:$LINENO: checking $ac_header usability" >&5 | 21159 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
22407 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | 21160 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 |
22408 | cat >conftest.$ac_ext <<_ACEOF | 21161 | cat >conftest.$ac_ext <<_ACEOF |
22409 | /* confdefs.h. */ | 21162 | /* confdefs.h. */ |
22410 | _ACEOF | 21163 | _ACEOF |
@@ -22415,36 +21168,24 @@ $ac_includes_default | |||
22415 | #include <$ac_header> | 21168 | #include <$ac_header> |
22416 | _ACEOF | 21169 | _ACEOF |
22417 | rm -f conftest.$ac_objext | 21170 | rm -f conftest.$ac_objext |
22418 | if { (ac_try="$ac_compile" | 21171 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
22419 | case "(($ac_try" in | 21172 | (eval $ac_compile) 2>conftest.er1 |
22420 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
22421 | *) ac_try_echo=$ac_try;; | ||
22422 | esac | ||
22423 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22424 | (eval "$ac_compile") 2>conftest.er1 | ||
22425 | ac_status=$? | 21173 | ac_status=$? |
22426 | grep -v '^ *+' conftest.er1 >conftest.err | 21174 | grep -v '^ *+' conftest.er1 >conftest.err |
22427 | rm -f conftest.er1 | 21175 | rm -f conftest.er1 |
22428 | cat conftest.err >&5 | 21176 | cat conftest.err >&5 |
22429 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21177 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22430 | (exit $ac_status); } && | 21178 | (exit $ac_status); } && |
22431 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 21179 | { ac_try='test -z "$ac_c_werror_flag" |
22432 | { (case "(($ac_try" in | 21180 | || test ! -s conftest.err' |
22433 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 21181 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
22434 | *) ac_try_echo=$ac_try;; | 21182 | (eval $ac_try) 2>&5 |
22435 | esac | ||
22436 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22437 | (eval "$ac_try") 2>&5 | ||
22438 | ac_status=$? | 21183 | ac_status=$? |
22439 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21184 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22440 | (exit $ac_status); }; } && | 21185 | (exit $ac_status); }; } && |
22441 | { ac_try='test -s conftest.$ac_objext' | 21186 | { ac_try='test -s conftest.$ac_objext' |
22442 | { (case "(($ac_try" in | 21187 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
22443 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 21188 | (eval $ac_try) 2>&5 |
22444 | *) ac_try_echo=$ac_try;; | ||
22445 | esac | ||
22446 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22447 | (eval "$ac_try") 2>&5 | ||
22448 | ac_status=$? | 21189 | ac_status=$? |
22449 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21190 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22450 | (exit $ac_status); }; }; then | 21191 | (exit $ac_status); }; }; then |
@@ -22453,16 +21194,15 @@ else | |||
22453 | echo "$as_me: failed program was:" >&5 | 21194 | echo "$as_me: failed program was:" >&5 |
22454 | sed 's/^/| /' conftest.$ac_ext >&5 | 21195 | sed 's/^/| /' conftest.$ac_ext >&5 |
22455 | 21196 | ||
22456 | ac_header_compiler=no | 21197 | ac_header_compiler=no |
22457 | fi | 21198 | fi |
22458 | 21199 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
22459 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 21200 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 |
22460 | { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | 21201 | echo "${ECHO_T}$ac_header_compiler" >&6 |
22461 | echo "${ECHO_T}$ac_header_compiler" >&6; } | ||
22462 | 21202 | ||
22463 | # Is the header present? | 21203 | # Is the header present? |
22464 | { echo "$as_me:$LINENO: checking $ac_header presence" >&5 | 21204 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 |
22465 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | 21205 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 |
22466 | cat >conftest.$ac_ext <<_ACEOF | 21206 | cat >conftest.$ac_ext <<_ACEOF |
22467 | /* confdefs.h. */ | 21207 | /* confdefs.h. */ |
22468 | _ACEOF | 21208 | _ACEOF |
@@ -22471,13 +21211,8 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
22471 | /* end confdefs.h. */ | 21211 | /* end confdefs.h. */ |
22472 | #include <$ac_header> | 21212 | #include <$ac_header> |
22473 | _ACEOF | 21213 | _ACEOF |
22474 | if { (ac_try="$ac_cpp conftest.$ac_ext" | 21214 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
22475 | case "(($ac_try" in | 21215 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
22476 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
22477 | *) ac_try_echo=$ac_try;; | ||
22478 | esac | ||
22479 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22480 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | ||
22481 | ac_status=$? | 21216 | ac_status=$? |
22482 | grep -v '^ *+' conftest.er1 >conftest.err | 21217 | grep -v '^ *+' conftest.er1 >conftest.err |
22483 | rm -f conftest.er1 | 21218 | rm -f conftest.er1 |
@@ -22501,10 +21236,9 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
22501 | 21236 | ||
22502 | ac_header_preproc=no | 21237 | ac_header_preproc=no |
22503 | fi | 21238 | fi |
22504 | |||
22505 | rm -f conftest.err conftest.$ac_ext | 21239 | rm -f conftest.err conftest.$ac_ext |
22506 | { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | 21240 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 |
22507 | echo "${ECHO_T}$ac_header_preproc" >&6; } | 21241 | echo "${ECHO_T}$ac_header_preproc" >&6 |
22508 | 21242 | ||
22509 | # So? What about this header? | 21243 | # So? What about this header? |
22510 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | 21244 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in |
@@ -22528,24 +21262,25 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ | |||
22528 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | 21262 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} |
22529 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | 21263 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 |
22530 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | 21264 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} |
22531 | ( cat <<\_ASBOX | 21265 | ( |
21266 | cat <<\_ASBOX | ||
22532 | ## ---------------------------------- ## | 21267 | ## ---------------------------------- ## |
22533 | ## Report this to bug-libtool@gnu.org ## | 21268 | ## Report this to bug-libtool@gnu.org ## |
22534 | ## ---------------------------------- ## | 21269 | ## ---------------------------------- ## |
22535 | _ASBOX | 21270 | _ASBOX |
22536 | ) | sed "s/^/$as_me: WARNING: /" >&2 | 21271 | ) | |
21272 | sed "s/^/$as_me: WARNING: /" >&2 | ||
22537 | ;; | 21273 | ;; |
22538 | esac | 21274 | esac |
22539 | { echo "$as_me:$LINENO: checking for $ac_header" >&5 | 21275 | echo "$as_me:$LINENO: checking for $ac_header" >&5 |
22540 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | 21276 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
22541 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 21277 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
22542 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21278 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
22543 | else | 21279 | else |
22544 | eval "$as_ac_Header=\$ac_header_preproc" | 21280 | eval "$as_ac_Header=\$ac_header_preproc" |
22545 | fi | 21281 | fi |
22546 | ac_res=`eval echo '${'$as_ac_Header'}'` | 21282 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
22547 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 21283 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
22548 | echo "${ECHO_T}$ac_res" >&6; } | ||
22549 | 21284 | ||
22550 | fi | 21285 | fi |
22551 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 21286 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
@@ -22563,9 +21298,9 @@ done | |||
22563 | for ac_func in strchr index | 21298 | for ac_func in strchr index |
22564 | do | 21299 | do |
22565 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 21300 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
22566 | { echo "$as_me:$LINENO: checking for $ac_func" >&5 | 21301 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
22567 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } | 21302 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
22568 | if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | 21303 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
22569 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21304 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
22570 | else | 21305 | else |
22571 | cat >conftest.$ac_ext <<_ACEOF | 21306 | cat >conftest.$ac_ext <<_ACEOF |
@@ -22591,59 +21326,53 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
22591 | 21326 | ||
22592 | #undef $ac_func | 21327 | #undef $ac_func |
22593 | 21328 | ||
22594 | /* Override any GCC internal prototype to avoid an error. | 21329 | /* Override any gcc2 internal prototype to avoid an error. */ |
22595 | Use char because int might match the return type of a GCC | ||
22596 | builtin and then its argument prototype would still apply. */ | ||
22597 | #ifdef __cplusplus | 21330 | #ifdef __cplusplus |
22598 | extern "C" | 21331 | extern "C" |
21332 | { | ||
22599 | #endif | 21333 | #endif |
21334 | /* We use char because int might match the return type of a gcc2 | ||
21335 | builtin and then its argument prototype would still apply. */ | ||
22600 | char $ac_func (); | 21336 | char $ac_func (); |
22601 | /* The GNU C library defines this for functions which it implements | 21337 | /* The GNU C library defines this for functions which it implements |
22602 | to always fail with ENOSYS. Some functions are actually named | 21338 | to always fail with ENOSYS. Some functions are actually named |
22603 | something starting with __ and the normal name is an alias. */ | 21339 | something starting with __ and the normal name is an alias. */ |
22604 | #if defined __stub_$ac_func || defined __stub___$ac_func | 21340 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
22605 | choke me | 21341 | choke me |
21342 | #else | ||
21343 | char (*f) () = $ac_func; | ||
21344 | #endif | ||
21345 | #ifdef __cplusplus | ||
21346 | } | ||
22606 | #endif | 21347 | #endif |
22607 | 21348 | ||
22608 | int | 21349 | int |
22609 | main () | 21350 | main () |
22610 | { | 21351 | { |
22611 | return $ac_func (); | 21352 | return f != $ac_func; |
22612 | ; | 21353 | ; |
22613 | return 0; | 21354 | return 0; |
22614 | } | 21355 | } |
22615 | _ACEOF | 21356 | _ACEOF |
22616 | rm -f conftest.$ac_objext conftest$ac_exeext | 21357 | rm -f conftest.$ac_objext conftest$ac_exeext |
22617 | if { (ac_try="$ac_link" | 21358 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
22618 | case "(($ac_try" in | 21359 | (eval $ac_link) 2>conftest.er1 |
22619 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
22620 | *) ac_try_echo=$ac_try;; | ||
22621 | esac | ||
22622 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22623 | (eval "$ac_link") 2>conftest.er1 | ||
22624 | ac_status=$? | 21360 | ac_status=$? |
22625 | grep -v '^ *+' conftest.er1 >conftest.err | 21361 | grep -v '^ *+' conftest.er1 >conftest.err |
22626 | rm -f conftest.er1 | 21362 | rm -f conftest.er1 |
22627 | cat conftest.err >&5 | 21363 | cat conftest.err >&5 |
22628 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21364 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22629 | (exit $ac_status); } && | 21365 | (exit $ac_status); } && |
22630 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 21366 | { ac_try='test -z "$ac_c_werror_flag" |
22631 | { (case "(($ac_try" in | 21367 | || test ! -s conftest.err' |
22632 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 21368 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
22633 | *) ac_try_echo=$ac_try;; | 21369 | (eval $ac_try) 2>&5 |
22634 | esac | ||
22635 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22636 | (eval "$ac_try") 2>&5 | ||
22637 | ac_status=$? | 21370 | ac_status=$? |
22638 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21371 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22639 | (exit $ac_status); }; } && | 21372 | (exit $ac_status); }; } && |
22640 | { ac_try='test -s conftest$ac_exeext' | 21373 | { ac_try='test -s conftest$ac_exeext' |
22641 | { (case "(($ac_try" in | 21374 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
22642 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 21375 | (eval $ac_try) 2>&5 |
22643 | *) ac_try_echo=$ac_try;; | ||
22644 | esac | ||
22645 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22646 | (eval "$ac_try") 2>&5 | ||
22647 | ac_status=$? | 21376 | ac_status=$? |
22648 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21377 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22649 | (exit $ac_status); }; }; then | 21378 | (exit $ac_status); }; }; then |
@@ -22652,15 +21381,13 @@ else | |||
22652 | echo "$as_me: failed program was:" >&5 | 21381 | echo "$as_me: failed program was:" >&5 |
22653 | sed 's/^/| /' conftest.$ac_ext >&5 | 21382 | sed 's/^/| /' conftest.$ac_ext >&5 |
22654 | 21383 | ||
22655 | eval "$as_ac_var=no" | 21384 | eval "$as_ac_var=no" |
22656 | fi | 21385 | fi |
22657 | 21386 | rm -f conftest.err conftest.$ac_objext \ | |
22658 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
22659 | conftest$ac_exeext conftest.$ac_ext | 21387 | conftest$ac_exeext conftest.$ac_ext |
22660 | fi | 21388 | fi |
22661 | ac_res=`eval echo '${'$as_ac_var'}'` | 21389 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
22662 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 21390 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
22663 | echo "${ECHO_T}$ac_res" >&6; } | ||
22664 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 21391 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
22665 | cat >>confdefs.h <<_ACEOF | 21392 | cat >>confdefs.h <<_ACEOF |
22666 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 21393 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
@@ -22674,9 +21401,9 @@ done | |||
22674 | for ac_func in strrchr rindex | 21401 | for ac_func in strrchr rindex |
22675 | do | 21402 | do |
22676 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 21403 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
22677 | { echo "$as_me:$LINENO: checking for $ac_func" >&5 | 21404 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
22678 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } | 21405 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
22679 | if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | 21406 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
22680 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21407 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
22681 | else | 21408 | else |
22682 | cat >conftest.$ac_ext <<_ACEOF | 21409 | cat >conftest.$ac_ext <<_ACEOF |
@@ -22702,59 +21429,53 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
22702 | 21429 | ||
22703 | #undef $ac_func | 21430 | #undef $ac_func |
22704 | 21431 | ||
22705 | /* Override any GCC internal prototype to avoid an error. | 21432 | /* Override any gcc2 internal prototype to avoid an error. */ |
22706 | Use char because int might match the return type of a GCC | ||
22707 | builtin and then its argument prototype would still apply. */ | ||
22708 | #ifdef __cplusplus | 21433 | #ifdef __cplusplus |
22709 | extern "C" | 21434 | extern "C" |
21435 | { | ||
22710 | #endif | 21436 | #endif |
21437 | /* We use char because int might match the return type of a gcc2 | ||
21438 | builtin and then its argument prototype would still apply. */ | ||
22711 | char $ac_func (); | 21439 | char $ac_func (); |
22712 | /* The GNU C library defines this for functions which it implements | 21440 | /* The GNU C library defines this for functions which it implements |
22713 | to always fail with ENOSYS. Some functions are actually named | 21441 | to always fail with ENOSYS. Some functions are actually named |
22714 | something starting with __ and the normal name is an alias. */ | 21442 | something starting with __ and the normal name is an alias. */ |
22715 | #if defined __stub_$ac_func || defined __stub___$ac_func | 21443 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
22716 | choke me | 21444 | choke me |
21445 | #else | ||
21446 | char (*f) () = $ac_func; | ||
21447 | #endif | ||
21448 | #ifdef __cplusplus | ||
21449 | } | ||
22717 | #endif | 21450 | #endif |
22718 | 21451 | ||
22719 | int | 21452 | int |
22720 | main () | 21453 | main () |
22721 | { | 21454 | { |
22722 | return $ac_func (); | 21455 | return f != $ac_func; |
22723 | ; | 21456 | ; |
22724 | return 0; | 21457 | return 0; |
22725 | } | 21458 | } |
22726 | _ACEOF | 21459 | _ACEOF |
22727 | rm -f conftest.$ac_objext conftest$ac_exeext | 21460 | rm -f conftest.$ac_objext conftest$ac_exeext |
22728 | if { (ac_try="$ac_link" | 21461 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
22729 | case "(($ac_try" in | 21462 | (eval $ac_link) 2>conftest.er1 |
22730 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
22731 | *) ac_try_echo=$ac_try;; | ||
22732 | esac | ||
22733 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22734 | (eval "$ac_link") 2>conftest.er1 | ||
22735 | ac_status=$? | 21463 | ac_status=$? |
22736 | grep -v '^ *+' conftest.er1 >conftest.err | 21464 | grep -v '^ *+' conftest.er1 >conftest.err |
22737 | rm -f conftest.er1 | 21465 | rm -f conftest.er1 |
22738 | cat conftest.err >&5 | 21466 | cat conftest.err >&5 |
22739 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21467 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22740 | (exit $ac_status); } && | 21468 | (exit $ac_status); } && |
22741 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 21469 | { ac_try='test -z "$ac_c_werror_flag" |
22742 | { (case "(($ac_try" in | 21470 | || test ! -s conftest.err' |
22743 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 21471 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
22744 | *) ac_try_echo=$ac_try;; | 21472 | (eval $ac_try) 2>&5 |
22745 | esac | ||
22746 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22747 | (eval "$ac_try") 2>&5 | ||
22748 | ac_status=$? | 21473 | ac_status=$? |
22749 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21474 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22750 | (exit $ac_status); }; } && | 21475 | (exit $ac_status); }; } && |
22751 | { ac_try='test -s conftest$ac_exeext' | 21476 | { ac_try='test -s conftest$ac_exeext' |
22752 | { (case "(($ac_try" in | 21477 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
22753 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 21478 | (eval $ac_try) 2>&5 |
22754 | *) ac_try_echo=$ac_try;; | ||
22755 | esac | ||
22756 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22757 | (eval "$ac_try") 2>&5 | ||
22758 | ac_status=$? | 21479 | ac_status=$? |
22759 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21480 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22760 | (exit $ac_status); }; }; then | 21481 | (exit $ac_status); }; }; then |
@@ -22763,15 +21484,13 @@ else | |||
22763 | echo "$as_me: failed program was:" >&5 | 21484 | echo "$as_me: failed program was:" >&5 |
22764 | sed 's/^/| /' conftest.$ac_ext >&5 | 21485 | sed 's/^/| /' conftest.$ac_ext >&5 |
22765 | 21486 | ||
22766 | eval "$as_ac_var=no" | 21487 | eval "$as_ac_var=no" |
22767 | fi | 21488 | fi |
22768 | 21489 | rm -f conftest.err conftest.$ac_objext \ | |
22769 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
22770 | conftest$ac_exeext conftest.$ac_ext | 21490 | conftest$ac_exeext conftest.$ac_ext |
22771 | fi | 21491 | fi |
22772 | ac_res=`eval echo '${'$as_ac_var'}'` | 21492 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
22773 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 21493 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
22774 | echo "${ECHO_T}$ac_res" >&6; } | ||
22775 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 21494 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
22776 | cat >>confdefs.h <<_ACEOF | 21495 | cat >>confdefs.h <<_ACEOF |
22777 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 21496 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
@@ -22785,9 +21504,9 @@ done | |||
22785 | for ac_func in memcpy bcopy | 21504 | for ac_func in memcpy bcopy |
22786 | do | 21505 | do |
22787 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 21506 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
22788 | { echo "$as_me:$LINENO: checking for $ac_func" >&5 | 21507 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
22789 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } | 21508 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
22790 | if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | 21509 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
22791 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21510 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
22792 | else | 21511 | else |
22793 | cat >conftest.$ac_ext <<_ACEOF | 21512 | cat >conftest.$ac_ext <<_ACEOF |
@@ -22813,59 +21532,53 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
22813 | 21532 | ||
22814 | #undef $ac_func | 21533 | #undef $ac_func |
22815 | 21534 | ||
22816 | /* Override any GCC internal prototype to avoid an error. | 21535 | /* Override any gcc2 internal prototype to avoid an error. */ |
22817 | Use char because int might match the return type of a GCC | ||
22818 | builtin and then its argument prototype would still apply. */ | ||
22819 | #ifdef __cplusplus | 21536 | #ifdef __cplusplus |
22820 | extern "C" | 21537 | extern "C" |
21538 | { | ||
22821 | #endif | 21539 | #endif |
21540 | /* We use char because int might match the return type of a gcc2 | ||
21541 | builtin and then its argument prototype would still apply. */ | ||
22822 | char $ac_func (); | 21542 | char $ac_func (); |
22823 | /* The GNU C library defines this for functions which it implements | 21543 | /* The GNU C library defines this for functions which it implements |
22824 | to always fail with ENOSYS. Some functions are actually named | 21544 | to always fail with ENOSYS. Some functions are actually named |
22825 | something starting with __ and the normal name is an alias. */ | 21545 | something starting with __ and the normal name is an alias. */ |
22826 | #if defined __stub_$ac_func || defined __stub___$ac_func | 21546 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
22827 | choke me | 21547 | choke me |
21548 | #else | ||
21549 | char (*f) () = $ac_func; | ||
21550 | #endif | ||
21551 | #ifdef __cplusplus | ||
21552 | } | ||
22828 | #endif | 21553 | #endif |
22829 | 21554 | ||
22830 | int | 21555 | int |
22831 | main () | 21556 | main () |
22832 | { | 21557 | { |
22833 | return $ac_func (); | 21558 | return f != $ac_func; |
22834 | ; | 21559 | ; |
22835 | return 0; | 21560 | return 0; |
22836 | } | 21561 | } |
22837 | _ACEOF | 21562 | _ACEOF |
22838 | rm -f conftest.$ac_objext conftest$ac_exeext | 21563 | rm -f conftest.$ac_objext conftest$ac_exeext |
22839 | if { (ac_try="$ac_link" | 21564 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
22840 | case "(($ac_try" in | 21565 | (eval $ac_link) 2>conftest.er1 |
22841 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
22842 | *) ac_try_echo=$ac_try;; | ||
22843 | esac | ||
22844 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22845 | (eval "$ac_link") 2>conftest.er1 | ||
22846 | ac_status=$? | 21566 | ac_status=$? |
22847 | grep -v '^ *+' conftest.er1 >conftest.err | 21567 | grep -v '^ *+' conftest.er1 >conftest.err |
22848 | rm -f conftest.er1 | 21568 | rm -f conftest.er1 |
22849 | cat conftest.err >&5 | 21569 | cat conftest.err >&5 |
22850 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21570 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22851 | (exit $ac_status); } && | 21571 | (exit $ac_status); } && |
22852 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 21572 | { ac_try='test -z "$ac_c_werror_flag" |
22853 | { (case "(($ac_try" in | 21573 | || test ! -s conftest.err' |
22854 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 21574 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
22855 | *) ac_try_echo=$ac_try;; | 21575 | (eval $ac_try) 2>&5 |
22856 | esac | ||
22857 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22858 | (eval "$ac_try") 2>&5 | ||
22859 | ac_status=$? | 21576 | ac_status=$? |
22860 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21577 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22861 | (exit $ac_status); }; } && | 21578 | (exit $ac_status); }; } && |
22862 | { ac_try='test -s conftest$ac_exeext' | 21579 | { ac_try='test -s conftest$ac_exeext' |
22863 | { (case "(($ac_try" in | 21580 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
22864 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 21581 | (eval $ac_try) 2>&5 |
22865 | *) ac_try_echo=$ac_try;; | ||
22866 | esac | ||
22867 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22868 | (eval "$ac_try") 2>&5 | ||
22869 | ac_status=$? | 21582 | ac_status=$? |
22870 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21583 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22871 | (exit $ac_status); }; }; then | 21584 | (exit $ac_status); }; }; then |
@@ -22874,15 +21587,13 @@ else | |||
22874 | echo "$as_me: failed program was:" >&5 | 21587 | echo "$as_me: failed program was:" >&5 |
22875 | sed 's/^/| /' conftest.$ac_ext >&5 | 21588 | sed 's/^/| /' conftest.$ac_ext >&5 |
22876 | 21589 | ||
22877 | eval "$as_ac_var=no" | 21590 | eval "$as_ac_var=no" |
22878 | fi | 21591 | fi |
22879 | 21592 | rm -f conftest.err conftest.$ac_objext \ | |
22880 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
22881 | conftest$ac_exeext conftest.$ac_ext | 21593 | conftest$ac_exeext conftest.$ac_ext |
22882 | fi | 21594 | fi |
22883 | ac_res=`eval echo '${'$as_ac_var'}'` | 21595 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
22884 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 21596 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
22885 | echo "${ECHO_T}$ac_res" >&6; } | ||
22886 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 21597 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
22887 | cat >>confdefs.h <<_ACEOF | 21598 | cat >>confdefs.h <<_ACEOF |
22888 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 21599 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
@@ -22896,9 +21607,9 @@ done | |||
22896 | for ac_func in memmove strcmp | 21607 | for ac_func in memmove strcmp |
22897 | do | 21608 | do |
22898 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 21609 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
22899 | { echo "$as_me:$LINENO: checking for $ac_func" >&5 | 21610 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
22900 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } | 21611 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
22901 | if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | 21612 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
22902 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21613 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
22903 | else | 21614 | else |
22904 | cat >conftest.$ac_ext <<_ACEOF | 21615 | cat >conftest.$ac_ext <<_ACEOF |
@@ -22924,59 +21635,53 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
22924 | 21635 | ||
22925 | #undef $ac_func | 21636 | #undef $ac_func |
22926 | 21637 | ||
22927 | /* Override any GCC internal prototype to avoid an error. | 21638 | /* Override any gcc2 internal prototype to avoid an error. */ |
22928 | Use char because int might match the return type of a GCC | ||
22929 | builtin and then its argument prototype would still apply. */ | ||
22930 | #ifdef __cplusplus | 21639 | #ifdef __cplusplus |
22931 | extern "C" | 21640 | extern "C" |
21641 | { | ||
22932 | #endif | 21642 | #endif |
21643 | /* We use char because int might match the return type of a gcc2 | ||
21644 | builtin and then its argument prototype would still apply. */ | ||
22933 | char $ac_func (); | 21645 | char $ac_func (); |
22934 | /* The GNU C library defines this for functions which it implements | 21646 | /* The GNU C library defines this for functions which it implements |
22935 | to always fail with ENOSYS. Some functions are actually named | 21647 | to always fail with ENOSYS. Some functions are actually named |
22936 | something starting with __ and the normal name is an alias. */ | 21648 | something starting with __ and the normal name is an alias. */ |
22937 | #if defined __stub_$ac_func || defined __stub___$ac_func | 21649 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
22938 | choke me | 21650 | choke me |
21651 | #else | ||
21652 | char (*f) () = $ac_func; | ||
21653 | #endif | ||
21654 | #ifdef __cplusplus | ||
21655 | } | ||
22939 | #endif | 21656 | #endif |
22940 | 21657 | ||
22941 | int | 21658 | int |
22942 | main () | 21659 | main () |
22943 | { | 21660 | { |
22944 | return $ac_func (); | 21661 | return f != $ac_func; |
22945 | ; | 21662 | ; |
22946 | return 0; | 21663 | return 0; |
22947 | } | 21664 | } |
22948 | _ACEOF | 21665 | _ACEOF |
22949 | rm -f conftest.$ac_objext conftest$ac_exeext | 21666 | rm -f conftest.$ac_objext conftest$ac_exeext |
22950 | if { (ac_try="$ac_link" | 21667 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
22951 | case "(($ac_try" in | 21668 | (eval $ac_link) 2>conftest.er1 |
22952 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
22953 | *) ac_try_echo=$ac_try;; | ||
22954 | esac | ||
22955 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22956 | (eval "$ac_link") 2>conftest.er1 | ||
22957 | ac_status=$? | 21669 | ac_status=$? |
22958 | grep -v '^ *+' conftest.er1 >conftest.err | 21670 | grep -v '^ *+' conftest.er1 >conftest.err |
22959 | rm -f conftest.er1 | 21671 | rm -f conftest.er1 |
22960 | cat conftest.err >&5 | 21672 | cat conftest.err >&5 |
22961 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21673 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22962 | (exit $ac_status); } && | 21674 | (exit $ac_status); } && |
22963 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 21675 | { ac_try='test -z "$ac_c_werror_flag" |
22964 | { (case "(($ac_try" in | 21676 | || test ! -s conftest.err' |
22965 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 21677 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
22966 | *) ac_try_echo=$ac_try;; | 21678 | (eval $ac_try) 2>&5 |
22967 | esac | ||
22968 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22969 | (eval "$ac_try") 2>&5 | ||
22970 | ac_status=$? | 21679 | ac_status=$? |
22971 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21680 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22972 | (exit $ac_status); }; } && | 21681 | (exit $ac_status); }; } && |
22973 | { ac_try='test -s conftest$ac_exeext' | 21682 | { ac_try='test -s conftest$ac_exeext' |
22974 | { (case "(($ac_try" in | 21683 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
22975 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 21684 | (eval $ac_try) 2>&5 |
22976 | *) ac_try_echo=$ac_try;; | ||
22977 | esac | ||
22978 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
22979 | (eval "$ac_try") 2>&5 | ||
22980 | ac_status=$? | 21685 | ac_status=$? |
22981 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21686 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22982 | (exit $ac_status); }; }; then | 21687 | (exit $ac_status); }; }; then |
@@ -22985,15 +21690,13 @@ else | |||
22985 | echo "$as_me: failed program was:" >&5 | 21690 | echo "$as_me: failed program was:" >&5 |
22986 | sed 's/^/| /' conftest.$ac_ext >&5 | 21691 | sed 's/^/| /' conftest.$ac_ext >&5 |
22987 | 21692 | ||
22988 | eval "$as_ac_var=no" | 21693 | eval "$as_ac_var=no" |
22989 | fi | 21694 | fi |
22990 | 21695 | rm -f conftest.err conftest.$ac_objext \ | |
22991 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
22992 | conftest$ac_exeext conftest.$ac_ext | 21696 | conftest$ac_exeext conftest.$ac_ext |
22993 | fi | 21697 | fi |
22994 | ac_res=`eval echo '${'$as_ac_var'}'` | 21698 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
22995 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 21699 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
22996 | echo "${ECHO_T}$ac_res" >&6; } | ||
22997 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 21700 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
22998 | cat >>confdefs.h <<_ACEOF | 21701 | cat >>confdefs.h <<_ACEOF |
22999 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 21702 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
@@ -23008,9 +21711,9 @@ done | |||
23008 | for ac_func in closedir opendir readdir | 21711 | for ac_func in closedir opendir readdir |
23009 | do | 21712 | do |
23010 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 21713 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
23011 | { echo "$as_me:$LINENO: checking for $ac_func" >&5 | 21714 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
23012 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } | 21715 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
23013 | if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | 21716 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
23014 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21717 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
23015 | else | 21718 | else |
23016 | cat >conftest.$ac_ext <<_ACEOF | 21719 | cat >conftest.$ac_ext <<_ACEOF |
@@ -23036,59 +21739,53 @@ cat >>conftest.$ac_ext <<_ACEOF | |||
23036 | 21739 | ||
23037 | #undef $ac_func | 21740 | #undef $ac_func |
23038 | 21741 | ||
23039 | /* Override any GCC internal prototype to avoid an error. | 21742 | /* Override any gcc2 internal prototype to avoid an error. */ |
23040 | Use char because int might match the return type of a GCC | ||
23041 | builtin and then its argument prototype would still apply. */ | ||
23042 | #ifdef __cplusplus | 21743 | #ifdef __cplusplus |
23043 | extern "C" | 21744 | extern "C" |
21745 | { | ||
23044 | #endif | 21746 | #endif |
21747 | /* We use char because int might match the return type of a gcc2 | ||
21748 | builtin and then its argument prototype would still apply. */ | ||
23045 | char $ac_func (); | 21749 | char $ac_func (); |
23046 | /* The GNU C library defines this for functions which it implements | 21750 | /* The GNU C library defines this for functions which it implements |
23047 | to always fail with ENOSYS. Some functions are actually named | 21751 | to always fail with ENOSYS. Some functions are actually named |
23048 | something starting with __ and the normal name is an alias. */ | 21752 | something starting with __ and the normal name is an alias. */ |
23049 | #if defined __stub_$ac_func || defined __stub___$ac_func | 21753 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
23050 | choke me | 21754 | choke me |
21755 | #else | ||
21756 | char (*f) () = $ac_func; | ||
21757 | #endif | ||
21758 | #ifdef __cplusplus | ||
21759 | } | ||
23051 | #endif | 21760 | #endif |
23052 | 21761 | ||
23053 | int | 21762 | int |
23054 | main () | 21763 | main () |
23055 | { | 21764 | { |
23056 | return $ac_func (); | 21765 | return f != $ac_func; |
23057 | ; | 21766 | ; |
23058 | return 0; | 21767 | return 0; |
23059 | } | 21768 | } |
23060 | _ACEOF | 21769 | _ACEOF |
23061 | rm -f conftest.$ac_objext conftest$ac_exeext | 21770 | rm -f conftest.$ac_objext conftest$ac_exeext |
23062 | if { (ac_try="$ac_link" | 21771 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
23063 | case "(($ac_try" in | 21772 | (eval $ac_link) 2>conftest.er1 |
23064 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
23065 | *) ac_try_echo=$ac_try;; | ||
23066 | esac | ||
23067 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
23068 | (eval "$ac_link") 2>conftest.er1 | ||
23069 | ac_status=$? | 21773 | ac_status=$? |
23070 | grep -v '^ *+' conftest.er1 >conftest.err | 21774 | grep -v '^ *+' conftest.er1 >conftest.err |
23071 | rm -f conftest.er1 | 21775 | rm -f conftest.er1 |
23072 | cat conftest.err >&5 | 21776 | cat conftest.err >&5 |
23073 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21777 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
23074 | (exit $ac_status); } && | 21778 | (exit $ac_status); } && |
23075 | { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' | 21779 | { ac_try='test -z "$ac_c_werror_flag" |
23076 | { (case "(($ac_try" in | 21780 | || test ! -s conftest.err' |
23077 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 21781 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
23078 | *) ac_try_echo=$ac_try;; | 21782 | (eval $ac_try) 2>&5 |
23079 | esac | ||
23080 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
23081 | (eval "$ac_try") 2>&5 | ||
23082 | ac_status=$? | 21783 | ac_status=$? |
23083 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21784 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
23084 | (exit $ac_status); }; } && | 21785 | (exit $ac_status); }; } && |
23085 | { ac_try='test -s conftest$ac_exeext' | 21786 | { ac_try='test -s conftest$ac_exeext' |
23086 | { (case "(($ac_try" in | 21787 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
23087 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | 21788 | (eval $ac_try) 2>&5 |
23088 | *) ac_try_echo=$ac_try;; | ||
23089 | esac | ||
23090 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
23091 | (eval "$ac_try") 2>&5 | ||
23092 | ac_status=$? | 21789 | ac_status=$? |
23093 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | 21790 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
23094 | (exit $ac_status); }; }; then | 21791 | (exit $ac_status); }; }; then |
@@ -23097,15 +21794,13 @@ else | |||
23097 | echo "$as_me: failed program was:" >&5 | 21794 | echo "$as_me: failed program was:" >&5 |
23098 | sed 's/^/| /' conftest.$ac_ext >&5 | 21795 | sed 's/^/| /' conftest.$ac_ext >&5 |
23099 | 21796 | ||
23100 | eval "$as_ac_var=no" | 21797 | eval "$as_ac_var=no" |
23101 | fi | 21798 | fi |
23102 | 21799 | rm -f conftest.err conftest.$ac_objext \ | |
23103 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
23104 | conftest$ac_exeext conftest.$ac_ext | 21800 | conftest$ac_exeext conftest.$ac_ext |
23105 | fi | 21801 | fi |
23106 | ac_res=`eval echo '${'$as_ac_var'}'` | 21802 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
23107 | { echo "$as_me:$LINENO: result: $ac_res" >&5 | 21803 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
23108 | echo "${ECHO_T}$ac_res" >&6; } | ||
23109 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 21804 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
23110 | cat >>confdefs.h <<_ACEOF | 21805 | cat >>confdefs.h <<_ACEOF |
23111 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 21806 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
@@ -23120,7 +21815,7 @@ done | |||
23120 | ## -------- ## | 21815 | ## -------- ## |
23121 | ## Outputs. ## | 21816 | ## Outputs. ## |
23122 | ## -------- ## | 21817 | ## -------- ## |
23123 | ac_config_files="$ac_config_files Makefile" | 21818 | ac_config_files="$ac_config_files Makefile" |
23124 | 21819 | ||
23125 | cat >confcache <<\_ACEOF | 21820 | cat >confcache <<\_ACEOF |
23126 | # This file is a shell script that caches the results of configure | 21821 | # This file is a shell script that caches the results of configure |
@@ -23140,58 +21835,39 @@ _ACEOF | |||
23140 | 21835 | ||
23141 | # The following way of writing the cache mishandles newlines in values, | 21836 | # The following way of writing the cache mishandles newlines in values, |
23142 | # but we know of no workaround that is simple, portable, and efficient. | 21837 | # but we know of no workaround that is simple, portable, and efficient. |
23143 | # So, we kill variables containing newlines. | 21838 | # So, don't put newlines in cache variables' values. |
23144 | # Ultrix sh set writes to stderr and can't be redirected directly, | 21839 | # Ultrix sh set writes to stderr and can't be redirected directly, |
23145 | # and sets the high bit in the cache file unless we assign to the vars. | 21840 | # and sets the high bit in the cache file unless we assign to the vars. |
23146 | ( | 21841 | { |
23147 | for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do | ||
23148 | eval ac_val=\$$ac_var | ||
23149 | case $ac_val in #( | ||
23150 | *${as_nl}*) | ||
23151 | case $ac_var in #( | ||
23152 | *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 | ||
23153 | echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; | ||
23154 | esac | ||
23155 | case $ac_var in #( | ||
23156 | _ | IFS | as_nl) ;; #( | ||
23157 | *) $as_unset $ac_var ;; | ||
23158 | esac ;; | ||
23159 | esac | ||
23160 | done | ||
23161 | |||
23162 | (set) 2>&1 | | 21842 | (set) 2>&1 | |
23163 | case $as_nl`(ac_space=' '; set) 2>&1` in #( | 21843 | case `(ac_space=' '; set | grep ac_space) 2>&1` in |
23164 | *${as_nl}ac_space=\ *) | 21844 | *ac_space=\ *) |
23165 | # `set' does not quote correctly, so add quotes (double-quote | 21845 | # `set' does not quote correctly, so add quotes (double-quote |
23166 | # substitution turns \\\\ into \\, and sed turns \\ into \). | 21846 | # substitution turns \\\\ into \\, and sed turns \\ into \). |
23167 | sed -n \ | 21847 | sed -n \ |
23168 | "s/'/'\\\\''/g; | 21848 | "s/'/'\\\\''/g; |
23169 | s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" | 21849 | s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" |
23170 | ;; #( | 21850 | ;; |
23171 | *) | 21851 | *) |
23172 | # `set' quotes correctly as required by POSIX, so do not add quotes. | 21852 | # `set' quotes correctly as required by POSIX, so do not add quotes. |
23173 | sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" | 21853 | sed -n \ |
21854 | "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | ||
23174 | ;; | 21855 | ;; |
23175 | esac | | 21856 | esac; |
23176 | sort | 21857 | } | |
23177 | ) | | ||
23178 | sed ' | 21858 | sed ' |
23179 | /^ac_cv_env_/b end | ||
23180 | t clear | 21859 | t clear |
23181 | :clear | 21860 | : clear |
23182 | s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ | 21861 | s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ |
23183 | t end | 21862 | t end |
23184 | s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ | 21863 | /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ |
23185 | :end' >>confcache | 21864 | : end' >>confcache |
23186 | if diff "$cache_file" confcache >/dev/null 2>&1; then :; else | 21865 | if diff $cache_file confcache >/dev/null 2>&1; then :; else |
23187 | if test -w "$cache_file"; then | 21866 | if test -w $cache_file; then |
23188 | test "x$cache_file" != "x/dev/null" && | 21867 | test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" |
23189 | { echo "$as_me:$LINENO: updating cache $cache_file" >&5 | ||
23190 | echo "$as_me: updating cache $cache_file" >&6;} | ||
23191 | cat confcache >$cache_file | 21868 | cat confcache >$cache_file |
23192 | else | 21869 | else |
23193 | { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 | 21870 | echo "not updating unwritable cache $cache_file" |
23194 | echo "$as_me: not updating unwritable cache $cache_file" >&6;} | ||
23195 | fi | 21871 | fi |
23196 | fi | 21872 | fi |
23197 | rm -f confcache | 21873 | rm -f confcache |
@@ -23200,18 +21876,32 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix | |||
23200 | # Let make expand exec_prefix. | 21876 | # Let make expand exec_prefix. |
23201 | test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' | 21877 | test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' |
23202 | 21878 | ||
21879 | # VPATH may cause trouble with some makes, so we remove $(srcdir), | ||
21880 | # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and | ||
21881 | # trailing colons and then remove the whole line if VPATH becomes empty | ||
21882 | # (actually we leave an empty line to preserve line numbers). | ||
21883 | if test "x$srcdir" = x.; then | ||
21884 | ac_vpsub='/^[ ]*VPATH[ ]*=/{ | ||
21885 | s/:*\$(srcdir):*/:/; | ||
21886 | s/:*\${srcdir}:*/:/; | ||
21887 | s/:*@srcdir@:*/:/; | ||
21888 | s/^\([^=]*=[ ]*\):*/\1/; | ||
21889 | s/:*$//; | ||
21890 | s/^[^=]*=[ ]*$//; | ||
21891 | }' | ||
21892 | fi | ||
21893 | |||
23203 | DEFS=-DHAVE_CONFIG_H | 21894 | DEFS=-DHAVE_CONFIG_H |
23204 | 21895 | ||
23205 | ac_libobjs= | 21896 | ac_libobjs= |
23206 | ac_ltlibobjs= | 21897 | ac_ltlibobjs= |
23207 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue | 21898 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue |
23208 | # 1. Remove the extension, and $U if already installed. | 21899 | # 1. Remove the extension, and $U if already installed. |
23209 | ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' | 21900 | ac_i=`echo "$ac_i" | |
23210 | ac_i=`echo "$ac_i" | sed "$ac_script"` | 21901 | sed 's/\$U\././;s/\.o$//;s/\.obj$//'` |
23211 | # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR | 21902 | # 2. Add them. |
23212 | # will be set to the directory where LIBOBJS objects are built. | 21903 | ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" |
23213 | ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" | 21904 | ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' |
23214 | ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' | ||
23215 | done | 21905 | done |
23216 | LIBOBJS=$ac_libobjs | 21906 | LIBOBJS=$ac_libobjs |
23217 | 21907 | ||
@@ -23291,35 +21981,11 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |||
23291 | # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | 21981 | # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which |
23292 | # is contrary to our usage. Disable this feature. | 21982 | # is contrary to our usage. Disable this feature. |
23293 | alias -g '${1+"$@"}'='"$@"' | 21983 | alias -g '${1+"$@"}'='"$@"' |
23294 | setopt NO_GLOB_SUBST | 21984 | elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then |
23295 | else | 21985 | set -o posix |
23296 | case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac | ||
23297 | fi | 21986 | fi |
23298 | BIN_SH=xpg4; export BIN_SH # for Tru64 | ||
23299 | DUALCASE=1; export DUALCASE # for MKS sh | 21987 | DUALCASE=1; export DUALCASE # for MKS sh |
23300 | 21988 | ||
23301 | |||
23302 | # PATH needs CR | ||
23303 | # Avoid depending upon Character Ranges. | ||
23304 | as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
23305 | as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
23306 | as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
23307 | as_cr_digits='0123456789' | ||
23308 | as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
23309 | |||
23310 | # The user is always right. | ||
23311 | if test "${PATH_SEPARATOR+set}" != set; then | ||
23312 | echo "#! /bin/sh" >conf$$.sh | ||
23313 | echo "exit 0" >>conf$$.sh | ||
23314 | chmod +x conf$$.sh | ||
23315 | if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
23316 | PATH_SEPARATOR=';' | ||
23317 | else | ||
23318 | PATH_SEPARATOR=: | ||
23319 | fi | ||
23320 | rm -f conf$$.sh | ||
23321 | fi | ||
23322 | |||
23323 | # Support unset when possible. | 21989 | # Support unset when possible. |
23324 | if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | 21990 | if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then |
23325 | as_unset=unset | 21991 | as_unset=unset |
@@ -23328,43 +21994,8 @@ else | |||
23328 | fi | 21994 | fi |
23329 | 21995 | ||
23330 | 21996 | ||
23331 | # IFS | ||
23332 | # We need space, tab and new line, in precisely that order. Quoting is | ||
23333 | # there to prevent editors from complaining about space-tab. | ||
23334 | # (If _AS_PATH_WALK were called with IFS unset, it would disable word | ||
23335 | # splitting by setting IFS to empty value.) | ||
23336 | as_nl=' | ||
23337 | ' | ||
23338 | IFS=" "" $as_nl" | ||
23339 | |||
23340 | # Find who we are. Look in the path if we contain no directory separator. | ||
23341 | case $0 in | ||
23342 | *[\\/]* ) as_myself=$0 ;; | ||
23343 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
23344 | for as_dir in $PATH | ||
23345 | do | ||
23346 | IFS=$as_save_IFS | ||
23347 | test -z "$as_dir" && as_dir=. | ||
23348 | test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
23349 | done | ||
23350 | IFS=$as_save_IFS | ||
23351 | |||
23352 | ;; | ||
23353 | esac | ||
23354 | # We did not find ourselves, most probably we were run as `sh COMMAND' | ||
23355 | # in which case we are not to be found in the path. | ||
23356 | if test "x$as_myself" = x; then | ||
23357 | as_myself=$0 | ||
23358 | fi | ||
23359 | if test ! -f "$as_myself"; then | ||
23360 | echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | ||
23361 | { (exit 1); exit 1; } | ||
23362 | fi | ||
23363 | |||
23364 | # Work around bugs in pre-3.0 UWIN ksh. | 21997 | # Work around bugs in pre-3.0 UWIN ksh. |
23365 | for as_var in ENV MAIL MAILPATH | 21998 | $as_unset ENV MAIL MAILPATH |
23366 | do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | ||
23367 | done | ||
23368 | PS1='$ ' | 21999 | PS1='$ ' |
23369 | PS2='> ' | 22000 | PS2='> ' |
23370 | PS4='+ ' | 22001 | PS4='+ ' |
@@ -23378,19 +22009,18 @@ do | |||
23378 | if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | 22009 | if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then |
23379 | eval $as_var=C; export $as_var | 22010 | eval $as_var=C; export $as_var |
23380 | else | 22011 | else |
23381 | ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | 22012 | $as_unset $as_var |
23382 | fi | 22013 | fi |
23383 | done | 22014 | done |
23384 | 22015 | ||
23385 | # Required to use basename. | 22016 | # Required to use basename. |
23386 | if expr a : '\(a\)' >/dev/null 2>&1 && | 22017 | if expr a : '\(a\)' >/dev/null 2>&1; then |
23387 | test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
23388 | as_expr=expr | 22018 | as_expr=expr |
23389 | else | 22019 | else |
23390 | as_expr=false | 22020 | as_expr=false |
23391 | fi | 22021 | fi |
23392 | 22022 | ||
23393 | if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then | 22023 | if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then |
23394 | as_basename=basename | 22024 | as_basename=basename |
23395 | else | 22025 | else |
23396 | as_basename=false | 22026 | as_basename=false |
@@ -23398,120 +22028,159 @@ fi | |||
23398 | 22028 | ||
23399 | 22029 | ||
23400 | # Name of the executable. | 22030 | # Name of the executable. |
23401 | as_me=`$as_basename -- "$0" || | 22031 | as_me=`$as_basename "$0" || |
23402 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | 22032 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ |
23403 | X"$0" : 'X\(//\)$' \| \ | 22033 | X"$0" : 'X\(//\)$' \| \ |
23404 | X"$0" : 'X\(/\)' \| . 2>/dev/null || | 22034 | X"$0" : 'X\(/\)$' \| \ |
22035 | . : '\(.\)' 2>/dev/null || | ||
23405 | echo X/"$0" | | 22036 | echo X/"$0" | |
23406 | sed '/^.*\/\([^/][^/]*\)\/*$/{ | 22037 | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } |
23407 | s//\1/ | 22038 | /^X\/\(\/\/\)$/{ s//\1/; q; } |
23408 | q | 22039 | /^X\/\(\/\).*/{ s//\1/; q; } |
23409 | } | 22040 | s/.*/./; q'` |
23410 | /^X\/\(\/\/\)$/{ | ||
23411 | s//\1/ | ||
23412 | q | ||
23413 | } | ||
23414 | /^X\/\(\/\).*/{ | ||
23415 | s//\1/ | ||
23416 | q | ||
23417 | } | ||
23418 | s/.*/./; q'` | ||
23419 | 22041 | ||
23420 | # CDPATH. | ||
23421 | $as_unset CDPATH | ||
23422 | 22042 | ||
22043 | # PATH needs CR, and LINENO needs CR and PATH. | ||
22044 | # Avoid depending upon Character Ranges. | ||
22045 | as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
22046 | as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
22047 | as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
22048 | as_cr_digits='0123456789' | ||
22049 | as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
22050 | |||
22051 | # The user is always right. | ||
22052 | if test "${PATH_SEPARATOR+set}" != set; then | ||
22053 | echo "#! /bin/sh" >conf$$.sh | ||
22054 | echo "exit 0" >>conf$$.sh | ||
22055 | chmod +x conf$$.sh | ||
22056 | if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
22057 | PATH_SEPARATOR=';' | ||
22058 | else | ||
22059 | PATH_SEPARATOR=: | ||
22060 | fi | ||
22061 | rm -f conf$$.sh | ||
22062 | fi | ||
23423 | 22063 | ||
23424 | 22064 | ||
23425 | as_lineno_1=$LINENO | 22065 | as_lineno_1=$LINENO |
23426 | as_lineno_2=$LINENO | 22066 | as_lineno_2=$LINENO |
22067 | as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | ||
22068 | test "x$as_lineno_1" != "x$as_lineno_2" && | ||
22069 | test "x$as_lineno_3" = "x$as_lineno_2" || { | ||
22070 | # Find who we are. Look in the path if we contain no path at all | ||
22071 | # relative or not. | ||
22072 | case $0 in | ||
22073 | *[\\/]* ) as_myself=$0 ;; | ||
22074 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
22075 | for as_dir in $PATH | ||
22076 | do | ||
22077 | IFS=$as_save_IFS | ||
22078 | test -z "$as_dir" && as_dir=. | ||
22079 | test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
22080 | done | ||
22081 | |||
22082 | ;; | ||
22083 | esac | ||
22084 | # We did not find ourselves, most probably we were run as `sh COMMAND' | ||
22085 | # in which case we are not to be found in the path. | ||
22086 | if test "x$as_myself" = x; then | ||
22087 | as_myself=$0 | ||
22088 | fi | ||
22089 | if test ! -f "$as_myself"; then | ||
22090 | { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 | ||
22091 | echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} | ||
22092 | { (exit 1); exit 1; }; } | ||
22093 | fi | ||
22094 | case $CONFIG_SHELL in | ||
22095 | '') | ||
22096 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
22097 | for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | ||
22098 | do | ||
22099 | IFS=$as_save_IFS | ||
22100 | test -z "$as_dir" && as_dir=. | ||
22101 | for as_base in sh bash ksh sh5; do | ||
22102 | case $as_dir in | ||
22103 | /*) | ||
22104 | if ("$as_dir/$as_base" -c ' | ||
22105 | as_lineno_1=$LINENO | ||
22106 | as_lineno_2=$LINENO | ||
22107 | as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | ||
23427 | test "x$as_lineno_1" != "x$as_lineno_2" && | 22108 | test "x$as_lineno_1" != "x$as_lineno_2" && |
23428 | test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { | 22109 | test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then |
22110 | $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } | ||
22111 | $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } | ||
22112 | CONFIG_SHELL=$as_dir/$as_base | ||
22113 | export CONFIG_SHELL | ||
22114 | exec "$CONFIG_SHELL" "$0" ${1+"$@"} | ||
22115 | fi;; | ||
22116 | esac | ||
22117 | done | ||
22118 | done | ||
22119 | ;; | ||
22120 | esac | ||
23429 | 22121 | ||
23430 | # Create $as_me.lineno as a copy of $as_myself, but with $LINENO | 22122 | # Create $as_me.lineno as a copy of $as_myself, but with $LINENO |
23431 | # uniformly replaced by the line number. The first 'sed' inserts a | 22123 | # uniformly replaced by the line number. The first 'sed' inserts a |
23432 | # line-number line after each line using $LINENO; the second 'sed' | 22124 | # line-number line before each line; the second 'sed' does the real |
23433 | # does the real work. The second script uses 'N' to pair each | 22125 | # work. The second script uses 'N' to pair each line-number line |
23434 | # line-number line with the line containing $LINENO, and appends | 22126 | # with the numbered line, and appends trailing '-' during |
23435 | # trailing '-' during substitution so that $LINENO is not a special | 22127 | # substitution so that $LINENO is not a special case at line end. |
23436 | # case at line end. | ||
23437 | # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the | 22128 | # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the |
23438 | # scripts with optimization help from Paolo Bonzini. Blame Lee | 22129 | # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) |
23439 | # E. McMahon (1931-1989) for sed's syntax. :-) | 22130 | sed '=' <$as_myself | |
23440 | sed -n ' | ||
23441 | p | ||
23442 | /[$]LINENO/= | ||
23443 | ' <$as_myself | | ||
23444 | sed ' | 22131 | sed ' |
23445 | s/[$]LINENO.*/&-/ | ||
23446 | t lineno | ||
23447 | b | ||
23448 | :lineno | ||
23449 | N | 22132 | N |
23450 | :loop | 22133 | s,$,-, |
23451 | s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ | 22134 | : loop |
22135 | s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, | ||
23452 | t loop | 22136 | t loop |
23453 | s/-\n.*// | 22137 | s,-$,, |
22138 | s,^['$as_cr_digits']*\n,, | ||
23454 | ' >$as_me.lineno && | 22139 | ' >$as_me.lineno && |
23455 | chmod +x "$as_me.lineno" || | 22140 | chmod +x $as_me.lineno || |
23456 | { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | 22141 | { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 |
22142 | echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} | ||
23457 | { (exit 1); exit 1; }; } | 22143 | { (exit 1); exit 1; }; } |
23458 | 22144 | ||
23459 | # Don't try to exec as it changes $[0], causing all sort of problems | 22145 | # Don't try to exec as it changes $[0], causing all sort of problems |
23460 | # (the dirname of $[0] is not the place where we might find the | 22146 | # (the dirname of $[0] is not the place where we might find the |
23461 | # original and so on. Autoconf is especially sensitive to this). | 22147 | # original and so on. Autoconf is especially sensible to this). |
23462 | . "./$as_me.lineno" | 22148 | . ./$as_me.lineno |
23463 | # Exit status is that of the last command. | 22149 | # Exit status is that of the last command. |
23464 | exit | 22150 | exit |
23465 | } | 22151 | } |
23466 | 22152 | ||
23467 | 22153 | ||
23468 | if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then | 22154 | case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in |
23469 | as_dirname=dirname | 22155 | *c*,-n*) ECHO_N= ECHO_C=' |
23470 | else | 22156 | ' ECHO_T=' ' ;; |
23471 | as_dirname=false | 22157 | *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; |
23472 | fi | 22158 | *) ECHO_N= ECHO_C='\c' ECHO_T= ;; |
23473 | |||
23474 | ECHO_C= ECHO_N= ECHO_T= | ||
23475 | case `echo -n x` in | ||
23476 | -n*) | ||
23477 | case `echo 'x\c'` in | ||
23478 | *c*) ECHO_T=' ';; # ECHO_T is single tab character. | ||
23479 | *) ECHO_C='\c';; | ||
23480 | esac;; | ||
23481 | *) | ||
23482 | ECHO_N='-n';; | ||
23483 | esac | 22159 | esac |
23484 | 22160 | ||
23485 | if expr a : '\(a\)' >/dev/null 2>&1 && | 22161 | if expr a : '\(a\)' >/dev/null 2>&1; then |
23486 | test "X`expr 00001 : '.*\(...\)'`" = X001; then | ||
23487 | as_expr=expr | 22162 | as_expr=expr |
23488 | else | 22163 | else |
23489 | as_expr=false | 22164 | as_expr=false |
23490 | fi | 22165 | fi |
23491 | 22166 | ||
23492 | rm -f conf$$ conf$$.exe conf$$.file | 22167 | rm -f conf$$ conf$$.exe conf$$.file |
23493 | if test -d conf$$.dir; then | ||
23494 | rm -f conf$$.dir/conf$$.file | ||
23495 | else | ||
23496 | rm -f conf$$.dir | ||
23497 | mkdir conf$$.dir | ||
23498 | fi | ||
23499 | echo >conf$$.file | 22168 | echo >conf$$.file |
23500 | if ln -s conf$$.file conf$$ 2>/dev/null; then | 22169 | if ln -s conf$$.file conf$$ 2>/dev/null; then |
23501 | as_ln_s='ln -s' | 22170 | # We could just check for DJGPP; but this test a) works b) is more generic |
23502 | # ... but there are two gotchas: | 22171 | # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). |
23503 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | 22172 | if test -f conf$$.exe; then |
23504 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | 22173 | # Don't use ln at all; we don't have any links |
23505 | # In both cases, we have to default to `cp -p'. | ||
23506 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | ||
23507 | as_ln_s='cp -p' | 22174 | as_ln_s='cp -p' |
22175 | else | ||
22176 | as_ln_s='ln -s' | ||
22177 | fi | ||
23508 | elif ln conf$$.file conf$$ 2>/dev/null; then | 22178 | elif ln conf$$.file conf$$ 2>/dev/null; then |
23509 | as_ln_s=ln | 22179 | as_ln_s=ln |
23510 | else | 22180 | else |
23511 | as_ln_s='cp -p' | 22181 | as_ln_s='cp -p' |
23512 | fi | 22182 | fi |
23513 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file | 22183 | rm -f conf$$ conf$$.exe conf$$.file |
23514 | rmdir conf$$.dir 2>/dev/null | ||
23515 | 22184 | ||
23516 | if mkdir -p . 2>/dev/null; then | 22185 | if mkdir -p . 2>/dev/null; then |
23517 | as_mkdir_p=: | 22186 | as_mkdir_p=: |
@@ -23520,19 +22189,7 @@ else | |||
23520 | as_mkdir_p=false | 22189 | as_mkdir_p=false |
23521 | fi | 22190 | fi |
23522 | 22191 | ||
23523 | # Find out whether ``test -x'' works. Don't use a zero-byte file, as | 22192 | as_executable_p="test -f" |
23524 | # systems may use methods other than mode bits to determine executability. | ||
23525 | cat >conf$$.file <<_ASEOF | ||
23526 | #! /bin/sh | ||
23527 | exit 0 | ||
23528 | _ASEOF | ||
23529 | chmod +x conf$$.file | ||
23530 | if test -x conf$$.file >/dev/null 2>&1; then | ||
23531 | as_executable_p="test -x" | ||
23532 | else | ||
23533 | as_executable_p=: | ||
23534 | fi | ||
23535 | rm -f conf$$.file | ||
23536 | 22193 | ||
23537 | # Sed expression to map a string onto a valid CPP name. | 22194 | # Sed expression to map a string onto a valid CPP name. |
23538 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | 22195 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
@@ -23541,14 +22198,31 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | |||
23541 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | 22198 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" |
23542 | 22199 | ||
23543 | 22200 | ||
22201 | # IFS | ||
22202 | # We need space, tab and new line, in precisely that order. | ||
22203 | as_nl=' | ||
22204 | ' | ||
22205 | IFS=" $as_nl" | ||
22206 | |||
22207 | # CDPATH. | ||
22208 | $as_unset CDPATH | ||
22209 | |||
23544 | exec 6>&1 | 22210 | exec 6>&1 |
23545 | 22211 | ||
23546 | # Save the log message, to keep $[0] and so on meaningful, and to | 22212 | # Open the log real soon, to keep \$[0] and so on meaningful, and to |
23547 | # report actual input values of CONFIG_FILES etc. instead of their | 22213 | # report actual input values of CONFIG_FILES etc. instead of their |
23548 | # values after options handling. | 22214 | # values after options handling. Logging --version etc. is OK. |
23549 | ac_log=" | 22215 | exec 5>>config.log |
22216 | { | ||
22217 | echo | ||
22218 | sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX | ||
22219 | ## Running $as_me. ## | ||
22220 | _ASBOX | ||
22221 | } >&5 | ||
22222 | cat >&5 <<_CSEOF | ||
22223 | |||
23550 | This file was extended by libltdl $as_me 1.2, which was | 22224 | This file was extended by libltdl $as_me 1.2, which was |
23551 | generated by GNU Autoconf 2.60a. Invocation command line was | 22225 | generated by GNU Autoconf 2.59. Invocation command line was |
23552 | 22226 | ||
23553 | CONFIG_FILES = $CONFIG_FILES | 22227 | CONFIG_FILES = $CONFIG_FILES |
23554 | CONFIG_HEADERS = $CONFIG_HEADERS | 22228 | CONFIG_HEADERS = $CONFIG_HEADERS |
@@ -23556,20 +22230,30 @@ generated by GNU Autoconf 2.60a. Invocation command line was | |||
23556 | CONFIG_COMMANDS = $CONFIG_COMMANDS | 22230 | CONFIG_COMMANDS = $CONFIG_COMMANDS |
23557 | $ $0 $@ | 22231 | $ $0 $@ |
23558 | 22232 | ||
23559 | on `(hostname || uname -n) 2>/dev/null | sed 1q` | 22233 | _CSEOF |
23560 | " | 22234 | echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 |
23561 | 22235 | echo >&5 | |
23562 | _ACEOF | 22236 | _ACEOF |
23563 | 22237 | ||
23564 | cat >>$CONFIG_STATUS <<_ACEOF | ||
23565 | # Files that config.status was made for. | 22238 | # Files that config.status was made for. |
23566 | config_files="$ac_config_files" | 22239 | if test -n "$ac_config_files"; then |
23567 | config_headers="$ac_config_headers" | 22240 | echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS |
23568 | config_commands="$ac_config_commands" | 22241 | fi |
23569 | 22242 | ||
23570 | _ACEOF | 22243 | if test -n "$ac_config_headers"; then |
22244 | echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS | ||
22245 | fi | ||
22246 | |||
22247 | if test -n "$ac_config_links"; then | ||
22248 | echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS | ||
22249 | fi | ||
22250 | |||
22251 | if test -n "$ac_config_commands"; then | ||
22252 | echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS | ||
22253 | fi | ||
23571 | 22254 | ||
23572 | cat >>$CONFIG_STATUS <<\_ACEOF | 22255 | cat >>$CONFIG_STATUS <<\_ACEOF |
22256 | |||
23573 | ac_cs_usage="\ | 22257 | ac_cs_usage="\ |
23574 | \`$as_me' instantiates files from templates according to the | 22258 | \`$as_me' instantiates files from templates according to the |
23575 | current configuration. | 22259 | current configuration. |
@@ -23577,7 +22261,7 @@ current configuration. | |||
23577 | Usage: $0 [OPTIONS] [FILE]... | 22261 | Usage: $0 [OPTIONS] [FILE]... |
23578 | 22262 | ||
23579 | -h, --help print this help, then exit | 22263 | -h, --help print this help, then exit |
23580 | -V, --version print version number and configuration settings, then exit | 22264 | -V, --version print version number, then exit |
23581 | -q, --quiet do not print progress messages | 22265 | -q, --quiet do not print progress messages |
23582 | -d, --debug don't remove temporary files | 22266 | -d, --debug don't remove temporary files |
23583 | --recheck update $as_me by reconfiguring in the same conditions | 22267 | --recheck update $as_me by reconfiguring in the same conditions |
@@ -23596,21 +22280,19 @@ Configuration commands: | |||
23596 | $config_commands | 22280 | $config_commands |
23597 | 22281 | ||
23598 | Report bugs to <bug-autoconf@gnu.org>." | 22282 | Report bugs to <bug-autoconf@gnu.org>." |
23599 | |||
23600 | _ACEOF | 22283 | _ACEOF |
22284 | |||
23601 | cat >>$CONFIG_STATUS <<_ACEOF | 22285 | cat >>$CONFIG_STATUS <<_ACEOF |
23602 | ac_cs_version="\\ | 22286 | ac_cs_version="\\ |
23603 | libltdl config.status 1.2 | 22287 | libltdl config.status 1.2 |
23604 | configured by $0, generated by GNU Autoconf 2.60a, | 22288 | configured by $0, generated by GNU Autoconf 2.59, |
23605 | with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" | 22289 | with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" |
23606 | 22290 | ||
23607 | Copyright (C) 2006 Free Software Foundation, Inc. | 22291 | Copyright (C) 2003 Free Software Foundation, Inc. |
23608 | This config.status script is free software; the Free Software Foundation | 22292 | This config.status script is free software; the Free Software Foundation |
23609 | gives unlimited permission to copy, distribute and modify it." | 22293 | gives unlimited permission to copy, distribute and modify it." |
23610 | 22294 | srcdir=$srcdir | |
23611 | ac_pwd='$ac_pwd' | 22295 | INSTALL="$INSTALL" |
23612 | srcdir='$srcdir' | ||
23613 | INSTALL='$INSTALL' | ||
23614 | _ACEOF | 22296 | _ACEOF |
23615 | 22297 | ||
23616 | cat >>$CONFIG_STATUS <<\_ACEOF | 22298 | cat >>$CONFIG_STATUS <<\_ACEOF |
@@ -23621,24 +22303,39 @@ while test $# != 0 | |||
23621 | do | 22303 | do |
23622 | case $1 in | 22304 | case $1 in |
23623 | --*=*) | 22305 | --*=*) |
23624 | ac_option=`expr "X$1" : 'X\([^=]*\)='` | 22306 | ac_option=`expr "x$1" : 'x\([^=]*\)='` |
23625 | ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` | 22307 | ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` |
23626 | ac_shift=: | 22308 | ac_shift=: |
23627 | ;; | 22309 | ;; |
23628 | *) | 22310 | -*) |
23629 | ac_option=$1 | 22311 | ac_option=$1 |
23630 | ac_optarg=$2 | 22312 | ac_optarg=$2 |
23631 | ac_shift=shift | 22313 | ac_shift=shift |
23632 | ;; | 22314 | ;; |
22315 | *) # This is not an option, so the user has probably given explicit | ||
22316 | # arguments. | ||
22317 | ac_option=$1 | ||
22318 | ac_need_defaults=false;; | ||
23633 | esac | 22319 | esac |
23634 | 22320 | ||
23635 | case $ac_option in | 22321 | case $ac_option in |
23636 | # Handling of the options. | 22322 | # Handling of the options. |
22323 | _ACEOF | ||
22324 | cat >>$CONFIG_STATUS <<\_ACEOF | ||
23637 | -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) | 22325 | -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) |
23638 | ac_cs_recheck=: ;; | 22326 | ac_cs_recheck=: ;; |
23639 | --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) | 22327 | --version | --vers* | -V ) |
23640 | echo "$ac_cs_version"; exit ;; | 22328 | echo "$ac_cs_version"; exit 0 ;; |
23641 | --debug | --debu | --deb | --de | --d | -d ) | 22329 | --he | --h) |
22330 | # Conflict between --help and --header | ||
22331 | { { echo "$as_me:$LINENO: error: ambiguous option: $1 | ||
22332 | Try \`$0 --help' for more information." >&5 | ||
22333 | echo "$as_me: error: ambiguous option: $1 | ||
22334 | Try \`$0 --help' for more information." >&2;} | ||
22335 | { (exit 1); exit 1; }; };; | ||
22336 | --help | --hel | -h ) | ||
22337 | echo "$ac_cs_usage"; exit 0 ;; | ||
22338 | --debug | --d* | -d ) | ||
23642 | debug=: ;; | 22339 | debug=: ;; |
23643 | --file | --fil | --fi | --f ) | 22340 | --file | --fil | --fi | --f ) |
23644 | $ac_shift | 22341 | $ac_shift |
@@ -23648,24 +22345,18 @@ do | |||
23648 | $ac_shift | 22345 | $ac_shift |
23649 | CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" | 22346 | CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" |
23650 | ac_need_defaults=false;; | 22347 | ac_need_defaults=false;; |
23651 | --he | --h) | ||
23652 | # Conflict between --help and --header | ||
23653 | { echo "$as_me: error: ambiguous option: $1 | ||
23654 | Try \`$0 --help' for more information." >&2 | ||
23655 | { (exit 1); exit 1; }; };; | ||
23656 | --help | --hel | -h ) | ||
23657 | echo "$ac_cs_usage"; exit ;; | ||
23658 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | 22348 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ |
23659 | | -silent | --silent | --silen | --sile | --sil | --si | --s) | 22349 | | -silent | --silent | --silen | --sile | --sil | --si | --s) |
23660 | ac_cs_silent=: ;; | 22350 | ac_cs_silent=: ;; |
23661 | 22351 | ||
23662 | # This is an error. | 22352 | # This is an error. |
23663 | -*) { echo "$as_me: error: unrecognized option: $1 | 22353 | -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 |
23664 | Try \`$0 --help' for more information." >&2 | 22354 | Try \`$0 --help' for more information." >&5 |
22355 | echo "$as_me: error: unrecognized option: $1 | ||
22356 | Try \`$0 --help' for more information." >&2;} | ||
23665 | { (exit 1); exit 1; }; } ;; | 22357 | { (exit 1); exit 1; }; } ;; |
23666 | 22358 | ||
23667 | *) ac_config_targets="$ac_config_targets $1" | 22359 | *) ac_config_targets="$ac_config_targets $1" ;; |
23668 | ac_need_defaults=false ;; | ||
23669 | 22360 | ||
23670 | esac | 22361 | esac |
23671 | shift | 22362 | shift |
@@ -23681,49 +22372,37 @@ fi | |||
23681 | _ACEOF | 22372 | _ACEOF |
23682 | cat >>$CONFIG_STATUS <<_ACEOF | 22373 | cat >>$CONFIG_STATUS <<_ACEOF |
23683 | if \$ac_cs_recheck; then | 22374 | if \$ac_cs_recheck; then |
23684 | echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 | 22375 | echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 |
23685 | CONFIG_SHELL=$SHELL | 22376 | exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
23686 | export CONFIG_SHELL | ||
23687 | exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | ||
23688 | fi | 22377 | fi |
23689 | 22378 | ||
23690 | _ACEOF | 22379 | _ACEOF |
23691 | cat >>$CONFIG_STATUS <<\_ACEOF | ||
23692 | exec 5>>config.log | ||
23693 | { | ||
23694 | echo | ||
23695 | sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX | ||
23696 | ## Running $as_me. ## | ||
23697 | _ASBOX | ||
23698 | echo "$ac_log" | ||
23699 | } >&5 | ||
23700 | 22380 | ||
23701 | _ACEOF | ||
23702 | cat >>$CONFIG_STATUS <<_ACEOF | 22381 | cat >>$CONFIG_STATUS <<_ACEOF |
23703 | # | 22382 | # |
23704 | # INIT-COMMANDS | 22383 | # INIT-COMMANDS section. |
23705 | # | 22384 | # |
22385 | |||
23706 | AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" | 22386 | AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" |
23707 | 22387 | ||
23708 | _ACEOF | 22388 | _ACEOF |
23709 | 22389 | ||
23710 | cat >>$CONFIG_STATUS <<\_ACEOF | ||
23711 | 22390 | ||
23712 | # Handling of arguments. | 22391 | |
22392 | cat >>$CONFIG_STATUS <<\_ACEOF | ||
23713 | for ac_config_target in $ac_config_targets | 22393 | for ac_config_target in $ac_config_targets |
23714 | do | 22394 | do |
23715 | case $ac_config_target in | 22395 | case "$ac_config_target" in |
23716 | "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config-h.in" ;; | 22396 | # Handling of arguments. |
23717 | "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; | 22397 | "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
23718 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; | 22398 | "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; |
23719 | 22399 | "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config-h.in" ;; | |
23720 | *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 | 22400 | *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 |
23721 | echo "$as_me: error: invalid argument: $ac_config_target" >&2;} | 22401 | echo "$as_me: error: invalid argument: $ac_config_target" >&2;} |
23722 | { (exit 1); exit 1; }; };; | 22402 | { (exit 1); exit 1; }; };; |
23723 | esac | 22403 | esac |
23724 | done | 22404 | done |
23725 | 22405 | ||
23726 | |||
23727 | # If the user did not use the arguments to specify the items to instantiate, | 22406 | # If the user did not use the arguments to specify the items to instantiate, |
23728 | # then the envvar interface is used. Set only those that are not. | 22407 | # then the envvar interface is used. Set only those that are not. |
23729 | # We use the long form for the default assignment because of an extremely | 22408 | # We use the long form for the default assignment because of an extremely |
@@ -23735,467 +22414,366 @@ if $ac_need_defaults; then | |||
23735 | fi | 22414 | fi |
23736 | 22415 | ||
23737 | # Have a temporary directory for convenience. Make it in the build tree | 22416 | # Have a temporary directory for convenience. Make it in the build tree |
23738 | # simply because there is no reason against having it here, and in addition, | 22417 | # simply because there is no reason to put it here, and in addition, |
23739 | # creating and moving files from /tmp can sometimes cause problems. | 22418 | # creating and moving files from /tmp can sometimes cause problems. |
23740 | # Hook for its removal unless debugging. | 22419 | # Create a temporary directory, and hook for its removal unless debugging. |
23741 | # Note that there is a small window in which the directory will not be cleaned: | ||
23742 | # after its creation but before its name has been assigned to `$tmp'. | ||
23743 | $debug || | 22420 | $debug || |
23744 | { | 22421 | { |
23745 | tmp= | 22422 | trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 |
23746 | trap 'exit_status=$? | ||
23747 | { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status | ||
23748 | ' 0 | ||
23749 | trap '{ (exit 1); exit 1; }' 1 2 13 15 | 22423 | trap '{ (exit 1); exit 1; }' 1 2 13 15 |
23750 | } | 22424 | } |
22425 | |||
23751 | # Create a (secure) tmp directory for tmp files. | 22426 | # Create a (secure) tmp directory for tmp files. |
23752 | 22427 | ||
23753 | { | 22428 | { |
23754 | tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && | 22429 | tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && |
23755 | test -n "$tmp" && test -d "$tmp" | 22430 | test -n "$tmp" && test -d "$tmp" |
23756 | } || | 22431 | } || |
23757 | { | 22432 | { |
23758 | tmp=./conf$$-$RANDOM | 22433 | tmp=./confstat$$-$RANDOM |
23759 | (umask 077 && mkdir "$tmp") | 22434 | (umask 077 && mkdir $tmp) |
23760 | } || | 22435 | } || |
23761 | { | 22436 | { |
23762 | echo "$me: cannot create a temporary directory in ." >&2 | 22437 | echo "$me: cannot create a temporary directory in ." >&2 |
23763 | { (exit 1); exit 1; } | 22438 | { (exit 1); exit 1; } |
23764 | } | 22439 | } |
23765 | 22440 | ||
22441 | _ACEOF | ||
22442 | |||
22443 | cat >>$CONFIG_STATUS <<_ACEOF | ||
22444 | |||
23766 | # | 22445 | # |
23767 | # Set up the sed scripts for CONFIG_FILES section. | 22446 | # CONFIG_FILES section. |
23768 | # | 22447 | # |
23769 | 22448 | ||
23770 | # No need to generate the scripts if there are no CONFIG_FILES. | 22449 | # No need to generate the scripts if there are no CONFIG_FILES. |
23771 | # This happens for instance when ./config.status config.h | 22450 | # This happens for instance when ./config.status config.h |
23772 | if test -n "$CONFIG_FILES"; then | 22451 | if test -n "\$CONFIG_FILES"; then |
23773 | 22452 | # Protect against being on the right side of a sed subst in config.status. | |
23774 | _ACEOF | 22453 | sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; |
23775 | 22454 | s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF | |
23776 | 22455 | s,@SHELL@,$SHELL,;t t | |
23777 | 22456 | s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t | |
23778 | ac_delim='%!_!# ' | 22457 | s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t |
23779 | for ac_last_try in false false false false false :; do | 22458 | s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t |
23780 | cat >conf$$subs.sed <<_ACEOF | 22459 | s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t |
23781 | SHELL!$SHELL$ac_delim | 22460 | s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t |
23782 | PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim | 22461 | s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t |
23783 | PACKAGE_NAME!$PACKAGE_NAME$ac_delim | 22462 | s,@exec_prefix@,$exec_prefix,;t t |
23784 | PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim | 22463 | s,@prefix@,$prefix,;t t |
23785 | PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim | 22464 | s,@program_transform_name@,$program_transform_name,;t t |
23786 | PACKAGE_STRING!$PACKAGE_STRING$ac_delim | 22465 | s,@bindir@,$bindir,;t t |
23787 | PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim | 22466 | s,@sbindir@,$sbindir,;t t |
23788 | exec_prefix!$exec_prefix$ac_delim | 22467 | s,@libexecdir@,$libexecdir,;t t |
23789 | prefix!$prefix$ac_delim | 22468 | s,@datadir@,$datadir,;t t |
23790 | program_transform_name!$program_transform_name$ac_delim | 22469 | s,@sysconfdir@,$sysconfdir,;t t |
23791 | bindir!$bindir$ac_delim | 22470 | s,@sharedstatedir@,$sharedstatedir,;t t |
23792 | sbindir!$sbindir$ac_delim | 22471 | s,@localstatedir@,$localstatedir,;t t |
23793 | libexecdir!$libexecdir$ac_delim | 22472 | s,@libdir@,$libdir,;t t |
23794 | datarootdir!$datarootdir$ac_delim | 22473 | s,@includedir@,$includedir,;t t |
23795 | datadir!$datadir$ac_delim | 22474 | s,@oldincludedir@,$oldincludedir,;t t |
23796 | sysconfdir!$sysconfdir$ac_delim | 22475 | s,@infodir@,$infodir,;t t |
23797 | sharedstatedir!$sharedstatedir$ac_delim | 22476 | s,@mandir@,$mandir,;t t |
23798 | localstatedir!$localstatedir$ac_delim | 22477 | s,@build_alias@,$build_alias,;t t |
23799 | includedir!$includedir$ac_delim | 22478 | s,@host_alias@,$host_alias,;t t |
23800 | oldincludedir!$oldincludedir$ac_delim | 22479 | s,@target_alias@,$target_alias,;t t |
23801 | docdir!$docdir$ac_delim | 22480 | s,@DEFS@,$DEFS,;t t |
23802 | infodir!$infodir$ac_delim | 22481 | s,@ECHO_C@,$ECHO_C,;t t |
23803 | htmldir!$htmldir$ac_delim | 22482 | s,@ECHO_N@,$ECHO_N,;t t |
23804 | dvidir!$dvidir$ac_delim | 22483 | s,@ECHO_T@,$ECHO_T,;t t |
23805 | pdfdir!$pdfdir$ac_delim | 22484 | s,@LIBS@,$LIBS,;t t |
23806 | psdir!$psdir$ac_delim | 22485 | s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t |
23807 | libdir!$libdir$ac_delim | 22486 | s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t |
23808 | localedir!$localedir$ac_delim | 22487 | s,@INSTALL_DATA@,$INSTALL_DATA,;t t |
23809 | mandir!$mandir$ac_delim | 22488 | s,@CYGPATH_W@,$CYGPATH_W,;t t |
23810 | DEFS!$DEFS$ac_delim | 22489 | s,@PACKAGE@,$PACKAGE,;t t |
23811 | ECHO_C!$ECHO_C$ac_delim | 22490 | s,@VERSION@,$VERSION,;t t |
23812 | ECHO_N!$ECHO_N$ac_delim | 22491 | s,@ACLOCAL@,$ACLOCAL,;t t |
23813 | ECHO_T!$ECHO_T$ac_delim | 22492 | s,@AUTOCONF@,$AUTOCONF,;t t |
23814 | LIBS!$LIBS$ac_delim | 22493 | s,@AUTOMAKE@,$AUTOMAKE,;t t |
23815 | build_alias!$build_alias$ac_delim | 22494 | s,@AUTOHEADER@,$AUTOHEADER,;t t |
23816 | host_alias!$host_alias$ac_delim | 22495 | s,@MAKEINFO@,$MAKEINFO,;t t |
23817 | target_alias!$target_alias$ac_delim | 22496 | s,@install_sh@,$install_sh,;t t |
23818 | INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim | 22497 | s,@STRIP@,$STRIP,;t t |
23819 | INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim | 22498 | s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t |
23820 | INSTALL_DATA!$INSTALL_DATA$ac_delim | 22499 | s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t |
23821 | CYGPATH_W!$CYGPATH_W$ac_delim | 22500 | s,@mkdir_p@,$mkdir_p,;t t |
23822 | PACKAGE!$PACKAGE$ac_delim | 22501 | s,@AWK@,$AWK,;t t |
23823 | VERSION!$VERSION$ac_delim | 22502 | s,@SET_MAKE@,$SET_MAKE,;t t |
23824 | ACLOCAL!$ACLOCAL$ac_delim | 22503 | s,@am__leading_dot@,$am__leading_dot,;t t |
23825 | AUTOCONF!$AUTOCONF$ac_delim | 22504 | s,@AMTAR@,$AMTAR,;t t |
23826 | AUTOMAKE!$AUTOMAKE$ac_delim | 22505 | s,@am__tar@,$am__tar,;t t |
23827 | AUTOHEADER!$AUTOHEADER$ac_delim | 22506 | s,@am__untar@,$am__untar,;t t |
23828 | MAKEINFO!$MAKEINFO$ac_delim | 22507 | s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t |
23829 | AMTAR!$AMTAR$ac_delim | 22508 | s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t |
23830 | install_sh!$install_sh$ac_delim | 22509 | s,@MAINT@,$MAINT,;t t |
23831 | STRIP!$STRIP$ac_delim | 22510 | s,@CC@,$CC,;t t |
23832 | INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim | 22511 | s,@CFLAGS@,$CFLAGS,;t t |
23833 | mkdir_p!$mkdir_p$ac_delim | 22512 | s,@LDFLAGS@,$LDFLAGS,;t t |
23834 | AWK!$AWK$ac_delim | 22513 | s,@CPPFLAGS@,$CPPFLAGS,;t t |
23835 | SET_MAKE!$SET_MAKE$ac_delim | 22514 | s,@ac_ct_CC@,$ac_ct_CC,;t t |
23836 | am__leading_dot!$am__leading_dot$ac_delim | 22515 | s,@EXEEXT@,$EXEEXT,;t t |
23837 | MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim | 22516 | s,@OBJEXT@,$OBJEXT,;t t |
23838 | MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim | 22517 | s,@DEPDIR@,$DEPDIR,;t t |
23839 | MAINT!$MAINT$ac_delim | 22518 | s,@am__include@,$am__include,;t t |
23840 | CC!$CC$ac_delim | 22519 | s,@am__quote@,$am__quote,;t t |
23841 | CFLAGS!$CFLAGS$ac_delim | 22520 | s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t |
23842 | LDFLAGS!$LDFLAGS$ac_delim | 22521 | s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t |
23843 | CPPFLAGS!$CPPFLAGS$ac_delim | 22522 | s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t |
23844 | ac_ct_CC!$ac_ct_CC$ac_delim | 22523 | s,@CCDEPMODE@,$CCDEPMODE,;t t |
23845 | EXEEXT!$EXEEXT$ac_delim | 22524 | s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t |
23846 | OBJEXT!$OBJEXT$ac_delim | 22525 | s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t |
23847 | DEPDIR!$DEPDIR$ac_delim | 22526 | s,@build@,$build,;t t |
23848 | am__include!$am__include$ac_delim | 22527 | s,@build_cpu@,$build_cpu,;t t |
23849 | am__quote!$am__quote$ac_delim | 22528 | s,@build_vendor@,$build_vendor,;t t |
23850 | AMDEP_TRUE!$AMDEP_TRUE$ac_delim | 22529 | s,@build_os@,$build_os,;t t |
23851 | AMDEP_FALSE!$AMDEP_FALSE$ac_delim | 22530 | s,@host@,$host,;t t |
23852 | AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim | 22531 | s,@host_cpu@,$host_cpu,;t t |
23853 | CCDEPMODE!$CCDEPMODE$ac_delim | 22532 | s,@host_vendor@,$host_vendor,;t t |
23854 | am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim | 22533 | s,@host_os@,$host_os,;t t |
23855 | am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim | 22534 | s,@EGREP@,$EGREP,;t t |
23856 | build!$build$ac_delim | 22535 | s,@LN_S@,$LN_S,;t t |
23857 | build_cpu!$build_cpu$ac_delim | 22536 | s,@ECHO@,$ECHO,;t t |
23858 | build_vendor!$build_vendor$ac_delim | 22537 | s,@AR@,$AR,;t t |
23859 | build_os!$build_os$ac_delim | 22538 | s,@ac_ct_AR@,$ac_ct_AR,;t t |
23860 | host!$host$ac_delim | 22539 | s,@RANLIB@,$RANLIB,;t t |
23861 | host_cpu!$host_cpu$ac_delim | 22540 | s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t |
23862 | host_vendor!$host_vendor$ac_delim | 22541 | s,@DLLTOOL@,$DLLTOOL,;t t |
23863 | host_os!$host_os$ac_delim | 22542 | s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t |
23864 | GREP!$GREP$ac_delim | 22543 | s,@AS@,$AS,;t t |
23865 | EGREP!$EGREP$ac_delim | 22544 | s,@ac_ct_AS@,$ac_ct_AS,;t t |
23866 | LN_S!$LN_S$ac_delim | 22545 | s,@OBJDUMP@,$OBJDUMP,;t t |
23867 | ECHO!$ECHO$ac_delim | 22546 | s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t |
23868 | AR!$AR$ac_delim | 22547 | s,@CPP@,$CPP,;t t |
23869 | RANLIB!$RANLIB$ac_delim | 22548 | s,@CXX@,$CXX,;t t |
23870 | DLLTOOL!$DLLTOOL$ac_delim | 22549 | s,@CXXFLAGS@,$CXXFLAGS,;t t |
23871 | AS!$AS$ac_delim | 22550 | s,@ac_ct_CXX@,$ac_ct_CXX,;t t |
23872 | OBJDUMP!$OBJDUMP$ac_delim | 22551 | s,@CXXDEPMODE@,$CXXDEPMODE,;t t |
23873 | CPP!$CPP$ac_delim | 22552 | s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t |
23874 | CXX!$CXX$ac_delim | 22553 | s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t |
23875 | CXXFLAGS!$CXXFLAGS$ac_delim | 22554 | s,@CXXCPP@,$CXXCPP,;t t |
23876 | ac_ct_CXX!$ac_ct_CXX$ac_delim | 22555 | s,@F77@,$F77,;t t |
23877 | CXXDEPMODE!$CXXDEPMODE$ac_delim | 22556 | s,@FFLAGS@,$FFLAGS,;t t |
23878 | _ACEOF | 22557 | s,@ac_ct_F77@,$ac_ct_F77,;t t |
23879 | 22558 | s,@LIBTOOL@,$LIBTOOL,;t t | |
23880 | if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then | 22559 | s,@LIBTOOL_DEPS@,$LIBTOOL_DEPS,;t t |
23881 | break | 22560 | s,@INSTALL_LTDL_TRUE@,$INSTALL_LTDL_TRUE,;t t |
23882 | elif $ac_last_try; then | 22561 | s,@INSTALL_LTDL_FALSE@,$INSTALL_LTDL_FALSE,;t t |
23883 | { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | 22562 | s,@CONVENIENCE_LTDL_TRUE@,$CONVENIENCE_LTDL_TRUE,;t t |
23884 | echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | 22563 | s,@CONVENIENCE_LTDL_FALSE@,$CONVENIENCE_LTDL_FALSE,;t t |
23885 | { (exit 1); exit 1; }; } | 22564 | s,@LIBADD_DL@,$LIBADD_DL,;t t |
23886 | else | 22565 | s,@LIBOBJS@,$LIBOBJS,;t t |
23887 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | 22566 | s,@LTLIBOBJS@,$LTLIBOBJS,;t t |
23888 | fi | 22567 | CEOF |
23889 | done | ||
23890 | |||
23891 | ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` | ||
23892 | if test -n "$ac_eof"; then | ||
23893 | ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` | ||
23894 | ac_eof=`expr $ac_eof + 1` | ||
23895 | fi | ||
23896 | |||
23897 | cat >>$CONFIG_STATUS <<_ACEOF | ||
23898 | cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof | ||
23899 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b | ||
23900 | _ACEOF | ||
23901 | sed ' | ||
23902 | s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g | ||
23903 | s/^/s,@/; s/!/@,|#_!!_#|/ | ||
23904 | :n | ||
23905 | t n | ||
23906 | s/'"$ac_delim"'$/,g/; t | ||
23907 | s/$/\\/; p | ||
23908 | N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n | ||
23909 | ' >>$CONFIG_STATUS <conf$$subs.sed | ||
23910 | rm -f conf$$subs.sed | ||
23911 | cat >>$CONFIG_STATUS <<_ACEOF | ||
23912 | CEOF$ac_eof | ||
23913 | _ACEOF | ||
23914 | |||
23915 | 22568 | ||
23916 | ac_delim='%!_!# ' | ||
23917 | for ac_last_try in false false false false false :; do | ||
23918 | cat >conf$$subs.sed <<_ACEOF | ||
23919 | am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim | ||
23920 | am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim | ||
23921 | CXXCPP!$CXXCPP$ac_delim | ||
23922 | F77!$F77$ac_delim | ||
23923 | FFLAGS!$FFLAGS$ac_delim | ||
23924 | ac_ct_F77!$ac_ct_F77$ac_delim | ||
23925 | LIBTOOL!$LIBTOOL$ac_delim | ||
23926 | LIBTOOL_DEPS!$LIBTOOL_DEPS$ac_delim | ||
23927 | INSTALL_LTDL_TRUE!$INSTALL_LTDL_TRUE$ac_delim | ||
23928 | INSTALL_LTDL_FALSE!$INSTALL_LTDL_FALSE$ac_delim | ||
23929 | CONVENIENCE_LTDL_TRUE!$CONVENIENCE_LTDL_TRUE$ac_delim | ||
23930 | CONVENIENCE_LTDL_FALSE!$CONVENIENCE_LTDL_FALSE$ac_delim | ||
23931 | LIBADD_DL!$LIBADD_DL$ac_delim | ||
23932 | LIBOBJS!$LIBOBJS$ac_delim | ||
23933 | LTLIBOBJS!$LTLIBOBJS$ac_delim | ||
23934 | _ACEOF | 22569 | _ACEOF |
23935 | 22570 | ||
23936 | if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 15; then | 22571 | cat >>$CONFIG_STATUS <<\_ACEOF |
23937 | break | 22572 | # Split the substitutions into bite-sized pieces for seds with |
23938 | elif $ac_last_try; then | 22573 | # small command number limits, like on Digital OSF/1 and HP-UX. |
23939 | { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | 22574 | ac_max_sed_lines=48 |
23940 | echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | 22575 | ac_sed_frag=1 # Number of current file. |
23941 | { (exit 1); exit 1; }; } | 22576 | ac_beg=1 # First line for current file. |
23942 | else | 22577 | ac_end=$ac_max_sed_lines # Line after last line for current file. |
23943 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | 22578 | ac_more_lines=: |
22579 | ac_sed_cmds= | ||
22580 | while $ac_more_lines; do | ||
22581 | if test $ac_beg -gt 1; then | ||
22582 | sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag | ||
22583 | else | ||
22584 | sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag | ||
22585 | fi | ||
22586 | if test ! -s $tmp/subs.frag; then | ||
22587 | ac_more_lines=false | ||
22588 | else | ||
22589 | # The purpose of the label and of the branching condition is to | ||
22590 | # speed up the sed processing (if there are no `@' at all, there | ||
22591 | # is no need to browse any of the substitutions). | ||
22592 | # These are the two extra sed commands mentioned above. | ||
22593 | (echo ':t | ||
22594 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed | ||
22595 | if test -z "$ac_sed_cmds"; then | ||
22596 | ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" | ||
22597 | else | ||
22598 | ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" | ||
22599 | fi | ||
22600 | ac_sed_frag=`expr $ac_sed_frag + 1` | ||
22601 | ac_beg=$ac_end | ||
22602 | ac_end=`expr $ac_end + $ac_max_sed_lines` | ||
22603 | fi | ||
22604 | done | ||
22605 | if test -z "$ac_sed_cmds"; then | ||
22606 | ac_sed_cmds=cat | ||
23944 | fi | 22607 | fi |
23945 | done | 22608 | fi # test -n "$CONFIG_FILES" |
23946 | |||
23947 | ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` | ||
23948 | if test -n "$ac_eof"; then | ||
23949 | ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` | ||
23950 | ac_eof=`expr $ac_eof + 1` | ||
23951 | fi | ||
23952 | 22609 | ||
23953 | cat >>$CONFIG_STATUS <<_ACEOF | ||
23954 | cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof | ||
23955 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end | ||
23956 | _ACEOF | ||
23957 | sed ' | ||
23958 | s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g | ||
23959 | s/^/s,@/; s/!/@,|#_!!_#|/ | ||
23960 | :n | ||
23961 | t n | ||
23962 | s/'"$ac_delim"'$/,g/; t | ||
23963 | s/$/\\/; p | ||
23964 | N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n | ||
23965 | ' >>$CONFIG_STATUS <conf$$subs.sed | ||
23966 | rm -f conf$$subs.sed | ||
23967 | cat >>$CONFIG_STATUS <<_ACEOF | ||
23968 | :end | ||
23969 | s/|#_!!_#|//g | ||
23970 | CEOF$ac_eof | ||
23971 | _ACEOF | 22610 | _ACEOF |
23972 | |||
23973 | |||
23974 | # VPATH may cause trouble with some makes, so we remove $(srcdir), | ||
23975 | # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and | ||
23976 | # trailing colons and then remove the whole line if VPATH becomes empty | ||
23977 | # (actually we leave an empty line to preserve line numbers). | ||
23978 | if test "x$srcdir" = x.; then | ||
23979 | ac_vpsub='/^[ ]*VPATH[ ]*=/{ | ||
23980 | s/:*\$(srcdir):*/:/ | ||
23981 | s/:*\${srcdir}:*/:/ | ||
23982 | s/:*@srcdir@:*/:/ | ||
23983 | s/^\([^=]*=[ ]*\):*/\1/ | ||
23984 | s/:*$// | ||
23985 | s/^[^=]*=[ ]*$// | ||
23986 | }' | ||
23987 | fi | ||
23988 | |||
23989 | cat >>$CONFIG_STATUS <<\_ACEOF | 22611 | cat >>$CONFIG_STATUS <<\_ACEOF |
23990 | fi # test -n "$CONFIG_FILES" | 22612 | for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue |
23991 | 22613 | # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". | |
23992 | 22614 | case $ac_file in | |
23993 | for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS | 22615 | - | *:- | *:-:* ) # input from stdin |
23994 | do | 22616 | cat >$tmp/stdin |
23995 | case $ac_tag in | 22617 | ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` |
23996 | :[FHLC]) ac_mode=$ac_tag; continue;; | 22618 | ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; |
23997 | esac | 22619 | *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` |
23998 | case $ac_mode$ac_tag in | 22620 | ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; |
23999 | :[FHL]*:*);; | 22621 | * ) ac_file_in=$ac_file.in ;; |
24000 | :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 | ||
24001 | echo "$as_me: error: Invalid tag $ac_tag." >&2;} | ||
24002 | { (exit 1); exit 1; }; };; | ||
24003 | :[FH]-) ac_tag=-:-;; | ||
24004 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; | ||
24005 | esac | ||
24006 | ac_save_IFS=$IFS | ||
24007 | IFS=: | ||
24008 | set x $ac_tag | ||
24009 | IFS=$ac_save_IFS | ||
24010 | shift | ||
24011 | ac_file=$1 | ||
24012 | shift | ||
24013 | |||
24014 | case $ac_mode in | ||
24015 | :L) ac_source=$1;; | ||
24016 | :[FH]) | ||
24017 | ac_file_inputs= | ||
24018 | for ac_f | ||
24019 | do | ||
24020 | case $ac_f in | ||
24021 | -) ac_f="$tmp/stdin";; | ||
24022 | *) # Look for the file first in the build tree, then in the source tree | ||
24023 | # (if the path is not absolute). The absolute path cannot be DOS-style, | ||
24024 | # because $ac_f cannot contain `:'. | ||
24025 | test -f "$ac_f" || | ||
24026 | case $ac_f in | ||
24027 | [\\/$]*) false;; | ||
24028 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; | ||
24029 | esac || | ||
24030 | { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 | ||
24031 | echo "$as_me: error: cannot find input file: $ac_f" >&2;} | ||
24032 | { (exit 1); exit 1; }; };; | ||
24033 | esac | ||
24034 | ac_file_inputs="$ac_file_inputs $ac_f" | ||
24035 | done | ||
24036 | |||
24037 | # Let's still pretend it is `configure' which instantiates (i.e., don't | ||
24038 | # use $as_me), people would be surprised to read: | ||
24039 | # /* config.h. Generated by config.status. */ | ||
24040 | configure_input="Generated from "`IFS=: | ||
24041 | echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." | ||
24042 | if test x"$ac_file" != x-; then | ||
24043 | configure_input="$ac_file. $configure_input" | ||
24044 | { echo "$as_me:$LINENO: creating $ac_file" >&5 | ||
24045 | echo "$as_me: creating $ac_file" >&6;} | ||
24046 | fi | ||
24047 | |||
24048 | case $ac_tag in | ||
24049 | *:-:* | *:-) cat >"$tmp/stdin";; | ||
24050 | esac | ||
24051 | ;; | ||
24052 | esac | 22622 | esac |
24053 | 22623 | ||
24054 | ac_dir=`$as_dirname -- "$ac_file" || | 22624 | # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. |
22625 | ac_dir=`(dirname "$ac_file") 2>/dev/null || | ||
24055 | $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | 22626 | $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
24056 | X"$ac_file" : 'X\(//\)[^/]' \| \ | 22627 | X"$ac_file" : 'X\(//\)[^/]' \| \ |
24057 | X"$ac_file" : 'X\(//\)$' \| \ | 22628 | X"$ac_file" : 'X\(//\)$' \| \ |
24058 | X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || | 22629 | X"$ac_file" : 'X\(/\)' \| \ |
22630 | . : '\(.\)' 2>/dev/null || | ||
24059 | echo X"$ac_file" | | 22631 | echo X"$ac_file" | |
24060 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | 22632 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } |
24061 | s//\1/ | 22633 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } |
24062 | q | 22634 | /^X\(\/\/\)$/{ s//\1/; q; } |
24063 | } | 22635 | /^X\(\/\).*/{ s//\1/; q; } |
24064 | /^X\(\/\/\)[^/].*/{ | 22636 | s/.*/./; q'` |
24065 | s//\1/ | 22637 | { if $as_mkdir_p; then |
24066 | q | 22638 | mkdir -p "$ac_dir" |
24067 | } | 22639 | else |
24068 | /^X\(\/\/\)$/{ | 22640 | as_dir="$ac_dir" |
24069 | s//\1/ | ||
24070 | q | ||
24071 | } | ||
24072 | /^X\(\/\).*/{ | ||
24073 | s//\1/ | ||
24074 | q | ||
24075 | } | ||
24076 | s/.*/./; q'` | ||
24077 | { as_dir="$ac_dir" | ||
24078 | case $as_dir in #( | ||
24079 | -*) as_dir=./$as_dir;; | ||
24080 | esac | ||
24081 | test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { | ||
24082 | as_dirs= | 22641 | as_dirs= |
24083 | while :; do | 22642 | while test ! -d "$as_dir"; do |
24084 | case $as_dir in #( | 22643 | as_dirs="$as_dir $as_dirs" |
24085 | *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( | 22644 | as_dir=`(dirname "$as_dir") 2>/dev/null || |
24086 | *) as_qdir=$as_dir;; | ||
24087 | esac | ||
24088 | as_dirs="'$as_qdir' $as_dirs" | ||
24089 | as_dir=`$as_dirname -- "$as_dir" || | ||
24090 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | 22645 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
24091 | X"$as_dir" : 'X\(//\)[^/]' \| \ | 22646 | X"$as_dir" : 'X\(//\)[^/]' \| \ |
24092 | X"$as_dir" : 'X\(//\)$' \| \ | 22647 | X"$as_dir" : 'X\(//\)$' \| \ |
24093 | X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || | 22648 | X"$as_dir" : 'X\(/\)' \| \ |
22649 | . : '\(.\)' 2>/dev/null || | ||
24094 | echo X"$as_dir" | | 22650 | echo X"$as_dir" | |
24095 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | 22651 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } |
24096 | s//\1/ | 22652 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } |
24097 | q | 22653 | /^X\(\/\/\)$/{ s//\1/; q; } |
24098 | } | 22654 | /^X\(\/\).*/{ s//\1/; q; } |
24099 | /^X\(\/\/\)[^/].*/{ | 22655 | s/.*/./; q'` |
24100 | s//\1/ | ||
24101 | q | ||
24102 | } | ||
24103 | /^X\(\/\/\)$/{ | ||
24104 | s//\1/ | ||
24105 | q | ||
24106 | } | ||
24107 | /^X\(\/\).*/{ | ||
24108 | s//\1/ | ||
24109 | q | ||
24110 | } | ||
24111 | s/.*/./; q'` | ||
24112 | test -d "$as_dir" && break | ||
24113 | done | 22656 | done |
24114 | test -z "$as_dirs" || eval "mkdir $as_dirs" | 22657 | test ! -n "$as_dirs" || mkdir $as_dirs |
24115 | } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 | 22658 | fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 |
24116 | echo "$as_me: error: cannot create directory $as_dir" >&2;} | 22659 | echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} |
24117 | { (exit 1); exit 1; }; }; } | 22660 | { (exit 1); exit 1; }; }; } |
22661 | |||
24118 | ac_builddir=. | 22662 | ac_builddir=. |
24119 | 22663 | ||
24120 | case "$ac_dir" in | 22664 | if test "$ac_dir" != .; then |
24121 | .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; | ||
24122 | *) | ||
24123 | ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | 22665 | ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` |
24124 | # A ".." for each directory in $ac_dir_suffix. | 22666 | # A "../" for each directory in $ac_dir_suffix. |
24125 | ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` | 22667 | ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` |
24126 | case $ac_top_builddir_sub in | 22668 | else |
24127 | "") ac_top_builddir_sub=. ac_top_build_prefix= ;; | 22669 | ac_dir_suffix= ac_top_builddir= |
24128 | *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; | 22670 | fi |
24129 | esac ;; | ||
24130 | esac | ||
24131 | ac_abs_top_builddir=$ac_pwd | ||
24132 | ac_abs_builddir=$ac_pwd$ac_dir_suffix | ||
24133 | # for backward compatibility: | ||
24134 | ac_top_builddir=$ac_top_build_prefix | ||
24135 | 22671 | ||
24136 | case $srcdir in | 22672 | case $srcdir in |
24137 | .) # We are building in place. | 22673 | .) # No --srcdir option. We are building in place. |
24138 | ac_srcdir=. | 22674 | ac_srcdir=. |
24139 | ac_top_srcdir=$ac_top_builddir_sub | 22675 | if test -z "$ac_top_builddir"; then |
24140 | ac_abs_top_srcdir=$ac_pwd ;; | 22676 | ac_top_srcdir=. |
24141 | [\\/]* | ?:[\\/]* ) # Absolute name. | 22677 | else |
22678 | ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` | ||
22679 | fi ;; | ||
22680 | [\\/]* | ?:[\\/]* ) # Absolute path. | ||
24142 | ac_srcdir=$srcdir$ac_dir_suffix; | 22681 | ac_srcdir=$srcdir$ac_dir_suffix; |
24143 | ac_top_srcdir=$srcdir | 22682 | ac_top_srcdir=$srcdir ;; |
24144 | ac_abs_top_srcdir=$srcdir ;; | 22683 | *) # Relative path. |
24145 | *) # Relative name. | 22684 | ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix |
24146 | ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix | 22685 | ac_top_srcdir=$ac_top_builddir$srcdir ;; |
24147 | ac_top_srcdir=$ac_top_build_prefix$srcdir | ||
24148 | ac_abs_top_srcdir=$ac_pwd/$srcdir ;; | ||
24149 | esac | 22686 | esac |
24150 | ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix | ||
24151 | 22687 | ||
22688 | # Do not use `cd foo && pwd` to compute absolute paths, because | ||
22689 | # the directories may not exist. | ||
22690 | case `pwd` in | ||
22691 | .) ac_abs_builddir="$ac_dir";; | ||
22692 | *) | ||
22693 | case "$ac_dir" in | ||
22694 | .) ac_abs_builddir=`pwd`;; | ||
22695 | [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | ||
22696 | *) ac_abs_builddir=`pwd`/"$ac_dir";; | ||
22697 | esac;; | ||
22698 | esac | ||
22699 | case $ac_abs_builddir in | ||
22700 | .) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
22701 | *) | ||
22702 | case ${ac_top_builddir}. in | ||
22703 | .) ac_abs_top_builddir=$ac_abs_builddir;; | ||
22704 | [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
22705 | *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; | ||
22706 | esac;; | ||
22707 | esac | ||
22708 | case $ac_abs_builddir in | ||
22709 | .) ac_abs_srcdir=$ac_srcdir;; | ||
22710 | *) | ||
22711 | case $ac_srcdir in | ||
22712 | .) ac_abs_srcdir=$ac_abs_builddir;; | ||
22713 | [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | ||
22714 | *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | ||
22715 | esac;; | ||
22716 | esac | ||
22717 | case $ac_abs_builddir in | ||
22718 | .) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
22719 | *) | ||
22720 | case $ac_top_srcdir in | ||
22721 | .) ac_abs_top_srcdir=$ac_abs_builddir;; | ||
22722 | [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
22723 | *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | ||
22724 | esac;; | ||
22725 | esac | ||
24152 | 22726 | ||
24153 | case $ac_mode in | ||
24154 | :F) | ||
24155 | # | ||
24156 | # CONFIG_FILE | ||
24157 | # | ||
24158 | 22727 | ||
24159 | case $INSTALL in | 22728 | case $INSTALL in |
24160 | [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; | 22729 | [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; |
24161 | *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; | 22730 | *) ac_INSTALL=$ac_top_builddir$INSTALL ;; |
24162 | esac | 22731 | esac |
24163 | _ACEOF | ||
24164 | 22732 | ||
24165 | cat >>$CONFIG_STATUS <<\_ACEOF | 22733 | if test x"$ac_file" != x-; then |
24166 | # If the template does not know about datarootdir, expand it. | 22734 | { echo "$as_me:$LINENO: creating $ac_file" >&5 |
24167 | # FIXME: This hack should be removed a few years after 2.60. | 22735 | echo "$as_me: creating $ac_file" >&6;} |
24168 | ac_datarootdir_hack=; ac_datarootdir_seen= | 22736 | rm -f "$ac_file" |
24169 | 22737 | fi | |
24170 | case `sed -n '/datarootdir/ { | 22738 | # Let's still pretend it is `configure' which instantiates (i.e., don't |
24171 | p | 22739 | # use $as_me), people would be surprised to read: |
24172 | q | 22740 | # /* config.h. Generated by config.status. */ |
24173 | } | 22741 | if test x"$ac_file" = x-; then |
24174 | /@datadir@/p | 22742 | configure_input= |
24175 | /@docdir@/p | 22743 | else |
24176 | /@infodir@/p | 22744 | configure_input="$ac_file. " |
24177 | /@localedir@/p | 22745 | fi |
24178 | /@mandir@/p | 22746 | configure_input=$configure_input"Generated from `echo $ac_file_in | |
24179 | ' $ac_file_inputs` in | 22747 | sed 's,.*/,,'` by configure." |
24180 | *datarootdir*) ac_datarootdir_seen=yes;; | 22748 | |
24181 | *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) | 22749 | # First look for the input files in the build tree, otherwise in the |
24182 | { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 | 22750 | # src tree. |
24183 | echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} | 22751 | ac_file_inputs=`IFS=: |
24184 | _ACEOF | 22752 | for f in $ac_file_in; do |
24185 | cat >>$CONFIG_STATUS <<_ACEOF | 22753 | case $f in |
24186 | ac_datarootdir_hack=' | 22754 | -) echo $tmp/stdin ;; |
24187 | s&@datadir@&$datadir&g | 22755 | [\\/$]*) |
24188 | s&@docdir@&$docdir&g | 22756 | # Absolute (can't be DOS-style, as IFS=:) |
24189 | s&@infodir@&$infodir&g | 22757 | test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 |
24190 | s&@localedir@&$localedir&g | 22758 | echo "$as_me: error: cannot find input file: $f" >&2;} |
24191 | s&@mandir@&$mandir&g | 22759 | { (exit 1); exit 1; }; } |
24192 | s&\\\${datarootdir}&$datarootdir&g' ;; | 22760 | echo "$f";; |
24193 | esac | 22761 | *) # Relative |
22762 | if test -f "$f"; then | ||
22763 | # Build tree | ||
22764 | echo "$f" | ||
22765 | elif test -f "$srcdir/$f"; then | ||
22766 | # Source tree | ||
22767 | echo "$srcdir/$f" | ||
22768 | else | ||
22769 | # /dev/null tree | ||
22770 | { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
22771 | echo "$as_me: error: cannot find input file: $f" >&2;} | ||
22772 | { (exit 1); exit 1; }; } | ||
22773 | fi;; | ||
22774 | esac | ||
22775 | done` || { (exit 1); exit 1; } | ||
24194 | _ACEOF | 22776 | _ACEOF |
24195 | |||
24196 | # Neutralize VPATH when `$srcdir' = `.'. | ||
24197 | # Shell code in configure.ac might set extrasub. | ||
24198 | # FIXME: do we really want to maintain this feature? | ||
24199 | cat >>$CONFIG_STATUS <<_ACEOF | 22777 | cat >>$CONFIG_STATUS <<_ACEOF |
24200 | sed "$ac_vpsub | 22778 | sed "$ac_vpsub |
24201 | $extrasub | 22779 | $extrasub |
@@ -24203,130 +22781,248 @@ _ACEOF | |||
24203 | cat >>$CONFIG_STATUS <<\_ACEOF | 22781 | cat >>$CONFIG_STATUS <<\_ACEOF |
24204 | :t | 22782 | :t |
24205 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b | 22783 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b |
24206 | s&@configure_input@&$configure_input&;t t | 22784 | s,@configure_input@,$configure_input,;t t |
24207 | s&@top_builddir@&$ac_top_builddir_sub&;t t | 22785 | s,@srcdir@,$ac_srcdir,;t t |
24208 | s&@srcdir@&$ac_srcdir&;t t | 22786 | s,@abs_srcdir@,$ac_abs_srcdir,;t t |
24209 | s&@abs_srcdir@&$ac_abs_srcdir&;t t | 22787 | s,@top_srcdir@,$ac_top_srcdir,;t t |
24210 | s&@top_srcdir@&$ac_top_srcdir&;t t | 22788 | s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t |
24211 | s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t | 22789 | s,@builddir@,$ac_builddir,;t t |
24212 | s&@builddir@&$ac_builddir&;t t | 22790 | s,@abs_builddir@,$ac_abs_builddir,;t t |
24213 | s&@abs_builddir@&$ac_abs_builddir&;t t | 22791 | s,@top_builddir@,$ac_top_builddir,;t t |
24214 | s&@abs_top_builddir@&$ac_abs_top_builddir&;t t | 22792 | s,@abs_top_builddir@,$ac_abs_top_builddir,;t t |
24215 | s&@INSTALL@&$ac_INSTALL&;t t | 22793 | s,@INSTALL@,$ac_INSTALL,;t t |
24216 | $ac_datarootdir_hack | 22794 | " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out |
24217 | " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out | 22795 | rm -f $tmp/stdin |
24218 | 22796 | if test x"$ac_file" != x-; then | |
24219 | test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && | 22797 | mv $tmp/out $ac_file |
24220 | { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && | 22798 | else |
24221 | { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && | 22799 | cat $tmp/out |
24222 | { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' | 22800 | rm -f $tmp/out |
24223 | which seems to be undefined. Please make sure it is defined." >&5 | 22801 | fi |
24224 | echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' | 22802 | |
24225 | which seems to be undefined. Please make sure it is defined." >&2;} | 22803 | done |
24226 | 22804 | _ACEOF | |
24227 | rm -f "$tmp/stdin" | 22805 | cat >>$CONFIG_STATUS <<\_ACEOF |
22806 | |||
22807 | # | ||
22808 | # CONFIG_HEADER section. | ||
22809 | # | ||
22810 | |||
22811 | # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where | ||
22812 | # NAME is the cpp macro being defined and VALUE is the value it is being given. | ||
22813 | # | ||
22814 | # ac_d sets the value in "#define NAME VALUE" lines. | ||
22815 | ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' | ||
22816 | ac_dB='[ ].*$,\1#\2' | ||
22817 | ac_dC=' ' | ||
22818 | ac_dD=',;t' | ||
22819 | # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". | ||
22820 | ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' | ||
22821 | ac_uB='$,\1#\2define\3' | ||
22822 | ac_uC=' ' | ||
22823 | ac_uD=',;t' | ||
22824 | |||
22825 | for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue | ||
22826 | # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". | ||
24228 | case $ac_file in | 22827 | case $ac_file in |
24229 | -) cat "$tmp/out"; rm -f "$tmp/out";; | 22828 | - | *:- | *:-:* ) # input from stdin |
24230 | *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; | 22829 | cat >$tmp/stdin |
22830 | ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
22831 | ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
22832 | *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
22833 | ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | ||
22834 | * ) ac_file_in=$ac_file.in ;; | ||
24231 | esac | 22835 | esac |
24232 | ;; | 22836 | |
24233 | :H) | 22837 | test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 |
24234 | # | 22838 | echo "$as_me: creating $ac_file" >&6;} |
24235 | # CONFIG_HEADER | 22839 | |
24236 | # | 22840 | # First look for the input files in the build tree, otherwise in the |
22841 | # src tree. | ||
22842 | ac_file_inputs=`IFS=: | ||
22843 | for f in $ac_file_in; do | ||
22844 | case $f in | ||
22845 | -) echo $tmp/stdin ;; | ||
22846 | [\\/$]*) | ||
22847 | # Absolute (can't be DOS-style, as IFS=:) | ||
22848 | test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
22849 | echo "$as_me: error: cannot find input file: $f" >&2;} | ||
22850 | { (exit 1); exit 1; }; } | ||
22851 | # Do quote $f, to prevent DOS paths from being IFS'd. | ||
22852 | echo "$f";; | ||
22853 | *) # Relative | ||
22854 | if test -f "$f"; then | ||
22855 | # Build tree | ||
22856 | echo "$f" | ||
22857 | elif test -f "$srcdir/$f"; then | ||
22858 | # Source tree | ||
22859 | echo "$srcdir/$f" | ||
22860 | else | ||
22861 | # /dev/null tree | ||
22862 | { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | ||
22863 | echo "$as_me: error: cannot find input file: $f" >&2;} | ||
22864 | { (exit 1); exit 1; }; } | ||
22865 | fi;; | ||
22866 | esac | ||
22867 | done` || { (exit 1); exit 1; } | ||
22868 | # Remove the trailing spaces. | ||
22869 | sed 's/[ ]*$//' $ac_file_inputs >$tmp/in | ||
22870 | |||
24237 | _ACEOF | 22871 | _ACEOF |
24238 | 22872 | ||
24239 | # Transform confdefs.h into a sed script `conftest.defines', that | 22873 | # Transform confdefs.h into two sed scripts, `conftest.defines' and |
24240 | # substitutes the proper values into config.h.in to produce config.h. | 22874 | # `conftest.undefs', that substitutes the proper values into |
24241 | rm -f conftest.defines conftest.tail | 22875 | # config.h.in to produce config.h. The first handles `#define' |
24242 | # First, append a space to every undef/define line, to ease matching. | 22876 | # templates, and the second `#undef' templates. |
24243 | echo 's/$/ /' >conftest.defines | 22877 | # And first: Protect against being on the right side of a sed subst in |
24244 | # Then, protect against being on the right side of a sed subst, or in | 22878 | # config.status. Protect against being in an unquoted here document |
24245 | # an unquoted here document, in config.status. If some macros were | 22879 | # in config.status. |
24246 | # called several times there might be several #defines for the same | 22880 | rm -f conftest.defines conftest.undefs |
24247 | # symbol, which is useless. But do not sort them, since the last | 22881 | # Using a here document instead of a string reduces the quoting nightmare. |
24248 | # AC_DEFINE must be honored. | 22882 | # Putting comments in sed scripts is not portable. |
24249 | ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* | 22883 | # |
24250 | # These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where | 22884 | # `end' is used to avoid that the second main sed command (meant for |
24251 | # NAME is the cpp macro being defined, VALUE is the value it is being given. | 22885 | # 0-ary CPP macros) applies to n-ary macro definitions. |
24252 | # PARAMS is the parameter list in the macro definition--in most cases, it's | 22886 | # See the Autoconf documentation for `clear'. |
24253 | # just an empty string. | 22887 | cat >confdef2sed.sed <<\_ACEOF |
24254 | ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' | 22888 | s/[\\&,]/\\&/g |
24255 | ac_dB='\\)[ (].*,\\1define\\2' | 22889 | s,[\\$`],\\&,g |
24256 | ac_dC=' ' | 22890 | t clear |
24257 | ac_dD=' ,' | 22891 | : clear |
24258 | 22892 | s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp | |
24259 | uniq confdefs.h | | 22893 | t end |
24260 | sed -n ' | 22894 | s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp |
24261 | t rset | 22895 | : end |
24262 | :rset | 22896 | _ACEOF |
24263 | s/^[ ]*#[ ]*define[ ][ ]*// | 22897 | # If some macros were called several times there might be several times |
24264 | t ok | 22898 | # the same #defines, which is useless. Nevertheless, we may not want to |
24265 | d | 22899 | # sort them, since we want the *last* AC-DEFINE to be honored. |
24266 | :ok | 22900 | uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines |
24267 | s/[\\&,]/\\&/g | 22901 | sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs |
24268 | s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p | 22902 | rm -f confdef2sed.sed |
24269 | s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p | 22903 | |
24270 | ' >>conftest.defines | 22904 | # This sed command replaces #undef with comments. This is necessary, for |
24271 | |||
24272 | # Remove the space that was appended to ease matching. | ||
24273 | # Then replace #undef with comments. This is necessary, for | ||
24274 | # example, in the case of _POSIX_SOURCE, which is predefined and required | 22905 | # example, in the case of _POSIX_SOURCE, which is predefined and required |
24275 | # on some systems where configure will not decide to define it. | 22906 | # on some systems where configure will not decide to define it. |
24276 | # (The regexp can be short, since the line contains either #define or #undef.) | 22907 | cat >>conftest.undefs <<\_ACEOF |
24277 | echo 's/ $// | 22908 | s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, |
24278 | s,^[ #]*u.*,/* & */,' >>conftest.defines | ||
24279 | |||
24280 | # Break up conftest.defines: | ||
24281 | ac_max_sed_lines=50 | ||
24282 | |||
24283 | # First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" | ||
24284 | # Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" | ||
24285 | # Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" | ||
24286 | # et cetera. | ||
24287 | ac_in='$ac_file_inputs' | ||
24288 | ac_out='"$tmp/out1"' | ||
24289 | ac_nxt='"$tmp/out2"' | ||
24290 | |||
24291 | while : | ||
24292 | do | ||
24293 | # Write a here document: | ||
24294 | cat >>$CONFIG_STATUS <<_ACEOF | ||
24295 | # First, check the format of the line: | ||
24296 | cat >"\$tmp/defines.sed" <<\\CEOF | ||
24297 | /^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def | ||
24298 | /^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def | ||
24299 | b | ||
24300 | :def | ||
24301 | _ACEOF | 22909 | _ACEOF |
24302 | sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS | 22910 | |
22911 | # Break up conftest.defines because some shells have a limit on the size | ||
22912 | # of here documents, and old seds have small limits too (100 cmds). | ||
22913 | echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS | ||
22914 | echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS | ||
22915 | echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS | ||
22916 | echo ' :' >>$CONFIG_STATUS | ||
22917 | rm -f conftest.tail | ||
22918 | while grep . conftest.defines >/dev/null | ||
22919 | do | ||
22920 | # Write a limited-size here document to $tmp/defines.sed. | ||
22921 | echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS | ||
22922 | # Speed up: don't consider the non `#define' lines. | ||
22923 | echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS | ||
22924 | # Work around the forget-to-reset-the-flag bug. | ||
22925 | echo 't clr' >>$CONFIG_STATUS | ||
22926 | echo ': clr' >>$CONFIG_STATUS | ||
22927 | sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS | ||
24303 | echo 'CEOF | 22928 | echo 'CEOF |
24304 | sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS | 22929 | sed -f $tmp/defines.sed $tmp/in >$tmp/out |
24305 | ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in | 22930 | rm -f $tmp/in |
24306 | sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail | 22931 | mv $tmp/out $tmp/in |
24307 | grep . conftest.tail >/dev/null || break | 22932 | ' >>$CONFIG_STATUS |
22933 | sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail | ||
24308 | rm -f conftest.defines | 22934 | rm -f conftest.defines |
24309 | mv conftest.tail conftest.defines | 22935 | mv conftest.tail conftest.defines |
24310 | done | 22936 | done |
24311 | rm -f conftest.defines conftest.tail | 22937 | rm -f conftest.defines |
22938 | echo ' fi # grep' >>$CONFIG_STATUS | ||
22939 | echo >>$CONFIG_STATUS | ||
22940 | |||
22941 | # Break up conftest.undefs because some shells have a limit on the size | ||
22942 | # of here documents, and old seds have small limits too (100 cmds). | ||
22943 | echo ' # Handle all the #undef templates' >>$CONFIG_STATUS | ||
22944 | rm -f conftest.tail | ||
22945 | while grep . conftest.undefs >/dev/null | ||
22946 | do | ||
22947 | # Write a limited-size here document to $tmp/undefs.sed. | ||
22948 | echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS | ||
22949 | # Speed up: don't consider the non `#undef' | ||
22950 | echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS | ||
22951 | # Work around the forget-to-reset-the-flag bug. | ||
22952 | echo 't clr' >>$CONFIG_STATUS | ||
22953 | echo ': clr' >>$CONFIG_STATUS | ||
22954 | sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS | ||
22955 | echo 'CEOF | ||
22956 | sed -f $tmp/undefs.sed $tmp/in >$tmp/out | ||
22957 | rm -f $tmp/in | ||
22958 | mv $tmp/out $tmp/in | ||
22959 | ' >>$CONFIG_STATUS | ||
22960 | sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail | ||
22961 | rm -f conftest.undefs | ||
22962 | mv conftest.tail conftest.undefs | ||
22963 | done | ||
22964 | rm -f conftest.undefs | ||
24312 | 22965 | ||
24313 | echo "ac_result=$ac_in" >>$CONFIG_STATUS | ||
24314 | cat >>$CONFIG_STATUS <<\_ACEOF | 22966 | cat >>$CONFIG_STATUS <<\_ACEOF |
22967 | # Let's still pretend it is `configure' which instantiates (i.e., don't | ||
22968 | # use $as_me), people would be surprised to read: | ||
22969 | # /* config.h. Generated by config.status. */ | ||
22970 | if test x"$ac_file" = x-; then | ||
22971 | echo "/* Generated by configure. */" >$tmp/config.h | ||
22972 | else | ||
22973 | echo "/* $ac_file. Generated by configure. */" >$tmp/config.h | ||
22974 | fi | ||
22975 | cat $tmp/in >>$tmp/config.h | ||
22976 | rm -f $tmp/in | ||
24315 | if test x"$ac_file" != x-; then | 22977 | if test x"$ac_file" != x-; then |
24316 | echo "/* $configure_input */" >"$tmp/config.h" | 22978 | if diff $ac_file $tmp/config.h >/dev/null 2>&1; then |
24317 | cat "$ac_result" >>"$tmp/config.h" | ||
24318 | if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then | ||
24319 | { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 | 22979 | { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 |
24320 | echo "$as_me: $ac_file is unchanged" >&6;} | 22980 | echo "$as_me: $ac_file is unchanged" >&6;} |
24321 | else | 22981 | else |
22982 | ac_dir=`(dirname "$ac_file") 2>/dev/null || | ||
22983 | $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
22984 | X"$ac_file" : 'X\(//\)[^/]' \| \ | ||
22985 | X"$ac_file" : 'X\(//\)$' \| \ | ||
22986 | X"$ac_file" : 'X\(/\)' \| \ | ||
22987 | . : '\(.\)' 2>/dev/null || | ||
22988 | echo X"$ac_file" | | ||
22989 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
22990 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
22991 | /^X\(\/\/\)$/{ s//\1/; q; } | ||
22992 | /^X\(\/\).*/{ s//\1/; q; } | ||
22993 | s/.*/./; q'` | ||
22994 | { if $as_mkdir_p; then | ||
22995 | mkdir -p "$ac_dir" | ||
22996 | else | ||
22997 | as_dir="$ac_dir" | ||
22998 | as_dirs= | ||
22999 | while test ! -d "$as_dir"; do | ||
23000 | as_dirs="$as_dir $as_dirs" | ||
23001 | as_dir=`(dirname "$as_dir") 2>/dev/null || | ||
23002 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
23003 | X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
23004 | X"$as_dir" : 'X\(//\)$' \| \ | ||
23005 | X"$as_dir" : 'X\(/\)' \| \ | ||
23006 | . : '\(.\)' 2>/dev/null || | ||
23007 | echo X"$as_dir" | | ||
23008 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
23009 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
23010 | /^X\(\/\/\)$/{ s//\1/; q; } | ||
23011 | /^X\(\/\).*/{ s//\1/; q; } | ||
23012 | s/.*/./; q'` | ||
23013 | done | ||
23014 | test ! -n "$as_dirs" || mkdir $as_dirs | ||
23015 | fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 | ||
23016 | echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} | ||
23017 | { (exit 1); exit 1; }; }; } | ||
23018 | |||
24322 | rm -f $ac_file | 23019 | rm -f $ac_file |
24323 | mv "$tmp/config.h" $ac_file | 23020 | mv $tmp/config.h $ac_file |
24324 | fi | 23021 | fi |
24325 | else | 23022 | else |
24326 | echo "/* $configure_input */" | 23023 | cat $tmp/config.h |
24327 | cat "$ac_result" | 23024 | rm -f $tmp/config.h |
24328 | fi | 23025 | fi |
24329 | rm -f "$tmp/out12" | ||
24330 | # Compute $ac_file's index in $config_headers. | 23026 | # Compute $ac_file's index in $config_headers. |
24331 | _am_stamp_count=1 | 23027 | _am_stamp_count=1 |
24332 | for _am_header in $config_headers :; do | 23028 | for _am_header in $config_headers :; do |
@@ -24337,39 +23033,135 @@ for _am_header in $config_headers :; do | |||
24337 | _am_stamp_count=`expr $_am_stamp_count + 1` ;; | 23033 | _am_stamp_count=`expr $_am_stamp_count + 1` ;; |
24338 | esac | 23034 | esac |
24339 | done | 23035 | done |
24340 | echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || | 23036 | echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || |
24341 | $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | 23037 | $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
24342 | X$ac_file : 'X\(//\)[^/]' \| \ | 23038 | X$ac_file : 'X\(//\)[^/]' \| \ |
24343 | X$ac_file : 'X\(//\)$' \| \ | 23039 | X$ac_file : 'X\(//\)$' \| \ |
24344 | X$ac_file : 'X\(/\)' \| . 2>/dev/null || | 23040 | X$ac_file : 'X\(/\)' \| \ |
23041 | . : '\(.\)' 2>/dev/null || | ||
24345 | echo X$ac_file | | 23042 | echo X$ac_file | |
24346 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | 23043 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } |
24347 | s//\1/ | 23044 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } |
24348 | q | 23045 | /^X\(\/\/\)$/{ s//\1/; q; } |
24349 | } | 23046 | /^X\(\/\).*/{ s//\1/; q; } |
24350 | /^X\(\/\/\)[^/].*/{ | 23047 | s/.*/./; q'`/stamp-h$_am_stamp_count |
24351 | s//\1/ | 23048 | done |
24352 | q | 23049 | _ACEOF |
24353 | } | 23050 | cat >>$CONFIG_STATUS <<\_ACEOF |
24354 | /^X\(\/\/\)$/{ | ||
24355 | s//\1/ | ||
24356 | q | ||
24357 | } | ||
24358 | /^X\(\/\).*/{ | ||
24359 | s//\1/ | ||
24360 | q | ||
24361 | } | ||
24362 | s/.*/./; q'`/stamp-h$_am_stamp_count | ||
24363 | ;; | ||
24364 | 23051 | ||
24365 | :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 | 23052 | # |
24366 | echo "$as_me: executing $ac_file commands" >&6;} | 23053 | # CONFIG_COMMANDS section. |
24367 | ;; | 23054 | # |
24368 | esac | 23055 | for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue |
23056 | ac_dest=`echo "$ac_file" | sed 's,:.*,,'` | ||
23057 | ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` | ||
23058 | ac_dir=`(dirname "$ac_dest") 2>/dev/null || | ||
23059 | $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
23060 | X"$ac_dest" : 'X\(//\)[^/]' \| \ | ||
23061 | X"$ac_dest" : 'X\(//\)$' \| \ | ||
23062 | X"$ac_dest" : 'X\(/\)' \| \ | ||
23063 | . : '\(.\)' 2>/dev/null || | ||
23064 | echo X"$ac_dest" | | ||
23065 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
23066 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
23067 | /^X\(\/\/\)$/{ s//\1/; q; } | ||
23068 | /^X\(\/\).*/{ s//\1/; q; } | ||
23069 | s/.*/./; q'` | ||
23070 | { if $as_mkdir_p; then | ||
23071 | mkdir -p "$ac_dir" | ||
23072 | else | ||
23073 | as_dir="$ac_dir" | ||
23074 | as_dirs= | ||
23075 | while test ! -d "$as_dir"; do | ||
23076 | as_dirs="$as_dir $as_dirs" | ||
23077 | as_dir=`(dirname "$as_dir") 2>/dev/null || | ||
23078 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
23079 | X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
23080 | X"$as_dir" : 'X\(//\)$' \| \ | ||
23081 | X"$as_dir" : 'X\(/\)' \| \ | ||
23082 | . : '\(.\)' 2>/dev/null || | ||
23083 | echo X"$as_dir" | | ||
23084 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
23085 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
23086 | /^X\(\/\/\)$/{ s//\1/; q; } | ||
23087 | /^X\(\/\).*/{ s//\1/; q; } | ||
23088 | s/.*/./; q'` | ||
23089 | done | ||
23090 | test ! -n "$as_dirs" || mkdir $as_dirs | ||
23091 | fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 | ||
23092 | echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} | ||
23093 | { (exit 1); exit 1; }; }; } | ||
24369 | 23094 | ||
23095 | ac_builddir=. | ||
24370 | 23096 | ||
24371 | case $ac_file$ac_mode in | 23097 | if test "$ac_dir" != .; then |
24372 | "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do | 23098 | ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` |
23099 | # A "../" for each directory in $ac_dir_suffix. | ||
23100 | ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` | ||
23101 | else | ||
23102 | ac_dir_suffix= ac_top_builddir= | ||
23103 | fi | ||
23104 | |||
23105 | case $srcdir in | ||
23106 | .) # No --srcdir option. We are building in place. | ||
23107 | ac_srcdir=. | ||
23108 | if test -z "$ac_top_builddir"; then | ||
23109 | ac_top_srcdir=. | ||
23110 | else | ||
23111 | ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` | ||
23112 | fi ;; | ||
23113 | [\\/]* | ?:[\\/]* ) # Absolute path. | ||
23114 | ac_srcdir=$srcdir$ac_dir_suffix; | ||
23115 | ac_top_srcdir=$srcdir ;; | ||
23116 | *) # Relative path. | ||
23117 | ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix | ||
23118 | ac_top_srcdir=$ac_top_builddir$srcdir ;; | ||
23119 | esac | ||
23120 | |||
23121 | # Do not use `cd foo && pwd` to compute absolute paths, because | ||
23122 | # the directories may not exist. | ||
23123 | case `pwd` in | ||
23124 | .) ac_abs_builddir="$ac_dir";; | ||
23125 | *) | ||
23126 | case "$ac_dir" in | ||
23127 | .) ac_abs_builddir=`pwd`;; | ||
23128 | [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | ||
23129 | *) ac_abs_builddir=`pwd`/"$ac_dir";; | ||
23130 | esac;; | ||
23131 | esac | ||
23132 | case $ac_abs_builddir in | ||
23133 | .) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
23134 | *) | ||
23135 | case ${ac_top_builddir}. in | ||
23136 | .) ac_abs_top_builddir=$ac_abs_builddir;; | ||
23137 | [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
23138 | *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; | ||
23139 | esac;; | ||
23140 | esac | ||
23141 | case $ac_abs_builddir in | ||
23142 | .) ac_abs_srcdir=$ac_srcdir;; | ||
23143 | *) | ||
23144 | case $ac_srcdir in | ||
23145 | .) ac_abs_srcdir=$ac_abs_builddir;; | ||
23146 | [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | ||
23147 | *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | ||
23148 | esac;; | ||
23149 | esac | ||
23150 | case $ac_abs_builddir in | ||
23151 | .) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
23152 | *) | ||
23153 | case $ac_top_srcdir in | ||
23154 | .) ac_abs_top_srcdir=$ac_abs_builddir;; | ||
23155 | [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
23156 | *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | ||
23157 | esac;; | ||
23158 | esac | ||
23159 | |||
23160 | |||
23161 | { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 | ||
23162 | echo "$as_me: executing $ac_dest commands" >&6;} | ||
23163 | case $ac_dest in | ||
23164 | depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do | ||
24373 | # Strip MF so we end up with the name of the file. | 23165 | # Strip MF so we end up with the name of the file. |
24374 | mf=`echo "$mf" | sed -e 's/:.*$//'` | 23166 | mf=`echo "$mf" | sed -e 's/:.*$//'` |
24375 | # Check whether this is an Automake generated Makefile or not. | 23167 | # Check whether this is an Automake generated Makefile or not. |
@@ -24379,129 +23171,86 @@ echo "$as_me: executing $ac_file commands" >&6;} | |||
24379 | # each Makefile.in and add a new line on top of each file to say so. | 23171 | # each Makefile.in and add a new line on top of each file to say so. |
24380 | # So let's grep whole file. | 23172 | # So let's grep whole file. |
24381 | if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then | 23173 | if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then |
24382 | dirpart=`$as_dirname -- "$mf" || | 23174 | dirpart=`(dirname "$mf") 2>/dev/null || |
24383 | $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | 23175 | $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
24384 | X"$mf" : 'X\(//\)[^/]' \| \ | 23176 | X"$mf" : 'X\(//\)[^/]' \| \ |
24385 | X"$mf" : 'X\(//\)$' \| \ | 23177 | X"$mf" : 'X\(//\)$' \| \ |
24386 | X"$mf" : 'X\(/\)' \| . 2>/dev/null || | 23178 | X"$mf" : 'X\(/\)' \| \ |
23179 | . : '\(.\)' 2>/dev/null || | ||
24387 | echo X"$mf" | | 23180 | echo X"$mf" | |
24388 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | 23181 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } |
24389 | s//\1/ | 23182 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } |
24390 | q | 23183 | /^X\(\/\/\)$/{ s//\1/; q; } |
24391 | } | 23184 | /^X\(\/\).*/{ s//\1/; q; } |
24392 | /^X\(\/\/\)[^/].*/{ | 23185 | s/.*/./; q'` |
24393 | s//\1/ | ||
24394 | q | ||
24395 | } | ||
24396 | /^X\(\/\/\)$/{ | ||
24397 | s//\1/ | ||
24398 | q | ||
24399 | } | ||
24400 | /^X\(\/\).*/{ | ||
24401 | s//\1/ | ||
24402 | q | ||
24403 | } | ||
24404 | s/.*/./; q'` | ||
24405 | else | 23186 | else |
24406 | continue | 23187 | continue |
24407 | fi | 23188 | fi |
24408 | grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue | 23189 | # Extract the definition of DEPDIR, am__include, and am__quote |
24409 | # Extract the definition of DEP_FILES from the Makefile without | 23190 | # from the Makefile without running `make'. |
24410 | # running `make'. | ||
24411 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | 23191 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
24412 | test -z "$DEPDIR" && continue | 23192 | test -z "$DEPDIR" && continue |
23193 | am__include=`sed -n 's/^am__include = //p' < "$mf"` | ||
23194 | test -z "am__include" && continue | ||
23195 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | ||
24413 | # When using ansi2knr, U may be empty or an underscore; expand it | 23196 | # When using ansi2knr, U may be empty or an underscore; expand it |
24414 | U=`sed -n 's/^U = //p' < "$mf"` | 23197 | U=`sed -n 's/^U = //p' < "$mf"` |
24415 | test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" | 23198 | # Find all dependency output files, they are included files with |
24416 | # We invoke sed twice because it is the simplest approach to | 23199 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
24417 | # changing $(DEPDIR) to its actual value in the expansion. | 23200 | # simplest approach to changing $(DEPDIR) to its actual value in the |
24418 | for file in `sed -n ' | 23201 | # expansion. |
24419 | /^DEP_FILES = .*\\\\$/ { | 23202 | for file in `sed -n " |
24420 | s/^DEP_FILES = // | 23203 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
24421 | :loop | ||
24422 | s/\\\\$// | ||
24423 | p | ||
24424 | n | ||
24425 | /\\\\$/ b loop | ||
24426 | p | ||
24427 | } | ||
24428 | /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ | ||
24429 | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | 23204 | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
24430 | # Make sure the directory exists. | 23205 | # Make sure the directory exists. |
24431 | test -f "$dirpart/$file" && continue | 23206 | test -f "$dirpart/$file" && continue |
24432 | fdir=`$as_dirname -- "$file" || | 23207 | fdir=`(dirname "$file") 2>/dev/null || |
24433 | $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | 23208 | $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
24434 | X"$file" : 'X\(//\)[^/]' \| \ | 23209 | X"$file" : 'X\(//\)[^/]' \| \ |
24435 | X"$file" : 'X\(//\)$' \| \ | 23210 | X"$file" : 'X\(//\)$' \| \ |
24436 | X"$file" : 'X\(/\)' \| . 2>/dev/null || | 23211 | X"$file" : 'X\(/\)' \| \ |
23212 | . : '\(.\)' 2>/dev/null || | ||
24437 | echo X"$file" | | 23213 | echo X"$file" | |
24438 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | 23214 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } |
24439 | s//\1/ | 23215 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } |
24440 | q | 23216 | /^X\(\/\/\)$/{ s//\1/; q; } |
24441 | } | 23217 | /^X\(\/\).*/{ s//\1/; q; } |
24442 | /^X\(\/\/\)[^/].*/{ | 23218 | s/.*/./; q'` |
24443 | s//\1/ | 23219 | { if $as_mkdir_p; then |
24444 | q | 23220 | mkdir -p $dirpart/$fdir |
24445 | } | 23221 | else |
24446 | /^X\(\/\/\)$/{ | 23222 | as_dir=$dirpart/$fdir |
24447 | s//\1/ | ||
24448 | q | ||
24449 | } | ||
24450 | /^X\(\/\).*/{ | ||
24451 | s//\1/ | ||
24452 | q | ||
24453 | } | ||
24454 | s/.*/./; q'` | ||
24455 | { as_dir=$dirpart/$fdir | ||
24456 | case $as_dir in #( | ||
24457 | -*) as_dir=./$as_dir;; | ||
24458 | esac | ||
24459 | test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { | ||
24460 | as_dirs= | 23223 | as_dirs= |
24461 | while :; do | 23224 | while test ! -d "$as_dir"; do |
24462 | case $as_dir in #( | 23225 | as_dirs="$as_dir $as_dirs" |
24463 | *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( | 23226 | as_dir=`(dirname "$as_dir") 2>/dev/null || |
24464 | *) as_qdir=$as_dir;; | ||
24465 | esac | ||
24466 | as_dirs="'$as_qdir' $as_dirs" | ||
24467 | as_dir=`$as_dirname -- "$as_dir" || | ||
24468 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | 23227 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
24469 | X"$as_dir" : 'X\(//\)[^/]' \| \ | 23228 | X"$as_dir" : 'X\(//\)[^/]' \| \ |
24470 | X"$as_dir" : 'X\(//\)$' \| \ | 23229 | X"$as_dir" : 'X\(//\)$' \| \ |
24471 | X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || | 23230 | X"$as_dir" : 'X\(/\)' \| \ |
23231 | . : '\(.\)' 2>/dev/null || | ||
24472 | echo X"$as_dir" | | 23232 | echo X"$as_dir" | |
24473 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | 23233 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } |
24474 | s//\1/ | 23234 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } |
24475 | q | 23235 | /^X\(\/\/\)$/{ s//\1/; q; } |
24476 | } | 23236 | /^X\(\/\).*/{ s//\1/; q; } |
24477 | /^X\(\/\/\)[^/].*/{ | 23237 | s/.*/./; q'` |
24478 | s//\1/ | ||
24479 | q | ||
24480 | } | ||
24481 | /^X\(\/\/\)$/{ | ||
24482 | s//\1/ | ||
24483 | q | ||
24484 | } | ||
24485 | /^X\(\/\).*/{ | ||
24486 | s//\1/ | ||
24487 | q | ||
24488 | } | ||
24489 | s/.*/./; q'` | ||
24490 | test -d "$as_dir" && break | ||
24491 | done | 23238 | done |
24492 | test -z "$as_dirs" || eval "mkdir $as_dirs" | 23239 | test ! -n "$as_dirs" || mkdir $as_dirs |
24493 | } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 | 23240 | fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 |
24494 | echo "$as_me: error: cannot create directory $as_dir" >&2;} | 23241 | echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} |
24495 | { (exit 1); exit 1; }; }; } | 23242 | { (exit 1); exit 1; }; }; } |
23243 | |||
24496 | # echo "creating $dirpart/$file" | 23244 | # echo "creating $dirpart/$file" |
24497 | echo '# dummy' > "$dirpart/$file" | 23245 | echo '# dummy' > "$dirpart/$file" |
24498 | done | 23246 | done |
24499 | done | 23247 | done |
24500 | ;; | 23248 | ;; |
24501 | |||
24502 | esac | 23249 | esac |
24503 | done # for ac_tag | 23250 | done |
23251 | _ACEOF | ||
24504 | 23252 | ||
23253 | cat >>$CONFIG_STATUS <<\_ACEOF | ||
24505 | 23254 | ||
24506 | { (exit 0); exit 0; } | 23255 | { (exit 0); exit 0; } |
24507 | _ACEOF | 23256 | _ACEOF |
diff --git a/libltdl/install-sh b/libltdl/install-sh index e4160c99..4d4a9519 100755 --- a/libltdl/install-sh +++ b/libltdl/install-sh | |||
@@ -1,7 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # install - install a program, script, or datafile | 2 | # install - install a program, script, or datafile |
3 | 3 | ||
4 | scriptversion=2004-04-01.17 | 4 | scriptversion=2005-05-14.22 |
5 | 5 | ||
6 | # This originates from X11R5 (mit/util/scripts/install.sh), which was | 6 | # This originates from X11R5 (mit/util/scripts/install.sh), which was |
7 | # later released in X11R6 (xc/config/util/install.sh) with the | 7 | # later released in X11R6 (xc/config/util/install.sh) with the |
@@ -58,9 +58,6 @@ stripprog="${STRIPPROG-strip}" | |||
58 | rmprog="${RMPROG-rm}" | 58 | rmprog="${RMPROG-rm}" |
59 | mkdirprog="${MKDIRPROG-mkdir}" | 59 | mkdirprog="${MKDIRPROG-mkdir}" |
60 | 60 | ||
61 | transformbasename= | ||
62 | transform_arg= | ||
63 | instcmd="$mvprog" | ||
64 | chmodcmd="$chmodprog 0755" | 61 | chmodcmd="$chmodprog 0755" |
65 | chowncmd= | 62 | chowncmd= |
66 | chgrpcmd= | 63 | chgrpcmd= |
@@ -70,23 +67,27 @@ mvcmd="$mvprog" | |||
70 | src= | 67 | src= |
71 | dst= | 68 | dst= |
72 | dir_arg= | 69 | dir_arg= |
70 | dstarg= | ||
71 | no_target_directory= | ||
73 | 72 | ||
74 | usage="Usage: $0 [OPTION]... SRCFILE DSTFILE | 73 | usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE |
75 | or: $0 [OPTION]... SRCFILES... DIRECTORY | 74 | or: $0 [OPTION]... SRCFILES... DIRECTORY |
76 | or: $0 -d DIRECTORIES... | 75 | or: $0 [OPTION]... -t DIRECTORY SRCFILES... |
76 | or: $0 [OPTION]... -d DIRECTORIES... | ||
77 | 77 | ||
78 | In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default. | 78 | In the 1st form, copy SRCFILE to DSTFILE. |
79 | In the second, create the directory path DIR. | 79 | In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. |
80 | In the 4th, create DIRECTORIES. | ||
80 | 81 | ||
81 | Options: | 82 | Options: |
82 | -b=TRANSFORMBASENAME | 83 | -c (ignored) |
83 | -c copy source (using $cpprog) instead of moving (using $mvprog). | ||
84 | -d create directories instead of installing files. | 84 | -d create directories instead of installing files. |
85 | -g GROUP $chgrp installed files to GROUP. | 85 | -g GROUP $chgrpprog installed files to GROUP. |
86 | -m MODE $chmod installed files to MODE. | 86 | -m MODE $chmodprog installed files to MODE. |
87 | -o USER $chown installed files to USER. | 87 | -o USER $chownprog installed files to USER. |
88 | -s strip installed files (using $stripprog). | 88 | -s $stripprog installed files. |
89 | -t=TRANSFORM | 89 | -t DIRECTORY install into DIRECTORY. |
90 | -T report an error if DSTFILE is a directory. | ||
90 | --help display this help and exit. | 91 | --help display this help and exit. |
91 | --version display version info and exit. | 92 | --version display version info and exit. |
92 | 93 | ||
@@ -96,12 +97,7 @@ Environment variables override the default commands: | |||
96 | 97 | ||
97 | while test -n "$1"; do | 98 | while test -n "$1"; do |
98 | case $1 in | 99 | case $1 in |
99 | -b=*) transformbasename=`echo $1 | sed 's/-b=//'` | 100 | -c) shift |
100 | shift | ||
101 | continue;; | ||
102 | |||
103 | -c) instcmd=$cpprog | ||
104 | shift | ||
105 | continue;; | 101 | continue;; |
106 | 102 | ||
107 | -d) dir_arg=true | 103 | -d) dir_arg=true |
@@ -113,7 +109,7 @@ while test -n "$1"; do | |||
113 | shift | 109 | shift |
114 | continue;; | 110 | continue;; |
115 | 111 | ||
116 | --help) echo "$usage"; exit 0;; | 112 | --help) echo "$usage"; exit $?;; |
117 | 113 | ||
118 | -m) chmodcmd="$chmodprog $2" | 114 | -m) chmodcmd="$chmodprog $2" |
119 | shift | 115 | shift |
@@ -129,14 +125,20 @@ while test -n "$1"; do | |||
129 | shift | 125 | shift |
130 | continue;; | 126 | continue;; |
131 | 127 | ||
132 | -t=*) transformarg=`echo $1 | sed 's/-t=//'` | 128 | -t) dstarg=$2 |
133 | shift | 129 | shift |
134 | continue;; | 130 | shift |
131 | continue;; | ||
135 | 132 | ||
136 | --version) echo "$0 $scriptversion"; exit 0;; | 133 | -T) no_target_directory=true |
134 | shift | ||
135 | continue;; | ||
136 | |||
137 | --version) echo "$0 $scriptversion"; exit $?;; | ||
137 | 138 | ||
138 | *) # When -d is used, all remaining arguments are directories to create. | 139 | *) # When -d is used, all remaining arguments are directories to create. |
139 | test -n "$dir_arg" && break | 140 | # When -t is used, the destination is already specified. |
141 | test -n "$dir_arg$dstarg" && break | ||
140 | # Otherwise, the last argument is the destination. Remove it from $@. | 142 | # Otherwise, the last argument is the destination. Remove it from $@. |
141 | for arg | 143 | for arg |
142 | do | 144 | do |
@@ -174,13 +176,13 @@ do | |||
174 | src= | 176 | src= |
175 | 177 | ||
176 | if test -d "$dst"; then | 178 | if test -d "$dst"; then |
177 | instcmd=: | 179 | mkdircmd=: |
178 | chmodcmd= | 180 | chmodcmd= |
179 | else | 181 | else |
180 | instcmd=$mkdirprog | 182 | mkdircmd=$mkdirprog |
181 | fi | 183 | fi |
182 | else | 184 | else |
183 | # Waiting for this to be detected by the "$instcmd $src $dsttmp" command | 185 | # Waiting for this to be detected by the "$cpprog $src $dsttmp" command |
184 | # might cause directories to be created, which would be especially bad | 186 | # might cause directories to be created, which would be especially bad |
185 | # if $src (and thus $dsttmp) contains '*'. | 187 | # if $src (and thus $dsttmp) contains '*'. |
186 | if test ! -f "$src" && test ! -d "$src"; then | 188 | if test ! -f "$src" && test ! -d "$src"; then |
@@ -202,12 +204,16 @@ do | |||
202 | # If destination is a directory, append the input filename; won't work | 204 | # If destination is a directory, append the input filename; won't work |
203 | # if double slashes aren't ignored. | 205 | # if double slashes aren't ignored. |
204 | if test -d "$dst"; then | 206 | if test -d "$dst"; then |
207 | if test -n "$no_target_directory"; then | ||
208 | echo "$0: $dstarg: Is a directory" >&2 | ||
209 | exit 1 | ||
210 | fi | ||
205 | dst=$dst/`basename "$src"` | 211 | dst=$dst/`basename "$src"` |
206 | fi | 212 | fi |
207 | fi | 213 | fi |
208 | 214 | ||
209 | # This sed command emulates the dirname command. | 215 | # This sed command emulates the dirname command. |
210 | dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` | 216 | dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` |
211 | 217 | ||
212 | # Make sure that the destination directory exists. | 218 | # Make sure that the destination directory exists. |
213 | 219 | ||
@@ -220,7 +226,8 @@ do | |||
220 | oIFS=$IFS | 226 | oIFS=$IFS |
221 | # Some sh's can't handle IFS=/ for some reason. | 227 | # Some sh's can't handle IFS=/ for some reason. |
222 | IFS='%' | 228 | IFS='%' |
223 | set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` | 229 | set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` |
230 | shift | ||
224 | IFS=$oIFS | 231 | IFS=$oIFS |
225 | 232 | ||
226 | pathcomp= | 233 | pathcomp= |
@@ -229,51 +236,42 @@ do | |||
229 | pathcomp=$pathcomp$1 | 236 | pathcomp=$pathcomp$1 |
230 | shift | 237 | shift |
231 | if test ! -d "$pathcomp"; then | 238 | if test ! -d "$pathcomp"; then |
232 | $mkdirprog "$pathcomp" || lasterr=$? | 239 | $mkdirprog "$pathcomp" |
233 | # mkdir can fail with a `File exist' error in case several | 240 | # mkdir can fail with a `File exist' error in case several |
234 | # install-sh are creating the directory concurrently. This | 241 | # install-sh are creating the directory concurrently. This |
235 | # is OK. | 242 | # is OK. |
236 | test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; } | 243 | test -d "$pathcomp" || exit |
237 | fi | 244 | fi |
238 | pathcomp=$pathcomp/ | 245 | pathcomp=$pathcomp/ |
239 | done | 246 | done |
240 | fi | 247 | fi |
241 | 248 | ||
242 | if test -n "$dir_arg"; then | 249 | if test -n "$dir_arg"; then |
243 | $doit $instcmd "$dst" \ | 250 | $doit $mkdircmd "$dst" \ |
244 | && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ | 251 | && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ |
245 | && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ | 252 | && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ |
246 | && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ | 253 | && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ |
247 | && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } | 254 | && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } |
248 | 255 | ||
249 | else | 256 | else |
250 | # If we're going to rename the final executable, determine the name now. | 257 | dstfile=`basename "$dst"` |
251 | if test -z "$transformarg"; then | ||
252 | dstfile=`basename "$dst"` | ||
253 | else | ||
254 | dstfile=`basename "$dst" $transformbasename \ | ||
255 | | sed $transformarg`$transformbasename | ||
256 | fi | ||
257 | |||
258 | # don't allow the sed command to completely eliminate the filename. | ||
259 | test -z "$dstfile" && dstfile=`basename "$dst"` | ||
260 | 258 | ||
261 | # Make a couple of temp file names in the proper directory. | 259 | # Make a couple of temp file names in the proper directory. |
262 | dsttmp=$dstdir/_inst.$$_ | 260 | dsttmp=$dstdir/_inst.$$_ |
263 | rmtmp=$dstdir/_rm.$$_ | 261 | rmtmp=$dstdir/_rm.$$_ |
264 | 262 | ||
265 | # Trap to clean up those temp files at exit. | 263 | # Trap to clean up those temp files at exit. |
266 | trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 | 264 | trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 |
267 | trap '(exit $?); exit' 1 2 13 15 | 265 | trap '(exit $?); exit' 1 2 13 15 |
268 | 266 | ||
269 | # Move or copy the file name to the temp name | 267 | # Copy the file name to the temp name. |
270 | $doit $instcmd "$src" "$dsttmp" && | 268 | $doit $cpprog "$src" "$dsttmp" && |
271 | 269 | ||
272 | # and set any options; do chmod last to preserve setuid bits. | 270 | # and set any options; do chmod last to preserve setuid bits. |
273 | # | 271 | # |
274 | # If any of these fail, we abort the whole thing. If we want to | 272 | # If any of these fail, we abort the whole thing. If we want to |
275 | # ignore errors from any of these, just make sure not to ignore | 273 | # ignore errors from any of these, just make sure not to ignore |
276 | # errors from the above "$doit $instcmd $src $dsttmp" command. | 274 | # errors from the above "$doit $cpprog $src $dsttmp" command. |
277 | # | 275 | # |
278 | { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ | 276 | { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ |
279 | && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ | 277 | && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ |
@@ -298,7 +296,7 @@ do | |||
298 | || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ | 296 | || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ |
299 | || { | 297 | || { |
300 | echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 | 298 | echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 |
301 | (exit 1); exit | 299 | (exit 1); exit 1 |
302 | } | 300 | } |
303 | else | 301 | else |
304 | : | 302 | : |
@@ -309,12 +307,12 @@ do | |||
309 | $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" | 307 | $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" |
310 | } | 308 | } |
311 | } | 309 | } |
312 | fi || { (exit 1); exit; } | 310 | fi || { (exit 1); exit 1; } |
313 | done | 311 | done |
314 | 312 | ||
315 | # The final little trick to "correctly" pass the exit status to the exit trap. | 313 | # The final little trick to "correctly" pass the exit status to the exit trap. |
316 | { | 314 | { |
317 | (exit 0); exit | 315 | (exit 0); exit 0 |
318 | } | 316 | } |
319 | 317 | ||
320 | # Local variables: | 318 | # Local variables: |
diff --git a/libltdl/ltmain.sh b/libltdl/ltmain.sh index c715b594..06823e05 100644 --- a/libltdl/ltmain.sh +++ b/libltdl/ltmain.sh | |||
@@ -43,7 +43,7 @@ EXIT_FAILURE=1 | |||
43 | 43 | ||
44 | PROGRAM=ltmain.sh | 44 | PROGRAM=ltmain.sh |
45 | PACKAGE=libtool | 45 | PACKAGE=libtool |
46 | VERSION="1.5.22 Debian 1.5.22-4" | 46 | VERSION=1.5.22 |
47 | TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" | 47 | TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" |
48 | 48 | ||
49 | # See if we are running on zsh, and set the options which allow our | 49 | # See if we are running on zsh, and set the options which allow our |
@@ -2082,10 +2082,7 @@ EOF | |||
2082 | case $pass in | 2082 | case $pass in |
2083 | dlopen) libs="$dlfiles" ;; | 2083 | dlopen) libs="$dlfiles" ;; |
2084 | dlpreopen) libs="$dlprefiles" ;; | 2084 | dlpreopen) libs="$dlprefiles" ;; |
2085 | link) | 2085 | link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; |
2086 | libs="$deplibs %DEPLIBS%" | ||
2087 | test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" | ||
2088 | ;; | ||
2089 | esac | 2086 | esac |
2090 | fi | 2087 | fi |
2091 | if test "$pass" = dlopen; then | 2088 | if test "$pass" = dlopen; then |
@@ -3204,11 +3201,6 @@ EOF | |||
3204 | age="$number_minor" | 3201 | age="$number_minor" |
3205 | revision="$number_minor" | 3202 | revision="$number_minor" |
3206 | ;; | 3203 | ;; |
3207 | *) | ||
3208 | $echo "$modename: unknown library version type \`$version_type'" 1>&2 | ||
3209 | $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 | ||
3210 | exit $EXIT_FAILURE | ||
3211 | ;; | ||
3212 | esac | 3204 | esac |
3213 | ;; | 3205 | ;; |
3214 | no) | 3206 | no) |
diff --git a/libltdl/missing b/libltdl/missing index e7ef83a1..894e786e 100755 --- a/libltdl/missing +++ b/libltdl/missing | |||
@@ -1,9 +1,9 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # Common stub for a few missing GNU programs while installing. | 2 | # Common stub for a few missing GNU programs while installing. |
3 | 3 | ||
4 | scriptversion=2003-09-02.23 | 4 | scriptversion=2005-06-08.21 |
5 | 5 | ||
6 | # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 | 6 | # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 |
7 | # Free Software Foundation, Inc. | 7 | # Free Software Foundation, Inc. |
8 | # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. | 8 | # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
9 | 9 | ||
@@ -19,8 +19,8 @@ scriptversion=2003-09-02.23 | |||
19 | 19 | ||
20 | # You should have received a copy of the GNU General Public License | 20 | # You should have received a copy of the GNU General Public License |
21 | # along with this program; if not, write to the Free Software | 21 | # along with this program; if not, write to the Free Software |
22 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | 22 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA |
23 | # 02111-1307, USA. | 23 | # 02110-1301, USA. |
24 | 24 | ||
25 | # As a special exception to the GNU General Public License, if you | 25 | # As a special exception to the GNU General Public License, if you |
26 | # distribute this file as part of a program that contains a | 26 | # distribute this file as part of a program that contains a |
@@ -60,11 +60,6 @@ case "$1" in | |||
60 | msg="probably too old" | 60 | msg="probably too old" |
61 | fi | 61 | fi |
62 | ;; | 62 | ;; |
63 | esac | ||
64 | |||
65 | # If it does not exist, or fails to run (possibly an outdated version), | ||
66 | # try to emulate it. | ||
67 | case "$1" in | ||
68 | 63 | ||
69 | -h|--h|--he|--hel|--help) | 64 | -h|--h|--he|--hel|--help) |
70 | echo "\ | 65 | echo "\ |
@@ -92,10 +87,12 @@ Supported PROGRAM values: | |||
92 | yacc create \`y.tab.[ch]', if possible, from existing .[ch] | 87 | yacc create \`y.tab.[ch]', if possible, from existing .[ch] |
93 | 88 | ||
94 | Send bug reports to <bug-automake@gnu.org>." | 89 | Send bug reports to <bug-automake@gnu.org>." |
90 | exit $? | ||
95 | ;; | 91 | ;; |
96 | 92 | ||
97 | -v|--v|--ve|--ver|--vers|--versi|--versio|--version) | 93 | -v|--v|--ve|--ver|--vers|--versi|--versio|--version) |
98 | echo "missing $scriptversion (GNU Automake)" | 94 | echo "missing $scriptversion (GNU Automake)" |
95 | exit $? | ||
99 | ;; | 96 | ;; |
100 | 97 | ||
101 | -*) | 98 | -*) |
@@ -104,12 +101,42 @@ Send bug reports to <bug-automake@gnu.org>." | |||
104 | exit 1 | 101 | exit 1 |
105 | ;; | 102 | ;; |
106 | 103 | ||
107 | aclocal*) | 104 | esac |
105 | |||
106 | # Now exit if we have it, but it failed. Also exit now if we | ||
107 | # don't have it and --version was passed (most likely to detect | ||
108 | # the program). | ||
109 | case "$1" in | ||
110 | lex|yacc) | ||
111 | # Not GNU programs, they don't have --version. | ||
112 | ;; | ||
113 | |||
114 | tar) | ||
115 | if test -n "$run"; then | ||
116 | echo 1>&2 "ERROR: \`tar' requires --run" | ||
117 | exit 1 | ||
118 | elif test "x$2" = "x--version" || test "x$2" = "x--help"; then | ||
119 | exit 1 | ||
120 | fi | ||
121 | ;; | ||
122 | |||
123 | *) | ||
108 | if test -z "$run" && ($1 --version) > /dev/null 2>&1; then | 124 | if test -z "$run" && ($1 --version) > /dev/null 2>&1; then |
109 | # We have it, but it failed. | 125 | # We have it, but it failed. |
110 | exit 1 | 126 | exit 1 |
127 | elif test "x$2" = "x--version" || test "x$2" = "x--help"; then | ||
128 | # Could not run --version or --help. This is probably someone | ||
129 | # running `$TOOL --version' or `$TOOL --help' to check whether | ||
130 | # $TOOL exists and not knowing $TOOL uses missing. | ||
131 | exit 1 | ||
111 | fi | 132 | fi |
133 | ;; | ||
134 | esac | ||
112 | 135 | ||
136 | # If it does not exist, or fails to run (possibly an outdated version), | ||
137 | # try to emulate it. | ||
138 | case "$1" in | ||
139 | aclocal*) | ||
113 | echo 1>&2 "\ | 140 | echo 1>&2 "\ |
114 | WARNING: \`$1' is $msg. You should only need it if | 141 | WARNING: \`$1' is $msg. You should only need it if |
115 | you modified \`acinclude.m4' or \`${configure_ac}'. You might want | 142 | you modified \`acinclude.m4' or \`${configure_ac}'. You might want |
@@ -119,11 +146,6 @@ WARNING: \`$1' is $msg. You should only need it if | |||
119 | ;; | 146 | ;; |
120 | 147 | ||
121 | autoconf) | 148 | autoconf) |
122 | if test -z "$run" && ($1 --version) > /dev/null 2>&1; then | ||
123 | # We have it, but it failed. | ||
124 | exit 1 | ||
125 | fi | ||
126 | |||
127 | echo 1>&2 "\ | 149 | echo 1>&2 "\ |
128 | WARNING: \`$1' is $msg. You should only need it if | 150 | WARNING: \`$1' is $msg. You should only need it if |
129 | you modified \`${configure_ac}'. You might want to install the | 151 | you modified \`${configure_ac}'. You might want to install the |
@@ -133,11 +155,6 @@ WARNING: \`$1' is $msg. You should only need it if | |||
133 | ;; | 155 | ;; |
134 | 156 | ||
135 | autoheader) | 157 | autoheader) |
136 | if test -z "$run" && ($1 --version) > /dev/null 2>&1; then | ||
137 | # We have it, but it failed. | ||
138 | exit 1 | ||
139 | fi | ||
140 | |||
141 | echo 1>&2 "\ | 158 | echo 1>&2 "\ |
142 | WARNING: \`$1' is $msg. You should only need it if | 159 | WARNING: \`$1' is $msg. You should only need it if |
143 | you modified \`acconfig.h' or \`${configure_ac}'. You might want | 160 | you modified \`acconfig.h' or \`${configure_ac}'. You might want |
@@ -157,11 +174,6 @@ WARNING: \`$1' is $msg. You should only need it if | |||
157 | ;; | 174 | ;; |
158 | 175 | ||
159 | automake*) | 176 | automake*) |
160 | if test -z "$run" && ($1 --version) > /dev/null 2>&1; then | ||
161 | # We have it, but it failed. | ||
162 | exit 1 | ||
163 | fi | ||
164 | |||
165 | echo 1>&2 "\ | 177 | echo 1>&2 "\ |
166 | WARNING: \`$1' is $msg. You should only need it if | 178 | WARNING: \`$1' is $msg. You should only need it if |
167 | you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. | 179 | you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. |
@@ -173,11 +185,6 @@ WARNING: \`$1' is $msg. You should only need it if | |||
173 | ;; | 185 | ;; |
174 | 186 | ||
175 | autom4te) | 187 | autom4te) |
176 | if test -z "$run" && ($1 --version) > /dev/null 2>&1; then | ||
177 | # We have it, but it failed. | ||
178 | exit 1 | ||
179 | fi | ||
180 | |||
181 | echo 1>&2 "\ | 188 | echo 1>&2 "\ |
182 | WARNING: \`$1' is needed, but is $msg. | 189 | WARNING: \`$1' is needed, but is $msg. |
183 | You might have modified some files without having the | 190 | You might have modified some files without having the |
@@ -254,11 +261,6 @@ WARNING: \`$1' is $msg. You should only need it if | |||
254 | ;; | 261 | ;; |
255 | 262 | ||
256 | help2man) | 263 | help2man) |
257 | if test -z "$run" && ($1 --version) > /dev/null 2>&1; then | ||
258 | # We have it, but it failed. | ||
259 | exit 1 | ||
260 | fi | ||
261 | |||
262 | echo 1>&2 "\ | 264 | echo 1>&2 "\ |
263 | WARNING: \`$1' is $msg. You should only need it if | 265 | WARNING: \`$1' is $msg. You should only need it if |
264 | you modified a dependency of a manual page. You may need the | 266 | you modified a dependency of a manual page. You may need the |
@@ -279,11 +281,6 @@ WARNING: \`$1' is $msg. You should only need it if | |||
279 | ;; | 281 | ;; |
280 | 282 | ||
281 | makeinfo) | 283 | makeinfo) |
282 | if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then | ||
283 | # We have makeinfo, but it failed. | ||
284 | exit 1 | ||
285 | fi | ||
286 | |||
287 | echo 1>&2 "\ | 284 | echo 1>&2 "\ |
288 | WARNING: \`$1' is $msg. You should only need it if | 285 | WARNING: \`$1' is $msg. You should only need it if |
289 | you modified a \`.texi' or \`.texinfo' file, or any other file | 286 | you modified a \`.texi' or \`.texinfo' file, or any other file |
@@ -291,20 +288,23 @@ WARNING: \`$1' is $msg. You should only need it if | |||
291 | call might also be the consequence of using a buggy \`make' (AIX, | 288 | call might also be the consequence of using a buggy \`make' (AIX, |
292 | DU, IRIX). You might want to install the \`Texinfo' package or | 289 | DU, IRIX). You might want to install the \`Texinfo' package or |
293 | the \`GNU make' package. Grab either from any GNU archive site." | 290 | the \`GNU make' package. Grab either from any GNU archive site." |
291 | # The file to touch is that specified with -o ... | ||
294 | file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` | 292 | file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` |
295 | if test -z "$file"; then | 293 | if test -z "$file"; then |
296 | file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` | 294 | # ... or it is the one specified with @setfilename ... |
297 | file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` | 295 | infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` |
296 | file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` | ||
297 | # ... or it is derived from the source name (dir/f.texi becomes f.info) | ||
298 | test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info | ||
298 | fi | 299 | fi |
300 | # If the file does not exist, the user really needs makeinfo; | ||
301 | # let's fail without touching anything. | ||
302 | test -f $file || exit 1 | ||
299 | touch $file | 303 | touch $file |
300 | ;; | 304 | ;; |
301 | 305 | ||
302 | tar) | 306 | tar) |
303 | shift | 307 | shift |
304 | if test -n "$run"; then | ||
305 | echo 1>&2 "ERROR: \`tar' requires --run" | ||
306 | exit 1 | ||
307 | fi | ||
308 | 308 | ||
309 | # We have already tried tar in the generic part. | 309 | # We have already tried tar in the generic part. |
310 | # Look for gnutar/gtar before invocation to avoid ugly error | 310 | # Look for gnutar/gtar before invocation to avoid ugly error |
@@ -43,7 +43,7 @@ EXIT_FAILURE=1 | |||
43 | 43 | ||
44 | PROGRAM=ltmain.sh | 44 | PROGRAM=ltmain.sh |
45 | PACKAGE=libtool | 45 | PACKAGE=libtool |
46 | VERSION="1.5.22 Debian 1.5.22-4" | 46 | VERSION=1.5.22 |
47 | TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" | 47 | TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" |
48 | 48 | ||
49 | # See if we are running on zsh, and set the options which allow our | 49 | # See if we are running on zsh, and set the options which allow our |
@@ -2082,10 +2082,7 @@ EOF | |||
2082 | case $pass in | 2082 | case $pass in |
2083 | dlopen) libs="$dlfiles" ;; | 2083 | dlopen) libs="$dlfiles" ;; |
2084 | dlpreopen) libs="$dlprefiles" ;; | 2084 | dlpreopen) libs="$dlprefiles" ;; |
2085 | link) | 2085 | link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; |
2086 | libs="$deplibs %DEPLIBS%" | ||
2087 | test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" | ||
2088 | ;; | ||
2089 | esac | 2086 | esac |
2090 | fi | 2087 | fi |
2091 | if test "$pass" = dlopen; then | 2088 | if test "$pass" = dlopen; then |
@@ -3204,11 +3201,6 @@ EOF | |||
3204 | age="$number_minor" | 3201 | age="$number_minor" |
3205 | revision="$number_minor" | 3202 | revision="$number_minor" |
3206 | ;; | 3203 | ;; |
3207 | *) | ||
3208 | $echo "$modename: unknown library version type \`$version_type'" 1>&2 | ||
3209 | $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 | ||
3210 | exit $EXIT_FAILURE | ||
3211 | ;; | ||
3212 | esac | 3204 | esac |
3213 | ;; | 3205 | ;; |
3214 | no) | 3206 | no) |
diff --git a/mkinstalldirs b/mkinstalldirs index 6fbe5e11..259dbfcd 100644 --- a/mkinstalldirs +++ b/mkinstalldirs | |||
@@ -1,7 +1,7 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # mkinstalldirs --- make directory hierarchy | 2 | # mkinstalldirs --- make directory hierarchy |
3 | 3 | ||
4 | scriptversion=2004-02-15.20 | 4 | scriptversion=2005-06-29.22 |
5 | 5 | ||
6 | # Original author: Noah Friedman <friedman@prep.ai.mit.edu> | 6 | # Original author: Noah Friedman <friedman@prep.ai.mit.edu> |
7 | # Created: 1993-05-16 | 7 | # Created: 1993-05-16 |
@@ -12,7 +12,7 @@ scriptversion=2004-02-15.20 | |||
12 | # <automake-patches@gnu.org>. | 12 | # <automake-patches@gnu.org>. |
13 | 13 | ||
14 | errstatus=0 | 14 | errstatus=0 |
15 | dirmode="" | 15 | dirmode= |
16 | 16 | ||
17 | usage="\ | 17 | usage="\ |
18 | Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... | 18 | Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... |
@@ -27,7 +27,7 @@ while test $# -gt 0 ; do | |||
27 | case $1 in | 27 | case $1 in |
28 | -h | --help | --h*) # -h for help | 28 | -h | --help | --h*) # -h for help |
29 | echo "$usage" | 29 | echo "$usage" |
30 | exit 0 | 30 | exit $? |
31 | ;; | 31 | ;; |
32 | -m) # -m PERM arg | 32 | -m) # -m PERM arg |
33 | shift | 33 | shift |
@@ -37,7 +37,7 @@ while test $# -gt 0 ; do | |||
37 | ;; | 37 | ;; |
38 | --version) | 38 | --version) |
39 | echo "$0 $scriptversion" | 39 | echo "$0 $scriptversion" |
40 | exit 0 | 40 | exit $? |
41 | ;; | 41 | ;; |
42 | --) # stop option processing | 42 | --) # stop option processing |
43 | shift | 43 | shift |
@@ -103,13 +103,21 @@ esac | |||
103 | 103 | ||
104 | for file | 104 | for file |
105 | do | 105 | do |
106 | set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` | 106 | case $file in |
107 | /*) pathcomp=/ ;; | ||
108 | *) pathcomp= ;; | ||
109 | esac | ||
110 | oIFS=$IFS | ||
111 | IFS=/ | ||
112 | set fnord $file | ||
107 | shift | 113 | shift |
114 | IFS=$oIFS | ||
108 | 115 | ||
109 | pathcomp= | ||
110 | for d | 116 | for d |
111 | do | 117 | do |
112 | pathcomp="$pathcomp$d" | 118 | test "x$d" = x && continue |
119 | |||
120 | pathcomp=$pathcomp$d | ||
113 | case $pathcomp in | 121 | case $pathcomp in |
114 | -*) pathcomp=./$pathcomp ;; | 122 | -*) pathcomp=./$pathcomp ;; |
115 | esac | 123 | esac |
@@ -124,7 +132,7 @@ do | |||
124 | else | 132 | else |
125 | if test ! -z "$dirmode"; then | 133 | if test ! -z "$dirmode"; then |
126 | echo "chmod $dirmode $pathcomp" | 134 | echo "chmod $dirmode $pathcomp" |
127 | lasterr="" | 135 | lasterr= |
128 | chmod "$dirmode" "$pathcomp" || lasterr=$? | 136 | chmod "$dirmode" "$pathcomp" || lasterr=$? |
129 | 137 | ||
130 | if test ! -z "$lasterr"; then | 138 | if test ! -z "$lasterr"; then |
@@ -134,7 +142,7 @@ do | |||
134 | fi | 142 | fi |
135 | fi | 143 | fi |
136 | 144 | ||
137 | pathcomp="$pathcomp/" | 145 | pathcomp=$pathcomp/ |
138 | done | 146 | done |
139 | done | 147 | done |
140 | 148 | ||
diff --git a/src/plugins/fs/collection.c b/src/plugins/fs/collection.c index da25ddbc..712c777d 100644 --- a/src/plugins/fs/collection.c +++ b/src/plugins/fs/collection.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | (C) 2005 Christian Grothoff (and other contributing authors) | 3 | (C) 2005, 2006 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -30,12 +30,17 @@ | |||
30 | #include "helper.h" | 30 | #include "helper.h" |
31 | #include "meta.h" | 31 | #include "meta.h" |
32 | #include "collection.h" | 32 | #include "collection.h" |
33 | #include <GNUnet/gnunet_collection_lib.h> | ||
33 | #include <extractor.h> | 34 | #include <extractor.h> |
34 | 35 | ||
35 | static GladeXML * metaXML; | 36 | static GladeXML * metaXML; |
36 | 37 | ||
37 | void on_collectionDialogMetaDataAddButton_clicked(gpointer dummy, | 38 | static struct GE_Context * ectx; |
38 | GtkWidget * uploadButton) { | 39 | |
40 | static struct GC_Configuration * cfg; | ||
41 | |||
42 | void on_collectionDialogMetaDataAddButton_clicked_fs(gpointer dummy, | ||
43 | GtkWidget * uploadButton) { | ||
39 | handleMetaDataListUpdate(metaXML, | 44 | handleMetaDataListUpdate(metaXML, |
40 | "collectionMetaDataTypeComboBox", | 45 | "collectionMetaDataTypeComboBox", |
41 | "collectionMetaDataValueEntry", | 46 | "collectionMetaDataValueEntry", |
@@ -43,8 +48,8 @@ void on_collectionDialogMetaDataAddButton_clicked(gpointer dummy, | |||
43 | } | 48 | } |
44 | 49 | ||
45 | 50 | ||
46 | void createCollection_clicked(GtkWidget * dummy1, | 51 | void createCollection_clicked_fs(GtkWidget * dummy1, |
47 | GtkWidget * dummy2) { | 52 | GtkWidget * dummy2) { |
48 | const char * collectionName; | 53 | const char * collectionName; |
49 | const char * updateIntervalString; | 54 | const char * updateIntervalString; |
50 | GtkWidget * w; | 55 | GtkWidget * w; |
@@ -109,12 +114,14 @@ void createCollection_clicked(GtkWidget * dummy1, | |||
109 | collectionName | 114 | collectionName |
110 | = gtk_entry_get_text(GTK_ENTRY(nameLine)); | 115 | = gtk_entry_get_text(GTK_ENTRY(nameLine)); |
111 | root = NULL; | 116 | root = NULL; |
112 | if (OK == FSUI_startCollection(ctx, | 117 | if (OK == CO_startCollection(ectx, |
113 | gtk_spin_button_get_value_as_int | 118 | cfg, |
114 | (GTK_SPIN_BUTTON(spin)), | 119 | gtk_spin_button_get_value_as_int |
115 | updateInterval, | 120 | (GTK_SPIN_BUTTON(spin)), |
116 | collectionName, | 121 | 1000, /* priority */ |
117 | meta)) { | 122 | updateInterval, |
123 | collectionName, | ||
124 | meta)) { | ||
118 | w = glade_xml_get_widget(getMainXML(), | 125 | w = glade_xml_get_widget(getMainXML(), |
119 | "createCollection"); | 126 | "createCollection"); |
120 | gtk_widget_set_sensitive(w, FALSE); | 127 | gtk_widget_set_sensitive(w, FALSE); |
@@ -141,11 +148,12 @@ void createCollection_clicked(GtkWidget * dummy1, | |||
141 | metaXML = NULL; | 148 | metaXML = NULL; |
142 | } | 149 | } |
143 | 150 | ||
144 | void deleteCollection_clicked(GtkWidget * dummy1, | 151 | void deleteCollection_clicked_fs(GtkWidget * dummy1, |
145 | GtkWidget * dummy2) { | 152 | GtkWidget * dummy2) { |
146 | GtkWidget * w; | 153 | GtkWidget * w; |
147 | 154 | ||
148 | if (OK == FSUI_stopCollection(ctx)) { | 155 | if (OK == CO_stopCollection(ectx, |
156 | cfg)) { | ||
149 | w = glade_xml_get_widget(getMainXML(), | 157 | w = glade_xml_get_widget(getMainXML(), |
150 | "createCollection"); | 158 | "createCollection"); |
151 | gtk_widget_set_sensitive(w, TRUE); | 159 | gtk_widget_set_sensitive(w, TRUE); |
@@ -160,10 +168,14 @@ void deleteCollection_clicked(GtkWidget * dummy1, | |||
160 | } | 168 | } |
161 | } | 169 | } |
162 | 170 | ||
163 | void fs_collection_start() { | 171 | void fs_collection_start(struct GE_Context * e, |
172 | struct GC_Configuration * c) { | ||
164 | GtkWidget * w; | 173 | GtkWidget * w; |
165 | 174 | ||
166 | if (NULL != FSUI_getCollection(ctx)) | 175 | ectx = e; |
176 | cfg = c; | ||
177 | if (NULL != CO_getCollection(ectx, | ||
178 | cfg)) | ||
167 | w = glade_xml_get_widget(getMainXML(), | 179 | w = glade_xml_get_widget(getMainXML(), |
168 | "createCollection"); | 180 | "createCollection"); |
169 | else | 181 | else |
diff --git a/src/plugins/fs/collection.h b/src/plugins/fs/collection.h index 825db40e..2c8f712c 100644 --- a/src/plugins/fs/collection.h +++ b/src/plugins/fs/collection.h | |||
@@ -27,7 +27,10 @@ | |||
27 | #ifndef GTK_COLLECTION_H | 27 | #ifndef GTK_COLLECTION_H |
28 | #define GTK_COLLECTION_H | 28 | #define GTK_COLLECTION_H |
29 | 29 | ||
30 | void fs_collection_start(void); | 30 | #include <GNUnet/gnunet_util.h> |
31 | |||
32 | void fs_collection_start(struct GE_Context * ectx, | ||
33 | struct GC_Configuration * cfg); | ||
31 | 34 | ||
32 | void fs_collection_stop(void); | 35 | void fs_collection_stop(void); |
33 | 36 | ||
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c index cc287093..2e645738 100644 --- a/src/plugins/fs/download.c +++ b/src/plugins/fs/download.c | |||
@@ -44,6 +44,10 @@ static DownloadList * head; | |||
44 | 44 | ||
45 | static GtkTreeStore * summary; | 45 | static GtkTreeStore * summary; |
46 | 46 | ||
47 | static struct GE_Context * ectx; | ||
48 | |||
49 | static struct GC_Configuration * cfg; | ||
50 | |||
47 | static int addFilesToDirectory | 51 | static int addFilesToDirectory |
48 | (const ECRS_FileInfo * fi, | 52 | (const ECRS_FileInfo * fi, |
49 | const HashCode512 * key, | 53 | const HashCode512 * key, |
@@ -59,7 +63,6 @@ static int addFilesToDirectory | |||
59 | if (isRoot == YES) | 63 | if (isRoot == YES) |
60 | return OK; | 64 | return OK; |
61 | DEBUG_BEGIN(); | 65 | DEBUG_BEGIN(); |
62 | FSUI_trackURI(fi); | ||
63 | pos = head; | 66 | pos = head; |
64 | while (pos != NULL) { | 67 | while (pos != NULL) { |
65 | if (ECRS_equalsUri(uri, | 68 | if (ECRS_equalsUri(uri, |
@@ -112,7 +115,7 @@ typedef struct { | |||
112 | const char * mime; | 115 | const char * mime; |
113 | char * final_download_destination; | 116 | char * final_download_destination; |
114 | unsigned int anon; | 117 | unsigned int anon; |
115 | int ret; | 118 | struct FSUI_SearchList * ret; |
116 | } InitiateDownloadCls; | 119 | } InitiateDownloadCls; |
117 | 120 | ||
118 | static void * startSearch(void * cls) { | 121 | static void * startSearch(void * cls) { |
@@ -120,6 +123,8 @@ static void * startSearch(void * cls) { | |||
120 | 123 | ||
121 | idc->ret = FSUI_startSearch(ctx, | 124 | idc->ret = FSUI_startSearch(ctx, |
122 | idc->anon, | 125 | idc->anon, |
126 | 1000, /* FIXME: max results */ | ||
127 | 99 * cronYEARS, /* fixme: timeout */ | ||
123 | idc->uri); | 128 | idc->uri); |
124 | return NULL; | 129 | return NULL; |
125 | } | 130 | } |
@@ -129,6 +134,7 @@ static void * startDownload(void * cls) { | |||
129 | 134 | ||
130 | FSUI_startDownload(ctx, | 135 | FSUI_startDownload(ctx, |
131 | idc->anon, | 136 | idc->anon, |
137 | NO, /* FIXME: isRecursive */ | ||
132 | idc->uri, | 138 | idc->uri, |
133 | idc->final_download_destination); | 139 | idc->final_download_destination); |
134 | return NULL; | 140 | return NULL; |
@@ -189,8 +195,8 @@ static void initiateDownload(GtkTreeModel * model, | |||
189 | we'll just add it as a new tab for now */ | 195 | we'll just add it as a new tab for now */ |
190 | run_with_save_calls(&startSearch, | 196 | run_with_save_calls(&startSearch, |
191 | &idc); | 197 | &idc); |
192 | if (idc.ret == OK) | 198 | if (idc.ret != NULL) |
193 | openTabForSearch(NULL, | 199 | openTabForSearch(idc.ret, |
194 | idc.uri, | 200 | idc.uri, |
195 | idc.anon, | 201 | idc.anon, |
196 | 0, | 202 | 0, |
@@ -238,11 +244,11 @@ static void initiateDownload(GtkTreeModel * model, | |||
238 | if (*cname == '\0') /* name ended in '/' - likely directory */ | 244 | if (*cname == '\0') /* name ended in '/' - likely directory */ |
239 | cname = oname; | 245 | cname = oname; |
240 | idc.name = cname; | 246 | idc.name = cname; |
241 | 247 | GC_get_configuration_value_filename(cfg, | |
242 | final_download_dir = getFileName("FS", | 248 | "FS", |
243 | "INCOMINGDIR", | 249 | "INCOMINGDIR", |
244 | _("You must specify a directory in the configuration" | 250 | "$HOME/gnunet-downloads/", |
245 | " in section `%s' under `%s'.")); | 251 | &final_download_dir); |
246 | if (strlen(dname) > 0) { | 252 | if (strlen(dname) > 0) { |
247 | char * tmp; | 253 | char * tmp; |
248 | tmp = MALLOC(strlen(final_download_dir) + strlen(dname) + 2); | 254 | tmp = MALLOC(strlen(final_download_dir) + strlen(dname) + 2); |
@@ -301,7 +307,8 @@ static void initiateDownload(GtkTreeModel * model, | |||
301 | strcat(idc.final_download_destination, | 307 | strcat(idc.final_download_destination, |
302 | DIR_SEPARATOR_STR); | 308 | DIR_SEPARATOR_STR); |
303 | strcat(idc.final_download_destination, dirPath); | 309 | strcat(idc.final_download_destination, dirPath); |
304 | mkdirp(idc.final_download_destination); | 310 | disk_directory_create(ectx, |
311 | idc.final_download_destination); | ||
305 | strcat(idc.final_download_destination, idc.name); | 312 | strcat(idc.final_download_destination, idc.name); |
306 | if ( (idc.final_download_destination[strlen(idc.final_download_destination) - 1] == '/') || | 313 | if ( (idc.final_download_destination[strlen(idc.final_download_destination) - 1] == '/') || |
307 | (idc.final_download_destination[strlen(idc.final_download_destination) - 1] == '\\') ) | 314 | (idc.final_download_destination[strlen(idc.final_download_destination) - 1] == '\\') ) |
@@ -331,11 +338,11 @@ static void initiateDownload(GtkTreeModel * model, | |||
331 | if (final_download_dir[strlen(final_download_dir)-1] != DIR_SEPARATOR) | 338 | if (final_download_dir[strlen(final_download_dir)-1] != DIR_SEPARATOR) |
332 | strcat(list->finalName, DIR_SEPARATOR_STR); | 339 | strcat(list->finalName, DIR_SEPARATOR_STR); |
333 | strcat(list->finalName, dirPath); | 340 | strcat(list->finalName, dirPath); |
334 | mkdirp(list->finalName); | 341 | disk_directory_create(ectx, list->finalName); |
335 | strcat(list->finalName, idc.name); | 342 | strcat(list->finalName, idc.name); |
336 | head = list; | 343 | head = list; |
337 | size = ECRS_fileSize(idc.uri); | 344 | size = ECRS_fileSize(idc.uri); |
338 | size_h = getHumanSize(size); | 345 | size_h = string_get_fancy_byte_size(size); |
339 | gtk_tree_store_insert(summary, | 346 | gtk_tree_store_insert(summary, |
340 | &iiter, | 347 | &iiter, |
341 | NULL, | 348 | NULL, |
@@ -395,7 +402,7 @@ void on_statusDownloadURIEntry_editing_done(GtkWidget * entry, | |||
395 | urid = STRDUP(uris); | 402 | urid = STRDUP(uris); |
396 | gtk_entry_set_text(GTK_ENTRY(entry), | 403 | gtk_entry_set_text(GTK_ENTRY(entry), |
397 | ECRS_URI_PREFIX); | 404 | ECRS_URI_PREFIX); |
398 | idc.uri = ECRS_stringToUri(urid); | 405 | idc.uri = ECRS_stringToUri(ectx, urid); |
399 | if (idc.uri == NULL) { | 406 | if (idc.uri == NULL) { |
400 | addLogEntry(_("Invalid URI `%s'"), urid); | 407 | addLogEntry(_("Invalid URI `%s'"), urid); |
401 | FREE(urid); | 408 | FREE(urid); |
@@ -412,11 +419,12 @@ void on_statusDownloadURIEntry_editing_done(GtkWidget * entry, | |||
412 | ECRS_freeUri(idc.uri); | 419 | ECRS_freeUri(idc.uri); |
413 | return; | 420 | return; |
414 | } | 421 | } |
415 | final_download_dir = getFileName("FS", | 422 | GC_get_configuration_value_filename(cfg, |
416 | "INCOMINGDIR", | 423 | "FS", |
417 | _("You must specify a directory in the configuration" | 424 | "INCOMINGDIR", |
418 | " in section `%s' under `%s'.")); | 425 | "$HOME/gnunet-downloads/", |
419 | mkdirp(final_download_dir); | 426 | &final_download_dir); |
427 | disk_directory_create(ectx, final_download_dir); | ||
420 | dname = &uris[strlen(ECRS_URI_PREFIX) + strlen(ECRS_FILE_INFIX)]; | 428 | dname = &uris[strlen(ECRS_URI_PREFIX) + strlen(ECRS_FILE_INFIX)]; |
421 | idc.final_download_destination = MALLOC(strlen(final_download_dir) + strlen(dname) + 2); | 429 | idc.final_download_destination = MALLOC(strlen(final_download_dir) + strlen(dname) + 2); |
422 | strcpy(idc.final_download_destination, final_download_dir); | 430 | strcpy(idc.final_download_destination, final_download_dir); |
@@ -434,7 +442,7 @@ void on_statusDownloadURIEntry_editing_done(GtkWidget * entry, | |||
434 | list->filename = idc.final_download_destination; | 442 | list->filename = idc.final_download_destination; |
435 | list->finalName = STRDUP(idc.final_download_destination); | 443 | list->finalName = STRDUP(idc.final_download_destination); |
436 | head = list; | 444 | head = list; |
437 | size_h = getHumanSize(ECRS_fileSize(idc.uri)); | 445 | size_h = string_get_fancy_byte_size(ECRS_fileSize(idc.uri)); |
438 | gtk_tree_store_insert(summary, | 446 | gtk_tree_store_insert(summary, |
439 | &iiter, | 447 | &iiter, |
440 | NULL, | 448 | NULL, |
@@ -507,7 +515,8 @@ void displayDownloadUpdate(const struct ECRS_URI * uri, | |||
507 | &iter)); | 515 | &iter)); |
508 | } | 516 | } |
509 | meta = NULL; | 517 | meta = NULL; |
510 | ECRS_listDirectory(data, | 518 | ECRS_listDirectory(ectx, |
519 | data, | ||
511 | size, | 520 | size, |
512 | &meta, | 521 | &meta, |
513 | &addFilesToDirectory, | 522 | &addFilesToDirectory, |
@@ -528,9 +537,10 @@ void displayDownloadComplete(const struct ECRS_URI * uri, | |||
528 | DownloadList * pos; | 537 | DownloadList * pos; |
529 | 538 | ||
530 | DEBUG_BEGIN(); | 539 | DEBUG_BEGIN(); |
531 | LOG(LOG_DEBUG, | 540 | GE_LOG(ectx, |
532 | "Download '%s' complete\n", | 541 | GE_STATUS | GE_USER | GE_BULK, |
533 | filename); | 542 | _("Download '%s' complete.\n"), |
543 | filename); | ||
534 | pos = head; | 544 | pos = head; |
535 | while (pos != NULL) { | 545 | while (pos != NULL) { |
536 | if (ECRS_equalsUri(uri, | 546 | if (ECRS_equalsUri(uri, |
@@ -544,16 +554,20 @@ void displayDownloadComplete(const struct ECRS_URI * uri, | |||
544 | if ( (pos->rr != NULL) && | 554 | if ( (pos->rr != NULL) && |
545 | (gtk_tree_row_reference_valid(pos->rr)) ) { | 555 | (gtk_tree_row_reference_valid(pos->rr)) ) { |
546 | /* update directory view (if applicable!) */ | 556 | /* update directory view (if applicable!) */ |
547 | if (OK == getFileSize(filename, &size)) { | 557 | if (OK == disk_file_size(ectx, |
548 | LOG(LOG_DEBUG, | 558 | filename, |
549 | "Updating directory view of '%s'\n", | 559 | &size, |
550 | filename); | 560 | YES)) { |
561 | GE_LOG(ectx, | ||
562 | GE_DEBUG, | ||
563 | "Updating directory view of '%s'\n", | ||
564 | filename); | ||
551 | 565 | ||
552 | meta = NULL; | 566 | meta = NULL; |
553 | fd = fileopen(filename, O_RDONLY); | 567 | fd = disk_file_open(ectx, |
554 | if (fd == -1) { | 568 | filename, |
555 | LOG_FILE_STRERROR(LOG_ERROR, "open", filename); | 569 | O_RDONLY); |
556 | } else { | 570 | if (fd != -1) { |
557 | data = MMAP(NULL, | 571 | data = MMAP(NULL, |
558 | size, | 572 | size, |
559 | PROT_READ, | 573 | PROT_READ, |
@@ -561,10 +575,14 @@ void displayDownloadComplete(const struct ECRS_URI * uri, | |||
561 | fd, | 575 | fd, |
562 | 0); | 576 | 0); |
563 | if (data == MAP_FAILED) { | 577 | if (data == MAP_FAILED) { |
564 | LOG_FILE_STRERROR(LOG_ERROR, "mmap", filename); | 578 | GE_LOG_STRERROR_FILE(ectx, |
579 | GE_ERROR | GE_ADMIN | GE_BULK, | ||
580 | "mmap", | ||
581 | filename); | ||
565 | } else { | 582 | } else { |
566 | if (data != NULL) { | 583 | if (data != NULL) { |
567 | ECRS_listDirectory(data, | 584 | ECRS_listDirectory(ectx, |
585 | data, | ||
568 | size, | 586 | size, |
569 | &meta, | 587 | &meta, |
570 | &addFilesToDirectory, | 588 | &addFilesToDirectory, |
@@ -622,28 +640,20 @@ static int delDownloadView(void * cls, | |||
622 | } | 640 | } |
623 | 641 | ||
624 | static void * clearCompletedDownloads(void * unused) { | 642 | static void * clearCompletedDownloads(void * unused) { |
625 | FSUI_clearCompletedDownloads(ctx, | 643 | /* FIXME */ |
626 | &delDownloadView, | ||
627 | NULL); | ||
628 | return NULL; | 644 | return NULL; |
629 | } | 645 | } |
630 | 646 | ||
631 | void on_clearCompletedDownloadsButton_clicked(void * unused, | 647 | void on_clearCompletedDownloadsButton_clicked_fs(void * unused, |
632 | GtkWidget * clearButton) { | 648 | GtkWidget * clearButton) { |
633 | run_with_save_calls(&clearCompletedDownloads, | 649 | run_with_save_calls(&clearCompletedDownloads, |
634 | NULL); | 650 | NULL); |
635 | } | 651 | } |
636 | 652 | ||
637 | struct aDC_closure { | ||
638 | struct ECRS_URI * u; | ||
639 | char * fn; | ||
640 | }; | ||
641 | |||
642 | static void * shutdownCode(void * c) { | 653 | static void * shutdownCode(void * c) { |
643 | struct aDC_closure * cls = c; | 654 | struct FSUI_DownloadList * pos = c; |
644 | FSUI_stopDownload(ctx, | 655 | FSUI_stopDownload(ctx, |
645 | cls->u, | 656 | pos); |
646 | cls->fn); | ||
647 | return NULL; | 657 | return NULL; |
648 | } | 658 | } |
649 | 659 | ||
@@ -651,20 +661,21 @@ static void abortDownloadCallback(GtkTreeModel * model, | |||
651 | GtkTreePath * path, | 661 | GtkTreePath * path, |
652 | GtkTreeIter * iter, | 662 | GtkTreeIter * iter, |
653 | GtkTreeStore * tree) { | 663 | GtkTreeStore * tree) { |
654 | struct aDC_closure cls; | 664 | void * c; |
665 | struct ECRS_URI * u; | ||
655 | 666 | ||
656 | GNUNET_ASSERT(model == GTK_TREE_MODEL(summary)); | 667 | GE_ASSERT(ectx, model == GTK_TREE_MODEL(summary)); |
657 | gtk_tree_model_get(model, | 668 | gtk_tree_model_get(model, |
658 | iter, | 669 | iter, |
659 | DOWNLOAD_URI, &cls.u, | 670 | DOWNLOAD_POS, &c, |
660 | DOWNLOAD_FILENAME, &cls.fn, | 671 | DOWNLOAD_URI, &u, |
661 | -1); | 672 | -1); |
662 | run_with_save_calls(&shutdownCode, | 673 | run_with_save_calls(&shutdownCode, |
663 | &cls); | 674 | c); |
664 | gtk_tree_store_remove(summary, | 675 | gtk_tree_store_remove(summary, |
665 | iter); | 676 | iter); |
666 | if (cls.u != NULL) | 677 | if (u != NULL) |
667 | ECRS_freeUri(cls.u); | 678 | ECRS_freeUri(u); |
668 | } | 679 | } |
669 | 680 | ||
670 | void on_abortDownloadButton_clicked(void * unused, | 681 | void on_abortDownloadButton_clicked(void * unused, |
@@ -683,14 +694,14 @@ void on_abortDownloadButton_clicked(void * unused, | |||
683 | DEBUG_END(); | 694 | DEBUG_END(); |
684 | } | 695 | } |
685 | 696 | ||
686 | static int addDownloadView(void * cls, | 697 | int addDownloadView(struct FSUI_DownloadList * pos, |
687 | const struct FSUI_DownloadList * pos, | 698 | struct FSUI_DownloadList * ppos, |
688 | const char * filename, | 699 | const char * filename, |
689 | const struct ECRS_URI * uri, | 700 | const struct ECRS_URI * uri, |
690 | unsigned long long filesize, | 701 | unsigned long long filesize, |
691 | unsigned long long bytesCompleted, | 702 | unsigned long long bytesCompleted, |
692 | int isRecursive, | 703 | int isRecursive, |
693 | unsigned int anonymityLevel) { | 704 | unsigned int anonymityLevel) { |
694 | GtkTreeIter iiter; | 705 | GtkTreeIter iiter; |
695 | int progress; | 706 | int progress; |
696 | char * uriname; | 707 | char * uriname; |
@@ -712,7 +723,7 @@ static int addDownloadView(void * cls, | |||
712 | (sname[-1] != '/') && | 723 | (sname[-1] != '/') && |
713 | (sname[-1] != '\\') ) | 724 | (sname[-1] != '\\') ) |
714 | sname--; | 725 | sname--; |
715 | size_h = getHumanSize(filesize); | 726 | size_h = string_get_fancy_byte_size(filesize); |
716 | gtk_tree_store_set(summary, | 727 | gtk_tree_store_set(summary, |
717 | &iiter, | 728 | &iiter, |
718 | DOWNLOAD_FILENAME, filename, | 729 | DOWNLOAD_FILENAME, filename, |
@@ -731,12 +742,15 @@ static int addDownloadView(void * cls, | |||
731 | } | 742 | } |
732 | 743 | ||
733 | 744 | ||
734 | void fs_download_start() { | 745 | void fs_download_start(struct GE_Context * e, |
746 | struct GC_Configuration * c) { | ||
735 | GtkWidget * downloadList; | 747 | GtkWidget * downloadList; |
736 | GtkCellRenderer * renderer; | 748 | GtkCellRenderer * renderer; |
737 | GtkTreeViewColumn * column; | 749 | GtkTreeViewColumn * column; |
738 | int col; | 750 | int col; |
739 | 751 | ||
752 | ectx = e; | ||
753 | cfg = c; | ||
740 | DEBUG_BEGIN(); | 754 | DEBUG_BEGIN(); |
741 | downloadList = glade_xml_get_widget(getMainXML(), | 755 | downloadList = glade_xml_get_widget(getMainXML(), |
742 | "activeDownloadsList"); | 756 | "activeDownloadsList"); |
@@ -805,10 +819,6 @@ void fs_download_start() { | |||
805 | gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(downloadList), | 819 | gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(downloadList), |
806 | col - 1), | 820 | col - 1), |
807 | TRUE); | 821 | TRUE); |
808 | FSUI_listDownloads(ctx, | ||
809 | NULL, | ||
810 | &addDownloadView, | ||
811 | NULL); | ||
812 | DEBUG_END(); | 822 | DEBUG_END(); |
813 | } | 823 | } |
814 | 824 | ||
diff --git a/src/plugins/fs/download.h b/src/plugins/fs/download.h index a897d458..3f194c57 100644 --- a/src/plugins/fs/download.h +++ b/src/plugins/fs/download.h | |||
@@ -41,7 +41,8 @@ void displayDownloadUpdate(const struct ECRS_URI * uri, | |||
41 | void displayDownloadComplete(const struct ECRS_URI * uri, | 41 | void displayDownloadComplete(const struct ECRS_URI * uri, |
42 | const char * filename); | 42 | const char * filename); |
43 | 43 | ||
44 | void fs_download_start(void); | 44 | void fs_download_start(struct GE_Context * e, |
45 | struct GC_Configuration * c); | ||
45 | 46 | ||
46 | void fs_download_stop(void); | 47 | void fs_download_stop(void); |
47 | 48 | ||
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c index d7889698..44008226 100644 --- a/src/plugins/fs/fs.c +++ b/src/plugins/fs/fs.c | |||
@@ -36,9 +36,20 @@ | |||
36 | 36 | ||
37 | struct FSUI_Context * ctx; | 37 | struct FSUI_Context * ctx; |
38 | 38 | ||
39 | static void * saveEventProcessor(void * arg) { | 39 | static struct GE_Context * ectx; |
40 | const FSUI_Event * event = arg; | ||
41 | 40 | ||
41 | static struct GC_Configuration * cfg; | ||
42 | |||
43 | typedef struct { | ||
44 | const FSUI_Event * event; | ||
45 | void * ret; | ||
46 | } SEP_Closure; | ||
47 | |||
48 | static void saveEventProcessor(void * arg) { | ||
49 | SEP_Closure * cls = arg; | ||
50 | const FSUI_Event * event = cls->event; | ||
51 | |||
52 | cls->ret = NULL; | ||
42 | DEBUG_BEGIN(); | 53 | DEBUG_BEGIN(); |
43 | switch (event->type) { | 54 | switch (event->type) { |
44 | case FSUI_search_result: | 55 | case FSUI_search_result: |
@@ -50,10 +61,10 @@ static void * saveEventProcessor(void * arg) { | |||
50 | GE_LOG(ectx, | 61 | GE_LOG(ectx, |
51 | GE_ERROR, | 62 | GE_ERROR, |
52 | _("Error while searching: %s\n"), | 63 | _("Error while searching: %s\n"), |
53 | event->data.message); | 64 | event->data.SearchError.message); |
54 | break; | 65 | break; |
55 | case FSUI_download_aborted: | 66 | case FSUI_download_aborted: |
56 | case FSUI_download_suspending: | 67 | case FSUI_download_suspended: |
57 | /* ignore for now */ | 68 | /* ignore for now */ |
58 | break; | 69 | break; |
59 | case FSUI_download_progress: | 70 | case FSUI_download_progress: |
@@ -62,7 +73,7 @@ static void * saveEventProcessor(void * arg) { | |||
62 | event->data.DownloadProgress.last_block, | 73 | event->data.DownloadProgress.last_block, |
63 | event->data.DownloadProgress.last_size); | 74 | event->data.DownloadProgress.last_size); |
64 | break; | 75 | break; |
65 | case FSUI_download_complete: | 76 | case FSUI_download_completed: |
66 | displayDownloadComplete(event->data.DownloadProgress.uri, | 77 | displayDownloadComplete(event->data.DownloadProgress.uri, |
67 | event->data.DownloadProgress.filename); | 78 | event->data.DownloadProgress.filename); |
68 | addLogEntry(_("Download `%s' complete"), | 79 | addLogEntry(_("Download `%s' complete"), |
@@ -76,47 +87,32 @@ static void * saveEventProcessor(void * arg) { | |||
76 | GE_LOG(ectx, | 87 | GE_LOG(ectx, |
77 | GE_ERROR, | 88 | GE_ERROR, |
78 | _("Error while downloading: %s\n"), | 89 | _("Error while downloading: %s\n"), |
79 | event->data.message); | 90 | event->data.DownloadError.message); |
80 | break; | 91 | break; |
81 | case FSUI_upload_progress: | 92 | case FSUI_upload_progress: |
82 | displayUploadUpdate(event->data.UploadProgress.main_filename, | 93 | displayUploadUpdate(event->data.UploadProgress.uc.cctx, |
83 | event->data.UploadProgress.filename, | 94 | event->data.UploadProgress.filename, |
84 | event->data.UploadProgress.completed, | 95 | event->data.UploadProgress.completed, |
85 | event->data.UploadProgress.total); | 96 | event->data.UploadProgress.total); |
86 | displayUploadUpdate(event->data.UploadProgress.main_filename, | ||
87 | event->data.UploadProgress.main_filename, | ||
88 | event->data.UploadProgress.main_completed, | ||
89 | event->data.UploadProgress.main_total); | ||
90 | break; | 97 | break; |
91 | case FSUI_upload_complete: | 98 | case FSUI_upload_completed: |
92 | displayUploadComplete(event->data.UploadComplete.main_filename, | 99 | displayUploadComplete(event->data.UploadCompleted.uc.cctx, |
93 | event->data.UploadComplete.filename, | 100 | event->data.UploadCompleted.filename, |
94 | event->data.UploadComplete.uri); | 101 | event->data.UploadCompleted.uri); |
95 | addLogEntry(_("Upload `%s' complete"), | 102 | addLogEntry(_("Upload `%s' complete"), |
96 | event->data.UploadComplete.filename); | 103 | event->data.UploadCompleted.filename); |
97 | gnunetgtk_notify(NOTIFY_NORMAL, | 104 | gnunetgtk_notify(NOTIFY_NORMAL, |
98 | _("Upload `%s' complete"), | 105 | _("Upload `%s' complete"), |
99 | event->data.UploadComplete.filename); | 106 | event->data.UploadCompleted.filename); |
100 | break; | 107 | break; |
101 | case FSUI_upload_error: | 108 | case FSUI_upload_error: |
102 | GE_LOG(ectx, | 109 | GE_LOG(ectx, |
103 | GE_ERROR, | 110 | GE_ERROR, |
104 | _("Error while uploading: %s\n"), | 111 | _("Error while uploading: %s\n"), |
105 | event->data.message); | 112 | event->data.UploadError.message); |
106 | gnunetgtk_notify(NOTIFY_NORMAL, | 113 | gnunetgtk_notify(NOTIFY_NORMAL, |
107 | _("Error while uploading `%s'"), | 114 | _("Error while uploading `%s'"), |
108 | event->data.message); | 115 | event->data.UploadError.message); |
109 | break; | ||
110 | case FSUI_gnunetd_connected: | ||
111 | GE_LOG(ectx, | ||
112 | GE_INFO, | ||
113 | _("Connected to gnunetd.\n")); | ||
114 | break; | ||
115 | case FSUI_gnunetd_disconnected: | ||
116 | GE_LOG(ectx, | ||
117 | GE_INFO, | ||
118 | _("Disconnected from gnunetd.\n")); | ||
119 | addLogEntry(_("Disconnected from gnunetd.\n")); | ||
120 | break; | 116 | break; |
121 | default: | 117 | default: |
122 | GE_BREAK(ectx, 0); | 118 | GE_BREAK(ectx, 0); |
@@ -127,23 +123,30 @@ static void * saveEventProcessor(void * arg) { | |||
127 | break; | 123 | break; |
128 | } | 124 | } |
129 | DEBUG_END(); | 125 | DEBUG_END(); |
130 | return NULL; | ||
131 | } | 126 | } |
132 | 127 | ||
133 | /** | 128 | /** |
134 | * FSUI event handler. | 129 | * FSUI event handler. |
135 | */ | 130 | */ |
136 | static void eventProcessor(void * cls, | 131 | static void * eventProcessor(void * unused, |
137 | const FSUI_Event * event) { | 132 | const FSUI_Event * event) { |
133 | SEP_Closure cls; | ||
134 | |||
135 | cls.event = event; | ||
136 | cls.ret = NULL; | ||
138 | gtkSaveCall(&saveEventProcessor, | 137 | gtkSaveCall(&saveEventProcessor, |
139 | (void*) event); | 138 | &cls); |
139 | return cls.ret; | ||
140 | } | 140 | } |
141 | 141 | ||
142 | void init_fs() { | 142 | void init_fs(struct GE_Context * e, |
143 | struct GC_Configuration * c) { | ||
143 | GtkWidget * tab; | 144 | GtkWidget * tab; |
144 | GtkWidget * book; | 145 | GtkWidget * book; |
145 | gint num; | 146 | gint num; |
146 | 147 | ||
148 | ectx = e; | ||
149 | cfg = c; | ||
147 | tab | 150 | tab |
148 | = glade_xml_get_widget(getMainXML(), | 151 | = glade_xml_get_widget(getMainXML(), |
149 | "fsnotebook"); | 152 | "fsnotebook"); |
@@ -154,15 +157,18 @@ void init_fs() { | |||
154 | gtk_notebook_set_current_page(GTK_NOTEBOOK(book), 1); | 157 | gtk_notebook_set_current_page(GTK_NOTEBOOK(book), 1); |
155 | gtk_notebook_set_current_page(GTK_NOTEBOOK(book), num); | 158 | gtk_notebook_set_current_page(GTK_NOTEBOOK(book), num); |
156 | 159 | ||
157 | ctx = FSUI_start("gnunet-gtk", | 160 | ctx = FSUI_start(ectx, |
161 | cfg, | ||
162 | "gnunet-gtk", | ||
163 | 128, | ||
158 | YES, | 164 | YES, |
159 | &eventProcessor, | 165 | &eventProcessor, |
160 | NULL); | 166 | NULL); |
161 | fs_collection_start(); | 167 | fs_collection_start(ectx, cfg); |
162 | fs_search_start(); | 168 | fs_search_start(ectx, cfg); |
163 | fs_download_start(); | 169 | fs_download_start(ectx, cfg); |
164 | fs_upload_start(); | 170 | fs_upload_start(ectx, cfg); |
165 | fs_namespace_start(); | 171 | fs_namespace_start(ectx, cfg); |
166 | } | 172 | } |
167 | 173 | ||
168 | void done_fs() { | 174 | void done_fs() { |
diff --git a/src/plugins/fs/fs.h b/src/plugins/fs/fs.h index 5121e9f8..0494a17c 100644 --- a/src/plugins/fs/fs.h +++ b/src/plugins/fs/fs.h | |||
@@ -68,6 +68,7 @@ enum { | |||
68 | DOWNLOAD_URI, | 68 | DOWNLOAD_URI, |
69 | DOWNLOAD_TREEPATH, | 69 | DOWNLOAD_TREEPATH, |
70 | DOWNLOAD_DIRPATH, | 70 | DOWNLOAD_DIRPATH, |
71 | DOWNLOAD_POS, // NEW! | ||
71 | DOWNLOAD_NUM | 72 | DOWNLOAD_NUM |
72 | }; | 73 | }; |
73 | 74 | ||
diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c index 686256d1..74ed7932 100644 --- a/src/plugins/fs/meta.c +++ b/src/plugins/fs/meta.c | |||
@@ -438,7 +438,7 @@ char * updateIntervalToString(TIME_T interval) { | |||
438 | return strdup(_("--sporadic update--")); | 438 | return strdup(_("--sporadic update--")); |
439 | if (interval == ECRS_SBLOCK_UPDATE_NONE) | 439 | if (interval == ECRS_SBLOCK_UPDATE_NONE) |
440 | return strdup(_("--no update--")); | 440 | return strdup(_("--no update--")); |
441 | return timeIntervalToFancyString(interval * cronSECONDS); | 441 | return string_get_fancy_time_interval(interval * cronSECONDS); |
442 | } | 442 | } |
443 | 443 | ||
444 | int parseTimeInterval(const char * timeSpec, | 444 | int parseTimeInterval(const char * timeSpec, |
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c index ac4e0ddf..4a3041e5 100644 --- a/src/plugins/fs/namespace.c +++ b/src/plugins/fs/namespace.c | |||
@@ -30,6 +30,9 @@ | |||
30 | #include "helper.h" | 30 | #include "helper.h" |
31 | #include "meta.h" | 31 | #include "meta.h" |
32 | #include "namespace.h" | 32 | #include "namespace.h" |
33 | #include <GNUnet/gnunet_util_crypto.h> | ||
34 | #include <GNUnet/gnunet_uritrack_lib.h> | ||
35 | #include <GNUnet/gnunet_namespace_lib.h> | ||
33 | #include <extractor.h> | 36 | #include <extractor.h> |
34 | 37 | ||
35 | #define UPDATE_CONTENT_LIST_FREQUENCY (5 * cronMINUTES) | 38 | #define UPDATE_CONTENT_LIST_FREQUENCY (5 * cronMINUTES) |
@@ -52,6 +55,10 @@ static NamespaceList * head; | |||
52 | 55 | ||
53 | static GladeXML * metaXML; | 56 | static GladeXML * metaXML; |
54 | 57 | ||
58 | static struct GE_Context * ectx; | ||
59 | |||
60 | static struct GC_Configuration * cfg; | ||
61 | |||
55 | static GtkWidget * makeNamespaceFrame(GtkWidget ** treeview, | 62 | static GtkWidget * makeNamespaceFrame(GtkWidget ** treeview, |
56 | GtkWidget ** anonSpin) { | 63 | GtkWidget ** anonSpin) { |
57 | GtkWidget * window; | 64 | GtkWidget * window; |
@@ -295,7 +302,7 @@ static int updateView(const ECRS_FileInfo * fi, | |||
295 | uriString = ECRS_uriToString(fi->uri); | 302 | uriString = ECRS_uriToString(fi->uri); |
296 | gtk_list_store_append(GTK_LIST_STORE(model), | 303 | gtk_list_store_append(GTK_LIST_STORE(model), |
297 | &iter); | 304 | &iter); |
298 | size_h = getHumanSize(size); | 305 | size_h = string_get_fancy_byte_size(size); |
299 | gtk_list_store_set(GTK_LIST_STORE(model), | 306 | gtk_list_store_set(GTK_LIST_STORE(model), |
300 | &iter, | 307 | &iter, |
301 | NAMESPACE_FILENAME, filename, | 308 | NAMESPACE_FILENAME, filename, |
@@ -353,8 +360,11 @@ static void doUpdateContentList(void * unused) { | |||
353 | "availableContentList"); | 360 | "availableContentList"); |
354 | model | 361 | model |
355 | = gtk_tree_view_get_model(GTK_TREE_VIEW(contentList)); | 362 | = gtk_tree_view_get_model(GTK_TREE_VIEW(contentList)); |
356 | FSUI_listURIs(&updateView, | 363 | URITRACK_listURIs(ectx, |
357 | model); | 364 | cfg, |
365 | YES, | ||
366 | &updateView, | ||
367 | model); | ||
358 | DEBUG_END(); | 368 | DEBUG_END(); |
359 | } | 369 | } |
360 | 370 | ||
@@ -451,7 +461,7 @@ static int addNamespaceContentToModel(void * cls, | |||
451 | date = GN_CTIME(&nextPublicationTime); | 461 | date = GN_CTIME(&nextPublicationTime); |
452 | 462 | ||
453 | freq = updateIntervalToString(publicationFrequency); | 463 | freq = updateIntervalToString(publicationFrequency); |
454 | size_h = getHumanSize(size); | 464 | size_h = string_get_fancy_byte_size(size); |
455 | gtk_list_store_append(model, | 465 | gtk_list_store_append(model, |
456 | &iter); | 466 | &iter); |
457 | gtk_list_store_set(model, | 467 | gtk_list_store_set(model, |
@@ -518,8 +528,9 @@ static int addTabForNamespace(void * unused, | |||
518 | list->namespacepage, | 528 | list->namespacepage, |
519 | label); | 529 | label); |
520 | gtk_widget_show(notebook); | 530 | gtk_widget_show(notebook); |
521 | FSUI_listNamespaceContent | 531 | NS_listNamespaceContent |
522 | (ctx, | 532 | (ectx, |
533 | cfg, | ||
523 | namespaceName, | 534 | namespaceName, |
524 | &addNamespaceContentToModel, | 535 | &addNamespaceContentToModel, |
525 | model); | 536 | model); |
@@ -594,10 +605,13 @@ void create_namespace_clicked(GtkWidget * dummy1, | |||
594 | nameLine = glade_xml_get_widget(metaXML, | 605 | nameLine = glade_xml_get_widget(metaXML, |
595 | "namespaceNameEntry"); | 606 | "namespaceNameEntry"); |
596 | namespaceName = gtk_entry_get_text(GTK_ENTRY(nameLine)); | 607 | namespaceName = gtk_entry_get_text(GTK_ENTRY(nameLine)); |
597 | root = FSUI_createNamespace(ctx, | 608 | root = NS_createNamespace(ectx, |
598 | gtk_spin_button_get_value_as_int | 609 | cfg, |
599 | (GTK_SPIN_BUTTON(spin)), | 610 | gtk_spin_button_get_value_as_int |
600 | namespaceName, | 611 | (GTK_SPIN_BUTTON(spin)), |
612 | 1000, /* FIXME: priority */ | ||
613 | 999999, /* FIXME: expiration */ | ||
614 | namespaceName, | ||
601 | meta, | 615 | meta, |
602 | keywordURI, | 616 | keywordURI, |
603 | &rootEntry); | 617 | &rootEntry); |
@@ -677,7 +691,7 @@ void namespaceDelete_clicked(GtkWidget * dummy1, | |||
677 | list = list->next; | 691 | list = list->next; |
678 | } | 692 | } |
679 | if (list == NULL) { | 693 | if (list == NULL) { |
680 | BREAK(); | 694 | GE_BREAK(ectx, 0); |
681 | return; | 695 | return; |
682 | } | 696 | } |
683 | /* open window to ask for confirmation, | 697 | /* open window to ask for confirmation, |
@@ -701,7 +715,9 @@ void namespaceDelete_clicked(GtkWidget * dummy1, | |||
701 | head = list->next; | 715 | head = list->next; |
702 | else | 716 | else |
703 | prev->next = list->next; | 717 | prev->next = list->next; |
704 | FSUI_deleteNamespace(list->name); | 718 | NS_deleteNamespace(ectx, |
719 | cfg, | ||
720 | list->name); | ||
705 | FREE(list->name); | 721 | FREE(list->name); |
706 | ECRS_freeMetaData(list->meta); | 722 | ECRS_freeMetaData(list->meta); |
707 | FREE(list); | 723 | FREE(list); |
@@ -748,18 +764,21 @@ static void initiateUpload(GtkTreeModel * model, | |||
748 | metadata immediately with the dialog. */ | 764 | metadata immediately with the dialog. */ |
749 | 765 | ||
750 | if (dst == NULL) { | 766 | if (dst == NULL) { |
751 | BREAK(); | 767 | GE_BREAK(ectx, 0); |
752 | return; | 768 | return; |
753 | } | 769 | } |
754 | resultURI = FSUI_addToNamespace(ctx, | 770 | resultURI = NS_addToNamespace(ectx, |
755 | cls->anonymityLevel, | 771 | cfg, |
756 | cls->namespaceName, | 772 | cls->anonymityLevel, |
757 | cls->updateInterval, | 773 | 1000, /* FIXME: priority */ |
758 | cls->lastId, | 774 | 999999, /* FIXME: expiration */ |
759 | &cls->thisId, | 775 | cls->namespaceName, |
760 | cls->nextId, | 776 | cls->updateInterval, |
761 | dst, | 777 | cls->lastId, |
762 | meta); | 778 | &cls->thisId, |
779 | cls->nextId, | ||
780 | dst, | ||
781 | meta); | ||
763 | if (resultURI != NULL) { | 782 | if (resultURI != NULL) { |
764 | list = head; | 783 | list = head; |
765 | while ( (list != NULL) && | 784 | while ( (list != NULL) && |
@@ -767,7 +786,7 @@ static void initiateUpload(GtkTreeModel * model, | |||
767 | list->name)) ) | 786 | list->name)) ) |
768 | list = list->next; | 787 | list = list->next; |
769 | if (list == NULL) { | 788 | if (list == NULL) { |
770 | BREAK(); | 789 | GE_BREAK(ectx, 0); |
771 | } else { | 790 | } else { |
772 | /* update namespace content list! */ | 791 | /* update namespace content list! */ |
773 | fi.uri = dst; | 792 | fi.uri = dst; |
@@ -834,7 +853,7 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1, | |||
834 | if (FALSE == gtk_tree_selection_get_selected(selection, | 853 | if (FALSE == gtk_tree_selection_get_selected(selection, |
835 | NULL, | 854 | NULL, |
836 | &iter)) { | 855 | &iter)) { |
837 | BREAK(); | 856 | GE_BREAK(ectx, 0); |
838 | return; | 857 | return; |
839 | } | 858 | } |
840 | gtk_tree_model_get(gtk_tree_view_get_model(GTK_TREE_VIEW(contentList)), | 859 | gtk_tree_model_get(gtk_tree_view_get_model(GTK_TREE_VIEW(contentList)), |
@@ -846,7 +865,7 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1, | |||
846 | = glade_xml_get_widget(getMainXML(), | 865 | = glade_xml_get_widget(getMainXML(), |
847 | "localNamespacesNotebook"); | 866 | "localNamespacesNotebook"); |
848 | num = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)); | 867 | num = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)); |
849 | GNUNET_ASSERT(num != -1); | 868 | GE_ASSERT(ectx, num != -1); |
850 | page =gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), | 869 | page =gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), |
851 | num); | 870 | num); |
852 | list = head; | 871 | list = head; |
@@ -854,7 +873,7 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1, | |||
854 | (list->namespacepage != page) ) | 873 | (list->namespacepage != page) ) |
855 | list = list->next; | 874 | list = list->next; |
856 | if (list == NULL) { | 875 | if (list == NULL) { |
857 | BREAK(); | 876 | GE_BREAK(ectx, 0); |
858 | return; | 877 | return; |
859 | } | 878 | } |
860 | cls.namespaceName = list->name; | 879 | cls.namespaceName = list->name; |
@@ -979,7 +998,7 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | |||
979 | if (FALSE == gtk_tree_selection_get_selected(selection, | 998 | if (FALSE == gtk_tree_selection_get_selected(selection, |
980 | NULL, | 999 | NULL, |
981 | &iter)) { | 1000 | &iter)) { |
982 | BREAK(); | 1001 | GE_BREAK(ectx, 0); |
983 | return; | 1002 | return; |
984 | } | 1003 | } |
985 | gtk_tree_model_get(gtk_tree_view_get_model(GTK_TREE_VIEW(contentList)), | 1004 | gtk_tree_model_get(gtk_tree_view_get_model(GTK_TREE_VIEW(contentList)), |
@@ -991,7 +1010,7 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | |||
991 | = glade_xml_get_widget(getMainXML(), | 1010 | = glade_xml_get_widget(getMainXML(), |
992 | "localNamespacesNotebook"); | 1011 | "localNamespacesNotebook"); |
993 | num = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)); | 1012 | num = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)); |
994 | GNUNET_ASSERT(num != -1); | 1013 | GE_ASSERT(ectx, num != -1); |
995 | page =gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), | 1014 | page =gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), |
996 | num); | 1015 | num); |
997 | list = head; | 1016 | list = head; |
@@ -999,7 +1018,7 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | |||
999 | (list->namespacepage != page) ) | 1018 | (list->namespacepage != page) ) |
1000 | list = list->next; | 1019 | list = list->next; |
1001 | if (list == NULL) { | 1020 | if (list == NULL) { |
1002 | BREAK(); | 1021 | GE_BREAK(ectx, 0); |
1003 | return; | 1022 | return; |
1004 | } | 1023 | } |
1005 | cls.namespaceName = list->name; | 1024 | cls.namespaceName = list->name; |
@@ -1023,7 +1042,7 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | |||
1023 | if (FALSE == gtk_tree_selection_get_selected(selectionNamespace, | 1042 | if (FALSE == gtk_tree_selection_get_selected(selectionNamespace, |
1024 | NULL, | 1043 | NULL, |
1025 | &iter)) { | 1044 | &iter)) { |
1026 | BREAK(); | 1045 | GE_BREAK(ectx, 0); |
1027 | return; | 1046 | return; |
1028 | } | 1047 | } |
1029 | gtk_tree_model_get(list->model, | 1048 | gtk_tree_model_get(list->model, |
@@ -1044,7 +1063,7 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | |||
1044 | next); | 1063 | next); |
1045 | if (OK != enc2hash(next, | 1064 | if (OK != enc2hash(next, |
1046 | &cls.thisId)) { | 1065 | &cls.thisId)) { |
1047 | BREAK(); | 1066 | GE_BREAK(ectx, 0); |
1048 | UNREF(metaXML); | 1067 | UNREF(metaXML); |
1049 | metaXML = NULL; | 1068 | metaXML = NULL; |
1050 | return; | 1069 | return; |
@@ -1053,14 +1072,14 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | |||
1053 | &prevId)) { | 1072 | &prevId)) { |
1054 | cls.lastId = &prevId; | 1073 | cls.lastId = &prevId; |
1055 | } else { | 1074 | } else { |
1056 | BREAK(); /* should not happen, try to continue */ | 1075 | GE_BREAK(ectx, 0); /* should not happen, try to continue */ |
1057 | cls.lastId = NULL; | 1076 | cls.lastId = NULL; |
1058 | } | 1077 | } |
1059 | nameLine = glade_xml_get_widget(metaXML, | 1078 | nameLine = glade_xml_get_widget(metaXML, |
1060 | "nextIdentifierEntry"); | 1079 | "nextIdentifierEntry"); |
1061 | if (OK != parseTimeInterval(freq, | 1080 | if (OK != parseTimeInterval(freq, |
1062 | &cls.updateInterval)) { | 1081 | &cls.updateInterval)) { |
1063 | BREAK(); | 1082 | GE_BREAK(ectx, 0); |
1064 | cls.updateInterval = ECRS_SBLOCK_UPDATE_SPORADIC; | 1083 | cls.updateInterval = ECRS_SBLOCK_UPDATE_SPORADIC; |
1065 | } | 1084 | } |
1066 | if (cls.updateInterval == ECRS_SBLOCK_UPDATE_SPORADIC) { | 1085 | if (cls.updateInterval == ECRS_SBLOCK_UPDATE_SPORADIC) { |
@@ -1069,12 +1088,14 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | |||
1069 | } else { | 1088 | } else { |
1070 | EncName updateName; | 1089 | EncName updateName; |
1071 | 1090 | ||
1072 | if (OK != FSUI_computeNextId(list->name, | 1091 | if (OK != NS_computeNextId(ectx, |
1073 | &prevId, | 1092 | cfg, |
1074 | &cls.thisId, | 1093 | list->name, |
1075 | cls.updateInterval, | 1094 | &prevId, |
1076 | &nextId)) { | 1095 | &cls.thisId, |
1077 | BREAK(); | 1096 | cls.updateInterval, |
1097 | &nextId)) { | ||
1098 | GE_BREAK(ectx, 0); | ||
1078 | UNREF(metaXML); | 1099 | UNREF(metaXML); |
1079 | metaXML = NULL; | 1100 | metaXML = NULL; |
1080 | return; | 1101 | return; |
@@ -1167,7 +1188,8 @@ void on_clearAvailableContentButton_clicked(GtkWidget * dummy1, | |||
1167 | "availableContentList"); | 1188 | "availableContentList"); |
1168 | model | 1189 | model |
1169 | = gtk_tree_view_get_model(GTK_TREE_VIEW(contentList)); | 1190 | = gtk_tree_view_get_model(GTK_TREE_VIEW(contentList)); |
1170 | FSUI_clearTrackedURIS(); | 1191 | URITRACK_clearTrackedURIS(ectx, |
1192 | cfg); | ||
1171 | gtkSaveCall(&clearContentList, model); | 1193 | gtkSaveCall(&clearContentList, model); |
1172 | updateContentList(NULL); | 1194 | updateContentList(NULL); |
1173 | DEBUG_END(); | 1195 | DEBUG_END(); |
@@ -1180,12 +1202,15 @@ void on_trackingCheckButton_toggled(GtkWidget * dummy1, | |||
1180 | trackCheckButton | 1202 | trackCheckButton |
1181 | = glade_xml_get_widget(getMainXML(), | 1203 | = glade_xml_get_widget(getMainXML(), |
1182 | "trackingCheckButton"); | 1204 | "trackingCheckButton"); |
1183 | FSUI_trackURIS(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(trackCheckButton)) == TRUE ? | 1205 | URITRACK_trackURIS(ectx, |
1184 | YES : NO); | 1206 | cfg, |
1207 | gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(trackCheckButton)) == TRUE ? | ||
1208 | YES : NO); | ||
1185 | } | 1209 | } |
1186 | 1210 | ||
1187 | 1211 | ||
1188 | void fs_namespace_start() { | 1212 | void fs_namespace_start(struct GE_Context * e, |
1213 | struct GC_Configuration * c) { | ||
1189 | GtkWidget * contentList; | 1214 | GtkWidget * contentList; |
1190 | GtkListStore * model; | 1215 | GtkListStore * model; |
1191 | GtkCellRenderer * renderer; | 1216 | GtkCellRenderer * renderer; |
@@ -1193,12 +1218,15 @@ void fs_namespace_start() { | |||
1193 | GtkTreeViewColumn * column; | 1218 | GtkTreeViewColumn * column; |
1194 | int col; | 1219 | int col; |
1195 | 1220 | ||
1221 | ectx = e; | ||
1222 | cfg = c; | ||
1196 | DEBUG_BEGIN(); | 1223 | DEBUG_BEGIN(); |
1197 | trackCheckButton | 1224 | trackCheckButton |
1198 | = glade_xml_get_widget(getMainXML(), | 1225 | = glade_xml_get_widget(getMainXML(), |
1199 | "trackingCheckButton"); | 1226 | "trackingCheckButton"); |
1200 | gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(trackCheckButton), | 1227 | gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(trackCheckButton), |
1201 | FSUI_trackStatus() == YES ? TRUE : FALSE); | 1228 | URITRACK_trackStatus(ectx, |
1229 | cfg) == YES ? TRUE : FALSE); | ||
1202 | 1230 | ||
1203 | contentList | 1231 | contentList |
1204 | = glade_xml_get_widget(getMainXML(), | 1232 | = glade_xml_get_widget(getMainXML(), |
@@ -1263,14 +1291,18 @@ void fs_namespace_start() { | |||
1263 | gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(contentList), | 1291 | gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(contentList), |
1264 | col - 1), | 1292 | col - 1), |
1265 | TRUE); | 1293 | TRUE); |
1294 | #if 0 | ||
1295 | /* FIXME: change to event based update approach! */ | ||
1266 | addCronJob(&updateContentList, | 1296 | addCronJob(&updateContentList, |
1267 | 0, | 1297 | 0, |
1268 | UPDATE_CONTENT_LIST_FREQUENCY, | 1298 | UPDATE_CONTENT_LIST_FREQUENCY, |
1269 | NULL); | 1299 | NULL); |
1270 | FSUI_listNamespaces(ctx, | 1300 | #endif |
1271 | YES, | 1301 | NS_listNamespaces(ectx, |
1272 | &addTabForNamespace, | 1302 | cfg, |
1273 | NULL); | 1303 | YES, |
1304 | &addTabForNamespace, | ||
1305 | NULL); | ||
1274 | DEBUG_END(); | 1306 | DEBUG_END(); |
1275 | } | 1307 | } |
1276 | 1308 | ||
diff --git a/src/plugins/fs/namespace.h b/src/plugins/fs/namespace.h index c2260f29..50e1b258 100644 --- a/src/plugins/fs/namespace.h +++ b/src/plugins/fs/namespace.h | |||
@@ -27,7 +27,10 @@ | |||
27 | #ifndef GTK_NAMESPACE_H | 27 | #ifndef GTK_NAMESPACE_H |
28 | #define GTK_NAMESPACE_H | 28 | #define GTK_NAMESPACE_H |
29 | 29 | ||
30 | void fs_namespace_start(void); | 30 | #include <GNUnet/gnunet_util.h> |
31 | |||
32 | void fs_namespace_start(struct GE_Context * ectx, | ||
33 | struct GC_Configuration * cfg); | ||
31 | 34 | ||
32 | void fs_namespace_stop(void); | 35 | void fs_namespace_stop(void); |
33 | 36 | ||
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c index e8f08881..369eff46 100644 --- a/src/plugins/fs/search.c +++ b/src/plugins/fs/search.c | |||
@@ -30,7 +30,8 @@ | |||
30 | #include "fs.h" | 30 | #include "fs.h" |
31 | #include "meta.h" | 31 | #include "meta.h" |
32 | #include <extractor.h> | 32 | #include <extractor.h> |
33 | 33 | #include <GNUnet/gnunet_util_crypto.h> | |
34 | #include <GNUnet/gnunet_namespace_lib.h> | ||
34 | 35 | ||
35 | 36 | ||
36 | /** | 37 | /** |
@@ -43,12 +44,16 @@ typedef struct SL { | |||
43 | GtkTreeModel * model; | 44 | GtkTreeModel * model; |
44 | GtkWidget * anonymityButton; | 45 | GtkWidget * anonymityButton; |
45 | struct ECRS_URI * uri; | 46 | struct ECRS_URI * uri; |
47 | struct FSUI_SearchList * fsui_list; /* FIXME: initialize! */ | ||
46 | } SearchList; | 48 | } SearchList; |
47 | 49 | ||
48 | static SearchList * head; | 50 | static SearchList * head; |
49 | 51 | ||
50 | static GtkListStore * summary; | 52 | static GtkListStore * summary; |
51 | 53 | ||
54 | static struct GE_Context * ectx; | ||
55 | |||
56 | static struct GC_Configuration * cfg; | ||
52 | 57 | ||
53 | /** | 58 | /** |
54 | * Add an entry to the search tree. | 59 | * Add an entry to the search tree. |
@@ -134,7 +139,7 @@ void addEntryToSearchTree(GtkTreeStore * model, | |||
134 | } else { | 139 | } else { |
135 | pixbuf = NULL; | 140 | pixbuf = NULL; |
136 | } | 141 | } |
137 | size_h = getHumanSize(size); | 142 | size_h = string_get_fancy_byte_size(size); |
138 | gtk_tree_store_set(model, | 143 | gtk_tree_store_set(model, |
139 | pos, | 144 | pos, |
140 | SEARCH_NAME, name, | 145 | SEARCH_NAME, name, |
@@ -244,14 +249,15 @@ void on_namespaceRatingSpinButton_changed(GtkWidget * dummy, | |||
244 | } else { | 249 | } else { |
245 | if (encStr != NULL) { | 250 | if (encStr != NULL) { |
246 | newrating = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin)); | 251 | newrating = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin)); |
247 | rating = FSUI_rankNamespace(ctx, | 252 | rating = NS_rankNamespace(ectx, |
248 | encStr, | 253 | cfg, |
249 | newrating - rating); | 254 | encStr, |
255 | newrating - rating); | ||
250 | if (rating != newrating) { | 256 | if (rating != newrating) { |
251 | /* concurrent modification? */ | 257 | /* concurrent modification? */ |
252 | gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), | 258 | gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), |
253 | rating); | 259 | rating); |
254 | BREAK(); | 260 | GE_BREAK(ectx, 0); |
255 | } | 261 | } |
256 | gtk_list_store_set(GTK_LIST_STORE(model), | 262 | gtk_list_store_set(GTK_LIST_STORE(model), |
257 | &iter, | 263 | &iter, |
@@ -321,8 +327,10 @@ void on_searchNamespaceComboBoxEntry_changed(GtkWidget * dummy, | |||
321 | rating); | 327 | rating); |
322 | gtk_widget_set_sensitive(spin, | 328 | gtk_widget_set_sensitive(spin, |
323 | TRUE); | 329 | TRUE); |
324 | if (OK == FSUI_getNamespaceRoot(encStr, | 330 | if (OK == NS_getNamespaceRoot(ectx, |
325 | &root)) { | 331 | cfg, |
332 | encStr, | ||
333 | &root)) { | ||
326 | hash2enc(&root, | 334 | hash2enc(&root, |
327 | &enc); | 335 | &enc); |
328 | keyword | 336 | keyword |
@@ -469,11 +477,11 @@ void displaySearchResult(const ECRS_FileInfo * info, | |||
469 | } | 477 | } |
470 | 478 | ||
471 | static void * stopSearch(void * u) { | 479 | static void * stopSearch(void * u) { |
472 | struct ECRS_URI * uri = u; | 480 | struct FSUI_SearchList * search = u; |
473 | 481 | ||
474 | DEBUG_BEGIN(); | 482 | DEBUG_BEGIN(); |
475 | FSUI_stopSearch(ctx, | 483 | FSUI_stopSearch(ctx, |
476 | uri); | 484 | search); |
477 | DEBUG_END(); | 485 | DEBUG_END(); |
478 | return NULL; | 486 | return NULL; |
479 | } | 487 | } |
@@ -562,7 +570,7 @@ static void closeSearchPage(SearchList * list) { | |||
562 | &iter)); | 570 | &iter)); |
563 | ECRS_freeUri(list->uri); | 571 | ECRS_freeUri(list->uri); |
564 | list->uri = NULL; | 572 | list->uri = NULL; |
565 | BREAK(); | 573 | GE_BREAK(ectx, 0); |
566 | } | 574 | } |
567 | 575 | ||
568 | void on_closeSearchButton_clicked(GtkWidget * searchPage, | 576 | void on_closeSearchButton_clicked(GtkWidget * searchPage, |
@@ -587,7 +595,7 @@ void on_closeSearchButton_clicked(GtkWidget * searchPage, | |||
587 | prev->next = list->next; | 595 | prev->next = list->next; |
588 | 596 | ||
589 | run_with_save_calls(&stopSearch, | 597 | run_with_save_calls(&stopSearch, |
590 | list->uri); | 598 | list->fsui_list); |
591 | closeSearchPage(list); | 599 | closeSearchPage(list); |
592 | FREE(list); | 600 | FREE(list); |
593 | DEBUG_END(); | 601 | DEBUG_END(); |
@@ -690,9 +698,10 @@ static GtkWidget * makeResultFrame(GtkWidget ** treeview, | |||
690 | gtk_tree_view_column_set_reorderable(column, TRUE); | 698 | gtk_tree_view_column_set_reorderable(column, TRUE); |
691 | gtk_tree_view_column_set_sort_column_id(column, SEARCH_DESC); | 699 | gtk_tree_view_column_set_sort_column_id(column, SEARCH_DESC); |
692 | /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/ | 700 | /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/ |
693 | if (! testConfigurationString("GNUNET-GTK", | 701 | if (YES != GC_get_configuration_value_yesno(cfg, |
694 | "DISABLE-PREVIEWS", | 702 | "GNUNET-GTK", |
695 | "YES")) { | 703 | "DISABLE-PREVIEWS", |
704 | NO)) { | ||
696 | renderer = gtk_cell_renderer_pixbuf_new(); | 705 | renderer = gtk_cell_renderer_pixbuf_new(); |
697 | col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList), | 706 | col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList), |
698 | -1, | 707 | -1, |
@@ -721,14 +730,17 @@ static GtkWidget * makeResultFrame(GtkWidget ** treeview, | |||
721 | typedef struct { | 730 | typedef struct { |
722 | struct ECRS_URI * uri; | 731 | struct ECRS_URI * uri; |
723 | int anon; | 732 | int anon; |
733 | struct FSUI_SearchList * ret; | ||
724 | } StartSearchClosure; | 734 | } StartSearchClosure; |
725 | 735 | ||
726 | static void * startSearch(void * cls) { | 736 | static void * startSearch(void * cls) { |
727 | StartSearchClosure * ssc = cls; | 737 | StartSearchClosure * ssc = cls; |
728 | 738 | ||
729 | FSUI_startSearch(ctx, | 739 | ssc->ret = FSUI_startSearch(ctx, |
730 | ssc->anon, | 740 | ssc->anon, |
731 | ssc->uri); | 741 | 1000, /* FIXME: max results */ |
742 | 99 * cronYEARS, /* FIXME: timeout */ | ||
743 | ssc->uri); | ||
732 | return NULL; | 744 | return NULL; |
733 | } | 745 | } |
734 | 746 | ||
@@ -815,7 +827,7 @@ void on_fssearchbutton_clicked(gpointer dummy2, | |||
815 | strcat(ustring, ns); | 827 | strcat(ustring, ns); |
816 | strcat(ustring, "/"); | 828 | strcat(ustring, "/"); |
817 | strcat(ustring, ss); | 829 | strcat(ustring, ss); |
818 | uri = ECRS_stringToUri(ustring); | 830 | uri = ECRS_stringToUri(ectx, ustring); |
819 | if (uri == NULL) { | 831 | if (uri == NULL) { |
820 | GE_LOG(ectx, | 832 | GE_LOG(ectx, |
821 | GE_ERROR | GE_BULK | GE_USER, | 833 | GE_ERROR | GE_BULK | GE_USER, |
@@ -824,14 +836,14 @@ void on_fssearchbutton_clicked(gpointer dummy2, | |||
824 | } | 836 | } |
825 | FREE(ustring); | 837 | FREE(ustring); |
826 | } else { | 838 | } else { |
827 | uri = FSUI_parseCharKeywordURI(ss); | 839 | uri = ECRS_parseCharKeywordURI(ectx, ss); |
828 | } | 840 | } |
829 | if (uri == NULL) | 841 | if (uri == NULL) |
830 | return; | 842 | return; |
831 | if (ns == NULL) { | 843 | if (ns == NULL) { |
832 | tabtxt = STRDUP(ss); | 844 | tabtxt = STRDUP(ss); |
833 | } else { | 845 | } else { |
834 | GNUNET_ASSERT(descStr != NULL); | 846 | GE_ASSERT(ectx, descStr != NULL); |
835 | tabtxt = MALLOC(strlen(ss) + strlen(descStr) + 2); | 847 | tabtxt = MALLOC(strlen(ss) + strlen(descStr) + 2); |
836 | SNPRINTF(tabtxt, | 848 | SNPRINTF(tabtxt, |
837 | strlen(ss) + strlen(descStr) + 2, | 849 | strlen(ss) + strlen(descStr) + 2, |
@@ -899,6 +911,7 @@ void on_fssearchbutton_clicked(gpointer dummy2, | |||
899 | ssc.uri = uri; | 911 | ssc.uri = uri; |
900 | run_with_save_calls(&startSearch, | 912 | run_with_save_calls(&startSearch, |
901 | &ssc); | 913 | &ssc); |
914 | list->fsui_list = ssc.ret; | ||
902 | FREE(tabtxt); | 915 | FREE(tabtxt); |
903 | DEBUG_END(); | 916 | DEBUG_END(); |
904 | } | 917 | } |
@@ -963,6 +976,7 @@ static int addNamespace(void * arg, | |||
963 | return OK; | 976 | return OK; |
964 | } | 977 | } |
965 | 978 | ||
979 | #if 0 | ||
966 | /** | 980 | /** |
967 | * cron job that periodically updates the model for the | 981 | * cron job that periodically updates the model for the |
968 | * namespace selection in the search vbox. | 982 | * namespace selection in the search vbox. |
@@ -986,10 +1000,11 @@ static void updateNCBModelSafe(void * unused) { | |||
986 | NS_SEARCH_METADATA, NULL, | 1000 | NS_SEARCH_METADATA, NULL, |
987 | NS_SEARCH_RATING, 0, | 1001 | NS_SEARCH_RATING, 0, |
988 | -1); | 1002 | -1); |
989 | FSUI_listNamespaces(ctx, | 1003 | NS_listNamespaces(ectx, |
990 | NO, | 1004 | cfg, |
991 | &addNamespace, | 1005 | NO, |
992 | model); | 1006 | &addNamespace, |
1007 | model); | ||
993 | searchNamespaceCB | 1008 | searchNamespaceCB |
994 | = glade_xml_get_widget(getMainXML(), | 1009 | = glade_xml_get_widget(getMainXML(), |
995 | "searchNamespaceComboBoxEntry"); | 1010 | "searchNamespaceComboBoxEntry"); |
@@ -1006,12 +1021,14 @@ static void updateNCBModelSafe(void * unused) { | |||
1006 | static void updateNCBModel(void * dummy) { | 1021 | static void updateNCBModel(void * dummy) { |
1007 | gtkSaveCall(&updateNCBModelSafe, NULL); | 1022 | gtkSaveCall(&updateNCBModelSafe, NULL); |
1008 | } | 1023 | } |
1024 | #endif | ||
1025 | |||
1009 | 1026 | ||
1010 | /** | 1027 | /** |
1011 | * Open a tab for the given search | 1028 | * Open a tab for the given search |
1012 | * (and display the results). | 1029 | * (and display the results). |
1013 | */ | 1030 | */ |
1014 | int openTabForSearch(void * unused, | 1031 | int openTabForSearch(struct FSUI_SearchList * slist, |
1015 | const struct ECRS_URI * uri, | 1032 | const struct ECRS_URI * uri, |
1016 | unsigned int anonymityLevel, | 1033 | unsigned int anonymityLevel, |
1017 | unsigned int resultCount, | 1034 | unsigned int resultCount, |
@@ -1102,14 +1119,17 @@ int openTabForSearch(void * unused, | |||
1102 | return OK; | 1119 | return OK; |
1103 | } | 1120 | } |
1104 | 1121 | ||
1105 | void fs_search_start() { | 1122 | void fs_search_start(struct GE_Context * e, |
1123 | struct GC_Configuration * c) { | ||
1106 | GtkWidget * searchCB; | 1124 | GtkWidget * searchCB; |
1107 | GtkListStore * model; | 1125 | GtkListStore * model; |
1108 | GtkWidget * searchList; | 1126 | GtkWidget * searchList; |
1109 | GtkCellRenderer * renderer; | 1127 | GtkCellRenderer * renderer; |
1110 | GtkTreeViewColumn * column; | 1128 | GtkTreeViewColumn * column; |
1111 | int col; | 1129 | int col; |
1112 | 1130 | ||
1131 | ectx = e; | ||
1132 | cfg = c; | ||
1113 | DEBUG_BEGIN(); | 1133 | DEBUG_BEGIN(); |
1114 | searchCB | 1134 | searchCB |
1115 | = glade_xml_get_widget(getMainXML(), | 1135 | = glade_xml_get_widget(getMainXML(), |
@@ -1124,12 +1144,14 @@ void fs_search_start() { | |||
1124 | GTK_TREE_MODEL(model)); | 1144 | GTK_TREE_MODEL(model)); |
1125 | gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(searchCB), | 1145 | gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(searchCB), |
1126 | NS_SEARCH_DESCRIPTION); | 1146 | NS_SEARCH_DESCRIPTION); |
1147 | #if 0 | ||
1148 | /* FIXME: replace with event callback! */ | ||
1127 | cron_job_add(cron, | 1149 | cron_job_add(cron, |
1128 | &updateNCBModel, | 1150 | &updateNCBModel, |
1129 | 0, | 1151 | 0, |
1130 | 5 * cronMINUTES, | 1152 | 5 * cronMINUTES, |
1131 | NULL); | 1153 | NULL); |
1132 | 1154 | #endif | |
1133 | searchList = glade_xml_get_widget(getMainXML(), | 1155 | searchList = glade_xml_get_widget(getMainXML(), |
1134 | "activeSearchesSummary"); | 1156 | "activeSearchesSummary"); |
1135 | summary = | 1157 | summary = |
@@ -1173,10 +1195,6 @@ void fs_search_start() { | |||
1173 | gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(searchList), | 1195 | gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(searchList), |
1174 | col - 1), | 1196 | col - 1), |
1175 | TRUE); | 1197 | TRUE); |
1176 | |||
1177 | FSUI_listSearches(ctx, | ||
1178 | &openTabForSearch, | ||
1179 | NULL); | ||
1180 | DEBUG_END(); | 1198 | DEBUG_END(); |
1181 | } | 1199 | } |
1182 | 1200 | ||
@@ -1185,10 +1203,12 @@ void fs_search_stop() { | |||
1185 | GtkTreeIter iter; | 1203 | GtkTreeIter iter; |
1186 | struct ECRS_URI * u; | 1204 | struct ECRS_URI * u; |
1187 | 1205 | ||
1206 | #if 0 | ||
1188 | cron_job_del(cron, | 1207 | cron_job_del(cron, |
1189 | &updateNCBModel, | 1208 | &updateNCBModel, |
1190 | 5 * cronMINUTES, | 1209 | 5 * cronMINUTES, |
1191 | NULL); | 1210 | NULL); |
1211 | #endif | ||
1192 | while (head != NULL) { | 1212 | while (head != NULL) { |
1193 | list = head; | 1213 | list = head; |
1194 | head = head->next; | 1214 | head = head->next; |
@@ -1222,8 +1242,8 @@ void fs_search_stop() { | |||
1222 | * This function is a modified version of an Epiphany/Gedit code, | 1242 | * This function is a modified version of an Epiphany/Gedit code, |
1223 | * part of this work is copyrighted (GPL license) by its authors. | 1243 | * part of this work is copyrighted (GPL license) by its authors. |
1224 | */ | 1244 | */ |
1225 | GtkWidget *buildSearchTabLabel (GtkWidget *searchPage, const char *title) | 1245 | GtkWidget *buildSearchTabLabel(GtkWidget *searchPage, |
1226 | { | 1246 | const char *title) { |
1227 | GtkWidget *hbox, *label_hbox, *label_ebox; | 1247 | GtkWidget *hbox, *label_hbox, *label_ebox; |
1228 | GtkWidget *label, *dummy_label; | 1248 | GtkWidget *label, *dummy_label; |
1229 | GtkWidget *close_button; | 1249 | GtkWidget *close_button; |
diff --git a/src/plugins/fs/search.h b/src/plugins/fs/search.h index 7cf46b7a..089074c3 100644 --- a/src/plugins/fs/search.h +++ b/src/plugins/fs/search.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | (C) 2005 Christian Grothoff (and other contributing authors) | 3 | (C) 2005, 2006 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -28,6 +28,7 @@ | |||
28 | #define GTK_SEARCH_H | 28 | #define GTK_SEARCH_H |
29 | 29 | ||
30 | #include <GNUnet/gnunet_ecrs_lib.h> | 30 | #include <GNUnet/gnunet_ecrs_lib.h> |
31 | #include <GNUnet/gnunet_fsui_lib.h> | ||
31 | 32 | ||
32 | /** | 33 | /** |
33 | * Add an entry to the search tree. | 34 | * Add an entry to the search tree. |
@@ -59,13 +60,14 @@ void displaySearchResult(const ECRS_FileInfo * info, | |||
59 | */ | 60 | */ |
60 | GtkWidget * getAnonymityButtonFromTM(GtkTreeModel * model); | 61 | GtkWidget * getAnonymityButtonFromTM(GtkTreeModel * model); |
61 | 62 | ||
62 | int openTabForSearch(void * unused, | 63 | int openTabForSearch(struct FSUI_SearchList * list, |
63 | const struct ECRS_URI * uri, | 64 | const struct ECRS_URI * uri, |
64 | unsigned int anonymityLevel, | 65 | unsigned int anonymityLevel, |
65 | unsigned int resultCount, | 66 | unsigned int resultCount, |
66 | const ECRS_FileInfo * results); | 67 | const ECRS_FileInfo * results); |
67 | 68 | ||
68 | void fs_search_start(void); | 69 | void fs_search_start(struct GE_Context * e, |
70 | struct GC_Configuration * c); | ||
69 | 71 | ||
70 | void fs_search_stop(void); | 72 | void fs_search_stop(void); |
71 | 73 | ||
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c index a0fa0e14..6cf8b153 100644 --- a/src/plugins/fs/upload.c +++ b/src/plugins/fs/upload.c | |||
@@ -49,16 +49,17 @@ static GtkTreeStore * summary; | |||
49 | */ | 49 | */ |
50 | static GladeXML * metaXML; | 50 | static GladeXML * metaXML; |
51 | 51 | ||
52 | static struct GE_Context * ectx; | ||
53 | |||
54 | static struct GC_Configuration * cfg; | ||
55 | |||
52 | /** | 56 | /** |
53 | */ | 57 | */ |
54 | void displayUploadUpdate(const char * mainName, | 58 | void displayUploadUpdate(struct FSUI_UploadList * list, |
55 | const char * filename, | 59 | const char * filename, |
56 | unsigned long long completed, | 60 | unsigned long long completed, |
57 | unsigned long long total) { | 61 | unsigned long long total) { |
58 | GtkTreeIter iter; | ||
59 | GtkTreeIter child; | ||
60 | int progress; | 62 | int progress; |
61 | char * name; | ||
62 | 63 | ||
63 | DEBUG_BEGIN(); | 64 | DEBUG_BEGIN(); |
64 | if (total != 0) | 65 | if (total != 0) |
@@ -66,184 +67,22 @@ void displayUploadUpdate(const char * mainName, | |||
66 | else | 67 | else |
67 | progress = 100; | 68 | progress = 100; |
68 | 69 | ||
69 | if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary), | 70 | /* FIXME! */ |
70 | &iter)) { | ||
71 | do { | ||
72 | gtk_tree_model_get(GTK_TREE_MODEL(summary), | ||
73 | &iter, | ||
74 | UPLOAD_FILENAME, &name, | ||
75 | -1); | ||
76 | if (0 == strcmp(name, filename)) { | ||
77 | gtk_tree_store_set(GTK_TREE_STORE(summary), | ||
78 | &iter, | ||
79 | UPLOAD_PROGRESS, progress, | ||
80 | -1); | ||
81 | return; | ||
82 | } | ||
83 | if (0 == strcmp(name, mainName)) { | ||
84 | if (gtk_tree_model_iter_children(GTK_TREE_MODEL(summary), | ||
85 | &child, | ||
86 | &iter)) { | ||
87 | do { | ||
88 | gtk_tree_model_get(GTK_TREE_MODEL(summary), | ||
89 | &child, | ||
90 | UPLOAD_FILENAME, &name, | ||
91 | -1); | ||
92 | if (0 == strcmp(name, filename)) { | ||
93 | gtk_tree_store_set(GTK_TREE_STORE(summary), | ||
94 | &child, | ||
95 | UPLOAD_PROGRESS, progress, | ||
96 | -1); | ||
97 | return; | ||
98 | } | ||
99 | } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary), | ||
100 | &child)); | ||
101 | } | ||
102 | gtk_tree_store_append(GTK_TREE_STORE(summary), | ||
103 | &child, | ||
104 | &iter); | ||
105 | gtk_tree_store_set(GTK_TREE_STORE(summary), | ||
106 | &child, | ||
107 | UPLOAD_FILENAME, filename, | ||
108 | UPLOAD_PROGRESS, progress, | ||
109 | UPLOAD_URISTRING, NULL, | ||
110 | -1); | ||
111 | return; | ||
112 | } | ||
113 | } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary), | ||
114 | &iter)); | ||
115 | } | ||
116 | if (0 != strcmp(mainName, | ||
117 | filename)) { | ||
118 | gtk_tree_store_append(GTK_TREE_STORE(summary), | ||
119 | &iter, | ||
120 | NULL); | ||
121 | gtk_tree_store_set(GTK_TREE_STORE(summary), | ||
122 | &iter, | ||
123 | UPLOAD_FILENAME, mainName, | ||
124 | UPLOAD_PROGRESS, 0, | ||
125 | UPLOAD_URISTRING, NULL, | ||
126 | -1); | ||
127 | gtk_tree_store_append(GTK_TREE_STORE(summary), | ||
128 | &child, | ||
129 | &iter); | ||
130 | gtk_tree_store_set(GTK_TREE_STORE(summary), | ||
131 | &child, | ||
132 | UPLOAD_FILENAME, filename, | ||
133 | UPLOAD_PROGRESS, progress, | ||
134 | UPLOAD_URISTRING, NULL, | ||
135 | -1); | ||
136 | } else { | ||
137 | gtk_tree_store_append(GTK_TREE_STORE(summary), | ||
138 | &iter, | ||
139 | NULL); | ||
140 | gtk_tree_store_set(GTK_TREE_STORE(summary), | ||
141 | &iter, | ||
142 | UPLOAD_FILENAME, filename, | ||
143 | UPLOAD_PROGRESS, progress, | ||
144 | UPLOAD_URISTRING, NULL, | ||
145 | -1); | ||
146 | } | ||
147 | DEBUG_END(); | 71 | DEBUG_END(); |
148 | } | 72 | } |
149 | 73 | ||
150 | /** | 74 | /** |
151 | */ | 75 | */ |
152 | void displayUploadComplete(const char * mainName, | 76 | void displayUploadComplete(struct FSUI_UploadList * list, |
153 | const char * filename, | 77 | const char * filename, |
154 | const struct ECRS_URI * uri) { | 78 | const struct ECRS_URI * uri) { |
155 | GtkTreeIter iter; | ||
156 | GtkTreeIter child; | ||
157 | char * name; | ||
158 | char * us; | 79 | char * us; |
159 | 80 | ||
160 | DEBUG_BEGIN(); | 81 | DEBUG_BEGIN(); |
161 | GE_ASSERT(ectx, uri != NULL); | 82 | GE_ASSERT(ectx, uri != NULL); |
162 | us = ECRS_uriToString(uri); | 83 | us = ECRS_uriToString(uri); |
163 | GE_ASSERT(ectx, us != NULL); | 84 | GE_ASSERT(ectx, us != NULL); |
164 | if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary), | 85 | /* FIXME */ |
165 | &iter)) { | ||
166 | do { | ||
167 | gtk_tree_model_get(GTK_TREE_MODEL(summary), | ||
168 | &iter, | ||
169 | UPLOAD_FILENAME, &name, | ||
170 | -1); | ||
171 | if (0 == strcmp(name, filename)) { | ||
172 | gtk_tree_store_set(GTK_TREE_STORE(summary), | ||
173 | &iter, | ||
174 | UPLOAD_PROGRESS, 100, | ||
175 | UPLOAD_URISTRING, us, | ||
176 | -1); | ||
177 | FREE(us); | ||
178 | return; | ||
179 | } | ||
180 | if (0 == strcmp(name, mainName)) { | ||
181 | if (gtk_tree_model_iter_children(GTK_TREE_MODEL(summary), | ||
182 | &child, | ||
183 | &iter)) { | ||
184 | do { | ||
185 | gtk_tree_model_get(GTK_TREE_MODEL(summary), | ||
186 | &child, | ||
187 | UPLOAD_FILENAME, &name, | ||
188 | -1); | ||
189 | if (0 == strcmp(name, filename)) { | ||
190 | gtk_tree_store_set(GTK_TREE_STORE(summary), | ||
191 | &child, | ||
192 | UPLOAD_PROGRESS, 100, | ||
193 | UPLOAD_URISTRING, us, | ||
194 | -1); | ||
195 | FREE(us); | ||
196 | return; | ||
197 | } | ||
198 | } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary), | ||
199 | &child)); | ||
200 | } | ||
201 | gtk_tree_store_append(GTK_TREE_STORE(summary), | ||
202 | &child, | ||
203 | &iter); | ||
204 | gtk_tree_store_set(GTK_TREE_STORE(summary), | ||
205 | &child, | ||
206 | UPLOAD_FILENAME, filename, | ||
207 | UPLOAD_PROGRESS, 100, | ||
208 | UPLOAD_URISTRING, us, | ||
209 | -1); | ||
210 | FREE(us); | ||
211 | return; | ||
212 | } | ||
213 | } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary), | ||
214 | &iter)); | ||
215 | } | ||
216 | if (0 != strcmp(mainName, | ||
217 | filename)) { | ||
218 | gtk_tree_store_append(GTK_TREE_STORE(summary), | ||
219 | &iter, | ||
220 | NULL); | ||
221 | gtk_tree_store_set(GTK_TREE_STORE(summary), | ||
222 | &iter, | ||
223 | UPLOAD_FILENAME, mainName, | ||
224 | UPLOAD_PROGRESS, 0, | ||
225 | UPLOAD_URISTRING, NULL, | ||
226 | -1); | ||
227 | gtk_tree_store_append(GTK_TREE_STORE(summary), | ||
228 | &child, | ||
229 | &iter); | ||
230 | gtk_tree_store_set(GTK_TREE_STORE(summary), | ||
231 | &iter, | ||
232 | UPLOAD_FILENAME, filename, | ||
233 | UPLOAD_PROGRESS, 100, | ||
234 | UPLOAD_URISTRING, NULL, | ||
235 | -1); | ||
236 | } else { | ||
237 | gtk_tree_store_append(GTK_TREE_STORE(summary), | ||
238 | &iter, | ||
239 | NULL); | ||
240 | gtk_tree_store_set(GTK_TREE_STORE(summary), | ||
241 | &iter, | ||
242 | UPLOAD_FILENAME, filename, | ||
243 | UPLOAD_PROGRESS, 100, | ||
244 | UPLOAD_URISTRING, us, | ||
245 | -1); | ||
246 | } | ||
247 | FREE(us); | 86 | FREE(us); |
248 | DEBUG_END(); | 87 | DEBUG_END(); |
249 | } | 88 | } |
@@ -293,29 +132,24 @@ typedef struct { | |||
293 | struct ECRS_URI * keywordURI; | 132 | struct ECRS_URI * keywordURI; |
294 | struct ECRS_URI * gkeywordURI; | 133 | struct ECRS_URI * gkeywordURI; |
295 | struct ECRS_MetaData * meta; | 134 | struct ECRS_MetaData * meta; |
135 | struct FSUI_UploadList * fsui_list; // FIXME: use this! | ||
296 | } UploadClosure; | 136 | } UploadClosure; |
297 | 137 | ||
298 | static void * doUpload(void * cls) { | 138 | static void * doUpload(void * cls) { |
299 | UploadClosure * uc = cls; | 139 | UploadClosure * uc = cls; |
300 | 140 | ||
301 | if (uc->doRec) { | 141 | uc->fsui_list = FSUI_startUpload(ctx, |
302 | FSUI_uploadAll(ctx, | 142 | uc->filename, |
303 | uc->filename, | 143 | (DirectoryScanCallback) &disk_directory_scan, |
304 | uc->anon, | 144 | ectx, |
305 | uc->doIndex, | 145 | uc->anon, |
306 | uc->deepIndex, | 146 | 1000, /* FIXME: priority */ |
307 | uc->meta, | 147 | uc->doIndex, |
308 | uc->gkeywordURI, | 148 | YES, /* FIXME: do extract */ |
309 | uc->keywordURI); | 149 | uc->deepIndex, |
310 | } else { | 150 | uc->meta, |
311 | FSUI_upload(ctx, | 151 | uc->gkeywordURI, |
312 | uc->filename, | 152 | uc->keywordURI); |
313 | uc->anon, | ||
314 | uc->doIndex, | ||
315 | NO, | ||
316 | uc->meta, | ||
317 | uc->keywordURI); | ||
318 | } | ||
319 | return NULL; | 153 | return NULL; |
320 | } | 154 | } |
321 | 155 | ||
@@ -334,8 +168,12 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy, | |||
334 | 168 | ||
335 | DEBUG_BEGIN(); | 169 | DEBUG_BEGIN(); |
336 | extractors = EXTRACTOR_loadDefaultLibraries(); | 170 | extractors = EXTRACTOR_loadDefaultLibraries(); |
337 | config = getConfigurationString("FS", | 171 | config = NULL; |
338 | "EXTRACTORS"); | 172 | GC_get_configuration_value_string(cfg, |
173 | "FS", | ||
174 | "EXTRACTORS", | ||
175 | NULL, | ||
176 | &config); | ||
339 | if (config != NULL) { | 177 | if (config != NULL) { |
340 | extractors = EXTRACTOR_loadConfigLibraries(extractors, | 178 | extractors = EXTRACTOR_loadConfigLibraries(extractors, |
341 | config); | 179 | config); |
@@ -354,7 +192,8 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy, | |||
354 | dialog = glade_xml_get_widget(metaXML, | 192 | dialog = glade_xml_get_widget(metaXML, |
355 | "metaDataDialog"); | 193 | "metaDataDialog"); |
356 | uc.meta = ECRS_createMetaData(); | 194 | uc.meta = ECRS_createMetaData(); |
357 | ECRS_extractMetaData(uc.meta, | 195 | ECRS_extractMetaData(ectx, |
196 | uc.meta, | ||
358 | uc.filename, | 197 | uc.filename, |
359 | extractors); | 198 | extractors); |
360 | EXTRACTOR_removeAll(extractors); | 199 | EXTRACTOR_removeAll(extractors); |
@@ -405,7 +244,8 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy, | |||
405 | deepIndex = glade_xml_get_widget(getMainXML(), | 244 | deepIndex = glade_xml_get_widget(getMainXML(), |
406 | "deepIndexCheckButton"); | 245 | "deepIndexCheckButton"); |
407 | uc.deepIndex = (TRUE == gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(deepIndex))) ? YES : NO; | 246 | uc.deepIndex = (TRUE == gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(deepIndex))) ? YES : NO; |
408 | uc.gkeywordURI = ECRS_stringToUri(ECRS_URI_PREFIX | 247 | uc.gkeywordURI = ECRS_stringToUri(ectx, |
248 | ECRS_URI_PREFIX | ||
409 | ECRS_SEARCH_INFIX); | 249 | ECRS_SEARCH_INFIX); |
410 | run_with_save_calls(&doUpload, | 250 | run_with_save_calls(&doUpload, |
411 | &uc); | 251 | &uc); |
@@ -476,7 +316,8 @@ static char * selectFile(const char *oldfilename) { | |||
476 | 316 | ||
477 | void on_mainFileSharingInsertBrowseButton_clicked(GtkWidget * browseButton, | 317 | void on_mainFileSharingInsertBrowseButton_clicked(GtkWidget * browseButton, |
478 | gpointer dummy) { | 318 | gpointer dummy) { |
479 | char *filename, *oldfilename; | 319 | char * filename; |
320 | const char *oldfilename; | ||
480 | GtkWidget * uploadLine; | 321 | GtkWidget * uploadLine; |
481 | GtkWidget * entry; | 322 | GtkWidget * entry; |
482 | GtkListStore * model; | 323 | GtkListStore * model; |
@@ -502,13 +343,16 @@ void on_mainFileSharingInsertBrowseButton_clicked(GtkWidget * browseButton, | |||
502 | } | 343 | } |
503 | 344 | ||
504 | 345 | ||
505 | void fs_upload_start() { | 346 | void fs_upload_start(struct GE_Context * e, |
347 | struct GC_Configuration * c) { | ||
506 | GtkWidget * uploadList; | 348 | GtkWidget * uploadList; |
507 | GtkWidget * uploadEntry; | 349 | GtkWidget * uploadEntry; |
508 | GtkCellRenderer * renderer; | 350 | GtkCellRenderer * renderer; |
509 | GtkListStore * model; | 351 | GtkListStore * model; |
510 | int col; | 352 | int col; |
511 | 353 | ||
354 | ectx = e; | ||
355 | cfg = c; | ||
512 | uploadList = glade_xml_get_widget(getMainXML(), | 356 | uploadList = glade_xml_get_widget(getMainXML(), |
513 | "activeUploadsList"); | 357 | "activeUploadsList"); |
514 | summary = | 358 | summary = |
diff --git a/src/plugins/fs/upload.h b/src/plugins/fs/upload.h index 1f34b118..d3b418cc 100644 --- a/src/plugins/fs/upload.h +++ b/src/plugins/fs/upload.h | |||
@@ -29,14 +29,14 @@ | |||
29 | 29 | ||
30 | /** | 30 | /** |
31 | */ | 31 | */ |
32 | void displayUploadUpdate(const char * mainName, | 32 | void displayUploadUpdate(struct FSUI_UploadList * list, |
33 | const char * filename, | 33 | const char * filename, |
34 | unsigned long long completed, | 34 | unsigned long long completed, |
35 | unsigned long long total); | 35 | unsigned long long total); |
36 | 36 | ||
37 | /** | 37 | /** |
38 | */ | 38 | */ |
39 | void displayUploadComplete(const char * mainName, | 39 | void displayUploadComplete(struct FSUI_UploadList * list, |
40 | const char * filename, | 40 | const char * filename, |
41 | const struct ECRS_URI * uri); | 41 | const struct ECRS_URI * uri); |
42 | 42 | ||
@@ -54,7 +54,8 @@ void displayUploadResult(const ECRS_FileInfo * info, | |||
54 | const struct ECRS_URI * uri, | 54 | const struct ECRS_URI * uri, |
55 | GtkTreeRowReference * row); | 55 | GtkTreeRowReference * row); |
56 | 56 | ||
57 | void fs_upload_start(void); | 57 | void fs_upload_start(struct GE_Context * e, |
58 | struct GC_Configuration * c); | ||
58 | 59 | ||
59 | void fs_upload_stop(void); | 60 | void fs_upload_stop(void); |
60 | 61 | ||