PageRenderTime 468ms CodeModel.GetById 29ms RepoModel.GetById 1ms app.codeStats 2ms

/core/10.4/libfuse/fuse-2.7.3-macosx.patch

http://macfuse.googlecode.com/
Patch | 12796 lines | 12358 code | 438 blank | 0 comment | 0 complexity | ed96b5cbba27551834293a2455db19a9 MD5 | raw file
Possible License(s): Apache-2.0, BSD-3-Clause, GPL-2.0

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

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

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