/core/10.4/libfuse/fuse-2.7.3-macosx.patch
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
- diff -Naur old/Makefile.in new/Makefile.in
- --- old/Makefile.in 2008-02-19 12:00:55.000000000 -0800
- +++ new/Makefile.in 2008-11-26 22:23:12.000000000 -0800
- @@ -1,8 +1,8 @@
- -# Makefile.in generated by automake 1.9.6 from Makefile.am.
- +# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- -# 2003, 2004, 2005 Free Software Foundation, Inc.
- +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- @@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
- -srcdir = @srcdir@
- -top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- -top_builddir = .
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- -INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
- @@ -37,18 +33,19 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
- +subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/fuse.pc.in \
- $(top_srcdir)/configure AUTHORS COPYING COPYING.LIB ChangeLog \
- INSTALL NEWS compile config.guess config.rpath config.sub \
- depcomp install-sh ltmain.sh missing mkinstalldirs
- -subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- -am__aclocal_m4_deps = $(top_srcdir)/configure.in
- +am__aclocal_m4_deps = $(top_srcdir)/iconv.m4 \
- + $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- - configure.lineno configure.status.lineno
- + configure.lineno config.status.lineno
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/include/config.h
- CONFIG_CLEAN_FILES = fuse.pc
- @@ -56,10 +53,11 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- - install-exec-recursive install-info-recursive \
- - install-recursive installcheck-recursive installdirs-recursive \
- - pdf-recursive ps-recursive uninstall-info-recursive \
- - uninstall-recursive
- + install-dvi-recursive install-exec-recursive \
- + install-html-recursive install-info-recursive \
- + install-pdf-recursive install-ps-recursive install-recursive \
- + installcheck-recursive installdirs-recursive pdf-recursive \
- + ps-recursive uninstall-recursive
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -69,6 +67,8 @@
- am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
- pkgconfigDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(pkgconfig_DATA)
- +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- + distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- @@ -84,53 +84,49 @@
- distuninstallcheck_listfiles = find . -type f -print
- distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
- -AMDEP_FALSE = @AMDEP_FALSE@
- -AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- -BSD_FALSE = @BSD_FALSE@
- -BSD_TRUE = @BSD_TRUE@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- +CXX = @CXX@
- +CXXCPP = @CXXCPP@
- +CXXDEPMODE = @CXXDEPMODE@
- +CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
- -DUMPBIN = @DUMPBIN@
- +ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- -FGREP = @FGREP@
- +F77 = @F77@
- +FFLAGS = @FFLAGS@
- GREP = @GREP@
- -ICONV_FALSE = @ICONV_FALSE@
- -ICONV_TRUE = @ICONV_TRUE@
- INIT_D_PATH = @INIT_D_PATH@
- +INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- -LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBICONV = @LIBICONV@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- -LINUX_FALSE = @LINUX_FALSE@
- -LINUX_TRUE = @LINUX_TRUE@
- LN_S = @LN_S@
- -LTLIBICONV = @LTLIBICONV@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
- +MKDIR_P = @MKDIR_P@
- MOUNT_FUSE_PATH = @MOUNT_FUSE_PATH@
- -NM = @NM@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- @@ -140,16 +136,18 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- RANLIB = @RANLIB@
- -SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- UDEV_RULES_PATH = @UDEV_RULES_PATH@
- VERSION = @VERSION@
- +abs_builddir = @abs_builddir@
- +abs_srcdir = @abs_srcdir@
- +abs_top_builddir = @abs_top_builddir@
- +abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- +ac_ct_CXX = @ac_ct_CXX@
- +ac_ct_F77 = @ac_ct_F77@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- @@ -161,6 +159,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- +builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
- @@ -180,7 +179,6 @@
- libfuse_libs = @libfuse_libs@
- localedir = @localedir@
- localstatedir = @localstatedir@
- -lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- @@ -191,6 +189,7 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- +srcdir = @srcdir@
- subdirs = @subdirs@
- subdirs2 = @subdirs2@
- sysconfdir = @sysconfdir@
- @@ -199,6 +198,8 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
- +top_builddir = @top_builddir@
- +top_srcdir = @top_srcdir@
- SUBDIRS = @subdirs@ @subdirs2@
- EXTRA_DIST = \
- fuse.pc.in \
- @@ -257,10 +258,9 @@
-
- distclean-libtool:
- -rm -f libtool
- -uninstall-info-am:
- install-pkgconfigDATA: $(pkgconfig_DATA)
- @$(NORMAL_INSTALL)
- - test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
- + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- @@ -307,8 +307,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
- -mostlyclean-recursive clean-recursive distclean-recursive \
- -maintainer-clean-recursive:
- +$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- @@ -410,24 +409,22 @@
-
- distdir: $(DISTFILES)
- $(am__remove_distdir)
- - mkdir $(distdir)
- - $(mkdir_p) $(distdir)/. $(distdir)/doc
- - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- - list='$(DISTFILES)'; for file in $$list; do \
- - case $$file in \
- - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- - esac; \
- + test -d $(distdir) || mkdir $(distdir)
- + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- + list='$(DISTFILES)'; \
- + dist_files=`for file in $$list; do echo $$file; done | \
- + sed -e "s|^$$srcdirstrip/||;t" \
- + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- + case $$dist_files in \
- + */*) $(MKDIR_P) `echo "$$dist_files" | \
- + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- + sort -u` ;; \
- + esac; \
- + for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- - if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- - dir="/$$dir"; \
- - $(mkdir_p) "$(distdir)$$dir"; \
- - else \
- - dir=''; \
- - fi; \
- if test -d $$d/$$file; then \
- + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- @@ -441,7 +438,7 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- - || $(mkdir_p) "$(distdir)/$$subdir" \
- + || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- @@ -449,6 +446,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
- + am__remove_distdir=: \
- + am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
- @@ -456,7 +455,7 @@
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
- dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- @@ -531,7 +530,7 @@
- $(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
- + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
- distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
- @@ -556,7 +555,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
- - test -z "$$dir" || $(mkdir_p) "$$dir"; \
- + test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-recursive
- install-exec: install-exec-recursive
- @@ -604,12 +603,20 @@
-
- install-data-am: install-pkgconfigDATA
-
- +install-dvi: install-dvi-recursive
- +
- install-exec-am:
-
- +install-html: install-html-recursive
- +
- install-info: install-info-recursive
-
- install-man:
-
- +install-pdf: install-pdf-recursive
- +
- +install-ps: install-ps-recursive
- +
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
- @@ -630,24 +637,26 @@
-
- ps-am:
-
- -uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
- +uninstall-am: uninstall-pkgconfigDATA
-
- -uninstall-info: uninstall-info-recursive
- +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- + install-strip
-
- -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- - check-am clean clean-generic clean-libtool clean-recursive \
- - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- - dist-shar dist-tarZ dist-zip distcheck distclean \
- - distclean-generic distclean-libtool distclean-recursive \
- - distclean-tags distcleancheck distdir distuninstallcheck dvi \
- - dvi-am html html-am info info-am install install-am \
- - install-data install-data-am install-exec install-exec-am \
- - install-info install-info-am install-man install-pkgconfigDATA \
- - install-strip installcheck installcheck-am installdirs \
- - installdirs-am maintainer-clean maintainer-clean-generic \
- - maintainer-clean-recursive mostlyclean mostlyclean-generic \
- - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- - tags tags-recursive uninstall uninstall-am uninstall-info-am \
- +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- + all all-am am--refresh check check-am clean clean-generic \
- + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- + dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- + distclean-generic distclean-libtool distclean-tags \
- + distcleancheck distdir distuninstallcheck dvi dvi-am html \
- + html-am info info-am install install-am install-data \
- + install-data-am install-dvi install-dvi-am install-exec \
- + install-exec-am install-html install-html-am install-info \
- + install-info-am install-man install-pdf install-pdf-am \
- + install-pkgconfigDATA install-ps install-ps-am install-strip \
- + installcheck installcheck-am installdirs installdirs-am \
- + maintainer-clean maintainer-clean-generic mostlyclean \
- + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- + tags tags-recursive uninstall uninstall-am \
- uninstall-pkgconfigDATA
-
-
- diff -Naur old/README.MacFUSE new/README.MacFUSE
- --- old/README.MacFUSE 1969-12-31 16:00:00.000000000 -0800
- +++ new/README.MacFUSE 2008-11-26 22:23:12.000000000 -0800
- @@ -0,0 +1,12 @@
- +MacFUSE Project Page:
- +
- +http://code.google.com/p/macfuse/
- +
- +Making a Universal build of libfuse:
- +
- +1. Run "/bin/sh ./darwin_configure.sh /path/to/macfuse/core/10.5/fusefs/"
- +2. Run make
- +
- +If you begin with the "raw" patch, you need to perform a step 0 as follows:
- +
- +aclocal -I . && autoheader && autoconf && automake -a
- diff -Naur old/aclocal.m4 new/aclocal.m4
- --- old/aclocal.m4 2008-02-19 12:00:31.000000000 -0800
- +++ new/aclocal.m4 2008-11-26 22:23:12.000000000 -0800
- @@ -1,7 +1,7 @@
- -# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
- +# generated automatically by aclocal 1.10 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- -# 2005 Free Software Foundation, Inc.
- +# 2005, 2006 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- @@ -11,3269 +11,1519 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
- -# iconv.m4 serial AM4 (gettext-0.11.3)
- -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
- -dnl This file is free software; the Free Software Foundation
- -dnl gives unlimited permission to copy and/or distribute it,
- -dnl with or without modifications, as long as this notice is preserved.
- +m4_if(m4_PACKAGE_VERSION, [2.61],,
- +[m4_fatal([this file was generated for autoconf 2.61.
- +You have another version of autoconf. If you want to use that,
- +you should regenerate the build system entirely.], [63])])
-
- -dnl From Bruno Haible.
- +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
- -AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
- -[
- - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
- - AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- - AC_REQUIRE([AC_LIB_RPATH])
- -
- - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
- - dnl accordingly.
- - AC_LIB_LINKFLAGS_BODY([iconv])
- -])
- +# serial 48 AC_PROG_LIBTOOL
-
- -AC_DEFUN([AM_ICONV_LINK],
- -[
- - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
- - dnl those with the standalone portable GNU libiconv installed).
-
- - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
- - dnl accordingly.
- - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
- -
- - dnl Add $INCICONV to CPPFLAGS before performing the following checks,
- - dnl because if the user has installed libiconv and not disabled its use
- - dnl via --without-libiconv-prefix, he wants to use it. The first
- - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
- - am_save_CPPFLAGS="$CPPFLAGS"
- - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
- -
- - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
- - am_cv_func_iconv="no, consider installing GNU libiconv"
- - am_cv_lib_iconv=no
- - AC_TRY_LINK([#include <stdlib.h>
- -#include <iconv.h>],
- - [iconv_t cd = iconv_open("","");
- - iconv(cd,NULL,NULL,NULL,NULL);
- - iconv_close(cd);],
- - am_cv_func_iconv=yes)
- - if test "$am_cv_func_iconv" != yes; then
- - am_save_LIBS="$LIBS"
- - LIBS="$LIBS $LIBICONV"
- - AC_TRY_LINK([#include <stdlib.h>
- -#include <iconv.h>],
- - [iconv_t cd = iconv_open("","");
- - iconv(cd,NULL,NULL,NULL,NULL);
- - iconv_close(cd);],
- - am_cv_lib_iconv=yes
- - am_cv_func_iconv=yes)
- - LIBS="$am_save_LIBS"
- - fi
- - ])
- - if test "$am_cv_func_iconv" = yes; then
- - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
- - fi
- - if test "$am_cv_lib_iconv" = yes; then
- - AC_MSG_CHECKING([how to link with libiconv])
- - AC_MSG_RESULT([$LIBICONV])
- - else
- - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
- - dnl either.
- - CPPFLAGS="$am_save_CPPFLAGS"
- - LIBICONV=
- - LTLIBICONV=
- - fi
- - AC_SUBST(LIBICONV)
- - AC_SUBST(LTLIBICONV)
- -])
- +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
- +# -----------------------------------------------------------
- +# If this macro is not defined by Autoconf, define it here.
- +m4_ifdef([AC_PROVIDE_IFELSE],
- + [],
- + [m4_define([AC_PROVIDE_IFELSE],
- + [m4_ifdef([AC_PROVIDE_$1],
- + [$2], [$3])])])
-
- -AC_DEFUN([AM_ICONV],
- -[
- - AM_ICONV_LINK
- - if test "$am_cv_func_iconv" = yes; then
- - AC_MSG_CHECKING([for iconv declaration])
- - AC_CACHE_VAL(am_cv_proto_iconv, [
- - AC_TRY_COMPILE([
- -#include <stdlib.h>
- -#include <iconv.h>
- -extern
- -#ifdef __cplusplus
- -"C"
- -#endif
- -#if defined(__STDC__) || defined(__cplusplus)
- -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
- -#else
- -size_t iconv();
- -#endif
- -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
- - 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);"])
- - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
- - AC_MSG_RESULT([$]{ac_t:-
- - }[$]am_cv_proto_iconv)
- - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
- - [Define as const if the declaration of iconv() needs const.])
- - fi
- -])
-
- -# lib-ld.m4 serial 3 (gettext-0.13)
- -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
- -dnl This file is free software; the Free Software Foundation
- -dnl gives unlimited permission to copy and/or distribute it,
- -dnl with or without modifications, as long as this notice is preserved.
- -
- -dnl Subroutines of libtool.m4,
- -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
- -dnl with libtool.m4.
- -
- -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
- -AC_DEFUN([AC_LIB_PROG_LD_GNU],
- -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
- -[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
- -case `$LD -v 2>&1 </dev/null` in
- -*GNU* | *'with BFD'*)
- - acl_cv_prog_gnu_ld=yes ;;
- -*)
- - acl_cv_prog_gnu_ld=no ;;
- -esac])
- -with_gnu_ld=$acl_cv_prog_gnu_ld
- -])
- +# AC_PROG_LIBTOOL
- +# ---------------
- +AC_DEFUN([AC_PROG_LIBTOOL],
- +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
- +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
- +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
- + AC_PROVIDE_IFELSE([AC_PROG_CXX],
- + [AC_LIBTOOL_CXX],
- + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
- + ])])
- +dnl And a similar setup for Fortran 77 support
- + AC_PROVIDE_IFELSE([AC_PROG_F77],
- + [AC_LIBTOOL_F77],
- + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
- +])])
- +
- +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
- +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
- +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
- + AC_PROVIDE_IFELSE([AC_PROG_GCJ],
- + [AC_LIBTOOL_GCJ],
- + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
- + [AC_LIBTOOL_GCJ],
- + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
- + [AC_LIBTOOL_GCJ],
- + [ifdef([AC_PROG_GCJ],
- + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- + ifdef([A][M_PROG_GCJ],
- + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- + ifdef([LT_AC_PROG_GCJ],
- + [define([LT_AC_PROG_GCJ],
- + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
- +])])# AC_PROG_LIBTOOL
-
- -dnl From libtool-1.4. Sets the variable LD.
- -AC_DEFUN([AC_LIB_PROG_LD],
- -[AC_ARG_WITH(gnu-ld,
- -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
- -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
- -AC_REQUIRE([AC_PROG_CC])dnl
- -AC_REQUIRE([AC_CANONICAL_HOST])dnl
- -# Prepare PATH_SEPARATOR.
- -# The user is always right.
- -if test "${PATH_SEPARATOR+set}" != set; then
- - echo "#! /bin/sh" >conf$$.sh
- - echo "exit 0" >>conf$$.sh
- - chmod +x conf$$.sh
- - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- - PATH_SEPARATOR=';'
- - else
- - PATH_SEPARATOR=:
- - fi
- - rm -f conf$$.sh
- -fi
- -ac_prog=ld
- -if test "$GCC" = yes; then
- - # Check if gcc -print-prog-name=ld gives a path.
- - AC_MSG_CHECKING([for ld used by GCC])
- - case $host in
- - *-*-mingw*)
- - # gcc leaves a trailing carriage return which upsets mingw
- - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- - *)
- - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- - esac
- - case $ac_prog in
- - # Accept absolute paths.
- - [[\\/]* | [A-Za-z]:[\\/]*)]
- - [re_direlt='/[^/][^/]*/\.\./']
- - # Canonicalize the path of ld
- - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
- - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
- - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
- - done
- - test -z "$LD" && LD="$ac_prog"
- - ;;
- - "")
- - # If it fails, then pretend we aren't using GCC.
- - ac_prog=ld
- - ;;
- - *)
- - # If it is relative, then search for the first ld in PATH.
- - with_gnu_ld=unknown
- - ;;
- - esac
- -elif test "$with_gnu_ld" = yes; then
- - AC_MSG_CHECKING([for GNU ld])
- -else
- - AC_MSG_CHECKING([for non-GNU ld])
- -fi
- -AC_CACHE_VAL(acl_cv_path_LD,
- -[if test -z "$LD"; then
- - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
- - for ac_dir in $PATH; do
- - test -z "$ac_dir" && ac_dir=.
- - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- - acl_cv_path_LD="$ac_dir/$ac_prog"
- - # Check to see if the program is GNU ld. I'd rather use --version,
- - # but apparently some GNU ld's only accept -v.
- - # Break only if it was the GNU/non-GNU ld that we prefer.
- - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
- - *GNU* | *'with BFD'*)
- - test "$with_gnu_ld" != no && break ;;
- - *)
- - test "$with_gnu_ld" != yes && break ;;
- - esac
- - fi
- - done
- - IFS="$ac_save_ifs"
- -else
- - acl_cv_path_LD="$LD" # Let the user override the test with a path.
- -fi])
- -LD="$acl_cv_path_LD"
- -if test -n "$LD"; then
- - AC_MSG_RESULT($LD)
- -else
- - AC_MSG_RESULT(no)
- -fi
- -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
- -AC_LIB_PROG_LD_GNU
- -])
-
- -# lib-link.m4 serial 9 (gettext-0.16)
- -dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
- -dnl This file is free software; the Free Software Foundation
- -dnl gives unlimited permission to copy and/or distribute it,
- -dnl with or without modifications, as long as this notice is preserved.
- -
- -dnl From Bruno Haible.
- -
- -AC_PREREQ(2.50)
- -
- -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
- -dnl the libraries corresponding to explicit and implicit dependencies.
- -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
- -dnl augments the CPPFLAGS variable.
- -AC_DEFUN([AC_LIB_LINKFLAGS],
- -[
- - AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- - AC_REQUIRE([AC_LIB_RPATH])
- - define([Name],[translit([$1],[./-], [___])])
- - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
- - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
- - AC_LIB_LINKFLAGS_BODY([$1], [$2])
- - ac_cv_lib[]Name[]_libs="$LIB[]NAME"
- - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
- - ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
- - ])
- - LIB[]NAME="$ac_cv_lib[]Name[]_libs"
- - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
- - INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
- - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
- - AC_SUBST([LIB]NAME)
- - AC_SUBST([LTLIB]NAME)
- - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
- - dnl results of this search when this library appears as a dependency.
- - HAVE_LIB[]NAME=yes
- - undefine([Name])
- - undefine([NAME])
- -])
- +# _AC_PROG_LIBTOOL
- +# ----------------
- +AC_DEFUN([_AC_PROG_LIBTOOL],
- +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
- +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
- +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
- +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
- -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
- -dnl searches for libname and the libraries corresponding to explicit and
- -dnl implicit dependencies, together with the specified include files and
- -dnl the ability to compile and link the specified testcode. If found, it
- -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
- -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
- -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
- -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
- -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
- -[
- - AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- - AC_REQUIRE([AC_LIB_RPATH])
- - define([Name],[translit([$1],[./-], [___])])
- - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
- -
- - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
- - dnl accordingly.
- - AC_LIB_LINKFLAGS_BODY([$1], [$2])
- -
- - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
- - dnl because if the user has installed lib[]Name and not disabled its use
- - dnl via --without-lib[]Name-prefix, he wants to use it.
- - ac_save_CPPFLAGS="$CPPFLAGS"
- - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
- -
- - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
- - ac_save_LIBS="$LIBS"
- - LIBS="$LIBS $LIB[]NAME"
- - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
- - LIBS="$ac_save_LIBS"
- - ])
- - if test "$ac_cv_lib[]Name" = yes; then
- - HAVE_LIB[]NAME=yes
- - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
- - AC_MSG_CHECKING([how to link with lib[]$1])
- - AC_MSG_RESULT([$LIB[]NAME])
- - else
- - HAVE_LIB[]NAME=no
- - dnl If $LIB[]NAME didn't lead to a usable library, we don't need
- - dnl $INC[]NAME either.
- - CPPFLAGS="$ac_save_CPPFLAGS"
- - LIB[]NAME=
- - LTLIB[]NAME=
- - fi
- - AC_SUBST([HAVE_LIB]NAME)
- - AC_SUBST([LIB]NAME)
- - AC_SUBST([LTLIB]NAME)
- - undefine([Name])
- - undefine([NAME])
- -])
- +# This can be used to rebuild libtool when needed
- +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
- -dnl Determine the platform dependent parameters needed to use rpath:
- -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
- -dnl hardcode_direct, hardcode_minus_L.
- -AC_DEFUN([AC_LIB_RPATH],
- -[
- - dnl Tell automake >= 1.10 to complain if config.rpath is missing.
- - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
- - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
- - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
- - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
- - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
- - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
- - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
- - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
- - . ./conftest.sh
- - rm -f ./conftest.sh
- - acl_cv_rpath=done
- - ])
- - wl="$acl_cv_wl"
- - libext="$acl_cv_libext"
- - shlibext="$acl_cv_shlibext"
- - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
- - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
- - hardcode_direct="$acl_cv_hardcode_direct"
- - hardcode_minus_L="$acl_cv_hardcode_minus_L"
- - dnl Determine whether the user wants rpath handling at all.
- - AC_ARG_ENABLE(rpath,
- - [ --disable-rpath do not hardcode runtime library paths],
- - :, enable_rpath=yes)
- -])
- +# Always use our own libtool.
- +LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- +AC_SUBST(LIBTOOL)dnl
-
- -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
- -dnl the libraries corresponding to explicit and implicit dependencies.
- -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
- -AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
- -[
- - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
- - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
- - dnl By default, look in $includedir and $libdir.
- - use_additional=yes
- - AC_LIB_WITH_FINAL_PREFIX([
- - eval additional_includedir=\"$includedir\"
- - eval additional_libdir=\"$libdir\"
- - ])
- - AC_LIB_ARG_WITH([lib$1-prefix],
- -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
- - --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
- -[
- - if test "X$withval" = "Xno"; then
- - use_additional=no
- - else
- - if test "X$withval" = "X"; then
- - AC_LIB_WITH_FINAL_PREFIX([
- - eval additional_includedir=\"$includedir\"
- - eval additional_libdir=\"$libdir\"
- - ])
- - else
- - additional_includedir="$withval/include"
- - additional_libdir="$withval/$acl_libdirstem"
- - fi
- - fi
- -])
- - dnl Search the library and its dependencies in $additional_libdir and
- - dnl $LDFLAGS. Using breadth-first-seach.
- - LIB[]NAME=
- - LTLIB[]NAME=
- - INC[]NAME=
- - rpathdirs=
- - ltrpathdirs=
- - names_already_handled=
- - names_next_round='$1 $2'
- - while test -n "$names_next_round"; do
- - names_this_round="$names_next_round"
- - names_next_round=
- - for name in $names_this_round; do
- - already_handled=
- - for n in $names_already_handled; do
- - if test "$n" = "$name"; then
- - already_handled=yes
- - break
- - fi
- - done
- - if test -z "$already_handled"; then
- - names_already_handled="$names_already_handled $name"
- - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
- - dnl or AC_LIB_HAVE_LINKFLAGS call.
- - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
- - eval value=\"\$HAVE_LIB$uppername\"
- - if test -n "$value"; then
- - if test "$value" = yes; then
- - eval value=\"\$LIB$uppername\"
- - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
- - eval value=\"\$LTLIB$uppername\"
- - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
- - else
- - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
- - dnl that this library doesn't exist. So just drop it.
- - :
- - fi
- - else
- - dnl Search the library lib$name in $additional_libdir and $LDFLAGS
- - dnl and the already constructed $LIBNAME/$LTLIBNAME.
- - found_dir=
- - found_la=
- - found_so=
- - found_a=
- - if test $use_additional = yes; then
- - if test -n "$shlibext" \
- - && { test -f "$additional_libdir/lib$name.$shlibext" \
- - || { test "$shlibext" = dll \
- - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
- - found_dir="$additional_libdir"
- - if test -f "$additional_libdir/lib$name.$shlibext"; then
- - found_so="$additional_libdir/lib$name.$shlibext"
- - else
- - found_so="$additional_libdir/lib$name.dll.a"
- - fi
- - if test -f "$additional_libdir/lib$name.la"; then
- - found_la="$additional_libdir/lib$name.la"
- - fi
- - else
- - if test -f "$additional_libdir/lib$name.$libext"; then
- - found_dir="$additional_libdir"
- - found_a="$additional_libdir/lib$name.$libext"
- - if test -f "$additional_libdir/lib$name.la"; then
- - found_la="$additional_libdir/lib$name.la"
- - fi
- - fi
- - fi
- - fi
- - if test "X$found_dir" = "X"; then
- - for x in $LDFLAGS $LTLIB[]NAME; do
- - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- - case "$x" in
- - -L*)
- - dir=`echo "X$x" | sed -e 's/^X-L//'`
- - if test -n "$shlibext" \
- - && { test -f "$dir/lib$name.$shlibext" \
- - || { test "$shlibext" = dll \
- - && test -f "$dir/lib$name.dll.a"; }; }; then
- - found_dir="$dir"
- - if test -f "$dir/lib$name.$shlibext"; then
- - found_so="$dir/lib$name.$shlibext"
- - else
- - found_so="$dir/lib$name.dll.a"
- - fi
- - if test -f "$dir/lib$name.la"; then
- - found_la="$dir/lib$name.la"
- - fi
- - else
- - if test -f "$dir/lib$name.$libext"; then
- - found_dir="$dir"
- - found_a="$dir/lib$name.$libext"
- - if test -f "$dir/lib$name.la"; then
- - found_la="$dir/lib$name.la"
- - fi
- - fi
- - fi
- - ;;
- - esac
- - if test "X$found_dir" != "X"; then
- - break
- - fi
- - done
- - fi
- - if test "X$found_dir" != "X"; then
- - dnl Found the library.
- - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
- - if test "X$found_so" != "X"; then
- - dnl Linking with a shared library. We attempt to hardcode its
- - dnl directory into the executable's runpath, unless it's the
- - dnl standard /usr/lib.
- - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
- - dnl No hardcoding is needed.
- - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- - else
- - dnl Use an explicit option to hardcode DIR into the resulting
- - dnl binary.
- - dnl Potentially add DIR to ltrpathdirs.
- - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
- - haveit=
- - for x in $ltrpathdirs; do
- - if test "X$x" = "X$found_dir"; then
- - haveit=yes
- - break
- - fi
- - done
- - if test -z "$haveit"; then
- - ltrpathdirs="$ltrpathdirs $found_dir"
- - fi
- - dnl The hardcoding into $LIBNAME is system dependent.
- - if test "$hardcode_direct" = yes; then
- - dnl Using DIR/libNAME.so during linking hardcodes DIR into the
- - dnl resulting binary.
- - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- - else
- - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
- - dnl Use an explicit option to hardcode DIR into the resulting
- - dnl binary.
- - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- - dnl Potentially add DIR to rpathdirs.
- - dnl The rpathdirs will be appended to $LIBNAME at the end.
- - haveit=
- - for x in $rpathdirs; do
- - if test "X$x" = "X$found_dir"; then
- - haveit=yes
- - break
- - fi
- - done
- - if test -z "$haveit"; then
- - rpathdirs="$rpathdirs $found_dir"
- - fi
- - else
- - dnl Rely on "-L$found_dir".
- - dnl But don't add it if it's already contained in the LDFLAGS
- - dnl or the already constructed $LIBNAME
- - haveit=
- - for x in $LDFLAGS $LIB[]NAME; do
- - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- - if test "X$x" = "X-L$found_dir"; then
- - haveit=yes
- - break
- - fi
- - done
- - if test -z "$haveit"; then
- - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
- - fi
- - if test "$hardcode_minus_L" != no; then
- - dnl FIXME: Not sure whether we should use
- - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- - dnl here.
- - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- - else
- - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
- - dnl here, because this doesn't fit in flags passed to the
- - dnl compiler. So give up. No hardcoding. This affects only
- - dnl very old systems.
- - dnl FIXME: Not sure whether we should use
- - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- - dnl here.
- - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
- - fi
- - fi
- - fi
- - fi
- - else
- - if test "X$found_a" != "X"; then
- - dnl Linking with a static library.
- - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
- - else
- - dnl We shouldn't come here, but anyway it's good to have a
- - dnl fallback.
- - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
- - fi
- - fi
- - dnl Assume the include files are nearby.
- - additional_includedir=
- - case "$found_dir" in
- - */$acl_libdirstem | */$acl_libdirstem/)
- - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
- - additional_includedir="$basedir/include"
- - ;;
- - esac
- - if test "X$additional_includedir" != "X"; then
- - dnl Potentially add $additional_includedir to $INCNAME.
- - dnl But don't add it
- - dnl 1. if it's the standard /usr/include,
- - dnl 2. if it's /usr/local/include and we are using GCC on Linux,
- - dnl 3. if it's already present in $CPPFLAGS or the already
- - dnl constructed $INCNAME,
- - dnl 4. if it doesn't exist as a directory.
- - if test "X$additional_includedir" != "X/usr/include"; then
- - haveit=
- - if test "X$additional_includedir" = "X/usr/local/include"; then
- - if test -n "$GCC"; then
- - case $host_os in
- - linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- - esac
- - fi
- - fi
- - if test -z "$haveit"; then
- - for x in $CPPFLAGS $INC[]NAME; do
- - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- - if test "X$x" = "X-I$additional_includedir"; then
- - haveit=yes
- - break
- - fi
- - done
- - if test -z "$haveit"; then
- - if test -d "$additional_includedir"; then
- - dnl Really add $additional_includedir to $INCNAME.
- - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
- - fi
- - fi
- - fi
- - fi
- - fi
- - dnl Look for dependencies.
- - if test -n "$found_la"; then
- - dnl Read the .la file. It defines the variables
- - dnl dlname, library_names, old_library, dependency_libs, current,
- - dnl age, revision, installed, dlopen, dlpreopen, libdir.
- - save_libdir="$libdir"
- - case "$found_la" in
- - */* | *\\*) . "$found_la" ;;
- - *) . "./$found_la" ;;
- - esac
- - libdir="$save_libdir"
- - dnl We use only dependency_libs.
- - for dep in $dependency_libs; do
- - case "$dep" in
- - -L*)
- - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
- - dnl But don't add it
- - dnl 1. if it's the standard /usr/lib,
- - dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
- - dnl 3. if it's already present in $LDFLAGS or the already
- - dnl constructed $LIBNAME,
- - dnl 4. if it doesn't exist as a directory.
- - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
- - haveit=
- - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
- - if test -n "$GCC"; then
- - case $host_os in
- - linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- - esac
- - fi
- - fi
- - if test -z "$haveit"; then
- - haveit=
- - for x in $LDFLAGS $LIB[]NAME; do
- - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- - if test "X$x" = "X-L$additional_libdir"; then
- - haveit=yes
- - break
- - fi
- - done
- - if test -z "$haveit"; then
- - if test -d "$additional_libdir"; then
- - dnl Really add $additional_libdir to $LIBNAME.
- - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
- - fi
- - fi
- - haveit=
- - for x in $LDFLAGS $LTLIB[]NAME; do
- - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- - if test "X$x" = "X-L$additional_libdir"; then
- - haveit=yes
- - break
- - fi
- - done
- - if test -z "$haveit"; then
- - if test -d "$additional_libdir"; then
- - dnl Really add $additional_libdir to $LTLIBNAME.
- - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
- - fi
- - fi
- - fi
- - fi
- - ;;
- - -R*)
- - dir=`echo "X$dep" | sed -e 's/^X-R//'`
- - if test "$enable_rpath" != no; then
- - dnl Potentially add DIR to rpathdirs.
- - dnl The rpathdirs will be appended to $LIBNAME at the end.
- - haveit=
- - for x in $rpathdirs; do
- - if test "X$x" = "X$dir"; then
- - haveit=yes
- - break
- - fi
- - done
- - if test -z "$haveit"; then
- - rpathdirs="$rpathdirs $dir"
- - fi
- - dnl Potentially add DIR to ltrpathdirs.
- - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
- - haveit=
- - for x in $ltrpathdirs; do
- - if test "X$x" = "X$dir"; then
- - haveit=yes
- - break
- - fi
- - done
- - if test -z "$haveit"; then
- - ltrpathdirs="$ltrpathdirs $dir"
- - fi
- - fi
- - ;;
- - -l*)
- - dnl Handle this in the next round.
- - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
- - ;;
- - *.la)
- - dnl Handle this in the next round. Throw away the .la's
- - dnl directory; it is already contained in a preceding -L
- - dnl option.
- - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
- - ;;
- - *)
- - dnl Most likely an immediate library name.
- - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
- - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
- - ;;
- - esac
- - done
- - fi
- - else
- - dnl Didn't find the library; assume it is in the system directories
- - dnl known to the linker and runtime loader. (All the system
- - dnl directories known to the linker should also be known to the
- - dnl runtime loader, otherwise the system is severely misconfigured.)
- - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
- - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
- - fi
- - fi
- - fi
- - done
- - done
- - if test "X$rpathdirs" != "X"; then
- - if test -n "$hardcode_libdir_separator"; then
- - dnl Weird platform: only the last -rpath option counts, the user must
- - dnl pass all path elements in one option. We can arrange that for a
- - dnl single library, but not when more than one $LIBNAMEs are used.
- - alldirs=
- - for found_dir in $rpathdirs; do
- - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
- - done
- - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
- - acl_save_libdir="$libdir"
- - libdir="$alldirs"
- - eval flag=\"$hardcode_libdir_flag_spec\"
- - libdir="$acl_save_libdir"
- - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
- - else
- - dnl The -rpath options are cumulative.
- - for found_dir in $rpathdirs; do
- - acl_save_libdir="$libdir"
- - libdir="$found_dir"
- - eval flag=\"$hardcode_libdir_flag_spec\"
- - libdir="$acl_save_libdir"
- - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
- - done
- - fi
- - fi
- - if test "X$ltrpathdirs" != "X"; then
- - dnl When using libtool, the option that works for both libraries and
- - dnl executables is -R. The -R options are cumulative.
- - for found_dir in $ltrpathdirs; do
- - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
- - done
- - fi
- -])
- +# Prevent multiple expansion
- +define([AC_PROG_LIBTOOL], [])
- +])# _AC_PROG_LIBTOOL
-
- -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
- -dnl unless already present in VAR.
- -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
- -dnl contains two or three consecutive elements that belong together.
- -AC_DEFUN([AC_LIB_APPENDTOVAR],
- -[
- - for element in [$2]; do
- - haveit=
- - for x in $[$1]; do
- - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- - if test "X$x" = "X$element"; then
- - haveit=yes
- - break
- - fi
- - done
- - if test -z "$haveit"; then
- - [$1]="${[$1]}${[$1]:+ }$element"
- - fi
- - done
- -])
-
- -dnl For those cases where a variable contains several -L and -l options
- -dnl referring to unknown libraries and directories, this macro determines the
- -dnl necessary additional linker options for the runtime path.
- -dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
- -dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
- -dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
- -dnl otherwise linking without libtool is assumed.
- -AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
- -[
- - AC_REQUIRE([AC_LIB_RPATH])
- - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
- - $1=
- - if test "$enable_rpath" != no; then
- - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
- - dnl Use an explicit option to hardcode directories into the resulting
- - dnl binary.
- - rpathdirs=
- - next=
- - for opt in $2; do
- - if test -n "$next"; then
- - dir="$next"
- - dnl No need to hardcode the standard /usr/lib.
- - if test "X$dir" != "X/usr/$acl_libdirstem"; then
- - rpathdirs="$rpathdirs $dir"
- - fi
- - next=
- - else
- - case $opt in
- - -L) next=yes ;;
- - -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
- - dnl No need to hardcode the standard /usr/lib.
- - if test "X$dir" != "X/usr/$acl_libdirstem"; then
- - rpathdirs="$rpathdirs $dir"
- - fi
- - next= ;;
- - *) next= ;;
- - esac
- - fi
- - done
- - if test "X$rpathdirs" != "X"; then
- - if test -n ""$3""; then
- - dnl libtool is used for linking. Use -R options.
- - for dir in $rpathdirs; do
- - $1="${$1}${$1:+ }-R$dir"
- - done
- - else
- - dnl The linker is used for linking directly.
- - if test -n "$hardcode_libdir_separator"; then
- - dnl Weird platform: only the last -rpath option counts, the user
- - dnl must pass all path elements in one option.
- - alldirs=
- - for dir in $rpathdirs; do
- - alldirs="${alldir…
Large files files are truncated, but you can click here to view the full file