PageRenderTime 136ms CodeModel.GetById 101ms app.highlight 4ms RepoModel.GetById 2ms app.codeStats 1ms

/core/10.5/libfuse/fuse-current-macosx.patch

http://macfuse.googlecode.com/
Patch | 12796 lines | 12358 code | 438 blank | 0 comment | 0 complexity | bfca57d9f1314b0d43fe2750496f268a MD5 | raw file

Large files files are truncated, but you can click here to view the full file

   1diff -Naur old/Makefile.in new/Makefile.in
   2--- old/Makefile.in	2008-02-19 12:00:55.000000000 -0800
   3+++ new/Makefile.in	2009-10-18 19:42:37.000000000 -0700
   4@@ -1,8 +1,8 @@
   5-# Makefile.in generated by automake 1.9.6 from Makefile.am.
   6+# Makefile.in generated by automake 1.10 from Makefile.am.
   7 # @configure_input@
   8 
   9 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
  10-# 2003, 2004, 2005  Free Software Foundation, Inc.
  11+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
  12 # This Makefile.in is free software; the Free Software Foundation
  13 # gives unlimited permission to copy and/or distribute it,
  14 # with or without modifications, as long as this notice is preserved.
  15@@ -14,15 +14,11 @@
  16 
  17 @SET_MAKE@
  18 
  19-srcdir = @srcdir@
  20-top_srcdir = @top_srcdir@
  21 VPATH = @srcdir@
  22 pkgdatadir = $(datadir)/@PACKAGE@
  23 pkglibdir = $(libdir)/@PACKAGE@
  24 pkgincludedir = $(includedir)/@PACKAGE@
  25-top_builddir = .
  26 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  27-INSTALL = @INSTALL@
  28 install_sh_DATA = $(install_sh) -c -m 644
  29 install_sh_PROGRAM = $(install_sh) -c
  30 install_sh_SCRIPT = $(install_sh) -c
  31@@ -37,18 +33,19 @@
  32 build_triplet = @build@
  33 host_triplet = @host@
  34 target_triplet = @target@
  35+subdir = .
  36 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
  37 	$(srcdir)/Makefile.in $(srcdir)/fuse.pc.in \
  38 	$(top_srcdir)/configure AUTHORS COPYING COPYING.LIB ChangeLog \
  39 	INSTALL NEWS compile config.guess config.rpath config.sub \
  40 	depcomp install-sh ltmain.sh missing mkinstalldirs
  41-subdir = .
  42 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  43-am__aclocal_m4_deps = $(top_srcdir)/configure.in
  44+am__aclocal_m4_deps = $(top_srcdir)/iconv.m4 \
  45+	$(top_srcdir)/configure.in
  46 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  47 	$(ACLOCAL_M4)
  48 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  49- configure.lineno configure.status.lineno
  50+ configure.lineno config.status.lineno
  51 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  52 CONFIG_HEADER = $(top_builddir)/include/config.h
  53 CONFIG_CLEAN_FILES = fuse.pc
  54@@ -56,10 +53,11 @@
  55 DIST_SOURCES =
  56 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
  57 	html-recursive info-recursive install-data-recursive \
  58-	install-exec-recursive install-info-recursive \
  59-	install-recursive installcheck-recursive installdirs-recursive \
  60-	pdf-recursive ps-recursive uninstall-info-recursive \
  61-	uninstall-recursive
  62+	install-dvi-recursive install-exec-recursive \
  63+	install-html-recursive install-info-recursive \
  64+	install-pdf-recursive install-ps-recursive install-recursive \
  65+	installcheck-recursive installdirs-recursive pdf-recursive \
  66+	ps-recursive uninstall-recursive
  67 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
  68 am__vpath_adj = case $$p in \
  69     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
  70@@ -69,6 +67,8 @@
  71 am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
  72 pkgconfigDATA_INSTALL = $(INSTALL_DATA)
  73 DATA = $(pkgconfig_DATA)
  74+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
  75+  distclean-recursive maintainer-clean-recursive
  76 ETAGS = etags
  77 CTAGS = ctags
  78 DIST_SUBDIRS = $(SUBDIRS)
  79@@ -84,53 +84,49 @@
  80 distuninstallcheck_listfiles = find . -type f -print
  81 distcleancheck_listfiles = find . -type f -print
  82 ACLOCAL = @ACLOCAL@
  83-AMDEP_FALSE = @AMDEP_FALSE@
  84-AMDEP_TRUE = @AMDEP_TRUE@
  85 AMTAR = @AMTAR@
  86 AR = @AR@
  87 AUTOCONF = @AUTOCONF@
  88 AUTOHEADER = @AUTOHEADER@
  89 AUTOMAKE = @AUTOMAKE@
  90 AWK = @AWK@
  91-BSD_FALSE = @BSD_FALSE@
  92-BSD_TRUE = @BSD_TRUE@
  93 CC = @CC@
  94 CCDEPMODE = @CCDEPMODE@
  95 CFLAGS = @CFLAGS@
  96 CPP = @CPP@
  97 CPPFLAGS = @CPPFLAGS@
  98+CXX = @CXX@
  99+CXXCPP = @CXXCPP@
 100+CXXDEPMODE = @CXXDEPMODE@
 101+CXXFLAGS = @CXXFLAGS@
 102 CYGPATH_W = @CYGPATH_W@
 103 DEFS = @DEFS@
 104 DEPDIR = @DEPDIR@
 105-DUMPBIN = @DUMPBIN@
 106+ECHO = @ECHO@
 107 ECHO_C = @ECHO_C@
 108 ECHO_N = @ECHO_N@
 109 ECHO_T = @ECHO_T@
 110 EGREP = @EGREP@
 111 EXEEXT = @EXEEXT@
 112-FGREP = @FGREP@
 113+F77 = @F77@
 114+FFLAGS = @FFLAGS@
 115 GREP = @GREP@
 116-ICONV_FALSE = @ICONV_FALSE@
 117-ICONV_TRUE = @ICONV_TRUE@
 118 INIT_D_PATH = @INIT_D_PATH@
 119+INSTALL = @INSTALL@
 120 INSTALL_DATA = @INSTALL_DATA@
 121 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 122 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 123 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 124-LD = @LD@
 125 LDFLAGS = @LDFLAGS@
 126 LIBICONV = @LIBICONV@
 127 LIBOBJS = @LIBOBJS@
 128 LIBS = @LIBS@
 129 LIBTOOL = @LIBTOOL@
 130-LINUX_FALSE = @LINUX_FALSE@
 131-LINUX_TRUE = @LINUX_TRUE@
 132 LN_S = @LN_S@
 133-LTLIBICONV = @LTLIBICONV@
 134 LTLIBOBJS = @LTLIBOBJS@
 135 MAKEINFO = @MAKEINFO@
 136+MKDIR_P = @MKDIR_P@
 137 MOUNT_FUSE_PATH = @MOUNT_FUSE_PATH@
 138-NM = @NM@
 139 OBJEXT = @OBJEXT@
 140 PACKAGE = @PACKAGE@
 141 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 142@@ -140,16 +136,18 @@
 143 PACKAGE_VERSION = @PACKAGE_VERSION@
 144 PATH_SEPARATOR = @PATH_SEPARATOR@
 145 RANLIB = @RANLIB@
 146-SED = @SED@
 147 SET_MAKE = @SET_MAKE@
 148 SHELL = @SHELL@
 149 STRIP = @STRIP@
 150 UDEV_RULES_PATH = @UDEV_RULES_PATH@
 151 VERSION = @VERSION@
 152+abs_builddir = @abs_builddir@
 153+abs_srcdir = @abs_srcdir@
 154+abs_top_builddir = @abs_top_builddir@
 155+abs_top_srcdir = @abs_top_srcdir@
 156 ac_ct_CC = @ac_ct_CC@
 157-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 158-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 159-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 160+ac_ct_CXX = @ac_ct_CXX@
 161+ac_ct_F77 = @ac_ct_F77@
 162 am__include = @am__include@
 163 am__leading_dot = @am__leading_dot@
 164 am__quote = @am__quote@
 165@@ -161,6 +159,7 @@
 166 build_cpu = @build_cpu@
 167 build_os = @build_os@
 168 build_vendor = @build_vendor@
 169+builddir = @builddir@
 170 datadir = @datadir@
 171 datarootdir = @datarootdir@
 172 docdir = @docdir@
 173@@ -180,7 +179,6 @@
 174 libfuse_libs = @libfuse_libs@
 175 localedir = @localedir@
 176 localstatedir = @localstatedir@
 177-lt_ECHO = @lt_ECHO@
 178 mandir = @mandir@
 179 mkdir_p = @mkdir_p@
 180 oldincludedir = @oldincludedir@
 181@@ -191,6 +189,7 @@
 182 psdir = @psdir@
 183 sbindir = @sbindir@
 184 sharedstatedir = @sharedstatedir@
 185+srcdir = @srcdir@
 186 subdirs = @subdirs@
 187 subdirs2 = @subdirs2@
 188 sysconfdir = @sysconfdir@
 189@@ -199,6 +198,8 @@
 190 target_cpu = @target_cpu@
 191 target_os = @target_os@
 192 target_vendor = @target_vendor@
 193+top_builddir = @top_builddir@
 194+top_srcdir = @top_srcdir@
 195 SUBDIRS = @subdirs@ @subdirs2@
 196 EXTRA_DIST = \
 197 	fuse.pc.in		\
 198@@ -257,10 +258,9 @@
 199 
 200 distclean-libtool:
 201 	-rm -f libtool
 202-uninstall-info-am:
 203 install-pkgconfigDATA: $(pkgconfig_DATA)
 204 	@$(NORMAL_INSTALL)
 205-	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
 206+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
 207 	@list='$(pkgconfig_DATA)'; for p in $$list; do \
 208 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 209 	  f=$(am__strip_dir) \
 210@@ -307,8 +307,7 @@
 211 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 212 	fi; test -z "$$fail"
 213 
 214-mostlyclean-recursive clean-recursive distclean-recursive \
 215-maintainer-clean-recursive:
 216+$(RECURSIVE_CLEAN_TARGETS):
 217 	@failcom='exit 1'; \
 218 	for f in x $$MAKEFLAGS; do \
 219 	  case $$f in \
 220@@ -410,24 +409,22 @@
 221 
 222 distdir: $(DISTFILES)
 223 	$(am__remove_distdir)
 224-	mkdir $(distdir)
 225-	$(mkdir_p) $(distdir)/. $(distdir)/doc
 226-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 227-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 228-	list='$(DISTFILES)'; for file in $$list; do \
 229-	  case $$file in \
 230-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
 231-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
 232-	  esac; \
 233+	test -d $(distdir) || mkdir $(distdir)
 234+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 235+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 236+	list='$(DISTFILES)'; \
 237+	  dist_files=`for file in $$list; do echo $$file; done | \
 238+	  sed -e "s|^$$srcdirstrip/||;t" \
 239+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 240+	case $$dist_files in \
 241+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 242+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 243+			   sort -u` ;; \
 244+	esac; \
 245+	for file in $$dist_files; do \
 246 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 247-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 248-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 249-	    dir="/$$dir"; \
 250-	    $(mkdir_p) "$(distdir)$$dir"; \
 251-	  else \
 252-	    dir=''; \
 253-	  fi; \
 254 	  if test -d $$d/$$file; then \
 255+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 256 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 257 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 258 	    fi; \
 259@@ -441,7 +438,7 @@
 260 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 261 	  if test "$$subdir" = .; then :; else \
 262 	    test -d "$(distdir)/$$subdir" \
 263-	    || $(mkdir_p) "$(distdir)/$$subdir" \
 264+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 265 	    || exit 1; \
 266 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 267 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 268@@ -449,6 +446,8 @@
 269 	      $(MAKE) $(AM_MAKEFLAGS) \
 270 	        top_distdir="$$top_distdir" \
 271 	        distdir="$$distdir/$$subdir" \
 272+		am__remove_distdir=: \
 273+		am__skip_length_check=: \
 274 	        distdir) \
 275 	      || exit 1; \
 276 	  fi; \
 277@@ -456,7 +455,7 @@
 278 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 279 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 280 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 281-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
 282+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 283 	|| chmod -R a+r $(distdir)
 284 dist-gzip: distdir
 285 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 286@@ -531,7 +530,7 @@
 287 	$(am__remove_distdir)
 288 	@(echo "$(distdir) archives ready for distribution: "; \
 289 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 290-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
 291+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 292 distuninstallcheck:
 293 	@cd $(distuninstallcheck_dir) \
 294 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 295@@ -556,7 +555,7 @@
 296 installdirs: installdirs-recursive
 297 installdirs-am:
 298 	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
 299-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 300+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 301 	done
 302 install: install-recursive
 303 install-exec: install-exec-recursive
 304@@ -604,12 +603,20 @@
 305 
 306 install-data-am: install-pkgconfigDATA
 307 
 308+install-dvi: install-dvi-recursive
 309+
 310 install-exec-am:
 311 
 312+install-html: install-html-recursive
 313+
 314 install-info: install-info-recursive
 315 
 316 install-man:
 317 
 318+install-pdf: install-pdf-recursive
 319+
 320+install-ps: install-ps-recursive
 321+
 322 installcheck-am:
 323 
 324 maintainer-clean: maintainer-clean-recursive
 325@@ -630,24 +637,26 @@
 326 
 327 ps-am:
 328 
 329-uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
 330+uninstall-am: uninstall-pkgconfigDATA
 331 
 332-uninstall-info: uninstall-info-recursive
 333+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 334+	install-strip
 335 
 336-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
 337-	check-am clean clean-generic clean-libtool clean-recursive \
 338-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
 339-	dist-shar dist-tarZ dist-zip distcheck distclean \
 340-	distclean-generic distclean-libtool distclean-recursive \
 341-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 342-	dvi-am html html-am info info-am install install-am \
 343-	install-data install-data-am install-exec install-exec-am \
 344-	install-info install-info-am install-man install-pkgconfigDATA \
 345-	install-strip installcheck installcheck-am installdirs \
 346-	installdirs-am maintainer-clean maintainer-clean-generic \
 347-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
 348-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
 349-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
 350+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 351+	all all-am am--refresh check check-am clean clean-generic \
 352+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
 353+	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
 354+	distclean-generic distclean-libtool distclean-tags \
 355+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
 356+	html-am info info-am install install-am install-data \
 357+	install-data-am install-dvi install-dvi-am install-exec \
 358+	install-exec-am install-html install-html-am install-info \
 359+	install-info-am install-man install-pdf install-pdf-am \
 360+	install-pkgconfigDATA install-ps install-ps-am install-strip \
 361+	installcheck installcheck-am installdirs installdirs-am \
 362+	maintainer-clean maintainer-clean-generic mostlyclean \
 363+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 364+	tags tags-recursive uninstall uninstall-am \
 365 	uninstall-pkgconfigDATA
 366 
 367 
 368diff -Naur old/README.MacFUSE new/README.MacFUSE
 369--- old/README.MacFUSE	1969-12-31 16:00:00.000000000 -0800
 370+++ new/README.MacFUSE	2009-10-18 19:42:37.000000000 -0700
 371@@ -0,0 +1,12 @@
 372+MacFUSE Project Page:
 373+
 374+http://code.google.com/p/macfuse/
 375+
 376+Making a Universal build of libfuse:
 377+
 378+1. Run "/bin/sh ./darwin_configure.sh /path/to/macfuse/core/10.5/fusefs/"
 379+2. Run make
 380+
 381+If you begin with the "raw" patch, you need to perform a step 0 as follows:
 382+
 383+aclocal -I . && autoheader && autoconf && automake -a
 384diff -Naur old/aclocal.m4 new/aclocal.m4
 385--- old/aclocal.m4	2008-02-19 12:00:31.000000000 -0800
 386+++ new/aclocal.m4	2009-10-18 19:42:37.000000000 -0700
 387@@ -1,7 +1,7 @@
 388-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 389+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 390 
 391 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 392-# 2005  Free Software Foundation, Inc.
 393+# 2005, 2006  Free Software Foundation, Inc.
 394 # This file is free software; the Free Software Foundation
 395 # gives unlimited permission to copy and/or distribute it,
 396 # with or without modifications, as long as this notice is preserved.
 397@@ -11,3269 +11,1519 @@
 398 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 399 # PARTICULAR PURPOSE.
 400 
 401-# iconv.m4 serial AM4 (gettext-0.11.3)
 402-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
 403-dnl This file is free software; the Free Software Foundation
 404-dnl gives unlimited permission to copy and/or distribute it,
 405-dnl with or without modifications, as long as this notice is preserved.
 406+m4_if(m4_PACKAGE_VERSION, [2.61],,
 407+[m4_fatal([this file was generated for autoconf 2.61.
 408+You have another version of autoconf.  If you want to use that,
 409+you should regenerate the build system entirely.], [63])])
 410 
 411-dnl From Bruno Haible.
 412+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 413 
 414-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
 415-[
 416-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
 417-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
 418-  AC_REQUIRE([AC_LIB_RPATH])
 419-
 420-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
 421-  dnl accordingly.
 422-  AC_LIB_LINKFLAGS_BODY([iconv])
 423-])
 424+# serial 48 AC_PROG_LIBTOOL
 425 
 426-AC_DEFUN([AM_ICONV_LINK],
 427-[
 428-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
 429-  dnl those with the standalone portable GNU libiconv installed).
 430 
 431-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
 432-  dnl accordingly.
 433-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
 434-
 435-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
 436-  dnl because if the user has installed libiconv and not disabled its use
 437-  dnl via --without-libiconv-prefix, he wants to use it. The first
 438-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
 439-  am_save_CPPFLAGS="$CPPFLAGS"
 440-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
 441-
 442-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
 443-    am_cv_func_iconv="no, consider installing GNU libiconv"
 444-    am_cv_lib_iconv=no
 445-    AC_TRY_LINK([#include <stdlib.h>
 446-#include <iconv.h>],
 447-      [iconv_t cd = iconv_open("","");
 448-       iconv(cd,NULL,NULL,NULL,NULL);
 449-       iconv_close(cd);],
 450-      am_cv_func_iconv=yes)
 451-    if test "$am_cv_func_iconv" != yes; then
 452-      am_save_LIBS="$LIBS"
 453-      LIBS="$LIBS $LIBICONV"
 454-      AC_TRY_LINK([#include <stdlib.h>
 455-#include <iconv.h>],
 456-        [iconv_t cd = iconv_open("","");
 457-         iconv(cd,NULL,NULL,NULL,NULL);
 458-         iconv_close(cd);],
 459-        am_cv_lib_iconv=yes
 460-        am_cv_func_iconv=yes)
 461-      LIBS="$am_save_LIBS"
 462-    fi
 463-  ])
 464-  if test "$am_cv_func_iconv" = yes; then
 465-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
 466-  fi
 467-  if test "$am_cv_lib_iconv" = yes; then
 468-    AC_MSG_CHECKING([how to link with libiconv])
 469-    AC_MSG_RESULT([$LIBICONV])
 470-  else
 471-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
 472-    dnl either.
 473-    CPPFLAGS="$am_save_CPPFLAGS"
 474-    LIBICONV=
 475-    LTLIBICONV=
 476-  fi
 477-  AC_SUBST(LIBICONV)
 478-  AC_SUBST(LTLIBICONV)
 479-])
 480+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
 481+# -----------------------------------------------------------
 482+# If this macro is not defined by Autoconf, define it here.
 483+m4_ifdef([AC_PROVIDE_IFELSE],
 484+         [],
 485+         [m4_define([AC_PROVIDE_IFELSE],
 486+	         [m4_ifdef([AC_PROVIDE_$1],
 487+		           [$2], [$3])])])
 488 
 489-AC_DEFUN([AM_ICONV],
 490-[
 491-  AM_ICONV_LINK
 492-  if test "$am_cv_func_iconv" = yes; then
 493-    AC_MSG_CHECKING([for iconv declaration])
 494-    AC_CACHE_VAL(am_cv_proto_iconv, [
 495-      AC_TRY_COMPILE([
 496-#include <stdlib.h>
 497-#include <iconv.h>
 498-extern
 499-#ifdef __cplusplus
 500-"C"
 501-#endif
 502-#if defined(__STDC__) || defined(__cplusplus)
 503-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 504-#else
 505-size_t iconv();
 506-#endif
 507-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
 508-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
 509-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
 510-    AC_MSG_RESULT([$]{ac_t:-
 511-         }[$]am_cv_proto_iconv)
 512-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
 513-      [Define as const if the declaration of iconv() needs const.])
 514-  fi
 515-])
 516 
 517-# lib-ld.m4 serial 3 (gettext-0.13)
 518-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
 519-dnl This file is free software; the Free Software Foundation
 520-dnl gives unlimited permission to copy and/or distribute it,
 521-dnl with or without modifications, as long as this notice is preserved.
 522-
 523-dnl Subroutines of libtool.m4,
 524-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
 525-dnl with libtool.m4.
 526-
 527-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
 528-AC_DEFUN([AC_LIB_PROG_LD_GNU],
 529-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
 530-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 531-case `$LD -v 2>&1 </dev/null` in
 532-*GNU* | *'with BFD'*)
 533-  acl_cv_prog_gnu_ld=yes ;;
 534-*)
 535-  acl_cv_prog_gnu_ld=no ;;
 536-esac])
 537-with_gnu_ld=$acl_cv_prog_gnu_ld
 538-])
 539+# AC_PROG_LIBTOOL
 540+# ---------------
 541+AC_DEFUN([AC_PROG_LIBTOOL],
 542+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
 543+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
 544+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
 545+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
 546+    [AC_LIBTOOL_CXX],
 547+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
 548+  ])])
 549+dnl And a similar setup for Fortran 77 support
 550+  AC_PROVIDE_IFELSE([AC_PROG_F77],
 551+    [AC_LIBTOOL_F77],
 552+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
 553+])])
 554+
 555+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
 556+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
 557+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
 558+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
 559+    [AC_LIBTOOL_GCJ],
 560+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
 561+      [AC_LIBTOOL_GCJ],
 562+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
 563+	[AC_LIBTOOL_GCJ],
 564+      [ifdef([AC_PROG_GCJ],
 565+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
 566+       ifdef([A][M_PROG_GCJ],
 567+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
 568+       ifdef([LT_AC_PROG_GCJ],
 569+	     [define([LT_AC_PROG_GCJ],
 570+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
 571+])])# AC_PROG_LIBTOOL
 572 
 573-dnl From libtool-1.4. Sets the variable LD.
 574-AC_DEFUN([AC_LIB_PROG_LD],
 575-[AC_ARG_WITH(gnu-ld,
 576-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
 577-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
 578-AC_REQUIRE([AC_PROG_CC])dnl
 579-AC_REQUIRE([AC_CANONICAL_HOST])dnl
 580-# Prepare PATH_SEPARATOR.
 581-# The user is always right.
 582-if test "${PATH_SEPARATOR+set}" != set; then
 583-  echo "#! /bin/sh" >conf$$.sh
 584-  echo  "exit 0"   >>conf$$.sh
 585-  chmod +x conf$$.sh
 586-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
 587-    PATH_SEPARATOR=';'
 588-  else
 589-    PATH_SEPARATOR=:
 590-  fi
 591-  rm -f conf$$.sh
 592-fi
 593-ac_prog=ld
 594-if test "$GCC" = yes; then
 595-  # Check if gcc -print-prog-name=ld gives a path.
 596-  AC_MSG_CHECKING([for ld used by GCC])
 597-  case $host in
 598-  *-*-mingw*)
 599-    # gcc leaves a trailing carriage return which upsets mingw
 600-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
 601-  *)
 602-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
 603-  esac
 604-  case $ac_prog in
 605-    # Accept absolute paths.
 606-    [[\\/]* | [A-Za-z]:[\\/]*)]
 607-      [re_direlt='/[^/][^/]*/\.\./']
 608-      # Canonicalize the path of ld
 609-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
 610-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
 611-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
 612-      done
 613-      test -z "$LD" && LD="$ac_prog"
 614-      ;;
 615-  "")
 616-    # If it fails, then pretend we aren't using GCC.
 617-    ac_prog=ld
 618-    ;;
 619-  *)
 620-    # If it is relative, then search for the first ld in PATH.
 621-    with_gnu_ld=unknown
 622-    ;;
 623-  esac
 624-elif test "$with_gnu_ld" = yes; then
 625-  AC_MSG_CHECKING([for GNU ld])
 626-else
 627-  AC_MSG_CHECKING([for non-GNU ld])
 628-fi
 629-AC_CACHE_VAL(acl_cv_path_LD,
 630-[if test -z "$LD"; then
 631-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
 632-  for ac_dir in $PATH; do
 633-    test -z "$ac_dir" && ac_dir=.
 634-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
 635-      acl_cv_path_LD="$ac_dir/$ac_prog"
 636-      # Check to see if the program is GNU ld.  I'd rather use --version,
 637-      # but apparently some GNU ld's only accept -v.
 638-      # Break only if it was the GNU/non-GNU ld that we prefer.
 639-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
 640-      *GNU* | *'with BFD'*)
 641-	test "$with_gnu_ld" != no && break ;;
 642-      *)
 643-	test "$with_gnu_ld" != yes && break ;;
 644-      esac
 645-    fi
 646-  done
 647-  IFS="$ac_save_ifs"
 648-else
 649-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
 650-fi])
 651-LD="$acl_cv_path_LD"
 652-if test -n "$LD"; then
 653-  AC_MSG_RESULT($LD)
 654-else
 655-  AC_MSG_RESULT(no)
 656-fi
 657-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 658-AC_LIB_PROG_LD_GNU
 659-])
 660 
 661-# lib-link.m4 serial 9 (gettext-0.16)
 662-dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
 663-dnl This file is free software; the Free Software Foundation
 664-dnl gives unlimited permission to copy and/or distribute it,
 665-dnl with or without modifications, as long as this notice is preserved.
 666-
 667-dnl From Bruno Haible.
 668-
 669-AC_PREREQ(2.50)
 670-
 671-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
 672-dnl the libraries corresponding to explicit and implicit dependencies.
 673-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
 674-dnl augments the CPPFLAGS variable.
 675-AC_DEFUN([AC_LIB_LINKFLAGS],
 676-[
 677-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
 678-  AC_REQUIRE([AC_LIB_RPATH])
 679-  define([Name],[translit([$1],[./-], [___])])
 680-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
 681-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
 682-  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
 683-    AC_LIB_LINKFLAGS_BODY([$1], [$2])
 684-    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
 685-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
 686-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
 687-  ])
 688-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
 689-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
 690-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
 691-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
 692-  AC_SUBST([LIB]NAME)
 693-  AC_SUBST([LTLIB]NAME)
 694-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
 695-  dnl results of this search when this library appears as a dependency.
 696-  HAVE_LIB[]NAME=yes
 697-  undefine([Name])
 698-  undefine([NAME])
 699-])
 700+# _AC_PROG_LIBTOOL
 701+# ----------------
 702+AC_DEFUN([_AC_PROG_LIBTOOL],
 703+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
 704+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
 705+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
 706+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 707 
 708-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
 709-dnl searches for libname and the libraries corresponding to explicit and
 710-dnl implicit dependencies, together with the specified include files and
 711-dnl the ability to compile and link the specified testcode. If found, it
 712-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
 713-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
 714-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
 715-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
 716-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
 717-[
 718-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
 719-  AC_REQUIRE([AC_LIB_RPATH])
 720-  define([Name],[translit([$1],[./-], [___])])
 721-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
 722-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
 723-
 724-  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
 725-  dnl accordingly.
 726-  AC_LIB_LINKFLAGS_BODY([$1], [$2])
 727-
 728-  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
 729-  dnl because if the user has installed lib[]Name and not disabled its use
 730-  dnl via --without-lib[]Name-prefix, he wants to use it.
 731-  ac_save_CPPFLAGS="$CPPFLAGS"
 732-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
 733-
 734-  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
 735-    ac_save_LIBS="$LIBS"
 736-    LIBS="$LIBS $LIB[]NAME"
 737-    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
 738-    LIBS="$ac_save_LIBS"
 739-  ])
 740-  if test "$ac_cv_lib[]Name" = yes; then
 741-    HAVE_LIB[]NAME=yes
 742-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
 743-    AC_MSG_CHECKING([how to link with lib[]$1])
 744-    AC_MSG_RESULT([$LIB[]NAME])
 745-  else
 746-    HAVE_LIB[]NAME=no
 747-    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
 748-    dnl $INC[]NAME either.
 749-    CPPFLAGS="$ac_save_CPPFLAGS"
 750-    LIB[]NAME=
 751-    LTLIB[]NAME=
 752-  fi
 753-  AC_SUBST([HAVE_LIB]NAME)
 754-  AC_SUBST([LIB]NAME)
 755-  AC_SUBST([LTLIB]NAME)
 756-  undefine([Name])
 757-  undefine([NAME])
 758-])
 759+# This can be used to rebuild libtool when needed
 760+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 761 
 762-dnl Determine the platform dependent parameters needed to use rpath:
 763-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
 764-dnl hardcode_direct, hardcode_minus_L.
 765-AC_DEFUN([AC_LIB_RPATH],
 766-[
 767-  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
 768-  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
 769-  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
 770-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
 771-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
 772-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
 773-  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
 774-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
 775-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
 776-    . ./conftest.sh
 777-    rm -f ./conftest.sh
 778-    acl_cv_rpath=done
 779-  ])
 780-  wl="$acl_cv_wl"
 781-  libext="$acl_cv_libext"
 782-  shlibext="$acl_cv_shlibext"
 783-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
 784-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
 785-  hardcode_direct="$acl_cv_hardcode_direct"
 786-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
 787-  dnl Determine whether the user wants rpath handling at all.
 788-  AC_ARG_ENABLE(rpath,
 789-    [  --disable-rpath         do not hardcode runtime library paths],
 790-    :, enable_rpath=yes)
 791-])
 792+# Always use our own libtool.
 793+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 794+AC_SUBST(LIBTOOL)dnl
 795 
 796-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
 797-dnl the libraries corresponding to explicit and implicit dependencies.
 798-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
 799-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 800-[
 801-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
 802-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
 803-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
 804-  dnl By default, look in $includedir and $libdir.
 805-  use_additional=yes
 806-  AC_LIB_WITH_FINAL_PREFIX([
 807-    eval additional_includedir=\"$includedir\"
 808-    eval additional_libdir=\"$libdir\"
 809-  ])
 810-  AC_LIB_ARG_WITH([lib$1-prefix],
 811-[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
 812-  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
 813-[
 814-    if test "X$withval" = "Xno"; then
 815-      use_additional=no
 816-    else
 817-      if test "X$withval" = "X"; then
 818-        AC_LIB_WITH_FINAL_PREFIX([
 819-          eval additional_includedir=\"$includedir\"
 820-          eval additional_libdir=\"$libdir\"
 821-        ])
 822-      else
 823-        additional_includedir="$withval/include"
 824-        additional_libdir="$withval/$acl_libdirstem"
 825-      fi
 826-    fi
 827-])
 828-  dnl Search the library and its dependencies in $additional_libdir and
 829-  dnl $LDFLAGS. Using breadth-first-seach.
 830-  LIB[]NAME=
 831-  LTLIB[]NAME=
 832-  INC[]NAME=
 833-  rpathdirs=
 834-  ltrpathdirs=
 835-  names_already_handled=
 836-  names_next_round='$1 $2'
 837-  while test -n "$names_next_round"; do
 838-    names_this_round="$names_next_round"
 839-    names_next_round=
 840-    for name in $names_this_round; do
 841-      already_handled=
 842-      for n in $names_already_handled; do
 843-        if test "$n" = "$name"; then
 844-          already_handled=yes
 845-          break
 846-        fi
 847-      done
 848-      if test -z "$already_handled"; then
 849-        names_already_handled="$names_already_handled $name"
 850-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
 851-        dnl or AC_LIB_HAVE_LINKFLAGS call.
 852-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
 853-        eval value=\"\$HAVE_LIB$uppername\"
 854-        if test -n "$value"; then
 855-          if test "$value" = yes; then
 856-            eval value=\"\$LIB$uppername\"
 857-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
 858-            eval value=\"\$LTLIB$uppername\"
 859-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
 860-          else
 861-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
 862-            dnl that this library doesn't exist. So just drop it.
 863-            :
 864-          fi
 865-        else
 866-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
 867-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
 868-          found_dir=
 869-          found_la=
 870-          found_so=
 871-          found_a=
 872-          if test $use_additional = yes; then
 873-            if test -n "$shlibext" \
 874-               && { test -f "$additional_libdir/lib$name.$shlibext" \
 875-                    || { test "$shlibext" = dll \
 876-                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
 877-              found_dir="$additional_libdir"
 878-              if test -f "$additional_libdir/lib$name.$shlibext"; then
 879-                found_so="$additional_libdir/lib$name.$shlibext"
 880-              else
 881-                found_so="$additional_libdir/lib$name.dll.a"
 882-              fi
 883-              if test -f "$additional_libdir/lib$name.la"; then
 884-                found_la="$additional_libdir/lib$name.la"
 885-              fi
 886-            else
 887-              if test -f "$additional_libdir/lib$name.$libext"; then
 888-                found_dir="$additional_libdir"
 889-                found_a="$additional_libdir/lib$name.$libext"
 890-                if test -f "$additional_libdir/lib$name.la"; then
 891-                  found_la="$additional_libdir/lib$name.la"
 892-                fi
 893-              fi
 894-            fi
 895-          fi
 896-          if test "X$found_dir" = "X"; then
 897-            for x in $LDFLAGS $LTLIB[]NAME; do
 898-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
 899-              case "$x" in
 900-                -L*)
 901-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
 902-                  if test -n "$shlibext" \
 903-                     && { test -f "$dir/lib$name.$shlibext" \
 904-                          || { test "$shlibext" = dll \
 905-                               && test -f "$dir/lib$name.dll.a"; }; }; then
 906-                    found_dir="$dir"
 907-                    if test -f "$dir/lib$name.$shlibext"; then
 908-                      found_so="$dir/lib$name.$shlibext"
 909-                    else
 910-                      found_so="$dir/lib$name.dll.a"
 911-                    fi
 912-                    if test -f "$dir/lib$name.la"; then
 913-                      found_la="$dir/lib$name.la"
 914-                    fi
 915-                  else
 916-                    if test -f "$dir/lib$name.$libext"; then
 917-                      found_dir="$dir"
 918-                      found_a="$dir/lib$name.$libext"
 919-                      if test -f "$dir/lib$name.la"; then
 920-                        found_la="$dir/lib$name.la"
 921-                      fi
 922-                    fi
 923-                  fi
 924-                  ;;
 925-              esac
 926-              if test "X$found_dir" != "X"; then
 927-                break
 928-              fi
 929-            done
 930-          fi
 931-          if test "X$found_dir" != "X"; then
 932-            dnl Found the library.
 933-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
 934-            if test "X$found_so" != "X"; then
 935-              dnl Linking with a shared library. We attempt to hardcode its
 936-              dnl directory into the executable's runpath, unless it's the
 937-              dnl standard /usr/lib.
 938-              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
 939-                dnl No hardcoding is needed.
 940-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
 941-              else
 942-                dnl Use an explicit option to hardcode DIR into the resulting
 943-                dnl binary.
 944-                dnl Potentially add DIR to ltrpathdirs.
 945-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
 946-                haveit=
 947-                for x in $ltrpathdirs; do
 948-                  if test "X$x" = "X$found_dir"; then
 949-                    haveit=yes
 950-                    break
 951-                  fi
 952-                done
 953-                if test -z "$haveit"; then
 954-                  ltrpathdirs="$ltrpathdirs $found_dir"
 955-                fi
 956-                dnl The hardcoding into $LIBNAME is system dependent.
 957-                if test "$hardcode_direct" = yes; then
 958-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
 959-                  dnl resulting binary.
 960-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
 961-                else
 962-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
 963-                    dnl Use an explicit option to hardcode DIR into the resulting
 964-                    dnl binary.
 965-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
 966-                    dnl Potentially add DIR to rpathdirs.
 967-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
 968-                    haveit=
 969-                    for x in $rpathdirs; do
 970-                      if test "X$x" = "X$found_dir"; then
 971-                        haveit=yes
 972-                        break
 973-                      fi
 974-                    done
 975-                    if test -z "$haveit"; then
 976-                      rpathdirs="$rpathdirs $found_dir"
 977-                    fi
 978-                  else
 979-                    dnl Rely on "-L$found_dir".
 980-                    dnl But don't add it if it's already contained in the LDFLAGS
 981-                    dnl or the already constructed $LIBNAME
 982-                    haveit=
 983-                    for x in $LDFLAGS $LIB[]NAME; do
 984-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
 985-                      if test "X$x" = "X-L$found_dir"; then
 986-                        haveit=yes
 987-                        break
 988-                      fi
 989-                    done
 990-                    if test -z "$haveit"; then
 991-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
 992-                    fi
 993-                    if test "$hardcode_minus_L" != no; then
 994-                      dnl FIXME: Not sure whether we should use
 995-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
 996-                      dnl here.
 997-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
 998-                    else
 999-                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
1000-                      dnl here, because this doesn't fit in flags passed to the
1001-                      dnl compiler. So give up. No hardcoding. This affects only
1002-                      dnl very old systems.
1003-                      dnl FIXME: Not sure whether we should use
1004-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
1005-                      dnl here.
1006-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
1007-                    fi
1008-                  fi
1009-                fi
1010-              fi
1011-            else
1012-              if test "X$found_a" != "X"; then
1013-                dnl Linking with a static library.
1014-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
1015-              else
1016-                dnl We shouldn't come here, but anyway it's good to have a
1017-                dnl fallback.
1018-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
1019-              fi
1020-            fi
1021-            dnl Assume the include files are nearby.
1022-            additional_includedir=
1023-            case "$found_dir" in
1024-              */$acl_libdirstem | */$acl_libdirstem/)
1025-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
1026-                additional_includedir="$basedir/include"
1027-                ;;
1028-            esac
1029-            if test "X$additional_includedir" != "X"; then
1030-              dnl Potentially add $additional_includedir to $INCNAME.
1031-              dnl But don't add it
1032-              dnl   1. if it's the standard /usr/include,
1033-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
1034-              dnl   3. if it's already present in $CPPFLAGS or the already
1035-              dnl      constructed $INCNAME,
1036-              dnl   4. if it doesn't exist as a directory.
1037-              if test "X$additional_includedir" != "X/usr/include"; then
1038-                haveit=
1039-                if test "X$additional_includedir" = "X/usr/local/include"; then
1040-                  if test -n "$GCC"; then
1041-                    case $host_os in
1042-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
1043-                    esac
1044-                  fi
1045-                fi
1046-                if test -z "$haveit"; then
1047-                  for x in $CPPFLAGS $INC[]NAME; do
1048-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1049-                    if test "X$x" = "X-I$additional_includedir"; then
1050-                      haveit=yes
1051-                      break
1052-                    fi
1053-                  done
1054-                  if test -z "$haveit"; then
1055-                    if test -d "$additional_includedir"; then
1056-                      dnl Really add $additional_includedir to $INCNAME.
1057-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
1058-                    fi
1059-                  fi
1060-                fi
1061-              fi
1062-            fi
1063-            dnl Look for dependencies.
1064-            if test -n "$found_la"; then
1065-              dnl Read the .la file. It defines the variables
1066-              dnl dlname, library_names, old_library, dependency_libs, current,
1067-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
1068-              save_libdir="$libdir"
1069-              case "$found_la" in
1070-                */* | *\\*) . "$found_la" ;;
1071-                *) . "./$found_la" ;;
1072-              esac
1073-              libdir="$save_libdir"
1074-              dnl We use only dependency_libs.
1075-              for dep in $dependency_libs; do
1076-                case "$dep" in
1077-                  -L*)
1078-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
1079-                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
1080-                    dnl But don't add it
1081-                    dnl   1. if it's the standard /usr/lib,
1082-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
1083-                    dnl   3. if it's already present in $LDFLAGS or the already
1084-                    dnl      constructed $LIBNAME,
1085-                    dnl   4. if it doesn't exist as a directory.
1086-                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
1087-                      haveit=
1088-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
1089-                        if test -n "$GCC"; then
1090-                          case $host_os in
1091-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
1092-                          esac
1093-                        fi
1094-                      fi
1095-                      if test -z "$haveit"; then
1096-                        haveit=
1097-                        for x in $LDFLAGS $LIB[]NAME; do
1098-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1099-                          if test "X$x" = "X-L$additional_libdir"; then
1100-                            haveit=yes
1101-                            break
1102-                          fi
1103-                        done
1104-                        if test -z "$haveit"; then
1105-                          if test -d "$additional_libdir"; then
1106-                            dnl Really add $additional_libdir to $LIBNAME.
1107-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
1108-                          fi
1109-                        fi
1110-                        haveit=
1111-                        for x in $LDFLAGS $LTLIB[]NAME; do
1112-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1113-                          if test "X$x" = "X-L$additional_libdir"; then
1114-                            haveit=yes
1115-                            break
1116-                          fi
1117-                        done
1118-                        if test -z "$haveit"; then
1119-                          if test -d "$additional_libdir"; then
1120-                            dnl Really add $additional_libdir to $LTLIBNAME.
1121-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
1122-                          fi
1123-                        fi
1124-                      fi
1125-                    fi
1126-                    ;;
1127-                  -R*)
1128-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
1129-                    if test "$enable_rpath" != no; then
1130-                      dnl Potentially add DIR to rpathdirs.
1131-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
1132-                      haveit=
1133-                      for x in $rpathdirs; do
1134-                        if test "X$x" = "X$dir"; then
1135-                          haveit=yes
1136-                          break
1137-                        fi
1138-                      done
1139-                      if test -z "$haveit"; then
1140-                        rpathdirs="$rpathdirs $dir"
1141-                      fi
1142-                      dnl Potentially add DIR to ltrpathdirs.
1143-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
1144-                      haveit=
1145-                      for x in $ltrpathdirs; do
1146-                        if test "X$x" = "X$dir"; then
1147-                          haveit=yes
1148-                          break
1149-                        fi
1150-                      done
1151-                      if test -z "$haveit"; then
1152-                        ltrpathdirs="$ltrpathdirs $dir"
1153-                      fi
1154-                    fi
1155-                    ;;
1156-                  -l*)
1157-                    dnl Handle this in the next round.
1158-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
1159-                    ;;
1160-                  *.la)
1161-                    dnl Handle this in the next round. Throw away the .la's
1162-                    dnl directory; it is already contained in a preceding -L
1163-                    dnl option.
1164-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
1165-                    ;;
1166-                  *)
1167-                    dnl Most likely an immediate library name.
1168-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
1169-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
1170-                    ;;
1171-                esac
1172-              done
1173-            fi
1174-          else
1175-            dnl Didn't find the library; assume it is in the system directories
1176-            dnl known to the linker and runtime loader. (All the system
1177-            dnl directories known to the linker should also be known to the
1178-            dnl runtime loader, otherwise the system is severely misconfigured.)
1179-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
1180-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
1181-          fi
1182-        fi
1183-      fi
1184-    done
1185-  done
1186-  if test "X$rpathdirs" != "X"; then
1187-    if test -n "$hardcode_libdir_separator"; then
1188-      dnl Weird platform: only the last -rpath option counts, the user must
1189-      dnl pass all path elements in one option. We can arrange that for a
1190-      dnl single library, but not when more than one $LIBNAMEs are used.
1191-      alldirs=
1192-      for found_dir in $rpathdirs; do
1193-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
1194-      done
1195-      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
1196-      acl_save_libdir="$libdir"
1197-      libdir="$alldirs"
1198-      eval flag=\"$hardcode_libdir_flag_spec\"
1199-      libdir="$acl_save_libdir"
1200-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
1201-    else
1202-      dnl The -rpath options are cumulative.
1203-      for found_dir in $rpathdirs; do
1204-        acl_save_libdir="$libdir"
1205-        libdir="$found_dir"
1206-        eval flag=\"$hardcode_libdir_flag_spec\"
1207-        libdir="$acl_save_libdir"
1208-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
1209-      done
1210-    fi
1211-  fi
1212-  if test "X$ltrpathdirs" != "X"; then
1213-    dnl When using libtool, the option that works for both libraries and
1214-    dnl executables is -R. The -R options are cumulative.
1215-    for found_dir in $ltrpathdirs; do
1216-      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
1217-    done
1218-  fi
1219-])
1220+# Prevent multiple expansion
1221+define([AC_PROG_LIBTOOL], [])
1222+])# _AC_PROG_LIBTOOL
1223 
1224-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
1225-dnl unless already present in VAR.
1226-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
1227-dnl contains two or three consecutive elements that belong together.
1228-AC_DEFUN([AC_LIB_APPENDTOVAR],
1229-[
1230-  for element in [$2]; do
1231-    haveit=
1232-    for x in $[$1]; do
1233-      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1234-      if test "X$x" = "X$element"; then
1235-        haveit=yes
1236-        break
1237-      fi
1238-    done
1239-    if test -z "$haveit"; then
1240-      [$1]="${[$1]}${[$1]:+ }$element"
1241-    fi
1242-  done
1243-])
1244 
1245-dnl For those cases where a variable contains several -L and -l options
1246-dnl referring to unknown libraries and directories, this macro determines the
1247-dnl necessary additional linker options for the runtime path.
1248-dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
1249-dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
1250-dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
1251-dnl otherwise linking without libtool is assumed.
1252-AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
1253-[
1254-  AC_REQUIRE([AC_LIB_RPATH])
1255-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
1256-  $1=
1257-  if test "$enable_rpath" != no; then
1258-    if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
1259-      dnl Use an explicit option to hardcode directories into the resulting
1260-      dnl binary.
1261-      rpathdirs=
1262-      next=
1263-      for opt in $2; do
1264-        if test -n "$next"; then
1265-          dir="$next"
1266-          dnl No need to hardcode the standard /usr/lib.
1267-          if test "X$dir" != "X/usr/$acl_libdirstem"; then
1268-            rpathdirs="$rpathdirs $dir"
1269-          fi
1270-          next=
1271-        else
1272-          case $opt in
1273-            -L) next=yes ;;
1274-            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
1275-                 dnl No need to hardcode the standard /usr/lib.
1276-                 if test "X$dir" != "X/usr/$acl_libdirstem"; then
1277-                   rpathdirs="$rpathdirs $dir"
1278-                 fi
1279-                 next= ;;
1280-            *) next= ;;
1281-          esac
1282-        fi
1283-      done
1284-      if test "X$rpathdirs" != "X"; then
1285-        if test -n ""$3""; then
1286-          dnl libtool is used for linking. Use -R options.
1287-          for dir in $rpathdirs; do
1288-            $1="${$1}${$1:+ }-R$dir"
1289-          done
1290-        else
1291-          dnl The linker is used for linking directly.
1292-          if test -n "$hardcode_libdir_separator"; then
1293-            dnl Weird platform: only the last -rpath option counts, the user
1294-            dnl must pass all path elements in one option.
1295-            alldirs=
1296-            for dir in $rpathdirs; do
1297-              alldirs="${alldir…

Large files files are truncated, but you can click here to view the full file