aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2005-08-17 06:59:47 +0000
committerChristian Grothoff <christian@grothoff.org>2005-08-17 06:59:47 +0000
commit5eb2cec19846e1448c6bc730d14d5f41cee68137 (patch)
tree42db1052541f852f1d16d68a0c229ed7eeb9abb5
parent927c4677c88a46ca4f577e3e8230f1bdf7c06b30 (diff)
downloadgnunet-gtk-5eb2cec19846e1448c6bc730d14d5f41cee68137.tar.gz
gnunet-gtk-5eb2cec19846e1448c6bc730d14d5f41cee68137.zip
fix
Diffstat
-rw-r--r--INSTALL61
-rw-r--r--libltdl/Makefile.in51
-rw-r--r--libltdl/aclocal.m4567
-rwxr-xr-xlibltdl/configure124
-rwxr-xr-xlibltdl/install-sh102
-rwxr-xr-xlibltdl/missing85
-rw-r--r--mkinstalldirs6
-rw-r--r--po/Makefile.in2
-rw-r--r--src/plugins/fs/upload.c2
9 files changed, 530 insertions, 470 deletions
diff --git a/INSTALL b/INSTALL
index 56b077d6..54caf7c1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,16 +1,13 @@
1Installation Instructions 1Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
2************************* 2Foundation, Inc.
3 3
4Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free 4 This file is free documentation; the Free Software Foundation gives
5Software Foundation, Inc.
6
7This file is free documentation; the Free Software Foundation gives
8unlimited permission to copy, distribute and modify it. 5unlimited permission to copy, distribute and modify it.
9 6
10Basic Installation 7Basic Installation
11================== 8==================
12 9
13These are generic installation instructions. 10 These are generic installation instructions.
14 11
15 The `configure' shell script attempts to guess correct values for 12 The `configure' shell script attempts to guess correct values for
16various system-dependent variables used during compilation. It uses 13various system-dependent variables used during compilation. It uses
@@ -70,9 +67,9 @@ The simplest way to compile this package is:
70Compilers and Options 67Compilers and Options
71===================== 68=====================
72 69
73Some systems require unusual options for compilation or linking that the 70 Some systems require unusual options for compilation or linking that
74`configure' script does not know about. Run `./configure --help' for 71the `configure' script does not know about. Run `./configure --help'
75details on some of the pertinent environment variables. 72for details on some of the pertinent environment variables.
76 73
77 You can give `configure' initial values for configuration parameters 74 You can give `configure' initial values for configuration parameters
78by setting variables in the command line or in the environment. Here 75by setting variables in the command line or in the environment. Here
@@ -85,7 +82,7 @@ is an example:
85Compiling For Multiple Architectures 82Compiling For Multiple Architectures
86==================================== 83====================================
87 84
88You can compile the package for more than one kind of computer at the 85 You can compile the package for more than one kind of computer at the
89same time, by placing the object files for each architecture in their 86same time, by placing the object files for each architecture in their
90own directory. To do this, you must use a version of `make' that 87own directory. To do this, you must use a version of `make' that
91supports the `VPATH' variable, such as GNU `make'. `cd' to the 88supports the `VPATH' variable, such as GNU `make'. `cd' to the
@@ -102,19 +99,19 @@ for another architecture.
102Installation Names 99Installation Names
103================== 100==================
104 101
105By default, `make install' will install the package's files in 102 By default, `make install' will install the package's files in
106`/usr/local/bin', `/usr/local/man', etc. You can specify an 103`/usr/local/bin', `/usr/local/man', etc. You can specify an
107installation prefix other than `/usr/local' by giving `configure' the 104installation prefix other than `/usr/local' by giving `configure' the
108option `--prefix=PREFIX'. 105option `--prefix=PATH'.
109 106
110 You can specify separate installation prefixes for 107 You can specify separate installation prefixes for
111architecture-specific files and architecture-independent files. If you 108architecture-specific files and architecture-independent files. If you
112give `configure' the option `--exec-prefix=PREFIX', the package will 109give `configure' the option `--exec-prefix=PATH', the package will use
113use PREFIX as the prefix for installing programs and libraries. 110PATH as the prefix for installing programs and libraries.
114Documentation and other data files will still use the regular prefix. 111Documentation and other data files will still use the regular prefix.
115 112
116 In addition, if you use an unusual directory layout you can give 113 In addition, if you use an unusual directory layout you can give
117options like `--bindir=DIR' to specify different values for particular 114options like `--bindir=PATH' to specify different values for particular
118kinds of files. Run `configure --help' for a list of the directories 115kinds of files. Run `configure --help' for a list of the directories
119you can set and what kinds of files go in them. 116you can set and what kinds of files go in them.
120 117
@@ -125,7 +122,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
125Optional Features 122Optional Features
126================= 123=================
127 124
128Some packages pay attention to `--enable-FEATURE' options to 125 Some packages pay attention to `--enable-FEATURE' options to
129`configure', where FEATURE indicates an optional part of the package. 126`configure', where FEATURE indicates an optional part of the package.
130They may also pay attention to `--with-PACKAGE' options, where PACKAGE 127They may also pay attention to `--with-PACKAGE' options, where PACKAGE
131is something like `gnu-as' or `x' (for the X Window System). The 128is something like `gnu-as' or `x' (for the X Window System). The
@@ -140,11 +137,11 @@ you can use the `configure' options `--x-includes=DIR' and
140Specifying the System Type 137Specifying the System Type
141========================== 138==========================
142 139
143There may be some features `configure' cannot figure out automatically, 140 There may be some features `configure' cannot figure out
144but needs to determine by the type of machine the package will run on. 141automatically, but needs to determine by the type of machine the package
145Usually, assuming the package is built to be run on the _same_ 142will run on. Usually, assuming the package is built to be run on the
146architectures, `configure' can figure that out, but if it prints a 143_same_ architectures, `configure' can figure that out, but if it prints
147message saying it cannot guess the machine type, give it the 144a message saying it cannot guess the machine type, give it the
148`--build=TYPE' option. TYPE can either be a short name for the system 145`--build=TYPE' option. TYPE can either be a short name for the system
149type, such as `sun4', or a canonical name which has the form: 146type, such as `sun4', or a canonical name which has the form:
150 147
@@ -170,9 +167,9 @@ eventually be run) with `--host=TYPE'.
170Sharing Defaults 167Sharing Defaults
171================ 168================
172 169
173If you want to set default values for `configure' scripts to share, you 170 If you want to set default values for `configure' scripts to share,
174can create a site shell script called `config.site' that gives default 171you can create a site shell script called `config.site' that gives
175values for variables like `CC', `cache_file', and `prefix'. 172default values for variables like `CC', `cache_file', and `prefix'.
176`configure' looks for `PREFIX/share/config.site' if it exists, then 173`configure' looks for `PREFIX/share/config.site' if it exists, then
177`PREFIX/etc/config.site' if it exists. Or, you can set the 174`PREFIX/etc/config.site' if it exists. Or, you can set the
178`CONFIG_SITE' environment variable to the location of the site script. 175`CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +178,7 @@ A warning: not all `configure' scripts look for a site script.
181Defining Variables 178Defining Variables
182================== 179==================
183 180
184Variables not defined in a site shell script can be set in the 181 Variables not defined in a site shell script can be set in the
185environment passed to `configure'. However, some packages may run 182environment passed to `configure'. However, some packages may run
186configure again during the build, and the customized values of these 183configure again during the build, and the customized values of these
187variables may be lost. In order to avoid this problem, you should set 184variables may be lost. In order to avoid this problem, you should set
@@ -189,18 +186,14 @@ them in the `configure' command line, using `VAR=value'. For example:
189 186
190 ./configure CC=/usr/local2/bin/gcc 187 ./configure CC=/usr/local2/bin/gcc
191 188
192causes the specified `gcc' to be used as the C compiler (unless it is 189will cause the specified gcc to be used as the C compiler (unless it is
193overridden in the site shell script). Here is a another example: 190overridden in the site shell script).
194
195 /bin/bash ./configure CONFIG_SHELL=/bin/bash
196
197Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
198configuration-related scripts to be executed by `/bin/bash'.
199 191
200`configure' Invocation 192`configure' Invocation
201====================== 193======================
202 194
203`configure' recognizes the following options to control how it operates. 195 `configure' recognizes the following options to control how it
196operates.
204 197
205`--help' 198`--help'
206`-h' 199`-h'
diff --git a/libltdl/Makefile.in b/libltdl/Makefile.in
index 0f077113..f00684f6 100644
--- a/libltdl/Makefile.in
+++ b/libltdl/Makefile.in
@@ -1,8 +1,8 @@
1# Makefile.in generated by automake 1.9.5 from Makefile.am. 1# Makefile.in generated by automake 1.8.5 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, 2005 Free Software Foundation, Inc. 5# 2003, 2004 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.
@@ -37,7 +37,6 @@ POST_INSTALL = :
37NORMAL_UNINSTALL = : 37NORMAL_UNINSTALL = :
38PRE_UNINSTALL = : 38PRE_UNINSTALL = :
39POST_UNINSTALL = : 39POST_UNINSTALL = :
40build_triplet = @build@
41host_triplet = @host@ 40host_triplet = @host@
42DIST_COMMON = README $(am__configure_deps) $(am__include_HEADERS_DIST) \ 41DIST_COMMON = README $(am__configure_deps) $(am__include_HEADERS_DIST) \
43 $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \ 42 $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \
@@ -51,15 +50,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
51 $(ACLOCAL_M4) 50 $(ACLOCAL_M4)
52am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ 51am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
53 configure.lineno configure.status.lineno 52 configure.lineno configure.status.lineno
54mkinstalldirs = $(install_sh) -d 53mkinstalldirs = $(mkdir_p)
55CONFIG_HEADER = config.h 54CONFIG_HEADER = config.h
56CONFIG_CLEAN_FILES = 55CONFIG_CLEAN_FILES =
57am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
58am__vpath_adj = case $$p in \
59 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
60 *) f=$$p;; \
61 esac;
62am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
63am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" 56am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
64libLTLIBRARIES_INSTALL = $(INSTALL) 57libLTLIBRARIES_INSTALL = $(INSTALL)
65LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) 58LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
@@ -67,21 +60,19 @@ am__DEPENDENCIES_1 =
67libltdl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) 60libltdl_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
68am_libltdl_la_OBJECTS = ltdl.lo 61am_libltdl_la_OBJECTS = ltdl.lo
69libltdl_la_OBJECTS = $(am_libltdl_la_OBJECTS) 62libltdl_la_OBJECTS = $(am_libltdl_la_OBJECTS)
70@INSTALL_LTDL_TRUE@am_libltdl_la_rpath = -rpath $(libdir)
71libltdlc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) 63libltdlc_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
72am_libltdlc_la_OBJECTS = ltdl.lo 64am_libltdlc_la_OBJECTS = ltdl.lo
73libltdlc_la_OBJECTS = $(am_libltdlc_la_OBJECTS) 65libltdlc_la_OBJECTS = $(am_libltdlc_la_OBJECTS)
74@CONVENIENCE_LTDL_TRUE@am_libltdlc_la_rpath =
75DEFAULT_INCLUDES = -I. -I$(srcdir) -I. 66DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
76depcomp = 67depcomp =
77am__depfiles_maybe = 68am__depfiles_maybe =
78COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 69COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
79 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 70 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
80LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ 71LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
81 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ 72 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
82 $(AM_CFLAGS) $(CFLAGS) 73 $(AM_CFLAGS) $(CFLAGS)
83CCLD = $(CC) 74CCLD = $(CC)
84LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ 75LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
85 $(AM_LDFLAGS) $(LDFLAGS) -o $@ 76 $(AM_LDFLAGS) $(LDFLAGS) -o $@
86SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES) 77SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES)
87DIST_SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES) 78DIST_SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES)
@@ -183,8 +174,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
183am__include = @am__include@ 174am__include = @am__include@
184am__leading_dot = @am__leading_dot@ 175am__leading_dot = @am__leading_dot@
185am__quote = @am__quote@ 176am__quote = @am__quote@
186am__tar = @am__tar@
187am__untar = @am__untar@
188bindir = @bindir@ 177bindir = @bindir@
189build = @build@ 178build = @build@
190build_alias = @build_alias@ 179build_alias = @build_alias@
@@ -284,7 +273,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
284 test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" 273 test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
285 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 274 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
286 if test -f $$p; then \ 275 if test -f $$p; then \
287 f=$(am__strip_dir) \ 276 f="`echo $$p | sed -e 's|^.*/||'`"; \
288 echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ 277 echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
289 $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ 278 $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
290 else :; fi; \ 279 else :; fi; \
@@ -292,8 +281,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
292 281
293uninstall-libLTLIBRARIES: 282uninstall-libLTLIBRARIES:
294 @$(NORMAL_UNINSTALL) 283 @$(NORMAL_UNINSTALL)
295 @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 284 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
296 p=$(am__strip_dir) \ 285 p="`echo $$p | sed -e 's|^.*/||'`"; \
297 echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ 286 echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
298 $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ 287 $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
299 done 288 done
@@ -316,9 +305,9 @@ clean-noinstLTLIBRARIES:
316 rm -f "$${dir}/so_locations"; \ 305 rm -f "$${dir}/so_locations"; \
317 done 306 done
318libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES) 307libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES)
319 $(LINK) $(am_libltdl_la_rpath) $(libltdl_la_LDFLAGS) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS) 308 $(LINK) -rpath $(libdir) $(libltdl_la_LDFLAGS) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS)
320libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES) 309libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES)
321 $(LINK) $(am_libltdlc_la_rpath) $(libltdlc_la_LDFLAGS) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS) 310 $(LINK) $(libltdlc_la_LDFLAGS) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS)
322 311
323mostlyclean-compile: 312mostlyclean-compile:
324 -rm -f *.$(OBJEXT) 313 -rm -f *.$(OBJEXT)
@@ -349,7 +338,7 @@ install-includeHEADERS: $(include_HEADERS)
349 test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" 338 test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
350 @list='$(include_HEADERS)'; for p in $$list; do \ 339 @list='$(include_HEADERS)'; for p in $$list; do \
351 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 340 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
352 f=$(am__strip_dir) \ 341 f="`echo $$p | sed -e 's|^.*/||'`"; \
353 echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ 342 echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
354 $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ 343 $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
355 done 344 done
@@ -357,7 +346,7 @@ install-includeHEADERS: $(include_HEADERS)
357uninstall-includeHEADERS: 346uninstall-includeHEADERS:
358 @$(NORMAL_UNINSTALL) 347 @$(NORMAL_UNINSTALL)
359 @list='$(include_HEADERS)'; for p in $$list; do \ 348 @list='$(include_HEADERS)'; for p in $$list; do \
360 f=$(am__strip_dir) \ 349 f="`echo $$p | sed -e 's|^.*/||'`"; \
361 echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ 350 echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
362 rm -f "$(DESTDIR)$(includedir)/$$f"; \ 351 rm -f "$(DESTDIR)$(includedir)/$$f"; \
363 done 352 done
@@ -445,15 +434,15 @@ distdir: $(DISTFILES)
445 ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ 434 ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
446 || chmod -R a+r $(distdir) 435 || chmod -R a+r $(distdir)
447dist-gzip: distdir 436dist-gzip: distdir
448 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz 437 $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
449 $(am__remove_distdir) 438 $(am__remove_distdir)
450 439
451dist-bzip2: distdir 440dist-bzip2: distdir
452 tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 441 $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
453 $(am__remove_distdir) 442 $(am__remove_distdir)
454 443
455dist-tarZ: distdir 444dist-tarZ: distdir
456 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z 445 $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
457 $(am__remove_distdir) 446 $(am__remove_distdir)
458 447
459dist-shar: distdir 448dist-shar: distdir
@@ -466,7 +455,7 @@ dist-zip: distdir
466 $(am__remove_distdir) 455 $(am__remove_distdir)
467 456
468dist dist-all: distdir 457dist dist-all: distdir
469 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz 458 $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
470 $(am__remove_distdir) 459 $(am__remove_distdir)
471 460
472# This target untars the dist file and tries a VPATH configuration. Then 461# This target untars the dist file and tries a VPATH configuration. Then
@@ -475,11 +464,11 @@ dist dist-all: distdir
475distcheck: dist 464distcheck: dist
476 case '$(DIST_ARCHIVES)' in \ 465 case '$(DIST_ARCHIVES)' in \
477 *.tar.gz*) \ 466 *.tar.gz*) \
478 GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ 467 GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
479 *.tar.bz2*) \ 468 *.tar.bz2*) \
480 bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ 469 bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
481 *.tar.Z*) \ 470 *.tar.Z*) \
482 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ 471 uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
483 *.shar.gz*) \ 472 *.shar.gz*) \
484 GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ 473 GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
485 *.zip*) \ 474 *.zip*) \
@@ -563,7 +552,7 @@ clean-generic:
563 -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) 552 -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
564 553
565distclean-generic: 554distclean-generic:
566 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) 555 -rm -f $(CONFIG_CLEAN_FILES)
567 556
568maintainer-clean-generic: 557maintainer-clean-generic:
569 @echo "This command is intended for maintainers to use" 558 @echo "This command is intended for maintainers to use"
diff --git a/libltdl/aclocal.m4 b/libltdl/aclocal.m4
index 6ba55da5..f83c9b74 100644
--- a/libltdl/aclocal.m4
+++ b/libltdl/aclocal.m4
@@ -1,7 +1,7 @@
1# generated automatically by aclocal 1.9.5 -*- Autoconf -*- 1# generated automatically by aclocal 1.8.5 -*- 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# 2005 Free Software Foundation, Inc. 4# 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.
@@ -6338,32 +6338,55 @@ AC_CHECK_TYPES([error_t],
6338AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next argz_stringify]) 6338AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next argz_stringify])
6339])# AC_LTDL_FUNC_ARGZ 6339])# AC_LTDL_FUNC_ARGZ
6340 6340
6341# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. 6341# -*- Autoconf -*-
6342# 6342# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
6343# This file is free software; the Free Software Foundation 6343# Generated from amversion.in; do not edit by hand.
6344# gives unlimited permission to copy and/or distribute it, 6344
6345# with or without modifications, as long as this notice is preserved. 6345# This program is free software; you can redistribute it and/or modify
6346# it under the terms of the GNU General Public License as published by
6347# the Free Software Foundation; either version 2, or (at your option)
6348# any later version.
6349
6350# This program is distributed in the hope that it will be useful,
6351# but WITHOUT ANY WARRANTY; without even the implied warranty of
6352# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6353# GNU General Public License for more details.
6354
6355# You should have received a copy of the GNU General Public License
6356# along with this program; if not, write to the Free Software
6357# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
6346 6358
6347# AM_AUTOMAKE_VERSION(VERSION) 6359# AM_AUTOMAKE_VERSION(VERSION)
6348# ---------------------------- 6360# ----------------------------
6349# Automake X.Y traces this macro to ensure aclocal.m4 has been 6361# Automake X.Y traces this macro to ensure aclocal.m4 has been
6350# generated from the m4 files accompanying Automake X.Y. 6362# generated from the m4 files accompanying Automake X.Y.
6351AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) 6363AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
6352 6364
6353# AM_SET_CURRENT_AUTOMAKE_VERSION 6365# AM_SET_CURRENT_AUTOMAKE_VERSION
6354# ------------------------------- 6366# -------------------------------
6355# Call AM_AUTOMAKE_VERSION so it can be traced. 6367# Call AM_AUTOMAKE_VERSION so it can be traced.
6356# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. 6368# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
6357AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 6369AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
6358 [AM_AUTOMAKE_VERSION([1.9.5])]) 6370 [AM_AUTOMAKE_VERSION([1.8.5])])
6359 6371
6360# AM_AUX_DIR_EXPAND -*- Autoconf -*- 6372# AM_AUX_DIR_EXPAND
6361 6373
6362# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. 6374# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
6363# 6375
6364# This file is free software; the Free Software Foundation 6376# This program is free software; you can redistribute it and/or modify
6365# gives unlimited permission to copy and/or distribute it, 6377# it under the terms of the GNU General Public License as published by
6366# with or without modifications, as long as this notice is preserved. 6378# the Free Software Foundation; either version 2, or (at your option)
6379# any later version.
6380
6381# This program is distributed in the hope that it will be useful,
6382# but WITHOUT ANY WARRANTY; without even the implied warranty of
6383# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6384# GNU General Public License for more details.
6385
6386# You should have received a copy of the GNU General Public License
6387# along with this program; if not, write to the Free Software
6388# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
6389# 02111-1307, USA.
6367 6390
6368# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets 6391# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
6369# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to 6392# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
@@ -6410,16 +6433,26 @@ AC_PREREQ([2.50])dnl
6410am_aux_dir=`cd $ac_aux_dir && pwd` 6433am_aux_dir=`cd $ac_aux_dir && pwd`
6411]) 6434])
6412 6435
6413# AM_CONDITIONAL -*- Autoconf -*- 6436# AM_CONDITIONAL -*- Autoconf -*-
6414 6437
6415# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 6438# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
6416# Free Software Foundation, Inc.
6417#
6418# This file is free software; the Free Software Foundation
6419# gives unlimited permission to copy and/or distribute it,
6420# with or without modifications, as long as this notice is preserved.
6421 6439
6422# serial 7 6440# This program is free software; you can redistribute it and/or modify
6441# it under the terms of the GNU General Public License as published by
6442# the Free Software Foundation; either version 2, or (at your option)
6443# any later version.
6444
6445# This program is distributed in the hope that it will be useful,
6446# but WITHOUT ANY WARRANTY; without even the implied warranty of
6447# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6448# GNU General Public License for more details.
6449
6450# You should have received a copy of the GNU General Public License
6451# along with this program; if not, write to the Free Software
6452# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
6453# 02111-1307, USA.
6454
6455# serial 6
6423 6456
6424# AM_CONDITIONAL(NAME, SHELL-CONDITION) 6457# AM_CONDITIONAL(NAME, SHELL-CONDITION)
6425# ------------------------------------- 6458# -------------------------------------
@@ -6439,19 +6472,30 @@ else
6439fi 6472fi
6440AC_CONFIG_COMMANDS_PRE( 6473AC_CONFIG_COMMANDS_PRE(
6441[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then 6474[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
6442 AC_MSG_ERROR([[conditional "$1" was never defined. 6475 AC_MSG_ERROR([conditional "$1" was never defined.
6443Usually this means the macro was only invoked conditionally.]]) 6476Usually this means the macro was only invoked conditionally.])
6444fi])]) 6477fi])])
6445 6478
6479# serial 7 -*- Autoconf -*-
6446 6480
6447# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 6481# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
6448# Free Software Foundation, Inc. 6482# Free Software Foundation, Inc.
6449#
6450# This file is free software; the Free Software Foundation
6451# gives unlimited permission to copy and/or distribute it,
6452# with or without modifications, as long as this notice is preserved.
6453 6483
6454# serial 8 6484# This program is free software; you can redistribute it and/or modify
6485# it under the terms of the GNU General Public License as published by
6486# the Free Software Foundation; either version 2, or (at your option)
6487# any later version.
6488
6489# This program is distributed in the hope that it will be useful,
6490# but WITHOUT ANY WARRANTY; without even the implied warranty of
6491# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6492# GNU General Public License for more details.
6493
6494# You should have received a copy of the GNU General Public License
6495# along with this program; if not, write to the Free Software
6496# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
6497# 02111-1307, USA.
6498
6455 6499
6456# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be 6500# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
6457# written in clear, in which case automake, when reading aclocal.m4, 6501# written in clear, in which case automake, when reading aclocal.m4,
@@ -6460,6 +6504,7 @@ fi])])
6460# CC etc. in the Makefile, will ask for an AC_PROG_CC use... 6504# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
6461 6505
6462 6506
6507
6463# _AM_DEPENDENCIES(NAME) 6508# _AM_DEPENDENCIES(NAME)
6464# ---------------------- 6509# ----------------------
6465# See how the compiler implements dependency checking. 6510# See how the compiler implements dependency checking.
@@ -6599,16 +6644,26 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
6599AC_SUBST([AMDEPBACKSLASH]) 6644AC_SUBST([AMDEPBACKSLASH])
6600]) 6645])
6601 6646
6602# Generate code to set up dependency tracking. -*- Autoconf -*- 6647# Generate code to set up dependency tracking. -*- Autoconf -*-
6603 6648
6604# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 6649# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
6605# Free Software Foundation, Inc. 6650
6606# 6651# This program is free software; you can redistribute it and/or modify
6607# This file is free software; the Free Software Foundation 6652# it under the terms of the GNU General Public License as published by
6608# gives unlimited permission to copy and/or distribute it, 6653# the Free Software Foundation; either version 2, or (at your option)
6609# with or without modifications, as long as this notice is preserved. 6654# any later version.
6655
6656# This program is distributed in the hope that it will be useful,
6657# but WITHOUT ANY WARRANTY; without even the implied warranty of
6658# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6659# GNU General Public License for more details.
6660
6661# You should have received a copy of the GNU General Public License
6662# along with this program; if not, write to the Free Software
6663# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
6664# 02111-1307, USA.
6610 6665
6611#serial 3 6666#serial 2
6612 6667
6613# _AM_OUTPUT_DEPENDENCY_COMMANDS 6668# _AM_OUTPUT_DEPENDENCY_COMMANDS
6614# ------------------------------ 6669# ------------------------------
@@ -6627,21 +6682,27 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
6627 else 6682 else
6628 continue 6683 continue
6629 fi 6684 fi
6630 # Extract the definition of DEPDIR, am__include, and am__quote 6685 grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
6631 # from the Makefile without running `make'. 6686 # Extract the definition of DEP_FILES from the Makefile without
6687 # running `make'.
6632 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` 6688 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
6633 test -z "$DEPDIR" && continue 6689 test -z "$DEPDIR" && continue
6634 am__include=`sed -n 's/^am__include = //p' < "$mf"`
6635 test -z "am__include" && continue
6636 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
6637 # When using ansi2knr, U may be empty or an underscore; expand it 6690 # When using ansi2knr, U may be empty or an underscore; expand it
6638 U=`sed -n 's/^U = //p' < "$mf"` 6691 U=`sed -n 's/^U = //p' < "$mf"`
6639 # Find all dependency output files, they are included files with 6692 test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
6640 # $(DEPDIR) in their names. We invoke sed twice because it is the 6693 # We invoke sed twice because it is the simplest approach to
6641 # simplest approach to changing $(DEPDIR) to its actual value in the 6694 # changing $(DEPDIR) to its actual value in the expansion.
6642 # expansion. 6695 for file in `sed -n '
6643 for file in `sed -n " 6696 /^DEP_FILES = .*\\\\$/ {
6644 s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ 6697 s/^DEP_FILES = //
6698 :loop
6699 s/\\\\$//
6700 p
6701 n
6702 /\\\\$/ b loop
6703 p
6704 }
6705 /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
6645 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do 6706 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
6646 # Make sure the directory exists. 6707 # Make sure the directory exists.
6647 test -f "$dirpart/$file" && continue 6708 test -f "$dirpart/$file" && continue
@@ -6667,31 +6728,54 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
6667 [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) 6728 [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
6668]) 6729])
6669 6730
6670# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 6731# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
6671# Free Software Foundation, Inc. 6732
6672# 6733# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
6673# This file is free software; the Free Software Foundation 6734
6674# gives unlimited permission to copy and/or distribute it, 6735# This program is free software; you can redistribute it and/or modify
6675# with or without modifications, as long as this notice is preserved. 6736# it under the terms of the GNU General Public License as published by
6737# the Free Software Foundation; either version 2, or (at your option)
6738# any later version.
6739
6740# This program is distributed in the hope that it will be useful,
6741# but WITHOUT ANY WARRANTY; without even the implied warranty of
6742# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6743# GNU General Public License for more details.
6676 6744
6677# serial 8 6745# You should have received a copy of the GNU General Public License
6746# along with this program; if not, write to the Free Software
6747# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
6748# 02111-1307, USA.
6749
6750# serial 7
6678 6751
6679# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. 6752# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
6680AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) 6753AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
6681 6754
6682# Do all the work for Automake. -*- Autoconf -*- 6755# Do all the work for Automake. -*- Autoconf -*-
6683 6756
6684# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 6757# This macro actually does too much some checks are only needed if
6758# your package does certain things. But this isn't really a big deal.
6759
6760# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
6685# Free Software Foundation, Inc. 6761# Free Software Foundation, Inc.
6686#
6687# This file is free software; the Free Software Foundation
6688# gives unlimited permission to copy and/or distribute it,
6689# with or without modifications, as long as this notice is preserved.
6690 6762
6691# serial 12 6763# This program is free software; you can redistribute it and/or modify
6764# it under the terms of the GNU General Public License as published by
6765# the Free Software Foundation; either version 2, or (at your option)
6766# any later version.
6767
6768# This program is distributed in the hope that it will be useful,
6769# but WITHOUT ANY WARRANTY; without even the implied warranty of
6770# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6771# GNU General Public License for more details.
6692 6772
6693# This macro actually does too much. Some checks are only needed if 6773# You should have received a copy of the GNU General Public License
6694# your package does certain things. But this isn't really a big deal. 6774# along with this program; if not, write to the Free Software
6775# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
6776# 02111-1307, USA.
6777
6778# serial 11
6695 6779
6696# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) 6780# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
6697# AM_INIT_AUTOMAKE([OPTIONS]) 6781# AM_INIT_AUTOMAKE([OPTIONS])
@@ -6749,6 +6833,7 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
6749AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) 6833AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
6750AM_MISSING_PROG(AUTOHEADER, autoheader) 6834AM_MISSING_PROG(AUTOHEADER, autoheader)
6751AM_MISSING_PROG(MAKEINFO, makeinfo) 6835AM_MISSING_PROG(MAKEINFO, makeinfo)
6836AM_MISSING_PROG(AMTAR, tar)
6752AM_PROG_INSTALL_SH 6837AM_PROG_INSTALL_SH
6753AM_PROG_INSTALL_STRIP 6838AM_PROG_INSTALL_STRIP
6754AC_REQUIRE([AM_PROG_MKDIR_P])dnl 6839AC_REQUIRE([AM_PROG_MKDIR_P])dnl
@@ -6757,9 +6842,7 @@ AC_REQUIRE([AM_PROG_MKDIR_P])dnl
6757AC_REQUIRE([AC_PROG_AWK])dnl 6842AC_REQUIRE([AC_PROG_AWK])dnl
6758AC_REQUIRE([AC_PROG_MAKE_SET])dnl 6843AC_REQUIRE([AC_PROG_MAKE_SET])dnl
6759AC_REQUIRE([AM_SET_LEADING_DOT])dnl 6844AC_REQUIRE([AM_SET_LEADING_DOT])dnl
6760_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], 6845
6761 [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
6762 [_AM_PROG_TAR([v7])])])
6763_AM_IF_OPTION([no-dependencies],, 6846_AM_IF_OPTION([no-dependencies],,
6764[AC_PROVIDE_IFELSE([AC_PROG_CC], 6847[AC_PROVIDE_IFELSE([AC_PROG_CC],
6765 [_AM_DEPENDENCIES(CC)], 6848 [_AM_DEPENDENCIES(CC)],
@@ -6793,27 +6876,51 @@ for _am_header in $config_headers :; do
6793done 6876done
6794echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) 6877echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
6795 6878
6796# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
6797#
6798# This file is free software; the Free Software Foundation
6799# gives unlimited permission to copy and/or distribute it,
6800# with or without modifications, as long as this notice is preserved.
6801
6802# AM_PROG_INSTALL_SH 6879# AM_PROG_INSTALL_SH
6803# ------------------ 6880# ------------------
6804# Define $install_sh. 6881# Define $install_sh.
6882
6883# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
6884
6885# This program is free software; you can redistribute it and/or modify
6886# it under the terms of the GNU General Public License as published by
6887# the Free Software Foundation; either version 2, or (at your option)
6888# any later version.
6889
6890# This program is distributed in the hope that it will be useful,
6891# but WITHOUT ANY WARRANTY; without even the implied warranty of
6892# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6893# GNU General Public License for more details.
6894
6895# You should have received a copy of the GNU General Public License
6896# along with this program; if not, write to the Free Software
6897# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
6898# 02111-1307, USA.
6899
6805AC_DEFUN([AM_PROG_INSTALL_SH], 6900AC_DEFUN([AM_PROG_INSTALL_SH],
6806[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl 6901[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
6807install_sh=${install_sh-"$am_aux_dir/install-sh"} 6902install_sh=${install_sh-"$am_aux_dir/install-sh"}
6808AC_SUBST(install_sh)]) 6903AC_SUBST(install_sh)])
6809 6904
6810# Copyright (C) 2003, 2005 Free Software Foundation, Inc. 6905# -*- Autoconf -*-
6811# 6906# Copyright (C) 2003 Free Software Foundation, Inc.
6812# This file is free software; the Free Software Foundation
6813# gives unlimited permission to copy and/or distribute it,
6814# with or without modifications, as long as this notice is preserved.
6815 6907
6816# serial 2 6908# This program is free software; you can redistribute it and/or modify
6909# it under the terms of the GNU General Public License as published by
6910# the Free Software Foundation; either version 2, or (at your option)
6911# any later version.
6912
6913# This program is distributed in the hope that it will be useful,
6914# but WITHOUT ANY WARRANTY; without even the implied warranty of
6915# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6916# GNU General Public License for more details.
6917
6918# You should have received a copy of the GNU General Public License
6919# along with this program; if not, write to the Free Software
6920# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
6921# 02111-1307, USA.
6922
6923# serial 1
6817 6924
6818# Check whether the underlying file-system supports filenames 6925# Check whether the underlying file-system supports filenames
6819# with a leading dot. For instance MS-DOS doesn't. 6926# with a leading dot. For instance MS-DOS doesn't.
@@ -6828,17 +6935,28 @@ fi
6828rmdir .tst 2>/dev/null 6935rmdir .tst 2>/dev/null
6829AC_SUBST([am__leading_dot])]) 6936AC_SUBST([am__leading_dot])])
6830 6937
6831# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- 6938# Add --enable-maintainer-mode option to configure.
6832# From Jim Meyering 6939# From Jim Meyering
6833 6940
6834# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 6941# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
6835# Free Software Foundation, Inc. 6942# Free Software Foundation, Inc.
6836#
6837# This file is free software; the Free Software Foundation
6838# gives unlimited permission to copy and/or distribute it,
6839# with or without modifications, as long as this notice is preserved.
6840 6943
6841# serial 4 6944# This program is free software; you can redistribute it and/or modify
6945# it under the terms of the GNU General Public License as published by
6946# the Free Software Foundation; either version 2, or (at your option)
6947# any later version.
6948
6949# This program is distributed in the hope that it will be useful,
6950# but WITHOUT ANY WARRANTY; without even the implied warranty of
6951# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6952# GNU General Public License for more details.
6953
6954# You should have received a copy of the GNU General Public License
6955# along with this program; if not, write to the Free Software
6956# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
6957# 02111-1307, USA.
6958
6959# serial 3
6842 6960
6843AC_DEFUN([AM_MAINTAINER_MODE], 6961AC_DEFUN([AM_MAINTAINER_MODE],
6844[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) 6962[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
@@ -6857,15 +6975,26 @@ AC_DEFUN([AM_MAINTAINER_MODE],
6857 6975
6858AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) 6976AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
6859 6977
6860# Check to see how 'make' treats includes. -*- Autoconf -*- 6978# Check to see how 'make' treats includes. -*- Autoconf -*-
6861 6979
6862# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. 6980# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
6863#
6864# This file is free software; the Free Software Foundation
6865# gives unlimited permission to copy and/or distribute it,
6866# with or without modifications, as long as this notice is preserved.
6867 6981
6868# serial 3 6982# This program is free software; you can redistribute it and/or modify
6983# it under the terms of the GNU General Public License as published by
6984# the Free Software Foundation; either version 2, or (at your option)
6985# any later version.
6986
6987# This program is distributed in the hope that it will be useful,
6988# but WITHOUT ANY WARRANTY; without even the implied warranty of
6989# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6990# GNU General Public License for more details.
6991
6992# You should have received a copy of the GNU General Public License
6993# along with this program; if not, write to the Free Software
6994# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
6995# 02111-1307, USA.
6996
6997# serial 2
6869 6998
6870# AM_MAKE_INCLUDE() 6999# AM_MAKE_INCLUDE()
6871# ----------------- 7000# -----------------
@@ -6909,16 +7038,27 @@ AC_MSG_RESULT([$_am_result])
6909rm -f confinc confmf 7038rm -f confinc confmf
6910]) 7039])
6911 7040
6912# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- 7041# -*- Autoconf -*-
6913 7042
6914# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
6915# Free Software Foundation, Inc.
6916#
6917# This file is free software; the Free Software Foundation
6918# gives unlimited permission to copy and/or distribute it,
6919# with or without modifications, as long as this notice is preserved.
6920 7043
6921# serial 4 7044# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
7045
7046# This program is free software; you can redistribute it and/or modify
7047# it under the terms of the GNU General Public License as published by
7048# the Free Software Foundation; either version 2, or (at your option)
7049# any later version.
7050
7051# This program is distributed in the hope that it will be useful,
7052# but WITHOUT ANY WARRANTY; without even the implied warranty of
7053# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7054# GNU General Public License for more details.
7055
7056# You should have received a copy of the GNU General Public License
7057# along with this program; if not, write to the Free Software
7058# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
7059# 02111-1307, USA.
7060
7061# serial 3
6922 7062
6923# AM_MISSING_PROG(NAME, PROGRAM) 7063# AM_MISSING_PROG(NAME, PROGRAM)
6924# ------------------------------ 7064# ------------------------------
@@ -6944,16 +7084,27 @@ else
6944fi 7084fi
6945]) 7085])
6946 7086
6947# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
6948#
6949# This file is free software; the Free Software Foundation
6950# gives unlimited permission to copy and/or distribute it,
6951# with or without modifications, as long as this notice is preserved.
6952
6953# AM_PROG_MKDIR_P 7087# AM_PROG_MKDIR_P
6954# --------------- 7088# ---------------
6955# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. 7089# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
6956# 7090
7091# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
7092
7093# This program is free software; you can redistribute it and/or modify
7094# it under the terms of the GNU General Public License as published by
7095# the Free Software Foundation; either version 2, or (at your option)
7096# any later version.
7097
7098# This program is distributed in the hope that it will be useful,
7099# but WITHOUT ANY WARRANTY; without even the implied warranty of
7100# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7101# GNU General Public License for more details.
7102
7103# You should have received a copy of the GNU General Public License
7104# along with this program; if not, write to the Free Software
7105# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
7106# 02111-1307, USA.
7107
6957# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories 7108# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
6958# created by `make install' are always world readable, even if the 7109# created by `make install' are always world readable, even if the
6959# installer happens to have an overly restrictive umask (e.g. 077). 7110# installer happens to have an overly restrictive umask (e.g. 077).
@@ -6974,21 +7125,13 @@ fi
6974# this.) 7125# this.)
6975AC_DEFUN([AM_PROG_MKDIR_P], 7126AC_DEFUN([AM_PROG_MKDIR_P],
6976[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then 7127[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
6977 # We used to keeping the `.' as first argument, in order to 7128 # Keeping the `.' argument allows $(mkdir_p) to be used without
6978 # allow $(mkdir_p) to be used without argument. As in 7129 # argument. Indeed, we sometimes output rules like
6979 # $(mkdir_p) $(somedir) 7130 # $(mkdir_p) $(somedir)
6980 # where $(somedir) is conditionally defined. However this is wrong 7131 # where $(somedir) is conditionally defined.
6981 # for two reasons: 7132 # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
6982 # 1. if the package is installed by a user who cannot write `.' 7133 # expensive solution, as it forces Make to start a sub-shell.)
6983 # make install will fail, 7134 mkdir_p='mkdir -p -- .'
6984 # 2. the above comment should most certainly read
6985 # $(mkdir_p) $(DESTDIR)$(somedir)
6986 # so it does not work when $(somedir) is undefined and
6987 # $(DESTDIR) is not.
6988 # To support the latter case, we have to write
6989 # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
6990 # so the `.' trick is pointless.
6991 mkdir_p='mkdir -p --'
6992else 7135else
6993 # On NextStep and OpenStep, the `mkdir' command does not 7136 # On NextStep and OpenStep, the `mkdir' command does not
6994 # recognize any option. It will interpret all options as 7137 # recognize any option. It will interpret all options as
@@ -7007,15 +7150,26 @@ else
7007fi 7150fi
7008AC_SUBST([mkdir_p])]) 7151AC_SUBST([mkdir_p])])
7009 7152
7010# Helper functions for option handling. -*- Autoconf -*- 7153# Helper functions for option handling. -*- Autoconf -*-
7011 7154
7012# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. 7155# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
7013#
7014# This file is free software; the Free Software Foundation
7015# gives unlimited permission to copy and/or distribute it,
7016# with or without modifications, as long as this notice is preserved.
7017 7156
7018# serial 3 7157# This program is free software; you can redistribute it and/or modify
7158# it under the terms of the GNU General Public License as published by
7159# the Free Software Foundation; either version 2, or (at your option)
7160# any later version.
7161
7162# This program is distributed in the hope that it will be useful,
7163# but WITHOUT ANY WARRANTY; without even the implied warranty of
7164# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7165# GNU General Public License for more details.
7166
7167# You should have received a copy of the GNU General Public License
7168# along with this program; if not, write to the Free Software
7169# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
7170# 02111-1307, USA.
7171
7172# serial 2
7019 7173
7020# _AM_MANGLE_OPTION(NAME) 7174# _AM_MANGLE_OPTION(NAME)
7021# ----------------------- 7175# -----------------------
@@ -7040,16 +7194,28 @@ AC_DEFUN([_AM_SET_OPTIONS],
7040AC_DEFUN([_AM_IF_OPTION], 7194AC_DEFUN([_AM_IF_OPTION],
7041[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) 7195[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
7042 7196
7043# Check to make sure that the build environment is sane. -*- Autoconf -*-
7044
7045# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
7046# Free Software Foundation, Inc.
7047# 7197#
7048# This file is free software; the Free Software Foundation 7198# Check to make sure that the build environment is sane.
7049# gives unlimited permission to copy and/or distribute it, 7199#
7050# with or without modifications, as long as this notice is preserved. 7200
7201# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
7202
7203# This program is free software; you can redistribute it and/or modify
7204# it under the terms of the GNU General Public License as published by
7205# the Free Software Foundation; either version 2, or (at your option)
7206# any later version.
7207
7208# This program is distributed in the hope that it will be useful,
7209# but WITHOUT ANY WARRANTY; without even the implied warranty of
7210# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7211# GNU General Public License for more details.
7212
7213# You should have received a copy of the GNU General Public License
7214# along with this program; if not, write to the Free Software
7215# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
7216# 02111-1307, USA.
7051 7217
7052# serial 4 7218# serial 3
7053 7219
7054# AM_SANITY_CHECK 7220# AM_SANITY_CHECK
7055# --------------- 7221# ---------------
@@ -7092,14 +7258,25 @@ Check your system clock])
7092fi 7258fi
7093AC_MSG_RESULT(yes)]) 7259AC_MSG_RESULT(yes)])
7094 7260
7095# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
7096#
7097# This file is free software; the Free Software Foundation
7098# gives unlimited permission to copy and/or distribute it,
7099# with or without modifications, as long as this notice is preserved.
7100
7101# AM_PROG_INSTALL_STRIP 7261# AM_PROG_INSTALL_STRIP
7102# --------------------- 7262
7263# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
7264
7265# This program is free software; you can redistribute it and/or modify
7266# it under the terms of the GNU General Public License as published by
7267# the Free Software Foundation; either version 2, or (at your option)
7268# any later version.
7269
7270# This program is distributed in the hope that it will be useful,
7271# but WITHOUT ANY WARRANTY; without even the implied warranty of
7272# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7273# GNU General Public License for more details.
7274
7275# You should have received a copy of the GNU General Public License
7276# along with this program; if not, write to the Free Software
7277# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
7278# 02111-1307, USA.
7279
7103# One issue with vendor `install' (even GNU) is that you can't 7280# One issue with vendor `install' (even GNU) is that you can't
7104# specify the program used to strip binaries. This is especially 7281# specify the program used to strip binaries. This is especially
7105# annoying in cross-compiling environments, where the build's strip 7282# annoying in cross-compiling environments, where the build's strip
@@ -7120,99 +7297,3 @@ fi
7120INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" 7297INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
7121AC_SUBST([INSTALL_STRIP_PROGRAM])]) 7298AC_SUBST([INSTALL_STRIP_PROGRAM])])
7122 7299
7123# Check how to create a tarball. -*- Autoconf -*-
7124
7125# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
7126#
7127# This file is free software; the Free Software Foundation
7128# gives unlimited permission to copy and/or distribute it,
7129# with or without modifications, as long as this notice is preserved.
7130
7131# serial 2
7132
7133# _AM_PROG_TAR(FORMAT)
7134# --------------------
7135# Check how to create a tarball in format FORMAT.
7136# FORMAT should be one of `v7', `ustar', or `pax'.
7137#
7138# Substitute a variable $(am__tar) that is a command
7139# writing to stdout a FORMAT-tarball containing the directory
7140# $tardir.
7141# tardir=directory && $(am__tar) > result.tar
7142#
7143# Substitute a variable $(am__untar) that extract such
7144# a tarball read from stdin.
7145# $(am__untar) < result.tar
7146AC_DEFUN([_AM_PROG_TAR],
7147[# Always define AMTAR for backward compatibility.
7148AM_MISSING_PROG([AMTAR], [tar])
7149m4_if([$1], [v7],
7150 [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
7151 [m4_case([$1], [ustar],, [pax],,
7152 [m4_fatal([Unknown tar format])])
7153AC_MSG_CHECKING([how to create a $1 tar archive])
7154# Loop over all known methods to create a tar archive until one works.
7155_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
7156_am_tools=${am_cv_prog_tar_$1-$_am_tools}
7157# Do not fold the above two line into one, because Tru64 sh and
7158# Solaris sh will not grok spaces in the rhs of `-'.
7159for _am_tool in $_am_tools
7160do
7161 case $_am_tool in
7162 gnutar)
7163 for _am_tar in tar gnutar gtar;
7164 do
7165 AM_RUN_LOG([$_am_tar --version]) && break
7166 done
7167 am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
7168 am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
7169 am__untar="$_am_tar -xf -"
7170 ;;
7171 plaintar)
7172 # Must skip GNU tar: if it does not support --format= it doesn't create
7173 # ustar tarball either.
7174 (tar --version) >/dev/null 2>&1 && continue
7175 am__tar='tar chf - "$$tardir"'
7176 am__tar_='tar chf - "$tardir"'
7177 am__untar='tar xf -'
7178 ;;
7179 pax)
7180 am__tar='pax -L -x $1 -w "$$tardir"'
7181 am__tar_='pax -L -x $1 -w "$tardir"'
7182 am__untar='pax -r'
7183 ;;
7184 cpio)
7185 am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
7186 am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
7187 am__untar='cpio -i -H $1 -d'
7188 ;;
7189 none)
7190 am__tar=false
7191 am__tar_=false
7192 am__untar=false
7193 ;;
7194 esac
7195
7196 # If the value was cached, stop now. We just wanted to have am__tar
7197 # and am__untar set.
7198 test -n "${am_cv_prog_tar_$1}" && break
7199
7200 # tar/untar a dummy directory, and stop if the command works
7201 rm -rf conftest.dir
7202 mkdir conftest.dir
7203 echo GrepMe > conftest.dir/file
7204 AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
7205 rm -rf conftest.dir
7206 if test -s conftest.tar; then
7207 AM_RUN_LOG([$am__untar <conftest.tar])
7208 grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
7209 fi
7210done
7211rm -rf conftest.dir
7212
7213AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
7214AC_MSG_RESULT([$am_cv_prog_tar_$1])])
7215AC_SUBST([am__tar])
7216AC_SUBST([am__untar])
7217]) # _AM_PROG_TAR
7218
diff --git a/libltdl/configure b/libltdl/configure
index 03678466..13b09f57 100755
--- a/libltdl/configure
+++ b/libltdl/configure
@@ -465,7 +465,7 @@ ac_includes_default="\
465# include <unistd.h> 465# include <unistd.h>
466#endif" 466#endif"
467 467
468ac_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' 468ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE 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'
469ac_subst_files='' 469ac_subst_files=''
470 470
471# Initialize some variables set by options. 471# Initialize some variables set by options.
@@ -1565,7 +1565,7 @@ fi
1565## ------------------------ ## 1565## ------------------------ ##
1566## Automake Initialisation. ## 1566## Automake Initialisation. ##
1567## ------------------------ ## 1567## ------------------------ ##
1568am__api_version="1.9" 1568am__api_version="1.8"
1569# Find a good install program. We prefer a C program (faster), 1569# Find a good install program. We prefer a C program (faster),
1570# 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
1571# incompatible versions: 1571# incompatible versions:
@@ -1717,21 +1717,13 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
1717fi 1717fi
1718 1718
1719if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then 1719if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
1720 # We used to keeping the `.' as first argument, in order to 1720 # Keeping the `.' argument allows $(mkdir_p) to be used without
1721 # allow $(mkdir_p) to be used without argument. As in 1721 # argument. Indeed, we sometimes output rules like
1722 # $(mkdir_p) $(somedir) 1722 # $(mkdir_p) $(somedir)
1723 # where $(somedir) is conditionally defined. However this is wrong 1723 # where $(somedir) is conditionally defined.
1724 # for two reasons: 1724 # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
1725 # 1. if the package is installed by a user who cannot write `.' 1725 # expensive solution, as it forces Make to start a sub-shell.)
1726 # make install will fail, 1726 mkdir_p='mkdir -p -- .'
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 --'
1735else 1727else
1736 # On NextStep and OpenStep, the `mkdir' command does not 1728 # On NextStep and OpenStep, the `mkdir' command does not
1737 # recognize any option. It will interpret all options as 1729 # recognize any option. It will interpret all options as
@@ -1866,6 +1858,9 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
1866 1858
1867MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} 1859MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
1868 1860
1861
1862AMTAR=${AMTAR-"${am_missing_run}tar"}
1863
1869install_sh=${install_sh-"$am_aux_dir/install-sh"} 1864install_sh=${install_sh-"$am_aux_dir/install-sh"}
1870 1865
1871# Installed binaries are usually stripped using `strip' when the user 1866# Installed binaries are usually stripped using `strip' when the user
@@ -1958,13 +1953,6 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
1958 1953
1959# We need awk for the "check" target. The system "awk" is bad on 1954# We need awk for the "check" target. The system "awk" is bad on
1960# some platforms. 1955# some platforms.
1961# Always define AMTAR for backward compatibility.
1962
1963AMTAR=${AMTAR-"${am_missing_run}tar"}
1964
1965am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
1966
1967
1968 1956
1969 1957
1970 1958
@@ -3879,7 +3867,7 @@ ia64-*-hpux*)
3879 ;; 3867 ;;
3880*-*-irix6*) 3868*-*-irix6*)
3881 # Find out which ABI we are using. 3869 # Find out which ABI we are using.
3882 echo '#line 3882 "configure"' > conftest.$ac_ext 3870 echo '#line 3870 "configure"' > conftest.$ac_ext
3883 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 3871 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3884 (eval $ac_compile) 2>&5 3872 (eval $ac_compile) 2>&5
3885 ac_status=$? 3873 ac_status=$?
@@ -5685,7 +5673,7 @@ fi
5685 5673
5686 5674
5687# Provide some information about the compiler. 5675# Provide some information about the compiler.
5688echo "$as_me:5688:" \ 5676echo "$as_me:5676:" \
5689 "checking for Fortran 77 compiler version" >&5 5677 "checking for Fortran 77 compiler version" >&5
5690ac_compiler=`set X $ac_compile; echo $2` 5678ac_compiler=`set X $ac_compile; echo $2`
5691{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 5679{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6717,11 +6705,11 @@ else
6717 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 6705 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
6718 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 6706 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6719 -e 's:$: $lt_compiler_flag:'` 6707 -e 's:$: $lt_compiler_flag:'`
6720 (eval echo "\"\$as_me:6720: $lt_compile\"" >&5) 6708 (eval echo "\"\$as_me:6708: $lt_compile\"" >&5)
6721 (eval "$lt_compile" 2>conftest.err) 6709 (eval "$lt_compile" 2>conftest.err)
6722 ac_status=$? 6710 ac_status=$?
6723 cat conftest.err >&5 6711 cat conftest.err >&5
6724 echo "$as_me:6724: \$? = $ac_status" >&5 6712 echo "$as_me:6712: \$? = $ac_status" >&5
6725 if (exit $ac_status) && test -s "$ac_outfile"; then 6713 if (exit $ac_status) && test -s "$ac_outfile"; then
6726 # The compiler can only warn and ignore the option if not recognized 6714 # The compiler can only warn and ignore the option if not recognized
6727 # So say no if there are warnings 6715 # So say no if there are warnings
@@ -6950,11 +6938,11 @@ else
6950 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 6938 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
6951 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 6939 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6952 -e 's:$: $lt_compiler_flag:'` 6940 -e 's:$: $lt_compiler_flag:'`
6953 (eval echo "\"\$as_me:6953: $lt_compile\"" >&5) 6941 (eval echo "\"\$as_me:6941: $lt_compile\"" >&5)
6954 (eval "$lt_compile" 2>conftest.err) 6942 (eval "$lt_compile" 2>conftest.err)
6955 ac_status=$? 6943 ac_status=$?
6956 cat conftest.err >&5 6944 cat conftest.err >&5
6957 echo "$as_me:6957: \$? = $ac_status" >&5 6945 echo "$as_me:6945: \$? = $ac_status" >&5
6958 if (exit $ac_status) && test -s "$ac_outfile"; then 6946 if (exit $ac_status) && test -s "$ac_outfile"; then
6959 # The compiler can only warn and ignore the option if not recognized 6947 # The compiler can only warn and ignore the option if not recognized
6960 # So say no if there are warnings 6948 # So say no if there are warnings
@@ -7010,11 +6998,11 @@ else
7010 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 6998 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
7011 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 6999 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7012 -e 's:$: $lt_compiler_flag:'` 7000 -e 's:$: $lt_compiler_flag:'`
7013 (eval echo "\"\$as_me:7013: $lt_compile\"" >&5) 7001 (eval echo "\"\$as_me:7001: $lt_compile\"" >&5)
7014 (eval "$lt_compile" 2>out/conftest.err) 7002 (eval "$lt_compile" 2>out/conftest.err)
7015 ac_status=$? 7003 ac_status=$?
7016 cat out/conftest.err >&5 7004 cat out/conftest.err >&5
7017 echo "$as_me:7017: \$? = $ac_status" >&5 7005 echo "$as_me:7005: \$? = $ac_status" >&5
7018 if (exit $ac_status) && test -s out/conftest2.$ac_objext 7006 if (exit $ac_status) && test -s out/conftest2.$ac_objext
7019 then 7007 then
7020 # The compiler can only warn and ignore the option if not recognized 7008 # The compiler can only warn and ignore the option if not recognized
@@ -9198,7 +9186,7 @@ else
9198 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9186 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9199 lt_status=$lt_dlunknown 9187 lt_status=$lt_dlunknown
9200 cat > conftest.$ac_ext <<EOF 9188 cat > conftest.$ac_ext <<EOF
9201#line 9201 "configure" 9189#line 9189 "configure"
9202#include "confdefs.h" 9190#include "confdefs.h"
9203 9191
9204#if HAVE_DLFCN_H 9192#if HAVE_DLFCN_H
@@ -9296,7 +9284,7 @@ else
9296 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9284 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9297 lt_status=$lt_dlunknown 9285 lt_status=$lt_dlunknown
9298 cat > conftest.$ac_ext <<EOF 9286 cat > conftest.$ac_ext <<EOF
9299#line 9299 "configure" 9287#line 9287 "configure"
9300#include "confdefs.h" 9288#include "confdefs.h"
9301 9289
9302#if HAVE_DLFCN_H 9290#if HAVE_DLFCN_H
@@ -11473,11 +11461,11 @@ else
11473 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 11461 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
11474 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 11462 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11475 -e 's:$: $lt_compiler_flag:'` 11463 -e 's:$: $lt_compiler_flag:'`
11476 (eval echo "\"\$as_me:11476: $lt_compile\"" >&5) 11464 (eval echo "\"\$as_me:11464: $lt_compile\"" >&5)
11477 (eval "$lt_compile" 2>conftest.err) 11465 (eval "$lt_compile" 2>conftest.err)
11478 ac_status=$? 11466 ac_status=$?
11479 cat conftest.err >&5 11467 cat conftest.err >&5
11480 echo "$as_me:11480: \$? = $ac_status" >&5 11468 echo "$as_me:11468: \$? = $ac_status" >&5
11481 if (exit $ac_status) && test -s "$ac_outfile"; then 11469 if (exit $ac_status) && test -s "$ac_outfile"; then
11482 # The compiler can only warn and ignore the option if not recognized 11470 # The compiler can only warn and ignore the option if not recognized
11483 # So say no if there are warnings 11471 # So say no if there are warnings
@@ -11533,11 +11521,11 @@ else
11533 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 11521 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
11534 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 11522 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11535 -e 's:$: $lt_compiler_flag:'` 11523 -e 's:$: $lt_compiler_flag:'`
11536 (eval echo "\"\$as_me:11536: $lt_compile\"" >&5) 11524 (eval echo "\"\$as_me:11524: $lt_compile\"" >&5)
11537 (eval "$lt_compile" 2>out/conftest.err) 11525 (eval "$lt_compile" 2>out/conftest.err)
11538 ac_status=$? 11526 ac_status=$?
11539 cat out/conftest.err >&5 11527 cat out/conftest.err >&5
11540 echo "$as_me:11540: \$? = $ac_status" >&5 11528 echo "$as_me:11528: \$? = $ac_status" >&5
11541 if (exit $ac_status) && test -s out/conftest2.$ac_objext 11529 if (exit $ac_status) && test -s out/conftest2.$ac_objext
11542 then 11530 then
11543 # The compiler can only warn and ignore the option if not recognized 11531 # The compiler can only warn and ignore the option if not recognized
@@ -12902,7 +12890,7 @@ else
12902 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 12890 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12903 lt_status=$lt_dlunknown 12891 lt_status=$lt_dlunknown
12904 cat > conftest.$ac_ext <<EOF 12892 cat > conftest.$ac_ext <<EOF
12905#line 12905 "configure" 12893#line 12893 "configure"
12906#include "confdefs.h" 12894#include "confdefs.h"
12907 12895
12908#if HAVE_DLFCN_H 12896#if HAVE_DLFCN_H
@@ -13000,7 +12988,7 @@ else
13000 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 12988 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
13001 lt_status=$lt_dlunknown 12989 lt_status=$lt_dlunknown
13002 cat > conftest.$ac_ext <<EOF 12990 cat > conftest.$ac_ext <<EOF
13003#line 13003 "configure" 12991#line 12991 "configure"
13004#include "confdefs.h" 12992#include "confdefs.h"
13005 12993
13006#if HAVE_DLFCN_H 12994#if HAVE_DLFCN_H
@@ -13827,11 +13815,11 @@ else
13827 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 13815 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
13828 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13816 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
13829 -e 's:$: $lt_compiler_flag:'` 13817 -e 's:$: $lt_compiler_flag:'`
13830 (eval echo "\"\$as_me:13830: $lt_compile\"" >&5) 13818 (eval echo "\"\$as_me:13818: $lt_compile\"" >&5)
13831 (eval "$lt_compile" 2>conftest.err) 13819 (eval "$lt_compile" 2>conftest.err)
13832 ac_status=$? 13820 ac_status=$?
13833 cat conftest.err >&5 13821 cat conftest.err >&5
13834 echo "$as_me:13834: \$? = $ac_status" >&5 13822 echo "$as_me:13822: \$? = $ac_status" >&5
13835 if (exit $ac_status) && test -s "$ac_outfile"; then 13823 if (exit $ac_status) && test -s "$ac_outfile"; then
13836 # The compiler can only warn and ignore the option if not recognized 13824 # The compiler can only warn and ignore the option if not recognized
13837 # So say no if there are warnings 13825 # So say no if there are warnings
@@ -13887,11 +13875,11 @@ else
13887 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 13875 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
13888 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13876 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
13889 -e 's:$: $lt_compiler_flag:'` 13877 -e 's:$: $lt_compiler_flag:'`
13890 (eval echo "\"\$as_me:13890: $lt_compile\"" >&5) 13878 (eval echo "\"\$as_me:13878: $lt_compile\"" >&5)
13891 (eval "$lt_compile" 2>out/conftest.err) 13879 (eval "$lt_compile" 2>out/conftest.err)
13892 ac_status=$? 13880 ac_status=$?
13893 cat out/conftest.err >&5 13881 cat out/conftest.err >&5
13894 echo "$as_me:13894: \$? = $ac_status" >&5 13882 echo "$as_me:13882: \$? = $ac_status" >&5
13895 if (exit $ac_status) && test -s out/conftest2.$ac_objext 13883 if (exit $ac_status) && test -s out/conftest2.$ac_objext
13896 then 13884 then
13897 # The compiler can only warn and ignore the option if not recognized 13885 # The compiler can only warn and ignore the option if not recognized
@@ -15932,11 +15920,11 @@ else
15932 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 15920 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
15933 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 15921 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
15934 -e 's:$: $lt_compiler_flag:'` 15922 -e 's:$: $lt_compiler_flag:'`
15935 (eval echo "\"\$as_me:15935: $lt_compile\"" >&5) 15923 (eval echo "\"\$as_me:15923: $lt_compile\"" >&5)
15936 (eval "$lt_compile" 2>conftest.err) 15924 (eval "$lt_compile" 2>conftest.err)
15937 ac_status=$? 15925 ac_status=$?
15938 cat conftest.err >&5 15926 cat conftest.err >&5
15939 echo "$as_me:15939: \$? = $ac_status" >&5 15927 echo "$as_me:15927: \$? = $ac_status" >&5
15940 if (exit $ac_status) && test -s "$ac_outfile"; then 15928 if (exit $ac_status) && test -s "$ac_outfile"; then
15941 # The compiler can only warn and ignore the option if not recognized 15929 # The compiler can only warn and ignore the option if not recognized
15942 # So say no if there are warnings 15930 # So say no if there are warnings
@@ -16165,11 +16153,11 @@ else
16165 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 16153 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
16166 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16154 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
16167 -e 's:$: $lt_compiler_flag:'` 16155 -e 's:$: $lt_compiler_flag:'`
16168 (eval echo "\"\$as_me:16168: $lt_compile\"" >&5) 16156 (eval echo "\"\$as_me:16156: $lt_compile\"" >&5)
16169 (eval "$lt_compile" 2>conftest.err) 16157 (eval "$lt_compile" 2>conftest.err)
16170 ac_status=$? 16158 ac_status=$?
16171 cat conftest.err >&5 16159 cat conftest.err >&5
16172 echo "$as_me:16172: \$? = $ac_status" >&5 16160 echo "$as_me:16160: \$? = $ac_status" >&5
16173 if (exit $ac_status) && test -s "$ac_outfile"; then 16161 if (exit $ac_status) && test -s "$ac_outfile"; then
16174 # The compiler can only warn and ignore the option if not recognized 16162 # The compiler can only warn and ignore the option if not recognized
16175 # So say no if there are warnings 16163 # So say no if there are warnings
@@ -16225,11 +16213,11 @@ else
16225 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 16213 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
16226 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16214 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
16227 -e 's:$: $lt_compiler_flag:'` 16215 -e 's:$: $lt_compiler_flag:'`
16228 (eval echo "\"\$as_me:16228: $lt_compile\"" >&5) 16216 (eval echo "\"\$as_me:16216: $lt_compile\"" >&5)
16229 (eval "$lt_compile" 2>out/conftest.err) 16217 (eval "$lt_compile" 2>out/conftest.err)
16230 ac_status=$? 16218 ac_status=$?
16231 cat out/conftest.err >&5 16219 cat out/conftest.err >&5
16232 echo "$as_me:16232: \$? = $ac_status" >&5 16220 echo "$as_me:16220: \$? = $ac_status" >&5
16233 if (exit $ac_status) && test -s out/conftest2.$ac_objext 16221 if (exit $ac_status) && test -s out/conftest2.$ac_objext
16234 then 16222 then
16235 # The compiler can only warn and ignore the option if not recognized 16223 # The compiler can only warn and ignore the option if not recognized
@@ -18413,7 +18401,7 @@ else
18413 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 18401 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18414 lt_status=$lt_dlunknown 18402 lt_status=$lt_dlunknown
18415 cat > conftest.$ac_ext <<EOF 18403 cat > conftest.$ac_ext <<EOF
18416#line 18416 "configure" 18404#line 18404 "configure"
18417#include "confdefs.h" 18405#include "confdefs.h"
18418 18406
18419#if HAVE_DLFCN_H 18407#if HAVE_DLFCN_H
@@ -18511,7 +18499,7 @@ else
18511 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 18499 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
18512 lt_status=$lt_dlunknown 18500 lt_status=$lt_dlunknown
18513 cat > conftest.$ac_ext <<EOF 18501 cat > conftest.$ac_ext <<EOF
18514#line 18514 "configure" 18502#line 18502 "configure"
18515#include "confdefs.h" 18503#include "confdefs.h"
18516 18504
18517#if HAVE_DLFCN_H 18505#if HAVE_DLFCN_H
@@ -20728,7 +20716,7 @@ else
20728 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 20716 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
20729 lt_status=$lt_dlunknown 20717 lt_status=$lt_dlunknown
20730 cat > conftest.$ac_ext <<EOF 20718 cat > conftest.$ac_ext <<EOF
20731#line 20731 "configure" 20719#line 20719 "configure"
20732#include "confdefs.h" 20720#include "confdefs.h"
20733 20721
20734#if HAVE_DLFCN_H 20722#if HAVE_DLFCN_H
@@ -22913,6 +22901,7 @@ s,@AUTOCONF@,$AUTOCONF,;t t
22913s,@AUTOMAKE@,$AUTOMAKE,;t t 22901s,@AUTOMAKE@,$AUTOMAKE,;t t
22914s,@AUTOHEADER@,$AUTOHEADER,;t t 22902s,@AUTOHEADER@,$AUTOHEADER,;t t
22915s,@MAKEINFO@,$MAKEINFO,;t t 22903s,@MAKEINFO@,$MAKEINFO,;t t
22904s,@AMTAR@,$AMTAR,;t t
22916s,@install_sh@,$install_sh,;t t 22905s,@install_sh@,$install_sh,;t t
22917s,@STRIP@,$STRIP,;t t 22906s,@STRIP@,$STRIP,;t t
22918s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t 22907s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
@@ -22921,9 +22910,6 @@ s,@mkdir_p@,$mkdir_p,;t t
22921s,@AWK@,$AWK,;t t 22910s,@AWK@,$AWK,;t t
22922s,@SET_MAKE@,$SET_MAKE,;t t 22911s,@SET_MAKE@,$SET_MAKE,;t t
22923s,@am__leading_dot@,$am__leading_dot,;t t 22912s,@am__leading_dot@,$am__leading_dot,;t t
22924s,@AMTAR@,$AMTAR,;t t
22925s,@am__tar@,$am__tar,;t t
22926s,@am__untar@,$am__untar,;t t
22927s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t 22913s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
22928s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t 22914s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
22929s,@MAINT@,$MAINT,;t t 22915s,@MAINT@,$MAINT,;t t
@@ -23607,21 +23593,27 @@ echo X"$mf" |
23607 else 23593 else
23608 continue 23594 continue
23609 fi 23595 fi
23610 # Extract the definition of DEPDIR, am__include, and am__quote 23596 grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
23611 # from the Makefile without running `make'. 23597 # Extract the definition of DEP_FILES from the Makefile without
23598 # running `make'.
23612 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` 23599 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
23613 test -z "$DEPDIR" && continue 23600 test -z "$DEPDIR" && continue
23614 am__include=`sed -n 's/^am__include = //p' < "$mf"`
23615 test -z "am__include" && continue
23616 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
23617 # When using ansi2knr, U may be empty or an underscore; expand it 23601 # When using ansi2knr, U may be empty or an underscore; expand it
23618 U=`sed -n 's/^U = //p' < "$mf"` 23602 U=`sed -n 's/^U = //p' < "$mf"`
23619 # Find all dependency output files, they are included files with 23603 test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
23620 # $(DEPDIR) in their names. We invoke sed twice because it is the 23604 # We invoke sed twice because it is the simplest approach to
23621 # simplest approach to changing $(DEPDIR) to its actual value in the 23605 # changing $(DEPDIR) to its actual value in the expansion.
23622 # expansion. 23606 for file in `sed -n '
23623 for file in `sed -n " 23607 /^DEP_FILES = .*\\\\$/ {
23624 s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ 23608 s/^DEP_FILES = //
23609 :loop
23610 s/\\\\$//
23611 p
23612 n
23613 /\\\\$/ b loop
23614 p
23615 }
23616 /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
23625 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do 23617 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
23626 # Make sure the directory exists. 23618 # Make sure the directory exists.
23627 test -f "$dirpart/$file" && continue 23619 test -f "$dirpart/$file" && continue
diff --git a/libltdl/install-sh b/libltdl/install-sh
index 1a835340..e4160c99 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
4scriptversion=2005-02-02.21 4scriptversion=2004-04-01.17
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,6 +58,9 @@ stripprog="${STRIPPROG-strip}"
58rmprog="${RMPROG-rm}" 58rmprog="${RMPROG-rm}"
59mkdirprog="${MKDIRPROG-mkdir}" 59mkdirprog="${MKDIRPROG-mkdir}"
60 60
61transformbasename=
62transform_arg=
63instcmd="$mvprog"
61chmodcmd="$chmodprog 0755" 64chmodcmd="$chmodprog 0755"
62chowncmd= 65chowncmd=
63chgrpcmd= 66chgrpcmd=
@@ -67,27 +70,23 @@ mvcmd="$mvprog"
67src= 70src=
68dst= 71dst=
69dir_arg= 72dir_arg=
70dstarg=
71no_target_directory=
72 73
73usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE 74usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
74 or: $0 [OPTION]... SRCFILES... DIRECTORY 75 or: $0 [OPTION]... SRCFILES... DIRECTORY
75 or: $0 [OPTION]... -t DIRECTORY SRCFILES... 76 or: $0 -d DIRECTORIES...
76 or: $0 [OPTION]... -d DIRECTORIES...
77 77
78In the 1st form, copy SRCFILE to DSTFILE. 78In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
79In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. 79In the second, create the directory path DIR.
80In the 4th, create DIRECTORIES.
81 80
82Options: 81Options:
83-c (ignored) 82-b=TRANSFORMBASENAME
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 $chgrpprog installed files to GROUP. 85-g GROUP $chgrp installed files to GROUP.
86-m MODE $chmodprog installed files to MODE. 86-m MODE $chmod installed files to MODE.
87-o USER $chownprog installed files to USER. 87-o USER $chown installed files to USER.
88-s $stripprog installed files. 88-s strip installed files (using $stripprog).
89-t DIRECTORY install into DIRECTORY. 89-t=TRANSFORM
90-T report an error if DSTFILE is a directory.
91--help display this help and exit. 90--help display this help and exit.
92--version display version info and exit. 91--version display version info and exit.
93 92
@@ -97,7 +96,12 @@ Environment variables override the default commands:
97 96
98while test -n "$1"; do 97while test -n "$1"; do
99 case $1 in 98 case $1 in
100 -c) shift 99 -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
100 shift
101 continue;;
102
103 -c) instcmd=$cpprog
104 shift
101 continue;; 105 continue;;
102 106
103 -d) dir_arg=true 107 -d) dir_arg=true
@@ -109,7 +113,7 @@ while test -n "$1"; do
109 shift 113 shift
110 continue;; 114 continue;;
111 115
112 --help) echo "$usage"; exit $?;; 116 --help) echo "$usage"; exit 0;;
113 117
114 -m) chmodcmd="$chmodprog $2" 118 -m) chmodcmd="$chmodprog $2"
115 shift 119 shift
@@ -125,20 +129,14 @@ while test -n "$1"; do
125 shift 129 shift
126 continue;; 130 continue;;
127 131
128 -t) dstarg=$2 132 -t=*) transformarg=`echo $1 | sed 's/-t=//'`
129 shift 133 shift
130 shift 134 continue;;
131 continue;;
132
133 -T) no_target_directory=true
134 shift
135 continue;;
136 135
137 --version) echo "$0 $scriptversion"; exit $?;; 136 --version) echo "$0 $scriptversion"; exit 0;;
138 137
139 *) # When -d is used, all remaining arguments are directories to create. 138 *) # When -d is used, all remaining arguments are directories to create.
140 # When -t is used, the destination is already specified. 139 test -n "$dir_arg" && break
141 test -n "$dir_arg$dstarg" && break
142 # Otherwise, the last argument is the destination. Remove it from $@. 140 # Otherwise, the last argument is the destination. Remove it from $@.
143 for arg 141 for arg
144 do 142 do
@@ -176,13 +174,13 @@ do
176 src= 174 src=
177 175
178 if test -d "$dst"; then 176 if test -d "$dst"; then
179 mkdircmd=: 177 instcmd=:
180 chmodcmd= 178 chmodcmd=
181 else 179 else
182 mkdircmd=$mkdirprog 180 instcmd=$mkdirprog
183 fi 181 fi
184 else 182 else
185 # Waiting for this to be detected by the "$cpprog $src $dsttmp" command 183 # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
186 # might cause directories to be created, which would be especially bad 184 # might cause directories to be created, which would be especially bad
187 # if $src (and thus $dsttmp) contains '*'. 185 # if $src (and thus $dsttmp) contains '*'.
188 if test ! -f "$src" && test ! -d "$src"; then 186 if test ! -f "$src" && test ! -d "$src"; then
@@ -204,16 +202,12 @@ do
204 # If destination is a directory, append the input filename; won't work 202 # If destination is a directory, append the input filename; won't work
205 # if double slashes aren't ignored. 203 # if double slashes aren't ignored.
206 if test -d "$dst"; then 204 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
211 dst=$dst/`basename "$src"` 205 dst=$dst/`basename "$src"`
212 fi 206 fi
213 fi 207 fi
214 208
215 # This sed command emulates the dirname command. 209 # This sed command emulates the dirname command.
216 dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` 210 dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
217 211
218 # Make sure that the destination directory exists. 212 # Make sure that the destination directory exists.
219 213
@@ -226,8 +220,7 @@ do
226 oIFS=$IFS 220 oIFS=$IFS
227 # Some sh's can't handle IFS=/ for some reason. 221 # Some sh's can't handle IFS=/ for some reason.
228 IFS='%' 222 IFS='%'
229 set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` 223 set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
230 shift
231 IFS=$oIFS 224 IFS=$oIFS
232 225
233 pathcomp= 226 pathcomp=
@@ -236,42 +229,51 @@ do
236 pathcomp=$pathcomp$1 229 pathcomp=$pathcomp$1
237 shift 230 shift
238 if test ! -d "$pathcomp"; then 231 if test ! -d "$pathcomp"; then
239 $mkdirprog "$pathcomp" 232 $mkdirprog "$pathcomp" || lasterr=$?
240 # mkdir can fail with a `File exist' error in case several 233 # mkdir can fail with a `File exist' error in case several
241 # install-sh are creating the directory concurrently. This 234 # install-sh are creating the directory concurrently. This
242 # is OK. 235 # is OK.
243 test -d "$pathcomp" || exit 236 test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
244 fi 237 fi
245 pathcomp=$pathcomp/ 238 pathcomp=$pathcomp/
246 done 239 done
247 fi 240 fi
248 241
249 if test -n "$dir_arg"; then 242 if test -n "$dir_arg"; then
250 $doit $mkdircmd "$dst" \ 243 $doit $instcmd "$dst" \
251 && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ 244 && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
252 && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ 245 && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
253 && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ 246 && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
254 && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } 247 && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
255 248
256 else 249 else
257 dstfile=`basename "$dst"` 250 # If we're going to rename the final executable, determine the name now.
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"`
258 260
259 # Make a couple of temp file names in the proper directory. 261 # Make a couple of temp file names in the proper directory.
260 dsttmp=$dstdir/_inst.$$_ 262 dsttmp=$dstdir/_inst.$$_
261 rmtmp=$dstdir/_rm.$$_ 263 rmtmp=$dstdir/_rm.$$_
262 264
263 # Trap to clean up those temp files at exit. 265 # Trap to clean up those temp files at exit.
264 trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 266 trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
265 trap '(exit $?); exit' 1 2 13 15 267 trap '(exit $?); exit' 1 2 13 15
266 268
267 # Copy the file name to the temp name. 269 # Move or copy the file name to the temp name
268 $doit $cpprog "$src" "$dsttmp" && 270 $doit $instcmd "$src" "$dsttmp" &&
269 271
270 # and set any options; do chmod last to preserve setuid bits. 272 # and set any options; do chmod last to preserve setuid bits.
271 # 273 #
272 # If any of these fail, we abort the whole thing. If we want to 274 # If any of these fail, we abort the whole thing. If we want to
273 # ignore errors from any of these, just make sure not to ignore 275 # ignore errors from any of these, just make sure not to ignore
274 # errors from the above "$doit $cpprog $src $dsttmp" command. 276 # errors from the above "$doit $instcmd $src $dsttmp" command.
275 # 277 #
276 { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ 278 { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
277 && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ 279 && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
@@ -296,7 +298,7 @@ do
296 || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ 298 || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
297 || { 299 || {
298 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 300 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
299 (exit 1); exit 1 301 (exit 1); exit
300 } 302 }
301 else 303 else
302 : 304 :
@@ -307,12 +309,12 @@ do
307 $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" 309 $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
308 } 310 }
309 } 311 }
310 fi || { (exit 1); exit 1; } 312 fi || { (exit 1); exit; }
311done 313done
312 314
313# The final little trick to "correctly" pass the exit status to the exit trap. 315# The final little trick to "correctly" pass the exit status to the exit trap.
314{ 316{
315 (exit 0); exit 0 317 (exit 0); exit
316} 318}
317 319
318# Local variables: 320# Local variables:
diff --git a/libltdl/missing b/libltdl/missing
index 09edd884..e7ef83a1 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
4scriptversion=2005-02-08.22 4scriptversion=2003-09-02.23
5 5
6# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 6# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
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
@@ -60,6 +60,11 @@ case "$1" in
60 msg="probably too old" 60 msg="probably too old"
61 fi 61 fi
62 ;; 62 ;;
63esac
64
65# If it does not exist, or fails to run (possibly an outdated version),
66# try to emulate it.
67case "$1" in
63 68
64 -h|--h|--he|--hel|--help) 69 -h|--h|--he|--hel|--help)
65 echo "\ 70 echo "\
@@ -87,12 +92,10 @@ Supported PROGRAM values:
87 yacc create \`y.tab.[ch]', if possible, from existing .[ch] 92 yacc create \`y.tab.[ch]', if possible, from existing .[ch]
88 93
89Send bug reports to <bug-automake@gnu.org>." 94Send bug reports to <bug-automake@gnu.org>."
90 exit $?
91 ;; 95 ;;
92 96
93 -v|--v|--ve|--ver|--vers|--versi|--versio|--version) 97 -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
94 echo "missing $scriptversion (GNU Automake)" 98 echo "missing $scriptversion (GNU Automake)"
95 exit $?
96 ;; 99 ;;
97 100
98 -*) 101 -*)
@@ -101,42 +104,12 @@ Send bug reports to <bug-automake@gnu.org>."
101 exit 1 104 exit 1
102 ;; 105 ;;
103 106
104esac 107 aclocal*)
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).
109case "$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 *)
124 if test -z "$run" && ($1 --version) > /dev/null 2>&1; then 108 if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
125 # We have it, but it failed. 109 # We have it, but it failed.
126 exit 1 110 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
132 fi 111 fi
133 ;;
134esac
135 112
136# If it does not exist, or fails to run (possibly an outdated version),
137# try to emulate it.
138case "$1" in
139 aclocal*)
140 echo 1>&2 "\ 113 echo 1>&2 "\
141WARNING: \`$1' is $msg. You should only need it if 114WARNING: \`$1' is $msg. You should only need it if
142 you modified \`acinclude.m4' or \`${configure_ac}'. You might want 115 you modified \`acinclude.m4' or \`${configure_ac}'. You might want
@@ -146,6 +119,11 @@ WARNING: \`$1' is $msg. You should only need it if
146 ;; 119 ;;
147 120
148 autoconf) 121 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
149 echo 1>&2 "\ 127 echo 1>&2 "\
150WARNING: \`$1' is $msg. You should only need it if 128WARNING: \`$1' is $msg. You should only need it if
151 you modified \`${configure_ac}'. You might want to install the 129 you modified \`${configure_ac}'. You might want to install the
@@ -155,6 +133,11 @@ WARNING: \`$1' is $msg. You should only need it if
155 ;; 133 ;;
156 134
157 autoheader) 135 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
158 echo 1>&2 "\ 141 echo 1>&2 "\
159WARNING: \`$1' is $msg. You should only need it if 142WARNING: \`$1' is $msg. You should only need it if
160 you modified \`acconfig.h' or \`${configure_ac}'. You might want 143 you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -174,6 +157,11 @@ WARNING: \`$1' is $msg. You should only need it if
174 ;; 157 ;;
175 158
176 automake*) 159 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
177 echo 1>&2 "\ 165 echo 1>&2 "\
178WARNING: \`$1' is $msg. You should only need it if 166WARNING: \`$1' is $msg. You should only need it if
179 you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. 167 you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
@@ -185,6 +173,11 @@ WARNING: \`$1' is $msg. You should only need it if
185 ;; 173 ;;
186 174
187 autom4te) 175 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
188 echo 1>&2 "\ 181 echo 1>&2 "\
189WARNING: \`$1' is needed, but is $msg. 182WARNING: \`$1' is needed, but is $msg.
190 You might have modified some files without having the 183 You might have modified some files without having the
@@ -261,6 +254,11 @@ WARNING: \`$1' is $msg. You should only need it if
261 ;; 254 ;;
262 255
263 help2man) 256 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
264 echo 1>&2 "\ 262 echo 1>&2 "\
265WARNING: \`$1' is $msg. You should only need it if 263WARNING: \`$1' is $msg. You should only need it if
266 you modified a dependency of a manual page. You may need the 264 you modified a dependency of a manual page. You may need the
@@ -281,6 +279,11 @@ WARNING: \`$1' is $msg. You should only need it if
281 ;; 279 ;;
282 280
283 makeinfo) 281 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
284 echo 1>&2 "\ 287 echo 1>&2 "\
285WARNING: \`$1' is $msg. You should only need it if 288WARNING: \`$1' is $msg. You should only need it if
286 you modified a \`.texi' or \`.texinfo' file, or any other file 289 you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -288,20 +291,20 @@ WARNING: \`$1' is $msg. You should only need it if
288 call might also be the consequence of using a buggy \`make' (AIX, 291 call might also be the consequence of using a buggy \`make' (AIX,
289 DU, IRIX). You might want to install the \`Texinfo' package or 292 DU, IRIX). You might want to install the \`Texinfo' package or
290 the \`GNU make' package. Grab either from any GNU archive site." 293 the \`GNU make' package. Grab either from any GNU archive site."
291 # The file to touch is that specified with -o ...
292 file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` 294 file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
293 if test -z "$file"; then 295 if test -z "$file"; then
294 # ... or it is the one specified with @setfilename ... 296 file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
295 infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` 297 file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
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
299 fi 298 fi
300 touch $file 299 touch $file
301 ;; 300 ;;
302 301
303 tar) 302 tar)
304 shift 303 shift
304 if test -n "$run"; then
305 echo 1>&2 "ERROR: \`tar' requires --run"
306 exit 1
307 fi
305 308
306 # We have already tried tar in the generic part. 309 # We have already tried tar in the generic part.
307 # Look for gnutar/gtar before invocation to avoid ugly error 310 # Look for gnutar/gtar before invocation to avoid ugly error
diff --git a/mkinstalldirs b/mkinstalldirs
index 5d26a485..6fbe5e11 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
4scriptversion=2005-02-02.21 4scriptversion=2004-02-15.20
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
@@ -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 $? 30 exit 0
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 $? 40 exit 0
41 ;; 41 ;;
42 --) # stop option processing 42 --) # stop option processing
43 shift 43 shift
diff --git a/po/Makefile.in b/po/Makefile.in
index b59b3c50..dc2efe81 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -20,7 +20,7 @@ srcdir = .
20top_srcdir = .. 20top_srcdir = ..
21 21
22 22
23prefix = /home/grothoff 23prefix = /home/grothoff/
24exec_prefix = ${prefix} 24exec_prefix = ${prefix}
25datadir = ${prefix}/share 25datadir = ${prefix}/share
26localedir = $(datadir)/locale 26localedir = $(datadir)/locale
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 971e6749..4a15f50e 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -331,8 +331,8 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
331 "metaDataDialogMetaDataList", 331 "metaDataDialogMetaDataList",
332 "previewImage", 332 "previewImage",
333 meta); 333 meta);
334 ECRS_freeMetaData(meta);
335 keywordURI = ECRS_metaDataToUri(meta); 334 keywordURI = ECRS_metaDataToUri(meta);
335 ECRS_freeMetaData(meta);
336 createKeywordListTreeView(metaXML, 336 createKeywordListTreeView(metaXML,
337 "metaDataDialogKeywordList", 337 "metaDataDialogKeywordList",
338 keywordURI); 338 keywordURI);
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 19:23:57 +0000