kopia lustrzana https://github.com/Hamlib/Hamlib
				
				
				
			updated to libtool-1.4.3
git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1216 7ae35d74-ebe9-4afe-98af-79ac388436b8Hamlib-1.1.4
							rodzic
							
								
									7ee29fda76
								
							
						
					
					
						commit
						a2a025e0f6
					
				|  | @ -1,8 +1,6 @@ | |||
| # Makefile.in generated by automake 1.6.1 from Makefile.am.
 | ||||
| # @configure_input@
 | ||||
| # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
 | ||||
| 
 | ||||
| # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 | ||||
| # Free Software Foundation, Inc.
 | ||||
| # Copyright (C) 1994, 1995-8, 1999, 2001 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.
 | ||||
|  | @ -12,7 +10,7 @@ | |||
| # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 | ||||
| # PARTICULAR PURPOSE.
 | ||||
| 
 | ||||
| @SET_MAKE@ | ||||
| 
 | ||||
| SHELL = @SHELL@ | ||||
| 
 | ||||
| srcdir = @srcdir@ | ||||
|  | @ -33,9 +31,13 @@ infodir = @infodir@ | |||
| mandir = @mandir@ | ||||
| includedir = @includedir@ | ||||
| oldincludedir = /usr/include | ||||
| 
 | ||||
| DESTDIR = | ||||
| 
 | ||||
| pkgdatadir = $(datadir)/@PACKAGE@ | ||||
| pkglibdir = $(libdir)/@PACKAGE@ | ||||
| pkgincludedir = $(includedir)/@PACKAGE@ | ||||
| 
 | ||||
| top_builddir = . | ||||
| 
 | ||||
| ACLOCAL = @ACLOCAL@ | ||||
|  | @ -43,15 +45,12 @@ AUTOCONF = @AUTOCONF@ | |||
| AUTOMAKE = @AUTOMAKE@ | ||||
| AUTOHEADER = @AUTOHEADER@ | ||||
| 
 | ||||
| am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||||
| INSTALL = @INSTALL@ | ||||
| INSTALL_PROGRAM = @INSTALL_PROGRAM@ | ||||
| INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) | ||||
| INSTALL_DATA = @INSTALL_DATA@ | ||||
| install_sh_DATA = $(install_sh) -c -m 644 | ||||
| install_sh_PROGRAM = $(install_sh) -c | ||||
| INSTALL_SCRIPT = @INSTALL_SCRIPT@ | ||||
| INSTALL_HEADER = $(INSTALL_DATA) | ||||
| transform = @program_transform_name@ | ||||
| 
 | ||||
| NORMAL_INSTALL = : | ||||
| PRE_INSTALL = : | ||||
| POST_INSTALL = : | ||||
|  | @ -60,41 +59,33 @@ PRE_UNINSTALL = : | |||
| POST_UNINSTALL = : | ||||
| host_alias = @host_alias@ | ||||
| host_triplet = @host@ | ||||
| 
 | ||||
| EXEEXT = @EXEEXT@ | ||||
| OBJEXT = @OBJEXT@ | ||||
| PATH_SEPARATOR = @PATH_SEPARATOR@ | ||||
| AMTAR = @AMTAR@ | ||||
| AS = @AS@ | ||||
| AWK = @AWK@ | ||||
| CC = @CC@ | ||||
| DEPDIR = @DEPDIR@ | ||||
| DLLTOOL = @DLLTOOL@ | ||||
| ECHO = @ECHO@ | ||||
| EXEEXT = @EXEEXT@ | ||||
| INCLTDL = @INCLTDL@ | ||||
| INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ | ||||
| LIBADD_DL = @LIBADD_DL@ | ||||
| LIBLTDL = @LIBLTDL@ | ||||
| LIBTOOL = @LIBTOOL@ | ||||
| LIBTOOL_DEPS = @LIBTOOL_DEPS@ | ||||
| LN_S = @LN_S@ | ||||
| MAINT = @MAINT@ | ||||
| MAKEINFO = @MAKEINFO@ | ||||
| OBJDUMP = @OBJDUMP@ | ||||
| OBJEXT = @OBJEXT@ | ||||
| PACKAGE = @PACKAGE@ | ||||
| RANLIB = @RANLIB@ | ||||
| STRIP = @STRIP@ | ||||
| VERSION = @VERSION@ | ||||
| am__include = @am__include@ | ||||
| am__quote = @am__quote@ | ||||
| install_sh = @install_sh@ | ||||
| 
 | ||||
| AUTOMAKE_OPTIONS = no-dependencies foreign | ||||
| 
 | ||||
| @INSTALL_LTDL_TRUE@include_HEADERS = ltdl.h | ||||
| @INSTALL_LTDL_TRUE@lib_LTLIBRARIES = libltdl.la | ||||
| @INSTALL_LTDL_FALSE@noinst_HEADERS = ltdl.h | ||||
| @INSTALL_LTDL_TRUE@include_HEADERS = @INSTALL_LTDL_TRUE@ltdl.h | ||||
| @INSTALL_LTDL_TRUE@lib_LTLIBRARIES = @INSTALL_LTDL_TRUE@libltdl.la | ||||
| @INSTALL_LTDL_FALSE@noinst_HEADERS = @INSTALL_LTDL_FALSE@ltdl.h | ||||
| 
 | ||||
| @CONVENIENCE_LTDL_TRUE@noinst_LTLIBRARIES = libltdlc.la | ||||
| @CONVENIENCE_LTDL_TRUE@noinst_LTLIBRARIES = @CONVENIENCE_LTDL_TRUE@libltdlc.la | ||||
| 
 | ||||
| CLEANFILES = libltdl.la libltdlc.la | ||||
| 
 | ||||
|  | @ -104,124 +95,153 @@ libltdl_la_LIBADD = $(LIBADD_DL) | |||
| 
 | ||||
| libltdlc_la_SOURCES = ltdl.c | ||||
| libltdlc_la_LIBADD = $(LIBADD_DL) | ||||
| subdir = . | ||||
| ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||||
| mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs | ||||
| CONFIG_HEADER = config.h | ||||
| CONFIG_CLEAN_FILES = | ||||
| LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) | ||||
| CONFIG_CLEAN_FILES =  | ||||
| LTLIBRARIES =  $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) | ||||
| 
 | ||||
| libltdl_la_DEPENDENCIES = | ||||
| am_libltdl_la_OBJECTS = ltdl.lo | ||||
| libltdl_la_OBJECTS = $(am_libltdl_la_OBJECTS) | ||||
| libltdlc_la_LDFLAGS = | ||||
| libltdlc_la_DEPENDENCIES = | ||||
| am_libltdlc_la_OBJECTS = ltdl.lo | ||||
| libltdlc_la_OBJECTS = $(am_libltdlc_la_OBJECTS) | ||||
| 
 | ||||
| DEFS = @DEFS@ | ||||
| DEFAULT_INCLUDES =  -I. -I$(srcdir) -I. | ||||
| DEFS = @DEFS@ -I. -I$(srcdir) -I. | ||||
| CPPFLAGS = @CPPFLAGS@ | ||||
| LDFLAGS = @LDFLAGS@ | ||||
| LIBS = @LIBS@ | ||||
| depcomp = | ||||
| am__depfiles_maybe = | ||||
| COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 | ||||
| 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||||
| LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
 | ||||
| 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||||
| CCLD = $(CC) | ||||
| LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 | ||||
| 	$(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||||
| libltdl_la_DEPENDENCIES =  | ||||
| libltdl_la_OBJECTS =  ltdl.lo | ||||
| libltdlc_la_LDFLAGS =  | ||||
| libltdlc_la_DEPENDENCIES =  | ||||
| libltdlc_la_OBJECTS =  ltdl.lo | ||||
| CFLAGS = @CFLAGS@ | ||||
| DIST_SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES) | ||||
| HEADERS = $(include_HEADERS) $(noinst_HEADERS) | ||||
| COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||||
| LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||||
| CCLD = $(CC) | ||||
| LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ | ||||
| HEADERS =  $(include_HEADERS) $(noinst_HEADERS) | ||||
| 
 | ||||
| DIST_COMMON = README $(include_HEADERS) $(noinst_HEADERS) \
 | ||||
| 	../config.guess ../config.sub ../install-sh ../ltmain.sh \
 | ||||
| 	../missing ../mkinstalldirs COPYING.LIB Makefile.am Makefile.in \
 | ||||
| 	acinclude.m4 aclocal.m4 config-h.in configure configure.in | ||||
| DIST_COMMON =  README ./stamp-h.in COPYING.LIB Makefile.am Makefile.in \
 | ||||
| acinclude.m4 aclocal.m4 config-h.in configure configure.in | ||||
| 
 | ||||
| 
 | ||||
| DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) | ||||
| 
 | ||||
| TAR = gtar | ||||
| GZIP_ENV = --best | ||||
| SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES) | ||||
| OBJECTS = $(libltdl_la_OBJECTS) $(libltdlc_la_OBJECTS) | ||||
| 
 | ||||
| all: config.h | ||||
| 	$(MAKE) $(AM_MAKEFLAGS) all-am | ||||
| 
 | ||||
| all: all-redirect | ||||
| .SUFFIXES: | ||||
| .SUFFIXES: .c .lo .o .obj | ||||
| $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) | ||||
| 	cd $(top_srcdir) && \
 | ||||
| 	  $(AUTOMAKE) --foreign  Makefile | ||||
| Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status | ||||
| 	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) | ||||
| .SUFFIXES: .S .c .lo .o .obj .s | ||||
| $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)  | ||||
| 	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile | ||||
| 
 | ||||
| $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | ||||
| Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status | ||||
| 	cd $(top_builddir) \
 | ||||
| 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status | ||||
| 
 | ||||
| $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4 | ||||
| 	cd $(srcdir) && $(ACLOCAL) | ||||
| 
 | ||||
| config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | ||||
| 	$(SHELL) ./config.status --recheck | ||||
| $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) | ||||
| $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) | ||||
| 	cd $(srcdir) && $(AUTOCONF) | ||||
| 
 | ||||
| $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 | ||||
| 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) | ||||
| 
 | ||||
| config.h: stamp-h1 | ||||
| config.h: stamp-h | ||||
| 	@if test ! -f $@; then \
 | ||||
| 	  rm -f stamp-h1; \
 | ||||
| 	  $(MAKE) stamp-h1; \
 | ||||
| 		rm -f stamp-h; \
 | ||||
| 		$(MAKE) stamp-h; \
 | ||||
| 	else :; fi | ||||
| 
 | ||||
| stamp-h1: $(srcdir)/config-h.in $(top_builddir)/config.status | ||||
| 	@rm -f stamp-h1 | ||||
| 	cd $(top_builddir) && $(SHELL) ./config.status config.h | ||||
| 
 | ||||
| $(srcdir)/config-h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4)  | ||||
| stamp-h: $(srcdir)/config-h.in $(top_builddir)/config.status | ||||
| 	cd $(top_builddir) \
 | ||||
| 	  && CONFIG_FILES= CONFIG_HEADERS=config.h:config-h.in \
 | ||||
| 	     $(SHELL) ./config.status | ||||
| 	@echo timestamp > stamp-h 2> /dev/null | ||||
| $(srcdir)/config-h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in | ||||
| 	@if test ! -f $@; then \
 | ||||
| 		rm -f $(srcdir)/stamp-h.in; \
 | ||||
| 		$(MAKE) $(srcdir)/stamp-h.in; \
 | ||||
| 	else :; fi | ||||
| $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)  | ||||
| 	cd $(top_srcdir) && $(AUTOHEADER) | ||||
| 	touch $(srcdir)/config-h.in | ||||
| 	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null | ||||
| 
 | ||||
| mostlyclean-hdr: | ||||
| 
 | ||||
| clean-hdr: | ||||
| 
 | ||||
| distclean-hdr: | ||||
| 	-rm -f config.h | ||||
| libLTLIBRARIES_INSTALL = $(INSTALL) | ||||
| 
 | ||||
| maintainer-clean-hdr: | ||||
| 
 | ||||
| mostlyclean-libLTLIBRARIES: | ||||
| 
 | ||||
| clean-libLTLIBRARIES: | ||||
| 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) | ||||
| 
 | ||||
| distclean-libLTLIBRARIES: | ||||
| 
 | ||||
| maintainer-clean-libLTLIBRARIES: | ||||
| 
 | ||||
| install-libLTLIBRARIES: $(lib_LTLIBRARIES) | ||||
| 	@$(NORMAL_INSTALL) | ||||
| 	$(mkinstalldirs) $(DESTDIR)$(libdir) | ||||
| 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 | ||||
| 	  if test -f $$p; then \
 | ||||
| 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
 | ||||
| 	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
 | ||||
| 	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
 | ||||
| 	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
 | ||||
| 	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
 | ||||
| 	  else :; fi; \
 | ||||
| 	done | ||||
| 
 | ||||
| uninstall-libLTLIBRARIES: | ||||
| 	@$(NORMAL_UNINSTALL) | ||||
| 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 | ||||
| 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
 | ||||
| 	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
 | ||||
| 	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
 | ||||
| 	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 | ||||
| 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
 | ||||
| 	done | ||||
| 
 | ||||
| clean-libLTLIBRARIES: | ||||
| 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) | ||||
| mostlyclean-noinstLTLIBRARIES: | ||||
| 
 | ||||
| clean-noinstLTLIBRARIES: | ||||
| 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||||
| libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES)  | ||||
| 	$(LINK) -rpath $(libdir) $(libltdl_la_LDFLAGS) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS) | ||||
| libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES)  | ||||
| 	$(LINK)  $(libltdlc_la_LDFLAGS) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS) | ||||
| 
 | ||||
| distclean-noinstLTLIBRARIES: | ||||
| 
 | ||||
| maintainer-clean-noinstLTLIBRARIES: | ||||
| 
 | ||||
| .c.o: | ||||
| 	$(COMPILE) -c $< | ||||
| 
 | ||||
| # FIXME: We should only use cygpath when building on Windows,
 | ||||
| # and only if it is available.
 | ||||
| .c.obj: | ||||
| 	$(COMPILE) -c `cygpath -w $<` | ||||
| 
 | ||||
| .s.o: | ||||
| 	$(COMPILE) -c $< | ||||
| 
 | ||||
| .S.o: | ||||
| 	$(COMPILE) -c $< | ||||
| 
 | ||||
| mostlyclean-compile: | ||||
| 	-rm -f *.$(OBJEXT) core *.core | ||||
| 	-rm -f *.o core *.core | ||||
| 	-rm -f *.$(OBJEXT) | ||||
| 
 | ||||
| clean-compile: | ||||
| 
 | ||||
| distclean-compile: | ||||
| 	-rm -f *.tab.c | ||||
| 
 | ||||
| .c.o: | ||||
| 	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< | ||||
| 
 | ||||
| .c.obj: | ||||
| 	$(COMPILE) -c `cygpath -w $<` | ||||
| maintainer-clean-compile: | ||||
| 
 | ||||
| .c.lo: | ||||
| 	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< | ||||
| 	$(LIBTOOL) --mode=compile $(COMPILE) -c $< | ||||
| 
 | ||||
| .s.lo: | ||||
| 	$(LIBTOOL) --mode=compile $(COMPILE) -c $< | ||||
| 
 | ||||
| .S.lo: | ||||
| 	$(LIBTOOL) --mode=compile $(COMPILE) -c $< | ||||
| 
 | ||||
| mostlyclean-libtool: | ||||
| 	-rm -f *.lo | ||||
|  | @ -230,236 +250,197 @@ clean-libtool: | |||
| 	-rm -rf .libs _libs | ||||
| 
 | ||||
| distclean-libtool: | ||||
| 	-rm -f libtool | ||||
| uninstall-info-am: | ||||
| includeHEADERS_INSTALL = $(INSTALL_HEADER) | ||||
| 
 | ||||
| maintainer-clean-libtool: | ||||
| 
 | ||||
| libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES) | ||||
| 	$(LINK) -rpath $(libdir) $(libltdl_la_LDFLAGS) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS) | ||||
| 
 | ||||
| libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES) | ||||
| 	$(LINK)  $(libltdlc_la_LDFLAGS) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS) | ||||
| 
 | ||||
| install-includeHEADERS: $(include_HEADERS) | ||||
| 	@$(NORMAL_INSTALL) | ||||
| 	$(mkinstalldirs) $(DESTDIR)$(includedir) | ||||
| 	@list='$(include_HEADERS)'; for p in $$list; do \
 | ||||
| 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 | ||||
| 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 | ||||
| 	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
 | ||||
| 	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
 | ||||
| 	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
 | ||||
| 	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
 | ||||
| 	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
 | ||||
| 	done | ||||
| 
 | ||||
| uninstall-includeHEADERS: | ||||
| 	@$(NORMAL_UNINSTALL) | ||||
| 	@list='$(include_HEADERS)'; for p in $$list; do \
 | ||||
| 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 | ||||
| 	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
 | ||||
| 	  rm -f $(DESTDIR)$(includedir)/$$f; \
 | ||||
| 	list='$(include_HEADERS)'; for p in $$list; do \
 | ||||
| 	  rm -f $(DESTDIR)$(includedir)/$$p; \
 | ||||
| 	done | ||||
| 
 | ||||
| ETAGS = etags | ||||
| ETAGSFLAGS = | ||||
| 
 | ||||
| tags: TAGS | ||||
| 
 | ||||
| ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||||
| 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 | ||||
| 	unique=`for i in $$list; do \
 | ||||
| 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 | ||||
| 	  done | \
 | ||||
| 	  $(AWK) '    { files[$$0] = 1; } \
 | ||||
| ID: $(HEADERS) $(SOURCES) $(LISP) | ||||
| 	list='$(SOURCES) $(HEADERS)'; \
 | ||||
| 	unique=`for i in $$list; do echo $$i; done | \
 | ||||
| 	  awk '    { files[$$0] = 1; } \
 | ||||
| 	       END { for (i in files) print i; }'`; \
 | ||||
| 	mkid -fID $$unique | ||||
| 	here=`pwd` && cd $(srcdir) \
 | ||||
| 	  && mkid -f$$here/ID $$unique $(LISP) | ||||
| 
 | ||||
| TAGS:  $(HEADERS) $(SOURCES) config-h.in $(TAGS_DEPENDENCIES) \ | ||||
| 		$(TAGS_FILES) $(LISP) | ||||
| TAGS:  $(HEADERS) $(SOURCES) config-h.in $(TAGS_DEPENDENCIES) $(LISP) | ||||
| 	tags=; \
 | ||||
| 	here=`pwd`; \
 | ||||
| 	list='$(SOURCES) $(HEADERS) config-h.in $(LISP) $(TAGS_FILES)'; \
 | ||||
| 	unique=`for i in $$list; do \
 | ||||
| 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 | ||||
| 	  done | \
 | ||||
| 	  $(AWK) '    { files[$$0] = 1; } \
 | ||||
| 	list='$(SOURCES) $(HEADERS)'; \
 | ||||
| 	unique=`for i in $$list; do echo $$i; done | \
 | ||||
| 	  awk '    { files[$$0] = 1; } \
 | ||||
| 	       END { for (i in files) print i; }'`; \
 | ||||
| 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
 | ||||
| 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 | ||||
| 	     $$tags $$unique | ||||
| 	test -z "$(ETAGS_ARGS)config-h.in$$unique$(LISP)$$tags" \
 | ||||
| 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config-h.in $$unique $(LISP) -o $$here/TAGS) | ||||
| 
 | ||||
| GTAGS: | ||||
| 	here=`$(am__cd) $(top_builddir) && pwd` \
 | ||||
| 	  && cd $(top_srcdir) \
 | ||||
| 	  && gtags -i $(GTAGS_ARGS) $$here | ||||
| mostlyclean-tags: | ||||
| 
 | ||||
| clean-tags: | ||||
| 
 | ||||
| distclean-tags: | ||||
| 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH | ||||
| DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||||
| 	-rm -f TAGS ID | ||||
| 
 | ||||
| maintainer-clean-tags: | ||||
| 
 | ||||
| top_distdir = . | ||||
| distdir = $(PACKAGE)-$(VERSION) | ||||
| 
 | ||||
| am__remove_distdir = \
 | ||||
|   { test ! -d $(distdir) \
 | ||||
|     || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
 | ||||
|          && rm -fr $(distdir); }; } | ||||
| 
 | ||||
| GZIP_ENV = --best | ||||
| distcleancheck_listfiles = find . -type f -print | ||||
| 
 | ||||
| distdir: $(DISTFILES) | ||||
| 	$(am__remove_distdir) | ||||
| 	mkdir $(distdir) | ||||
| 	$(mkinstalldirs) $(distdir)/.. | ||||
| 	@for file in $(DISTFILES); 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"; \
 | ||||
| 	    $(mkinstalldirs) "$(distdir)$$dir"; \
 | ||||
| 	  else \
 | ||||
| 	    dir=''; \
 | ||||
| 	  fi; \
 | ||||
| 	  if test -d $$d/$$file; then \
 | ||||
| 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 | ||||
| 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 | ||||
| 	    fi; \
 | ||||
| 	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 | ||||
| 	  else \
 | ||||
| 	    test -f $(distdir)/$$file \
 | ||||
| 	    || cp -p $$d/$$file $(distdir)/$$file \
 | ||||
| 	    || exit 1; \
 | ||||
| 	  fi; \
 | ||||
| 	done | ||||
| 	-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 {} {} \; \
 | ||||
| 	|| chmod -R a+r $(distdir) | ||||
| dist-gzip: distdir | ||||
| 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | ||||
| 	$(am__remove_distdir) | ||||
| 
 | ||||
| dist dist-all: distdir | ||||
| 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | ||||
| 	$(am__remove_distdir) | ||||
| top_distdir = $(distdir) | ||||
| 
 | ||||
| # This target untars the dist file and tries a VPATH configuration.  Then
 | ||||
| # it guarantees that the distribution is self-contained by making another
 | ||||
| # tarfile.
 | ||||
| distcheck: dist | ||||
| 	$(am__remove_distdir) | ||||
| 	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - | ||||
| 	chmod -R a-w $(distdir); chmod a+w $(distdir) | ||||
| 	-rm -rf $(distdir) | ||||
| 	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz | ||||
| 	mkdir $(distdir)/=build | ||||
| 	mkdir $(distdir)/=inst | ||||
| 	chmod a-w $(distdir) | ||||
| 	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
 | ||||
| 	  && cd $(distdir)/=build \
 | ||||
| 	dc_install_base=`cd $(distdir)/=inst && pwd`; \
 | ||||
| 	cd $(distdir)/=build \
 | ||||
| 	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
 | ||||
| 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 | ||||
| 	  && $(MAKE) $(AM_MAKEFLAGS) \
 | ||||
| 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 | ||||
| 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 | ||||
| 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 | ||||
| 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
 | ||||
| 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
 | ||||
| 	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
 | ||||
| 	      || { echo "ERROR: files left after uninstall:" ; \
 | ||||
| 	           find $$dc_install_base -type f -print ; \
 | ||||
| 	           exit 1; } >&2 ) \
 | ||||
| 	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
 | ||||
| 	  && rm -f $(distdir).tar.gz \
 | ||||
| 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck | ||||
| 	$(am__remove_distdir) | ||||
| 	@echo "$(distdir).tar.gz is ready for distribution" | \
 | ||||
| 	  sed 'h;s/./=/g;p;x;p;x' | ||||
| distcleancheck: distclean | ||||
| 	if test '$(srcdir)' = . ; then \
 | ||||
| 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
 | ||||
| 	  exit 1 ; \
 | ||||
| 	fi | ||||
| 	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
 | ||||
| 	  || { echo "ERROR: files left after distclean:" ; \
 | ||||
| 	       $(distcleancheck_listfiles) ; \
 | ||||
| 	       exit 1; } >&2 | ||||
| 	  && $(MAKE) $(AM_MAKEFLAGS) dist | ||||
| 	-rm -rf $(distdir) | ||||
| 	@banner="$(distdir).tar.gz is ready for distribution"; \
 | ||||
| 	dashes=`echo "$$banner" | sed s/./=/g`; \
 | ||||
| 	echo "$$dashes"; \
 | ||||
| 	echo "$$banner"; \
 | ||||
| 	echo "$$dashes" | ||||
| dist: distdir | ||||
| 	-chmod -R a+r $(distdir) | ||||
| 	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) | ||||
| 	-rm -rf $(distdir) | ||||
| dist-all: distdir | ||||
| 	-chmod -R a+r $(distdir) | ||||
| 	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) | ||||
| 	-rm -rf $(distdir) | ||||
| distdir: $(DISTFILES) | ||||
| 	-rm -rf $(distdir) | ||||
| 	mkdir $(distdir) | ||||
| 	-chmod 777 $(distdir) | ||||
| 	@for file in $(DISTFILES); do \
 | ||||
| 	  d=$(srcdir); \
 | ||||
| 	  if test -d $$d/$$file; then \
 | ||||
| 	    cp -pr $$d/$$file $(distdir)/$$file; \
 | ||||
| 	  else \
 | ||||
| 	    test -f $(distdir)/$$file \
 | ||||
| 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 | ||||
| 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 | ||||
| 	  fi; \
 | ||||
| 	done | ||||
| info-am: | ||||
| info: info-am | ||||
| dvi-am: | ||||
| dvi: dvi-am | ||||
| check-am: all-am | ||||
| check: check-am | ||||
| all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h | ||||
| installcheck-am: | ||||
| installcheck: installcheck-am | ||||
| all-recursive-am: config.h | ||||
| 	$(MAKE) $(AM_MAKEFLAGS) all-recursive | ||||
| 
 | ||||
| installdirs: | ||||
| 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) | ||||
| 
 | ||||
| install: install-am | ||||
| install-exec-am: install-libLTLIBRARIES | ||||
| install-exec: install-exec-am | ||||
| 
 | ||||
| install-data-am: install-includeHEADERS | ||||
| install-data: install-data-am | ||||
| uninstall: uninstall-am | ||||
| 
 | ||||
| install-am: all-am | ||||
| 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am | ||||
| 
 | ||||
| installcheck: installcheck-am | ||||
| install: install-am | ||||
| uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS | ||||
| uninstall: uninstall-am | ||||
| all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h | ||||
| all-redirect: all-am | ||||
| install-strip: | ||||
| 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 | ||||
| 	  INSTALL_STRIP_FLAG=-s \
 | ||||
| 	  `test -z '$(STRIP)' || \
 | ||||
| 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||||
| 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install | ||||
| installdirs: | ||||
| 	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) | ||||
| 
 | ||||
| 
 | ||||
| mostlyclean-generic: | ||||
| 
 | ||||
| clean-generic: | ||||
| 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) | ||||
| 
 | ||||
| distclean-generic: | ||||
| 	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* | ||||
| 	-rm -f Makefile $(CONFIG_CLEAN_FILES) | ||||
| 	-rm -f config.cache config.log stamp-h stamp-h[0-9]* | ||||
| 
 | ||||
| maintainer-clean-generic: | ||||
| 	@echo "This command is intended for maintainers to use" | ||||
| 	@echo "it deletes files that may require special tools to rebuild." | ||||
| clean: clean-am | ||||
| 
 | ||||
| clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ | ||||
| 	clean-noinstLTLIBRARIES mostlyclean-am | ||||
| 
 | ||||
| distclean: distclean-am | ||||
| 	-rm -f config.status config.cache config.log | ||||
| distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \ | ||||
| 	distclean-libtool distclean-tags | ||||
| 
 | ||||
| dvi: dvi-am | ||||
| 
 | ||||
| dvi-am: | ||||
| 
 | ||||
| info: info-am | ||||
| 
 | ||||
| info-am: | ||||
| 
 | ||||
| install-data-am: install-includeHEADERS | ||||
| 
 | ||||
| install-exec-am: install-libLTLIBRARIES | ||||
| 
 | ||||
| install-info: install-info-am | ||||
| 
 | ||||
| install-man: | ||||
| 
 | ||||
| installcheck-am: | ||||
| 
 | ||||
| maintainer-clean: maintainer-clean-am | ||||
| 
 | ||||
| maintainer-clean-am: distclean-am maintainer-clean-generic | ||||
| mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \ | ||||
| 		mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
 | ||||
| 		mostlyclean-libtool mostlyclean-tags \
 | ||||
| 		mostlyclean-generic | ||||
| 
 | ||||
| mostlyclean: mostlyclean-am | ||||
| 
 | ||||
| mostlyclean-am: mostlyclean-compile mostlyclean-generic \ | ||||
| 	mostlyclean-libtool | ||||
| clean-am:  clean-hdr clean-libLTLIBRARIES clean-noinstLTLIBRARIES \ | ||||
| 		clean-compile clean-libtool clean-tags clean-generic \
 | ||||
| 		mostlyclean-am | ||||
| 
 | ||||
| uninstall-am: uninstall-includeHEADERS uninstall-info-am \ | ||||
| 	uninstall-libLTLIBRARIES | ||||
| clean: clean-am | ||||
| 
 | ||||
| .PHONY: GTAGS all all-am check check-am clean clean-generic \ | ||||
| 	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES dist \
 | ||||
| 	dist-all dist-gzip distcheck distclean distclean-compile \
 | ||||
| 	distclean-generic distclean-hdr distclean-libtool \
 | ||||
| 	distclean-tags distcleancheck distdir dvi dvi-am info info-am \
 | ||||
| 	install install-am install-data install-data-am install-exec \
 | ||||
| 	install-exec-am install-includeHEADERS install-info \
 | ||||
| 	install-info-am install-libLTLIBRARIES install-man \
 | ||||
| 	install-strip installcheck installcheck-am installdirs \
 | ||||
| 	maintainer-clean maintainer-clean-generic mostlyclean \
 | ||||
| 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 | ||||
| 	tags uninstall uninstall-am uninstall-includeHEADERS \
 | ||||
| 	uninstall-info-am uninstall-libLTLIBRARIES | ||||
| distclean-am:  distclean-hdr distclean-libLTLIBRARIES \ | ||||
| 		distclean-noinstLTLIBRARIES distclean-compile \
 | ||||
| 		distclean-libtool distclean-tags distclean-generic \
 | ||||
| 		clean-am | ||||
| 	-rm -f libtool | ||||
| 
 | ||||
| distclean: distclean-am | ||||
| 	-rm -f config.status | ||||
| 
 | ||||
| maintainer-clean-am:  maintainer-clean-hdr \ | ||||
| 		maintainer-clean-libLTLIBRARIES \
 | ||||
| 		maintainer-clean-noinstLTLIBRARIES \
 | ||||
| 		maintainer-clean-compile maintainer-clean-libtool \
 | ||||
| 		maintainer-clean-tags maintainer-clean-generic \
 | ||||
| 		distclean-am | ||||
| 	@echo "This command is intended for maintainers to use;" | ||||
| 	@echo "it deletes files that may require special tools to rebuild." | ||||
| 
 | ||||
| maintainer-clean: maintainer-clean-am | ||||
| 	-rm -f config.status | ||||
| 
 | ||||
| .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ | ||||
| mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ | ||||
| clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ | ||||
| uninstall-libLTLIBRARIES install-libLTLIBRARIES \ | ||||
| mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \ | ||||
| clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \ | ||||
| mostlyclean-compile distclean-compile clean-compile \ | ||||
| maintainer-clean-compile mostlyclean-libtool distclean-libtool \ | ||||
| clean-libtool maintainer-clean-libtool uninstall-includeHEADERS \ | ||||
| install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \ | ||||
| maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \ | ||||
| installcheck-am installcheck all-recursive-am install-exec-am \ | ||||
| install-exec install-data-am install-data install-am install \ | ||||
| uninstall-am uninstall all-redirect all-am all installdirs \ | ||||
| mostlyclean-generic distclean-generic clean-generic \ | ||||
| maintainer-clean-generic clean mostlyclean distclean maintainer-clean | ||||
| 
 | ||||
| 
 | ||||
| ltdl.lo: ltdl.h config.h | ||||
|  | @ -480,6 +461,7 @@ local-install-files: $(DISTFILES) | |||
| 	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
 | ||||
| 	  fi; \
 | ||||
| 	done | ||||
| 
 | ||||
| # Tell versions [3.59,3.63) of GNU make to not export all variables.
 | ||||
| # Otherwise a system limit (for SysV at least) may be exceeded.
 | ||||
| .NOEXPORT: | ||||
|  |  | |||
|  | @ -221,6 +221,9 @@ hpux*) # Its linker distinguishes data from code symbols | |||
| irix* | nonstopux*) | ||||
|   symcode='[[BCDEGRST]]' | ||||
|   ;; | ||||
| osf*) | ||||
|   symcode='[[BCDEGQRST]]' | ||||
|   ;; | ||||
| solaris* | sysv5*) | ||||
|   symcode='[[BDT]]' | ||||
|   ;; | ||||
|  | @ -317,7 +320,7 @@ EOF | |||
| 	  save_CFLAGS="$CFLAGS" | ||||
| 	  LIBS="conftstm.$ac_objext" | ||||
| 	  CFLAGS="$CFLAGS$no_builtin_flag" | ||||
| 	  if AC_TRY_EVAL(ac_link) && test -s conftest; then | ||||
| 	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then | ||||
| 	    pipe_works=yes | ||||
| 	  fi | ||||
| 	  LIBS="$save_LIBS" | ||||
|  | @ -1461,10 +1464,12 @@ else | |||
|       # need to do runtime linking. | ||||
|       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) | ||||
| 	for ld_flag in $LDFLAGS; do | ||||
| 	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then | ||||
| 	  case $ld_flag in | ||||
| 	  *-brtl*) | ||||
| 	    aix_use_runtimelinking=yes | ||||
| 	    break | ||||
| 	  fi | ||||
| 	  ;; | ||||
| 	  esac | ||||
| 	done | ||||
|       esac | ||||
| 
 | ||||
|  | @ -1580,7 +1585,7 @@ else | |||
|     #        cross-compilation, but unfortunately the echo tests do not | ||||
|     #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles | ||||
|     #	     `"' quotes if we put them in here... so don't! | ||||
|     archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' | ||||
|     archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' | ||||
|     # We need to add '_' to the symbols in $export_symbols first | ||||
|     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' | ||||
|     hardcode_direct=yes | ||||
|  | @ -1635,10 +1640,11 @@ else | |||
|   irix5* | irix6* | nonstopux*) | ||||
|     if test "$GCC" = yes; then | ||||
|       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||||
|       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||||
|     else | ||||
|       archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' | ||||
|       hardcode_libdir_flag_spec='-rpath $libdir' | ||||
|     fi | ||||
|     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||||
|     hardcode_libdir_separator=: | ||||
|     link_all_deplibs=yes | ||||
|     ;; | ||||
|  | @ -1666,7 +1672,7 @@ else | |||
|     hardcode_direct=yes | ||||
|     hardcode_shlibpath_var=no | ||||
|     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | ||||
|       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' | ||||
|       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||||
|       hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||||
|       export_dynamic_flag_spec='${wl}-E' | ||||
|     else | ||||
|  | @ -1676,7 +1682,7 @@ else | |||
| 	hardcode_libdir_flag_spec='-R$libdir' | ||||
|         ;; | ||||
|       *) | ||||
|         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' | ||||
|         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||||
|         hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||||
|         ;; | ||||
|       esac | ||||
|  | @ -1957,6 +1963,9 @@ aix3*) | |||
| 
 | ||||
| aix4* | aix5*) | ||||
|   version_type=linux | ||||
|   need_lib_prefix=no | ||||
|   need_version=no | ||||
|   hardcode_into_libs=yes | ||||
|   if test "$host_cpu" = ia64; then | ||||
|     # AIX 5 supports IA64 | ||||
|     library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' | ||||
|  | @ -1995,6 +2004,7 @@ aix4* | aix5*) | |||
|     fi | ||||
|     shlibpath_var=LIBPATH | ||||
|   fi | ||||
|   hardcode_into_libs=yes | ||||
|   ;; | ||||
| 
 | ||||
| amigaos*) | ||||
|  | @ -2042,7 +2052,7 @@ cygwin* | mingw* | pw32*) | |||
|     ;; | ||||
|   yes,mingw*) | ||||
|     library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' | ||||
|     sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` | ||||
|     sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` | ||||
|     ;; | ||||
|   yes,pw32*) | ||||
|     library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' | ||||
|  | @ -2074,6 +2084,18 @@ freebsd1*) | |||
|   dynamic_linker=no | ||||
|   ;; | ||||
| 
 | ||||
| freebsd*-gnu*) | ||||
|   version_type=linux | ||||
|   need_lib_prefix=no | ||||
|   need_version=no | ||||
|   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' | ||||
|   soname_spec='${libname}${release}.so$major' | ||||
|   shlibpath_var=LD_LIBRARY_PATH | ||||
|   shlibpath_overrides_runpath=no | ||||
|   hardcode_into_libs=yes | ||||
|   dynamic_linker='GNU/FreeBSD ld.so' | ||||
|   ;; | ||||
| 
 | ||||
| freebsd*) | ||||
|   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` | ||||
|   version_type=freebsd-$objformat | ||||
|  | @ -2239,11 +2261,13 @@ os2*) | |||
| osf3* | osf4* | osf5*) | ||||
|   version_type=osf | ||||
|   need_version=no | ||||
|   soname_spec='${libname}${release}.so' | ||||
|   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' | ||||
|   need_lib_prefix=no | ||||
|   soname_spec='${libname}${release}.so$major' | ||||
|   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' | ||||
|   shlibpath_var=LD_LIBRARY_PATH | ||||
|   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" | ||||
|   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" | ||||
|   hardcode_into_libs=yes | ||||
|   ;; | ||||
| 
 | ||||
| sco3.2v5*) | ||||
|  | @ -3295,7 +3319,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" | |||
| # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies | ||||
| #  -- PORTME fill in with the dynamic library characteristics | ||||
| AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], | ||||
| [AC_CACHE_CHECK([how to recognise dependant libraries], | ||||
| [AC_CACHE_CHECK([how to recognise dependent libraries], | ||||
| lt_cv_deplibs_check_method, | ||||
| [lt_cv_file_magic_cmd='$MAGIC_CMD' | ||||
| lt_cv_file_magic_test_file= | ||||
|  | @ -3664,7 +3688,7 @@ $debug || | |||
|     # Check for GNU sed and select it if it is found. | ||||
|     if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then | ||||
|       lt_cv_path_SED=${_sed} | ||||
|       break; | ||||
|       break | ||||
|     fi | ||||
|     while true; do | ||||
|       cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" | ||||
|  | @ -3767,7 +3791,7 @@ AC_CONFIG_SUBDIRS([libltdl]) | |||
| # ----------- | ||||
| # Perform all the checks necessary for compilation of the ltdl objects | ||||
| #  -- including compiler checks and header checks. | ||||
| AC_DEFUN(AC_LIB_LTDL, | ||||
| AC_DEFUN([AC_LIB_LTDL], | ||||
| [AC_PREREQ(2.13) | ||||
| AC_REQUIRE([AC_PROG_CC]) | ||||
| AC_REQUIRE([AC_C_CONST]) | ||||
|  | @ -3800,7 +3824,7 @@ AC_CHECK_FUNCS([memmove strcmp]) | |||
| 
 | ||||
| # AC_LTDL_ENABLE_INSTALL | ||||
| # ---------------------- | ||||
| AC_DEFUN(AC_LTDL_ENABLE_INSTALL, | ||||
| AC_DEFUN([AC_LTDL_ENABLE_INSTALL], | ||||
| [AC_ARG_ENABLE(ltdl-install, | ||||
| [  --enable-ltdl-install   install libltdl]) | ||||
| 
 | ||||
|  | @ -3810,14 +3834,17 @@ AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno) | |||
| 
 | ||||
| # AC_LTDL_SYS_DLOPEN_DEPLIBS | ||||
| # -------------------------- | ||||
| AC_DEFUN(AC_LTDL_SYS_DLOPEN_DEPLIBS, | ||||
| AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], | ||||
| [AC_REQUIRE([AC_CANONICAL_HOST]) | ||||
| AC_CACHE_CHECK([whether deplibs are loaded by dlopen], | ||||
| 	libltdl_cv_sys_dlopen_deplibs, [dnl | ||||
| 	# PORTME does your system automatically load deplibs for dlopen()? | ||||
| 	libltdl_cv_sys_dlopen_deplibs=unknown | ||||
| 	case "$host_os" in | ||||
| 	linux*) | ||||
|         hpux10*|hpux11*) | ||||
|           libltdl_cv_sys_dlopen_deplibs=yes | ||||
|           ;; | ||||
| 	linux*|freebsd*-gnu*) | ||||
| 	  libltdl_cv_sys_dlopen_deplibs=yes | ||||
| 	  ;; | ||||
| 	netbsd*) | ||||
|  | @ -3839,7 +3866,7 @@ fi | |||
| 
 | ||||
| # AC_LTDL_SHLIBEXT | ||||
| # ---------------- | ||||
| AC_DEFUN(AC_LTDL_SHLIBEXT, | ||||
| AC_DEFUN([AC_LTDL_SHLIBEXT], | ||||
| [AC_REQUIRE([_LT_AC_LTCONFIG_HACK]) | ||||
| AC_CACHE_CHECK([which extension is used for shared libraries], | ||||
|   libltdl_cv_shlibext, | ||||
|  | @ -3859,7 +3886,7 @@ fi | |||
| 
 | ||||
| # AC_LTDL_SHLIBPATH | ||||
| # ----------------- | ||||
| AC_DEFUN(AC_LTDL_SHLIBPATH, | ||||
| AC_DEFUN([AC_LTDL_SHLIBPATH], | ||||
| [AC_REQUIRE([_LT_AC_LTCONFIG_HACK]) | ||||
| AC_CACHE_CHECK([which variable specifies run-time library path], | ||||
|   libltdl_cv_shlibpath_var, [libltdl_cv_shlibpath_var="$shlibpath_var"]) | ||||
|  | @ -3871,7 +3898,7 @@ fi | |||
| 
 | ||||
| # AC_LTDL_SYSSEARCHPATH | ||||
| # --------------------- | ||||
| AC_DEFUN(AC_LTDL_SYSSEARCHPATH, | ||||
| AC_DEFUN([AC_LTDL_SYSSEARCHPATH], | ||||
| [AC_REQUIRE([_LT_AC_LTCONFIG_HACK]) | ||||
| AC_CACHE_CHECK([for the default library search path], | ||||
|   libltdl_cv_sys_search_path, [libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec"]) | ||||
|  | @ -3895,7 +3922,7 @@ fi | |||
| 
 | ||||
| # AC_LTDL_OBJDIR | ||||
| # -------------- | ||||
| AC_DEFUN(AC_LTDL_OBJDIR, | ||||
| AC_DEFUN([AC_LTDL_OBJDIR], | ||||
| [AC_CACHE_CHECK([for objdir], | ||||
|   libltdl_cv_objdir, [libltdl_cv_objdir="$objdir" | ||||
| if test -n "$objdir"; then | ||||
|  | @ -3917,7 +3944,7 @@ AC_DEFINE_UNQUOTED(LTDL_OBJDIR, "$libltdl_cv_objdir/", | |||
| 
 | ||||
| # AC_LTDL_DLPREOPEN | ||||
| # ----------------- | ||||
| AC_DEFUN(AC_LTDL_DLPREOPEN, | ||||
| AC_DEFUN([AC_LTDL_DLPREOPEN], | ||||
| [AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl | ||||
| AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen], | ||||
|        libltdl_cv_preloaded_symbols, [dnl | ||||
|  | @ -3935,7 +3962,7 @@ fi | |||
| 
 | ||||
| # AC_LTDL_DLLIB | ||||
| # ------------- | ||||
| AC_DEFUN(AC_LTDL_DLLIB, | ||||
| AC_DEFUN([AC_LTDL_DLLIB], | ||||
| [LIBADD_DL= | ||||
| AC_SUBST(LIBADD_DL) | ||||
| 
 | ||||
|  | @ -3982,7 +4009,7 @@ fi | |||
| 
 | ||||
| # AC_LTDL_SYMBOL_USCORE | ||||
| # --------------------- | ||||
| AC_DEFUN(AC_LTDL_SYMBOL_USCORE, | ||||
| AC_DEFUN([AC_LTDL_SYMBOL_USCORE], | ||||
| [dnl does the compiler prefix global symbols with an underscore? | ||||
| AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl | ||||
| AC_MSG_CHECKING([for _ prefix in compiled symbols]) | ||||
|  | @ -4021,7 +4048,7 @@ AC_MSG_RESULT($ac_cv_sys_symbol_underscore) | |||
| 
 | ||||
| # AC_LTDL_DLSYM_USCORE | ||||
| # -------------------- | ||||
| AC_DEFUN(AC_LTDL_DLSYM_USCORE, | ||||
| AC_DEFUN([AC_LTDL_DLSYM_USCORE], | ||||
| [AC_REQUIRE([AC_LTDL_SYMBOL_USCORE])dnl | ||||
| if test x"$ac_cv_sys_symbol_underscore" = xyes; then | ||||
|   if test x"$ac_cv_func_dlopen" = xyes || | ||||
|  |  | |||
|  | @ -1,15 +1,14 @@ | |||
| # aclocal.m4 generated automatically by aclocal 1.5 | ||||
| dnl aclocal.m4 generated automatically by aclocal 1.4-p5 | ||||
| 
 | ||||
| # Copyright 1996, 1997, 1998, 1999, 2000, 2001 | ||||
| # 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. | ||||
| dnl Copyright (C) 1994, 1995-8, 1999, 2001 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. | ||||
| 
 | ||||
| # This program is distributed in the hope that it will be useful, | ||||
| # but WITHOUT ANY WARRANTY, to the extent permitted by law; without | ||||
| # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||||
| # PARTICULAR PURPOSE. | ||||
| dnl This program is distributed in the hope that it will be useful, | ||||
| dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without | ||||
| dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||||
| dnl PARTICULAR PURPOSE. | ||||
| 
 | ||||
| # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- | ||||
| 
 | ||||
|  | @ -212,6 +211,9 @@ hpux*) # Its linker distinguishes data from code symbols | |||
| irix* | nonstopux*) | ||||
|   symcode='[[BCDEGRST]]' | ||||
|   ;; | ||||
| osf*) | ||||
|   symcode='[[BCDEGQRST]]' | ||||
|   ;; | ||||
| solaris* | sysv5*) | ||||
|   symcode='[[BDT]]' | ||||
|   ;; | ||||
|  | @ -308,7 +310,7 @@ EOF | |||
| 	  save_CFLAGS="$CFLAGS" | ||||
| 	  LIBS="conftstm.$ac_objext" | ||||
| 	  CFLAGS="$CFLAGS$no_builtin_flag" | ||||
| 	  if AC_TRY_EVAL(ac_link) && test -s conftest; then | ||||
| 	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then | ||||
| 	    pipe_works=yes | ||||
| 	  fi | ||||
| 	  LIBS="$save_LIBS" | ||||
|  | @ -1426,10 +1428,12 @@ else | |||
|       # need to do runtime linking. | ||||
|       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) | ||||
| 	for ld_flag in $LDFLAGS; do | ||||
| 	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then | ||||
| 	  case $ld_flag in | ||||
| 	  *-brtl*) | ||||
| 	    aix_use_runtimelinking=yes | ||||
| 	    break | ||||
| 	  fi | ||||
| 	  ;; | ||||
| 	  esac | ||||
| 	done | ||||
|       esac | ||||
| 
 | ||||
|  | @ -1545,7 +1549,7 @@ else | |||
|     #        cross-compilation, but unfortunately the echo tests do not | ||||
|     #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles | ||||
|     #	     `"' quotes if we put them in here... so don't! | ||||
|     archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' | ||||
|     archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' | ||||
|     # We need to add '_' to the symbols in $export_symbols first | ||||
|     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' | ||||
|     hardcode_direct=yes | ||||
|  | @ -1600,10 +1604,11 @@ else | |||
|   irix5* | irix6* | nonstopux*) | ||||
|     if test "$GCC" = yes; then | ||||
|       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||||
|       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||||
|     else | ||||
|       archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' | ||||
|       hardcode_libdir_flag_spec='-rpath $libdir' | ||||
|     fi | ||||
|     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||||
|     hardcode_libdir_separator=: | ||||
|     link_all_deplibs=yes | ||||
|     ;; | ||||
|  | @ -1631,7 +1636,7 @@ else | |||
|     hardcode_direct=yes | ||||
|     hardcode_shlibpath_var=no | ||||
|     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | ||||
|       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' | ||||
|       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||||
|       hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||||
|       export_dynamic_flag_spec='${wl}-E' | ||||
|     else | ||||
|  | @ -1641,7 +1646,7 @@ else | |||
| 	hardcode_libdir_flag_spec='-R$libdir' | ||||
|         ;; | ||||
|       *) | ||||
|         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' | ||||
|         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||||
|         hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||||
|         ;; | ||||
|       esac | ||||
|  | @ -1910,6 +1915,9 @@ aix3*) | |||
| 
 | ||||
| aix4* | aix5*) | ||||
|   version_type=linux | ||||
|   need_lib_prefix=no | ||||
|   need_version=no | ||||
|   hardcode_into_libs=yes | ||||
|   if test "$host_cpu" = ia64; then | ||||
|     # AIX 5 supports IA64 | ||||
|     library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' | ||||
|  | @ -1948,6 +1956,7 @@ aix4* | aix5*) | |||
|     fi | ||||
|     shlibpath_var=LIBPATH | ||||
|   fi | ||||
|   hardcode_into_libs=yes | ||||
|   ;; | ||||
| 
 | ||||
| amigaos*) | ||||
|  | @ -1995,7 +2004,7 @@ cygwin* | mingw* | pw32*) | |||
|     ;; | ||||
|   yes,mingw*) | ||||
|     library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' | ||||
|     sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` | ||||
|     sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` | ||||
|     ;; | ||||
|   yes,pw32*) | ||||
|     library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' | ||||
|  | @ -2192,11 +2201,12 @@ os2*) | |||
| osf3* | osf4* | osf5*) | ||||
|   version_type=osf | ||||
|   need_version=no | ||||
|   soname_spec='${libname}${release}.so' | ||||
|   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' | ||||
|   soname_spec='${libname}${release}.so$major' | ||||
|   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' | ||||
|   shlibpath_var=LD_LIBRARY_PATH | ||||
|   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" | ||||
|   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" | ||||
|   hardcode_into_libs=yes | ||||
|   ;; | ||||
| 
 | ||||
| sco3.2v5*) | ||||
|  | @ -3226,7 +3236,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" | |||
| # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies | ||||
| #  -- PORTME fill in with the dynamic library characteristics | ||||
| AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], | ||||
| [AC_CACHE_CHECK([how to recognise dependant libraries], | ||||
| [AC_CACHE_CHECK([how to recognise dependent libraries], | ||||
| lt_cv_deplibs_check_method, | ||||
| [lt_cv_file_magic_cmd='$MAGIC_CMD' | ||||
| lt_cv_file_magic_test_file= | ||||
|  | @ -3593,7 +3603,7 @@ $debug || | |||
|     # Check for GNU sed and select it if it is found. | ||||
|     if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then | ||||
|       lt_cv_path_SED=${_sed} | ||||
|       break; | ||||
|       break | ||||
|     fi | ||||
|     while true; do | ||||
|       cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" | ||||
|  | @ -3675,7 +3685,7 @@ AC_CONFIG_SUBDIRS([libltdl]) | |||
| # ----------- | ||||
| # Perform all the checks necessary for compilation of the ltdl objects | ||||
| #  -- including compiler checks and header checks. | ||||
| AC_DEFUN(AC_LIB_LTDL, | ||||
| AC_DEFUN([AC_LIB_LTDL], | ||||
| [AC_PREREQ(2.13) | ||||
| AC_REQUIRE([AC_PROG_CC]) | ||||
| AC_REQUIRE([AC_C_CONST]) | ||||
|  | @ -3708,7 +3718,7 @@ AC_CHECK_FUNCS([memmove strcmp]) | |||
| 
 | ||||
| # AC_LTDL_ENABLE_INSTALL | ||||
| # ---------------------- | ||||
| AC_DEFUN(AC_LTDL_ENABLE_INSTALL, | ||||
| AC_DEFUN([AC_LTDL_ENABLE_INSTALL], | ||||
| [AC_ARG_ENABLE(ltdl-install, | ||||
| [  --enable-ltdl-install   install libltdl]) | ||||
| 
 | ||||
|  | @ -3718,13 +3728,16 @@ AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno) | |||
| 
 | ||||
| # AC_LTDL_SYS_DLOPEN_DEPLIBS | ||||
| # -------------------------- | ||||
| AC_DEFUN(AC_LTDL_SYS_DLOPEN_DEPLIBS, | ||||
| AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], | ||||
| [AC_REQUIRE([AC_CANONICAL_HOST]) | ||||
| AC_CACHE_CHECK([whether deplibs are loaded by dlopen], | ||||
| 	libltdl_cv_sys_dlopen_deplibs, [dnl | ||||
| 	# PORTME does your system automatically load deplibs for dlopen()? | ||||
| 	libltdl_cv_sys_dlopen_deplibs=unknown | ||||
| 	case "$host_os" in | ||||
|         hpux10*|hpux11*) | ||||
|           libltdl_cv_sys_dlopen_deplibs=yes | ||||
|           ;; | ||||
| 	linux*) | ||||
| 	  libltdl_cv_sys_dlopen_deplibs=yes | ||||
| 	  ;; | ||||
|  | @ -3747,7 +3760,7 @@ fi | |||
| 
 | ||||
| # AC_LTDL_SHLIBEXT | ||||
| # ---------------- | ||||
| AC_DEFUN(AC_LTDL_SHLIBEXT, | ||||
| AC_DEFUN([AC_LTDL_SHLIBEXT], | ||||
| [AC_REQUIRE([_LT_AC_LTCONFIG_HACK]) | ||||
| AC_CACHE_CHECK([which extension is used for shared libraries], | ||||
|   libltdl_cv_shlibext, | ||||
|  | @ -3767,7 +3780,7 @@ fi | |||
| 
 | ||||
| # AC_LTDL_SHLIBPATH | ||||
| # ----------------- | ||||
| AC_DEFUN(AC_LTDL_SHLIBPATH, | ||||
| AC_DEFUN([AC_LTDL_SHLIBPATH], | ||||
| [AC_REQUIRE([_LT_AC_LTCONFIG_HACK]) | ||||
| AC_CACHE_CHECK([which variable specifies run-time library path], | ||||
|   libltdl_cv_shlibpath_var, [libltdl_cv_shlibpath_var="$shlibpath_var"]) | ||||
|  | @ -3779,7 +3792,7 @@ fi | |||
| 
 | ||||
| # AC_LTDL_SYSSEARCHPATH | ||||
| # --------------------- | ||||
| AC_DEFUN(AC_LTDL_SYSSEARCHPATH, | ||||
| AC_DEFUN([AC_LTDL_SYSSEARCHPATH], | ||||
| [AC_REQUIRE([_LT_AC_LTCONFIG_HACK]) | ||||
| AC_CACHE_CHECK([for the default library search path], | ||||
|   libltdl_cv_sys_search_path, [libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec"]) | ||||
|  | @ -3803,7 +3816,7 @@ fi | |||
| 
 | ||||
| # AC_LTDL_OBJDIR | ||||
| # -------------- | ||||
| AC_DEFUN(AC_LTDL_OBJDIR, | ||||
| AC_DEFUN([AC_LTDL_OBJDIR], | ||||
| [AC_CACHE_CHECK([for objdir], | ||||
|   libltdl_cv_objdir, [libltdl_cv_objdir="$objdir" | ||||
| if test -n "$objdir"; then | ||||
|  | @ -3825,7 +3838,7 @@ AC_DEFINE_UNQUOTED(LTDL_OBJDIR, "$libltdl_cv_objdir/", | |||
| 
 | ||||
| # AC_LTDL_DLPREOPEN | ||||
| # ----------------- | ||||
| AC_DEFUN(AC_LTDL_DLPREOPEN, | ||||
| AC_DEFUN([AC_LTDL_DLPREOPEN], | ||||
| [AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl | ||||
| AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen], | ||||
|        libltdl_cv_preloaded_symbols, [dnl | ||||
|  | @ -3843,7 +3856,7 @@ fi | |||
| 
 | ||||
| # AC_LTDL_DLLIB | ||||
| # ------------- | ||||
| AC_DEFUN(AC_LTDL_DLLIB, | ||||
| AC_DEFUN([AC_LTDL_DLLIB], | ||||
| [LIBADD_DL= | ||||
| AC_SUBST(LIBADD_DL) | ||||
| 
 | ||||
|  | @ -3890,7 +3903,7 @@ fi | |||
| 
 | ||||
| # AC_LTDL_SYMBOL_USCORE | ||||
| # --------------------- | ||||
| AC_DEFUN(AC_LTDL_SYMBOL_USCORE, | ||||
| AC_DEFUN([AC_LTDL_SYMBOL_USCORE], | ||||
| [dnl does the compiler prefix global symbols with an underscore? | ||||
| AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl | ||||
| AC_MSG_CHECKING([for _ prefix in compiled symbols]) | ||||
|  | @ -3929,7 +3942,7 @@ AC_MSG_RESULT($ac_cv_sys_symbol_underscore) | |||
| 
 | ||||
| # AC_LTDL_DLSYM_USCORE | ||||
| # -------------------- | ||||
| AC_DEFUN(AC_LTDL_DLSYM_USCORE, | ||||
| AC_DEFUN([AC_LTDL_DLSYM_USCORE], | ||||
| [AC_REQUIRE([AC_LTDL_SYMBOL_USCORE])dnl | ||||
| if test x"$ac_cv_sys_symbol_underscore" = xyes; then | ||||
|   if test x"$ac_cv_func_dlopen" = xyes || | ||||
|  | @ -3992,25 +4005,11 @@ AC_CHECK_TYPES([error_t], | |||
| AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next argz_stringify]) | ||||
| ])# AC_LTDL_FUNC_ARGZ | ||||
| 
 | ||||
| # serial 3 | ||||
| 
 | ||||
| # AM_CONDITIONAL(NAME, SHELL-CONDITION) | ||||
| # ------------------------------------- | ||||
| # Define a conditional. | ||||
| # | ||||
| # FIXME: Once using 2.50, use this: | ||||
| # m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl | ||||
| 
 | ||||
| AC_DEFUN([AM_CONDITIONAL], | ||||
| [ifelse([$1], [TRUE], | ||||
|         [errprint(__file__:__line__: [$0: invalid condition: $1 | ||||
| ])dnl | ||||
| m4exit(1)])dnl | ||||
| ifelse([$1], [FALSE], | ||||
|        [errprint(__file__:__line__: [$0: invalid condition: $1 | ||||
| ])dnl | ||||
| m4exit(1)])dnl | ||||
| AC_SUBST([$1_TRUE]) | ||||
| AC_SUBST([$1_FALSE]) | ||||
| [AC_SUBST($1_TRUE) | ||||
| AC_SUBST($1_FALSE) | ||||
| if $2; then | ||||
|   $1_TRUE= | ||||
|   $1_FALSE='#' | ||||
|  | @ -4023,119 +4022,57 @@ fi]) | |||
| # some checks are only needed if your package does certain things. | ||||
| # But this isn't really a big deal. | ||||
| 
 | ||||
| # serial 5 | ||||
| # serial 1 | ||||
| 
 | ||||
| # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be | ||||
| # written in clear, in which case automake, when reading aclocal.m4, | ||||
| # will think it sees a *use*, and therefore will trigger all it's | ||||
| # C support machinery.  Also note that it means that autoscan, seeing | ||||
| # CC etc. in the Makefile, will ask for an AC_PROG_CC use... | ||||
| dnl Usage: | ||||
| dnl AM_INIT_AUTOMAKE(package,version, [no-define]) | ||||
| 
 | ||||
| 
 | ||||
| # We require 2.13 because we rely on SHELL being computed by configure. | ||||
| AC_PREREQ([2.13]) | ||||
| 
 | ||||
| # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) | ||||
| # ----------------------------------------------------------- | ||||
| # If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED. | ||||
| # The purpose of this macro is to provide the user with a means to | ||||
| # check macros which are provided without letting her know how the | ||||
| # information is coded. | ||||
| # If this macro is not defined by Autoconf, define it here. | ||||
| ifdef([AC_PROVIDE_IFELSE], | ||||
|       [], | ||||
|       [define([AC_PROVIDE_IFELSE], | ||||
|               [ifdef([AC_PROVIDE_$1], | ||||
|                      [$2], [$3])])]) | ||||
| 
 | ||||
| 
 | ||||
| # AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) | ||||
| # ---------------------------------------------- | ||||
| AC_DEFUN([AM_INIT_AUTOMAKE], | ||||
| [AC_REQUIRE([AC_PROG_INSTALL])dnl | ||||
| # test to see if srcdir already configured | ||||
| if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && | ||||
|    test -f $srcdir/config.status; then | ||||
|   AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) | ||||
| [AC_REQUIRE([AC_PROG_INSTALL]) | ||||
| PACKAGE=[$1] | ||||
| AC_SUBST(PACKAGE) | ||||
| VERSION=[$2] | ||||
| AC_SUBST(VERSION) | ||||
| dnl test to see if srcdir already configured | ||||
| if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then | ||||
|   AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) | ||||
| fi | ||||
| 
 | ||||
| # Define the identity of the package. | ||||
| PACKAGE=$1 | ||||
| AC_SUBST(PACKAGE)dnl | ||||
| VERSION=$2 | ||||
| AC_SUBST(VERSION)dnl | ||||
| ifelse([$3],, | ||||
| [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) | ||||
| AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) | ||||
| 
 | ||||
| # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow | ||||
| # the ones we care about. | ||||
| ifdef([m4_pattern_allow], | ||||
|       [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl | ||||
| 
 | ||||
| # Autoconf 2.50 always computes EXEEXT.  However we need to be | ||||
| # compatible with 2.13, for now.  So we always define EXEEXT, but we | ||||
| # don't compute it. | ||||
| AC_SUBST(EXEEXT) | ||||
| # Similar for OBJEXT -- only we only use OBJEXT if the user actually | ||||
| # requests that it be used.  This is a bit dumb. | ||||
| : ${OBJEXT=o} | ||||
| AC_SUBST(OBJEXT) | ||||
| 
 | ||||
| # Some tools Automake needs. | ||||
| AC_REQUIRE([AM_SANITY_CHECK])dnl | ||||
| AC_REQUIRE([AC_ARG_PROGRAM])dnl | ||||
| AM_MISSING_PROG(ACLOCAL, aclocal) | ||||
| AM_MISSING_PROG(AUTOCONF, autoconf) | ||||
| AM_MISSING_PROG(AUTOMAKE, automake) | ||||
| AM_MISSING_PROG(AUTOHEADER, autoheader) | ||||
| AM_MISSING_PROG(MAKEINFO, makeinfo) | ||||
| AM_MISSING_PROG(AMTAR, tar) | ||||
| AM_PROG_INSTALL_SH | ||||
| AM_PROG_INSTALL_STRIP | ||||
| # We need awk for the "check" target.  The system "awk" is bad on | ||||
| # some platforms. | ||||
| AC_REQUIRE([AC_PROG_AWK])dnl | ||||
| AC_REQUIRE([AC_PROG_MAKE_SET])dnl | ||||
| AC_REQUIRE([AM_DEP_TRACK])dnl | ||||
| AC_REQUIRE([AM_SET_DEPDIR])dnl | ||||
| AC_PROVIDE_IFELSE([AC_PROG_][CC], | ||||
|                   [_AM_DEPENDENCIES(CC)], | ||||
|                   [define([AC_PROG_][CC], | ||||
|                           defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl | ||||
| AC_PROVIDE_IFELSE([AC_PROG_][CXX], | ||||
|                   [_AM_DEPENDENCIES(CXX)], | ||||
|                   [define([AC_PROG_][CXX], | ||||
|                           defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl | ||||
| ]) | ||||
| AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) | ||||
| AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) | ||||
| AC_REQUIRE([AM_SANITY_CHECK]) | ||||
| AC_REQUIRE([AC_ARG_PROGRAM]) | ||||
| dnl FIXME This is truly gross. | ||||
| missing_dir=`cd $ac_aux_dir && pwd` | ||||
| AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) | ||||
| AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) | ||||
| AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) | ||||
| AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) | ||||
| AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) | ||||
| AC_REQUIRE([AC_PROG_MAKE_SET])]) | ||||
| 
 | ||||
| # | ||||
| # Check to make sure that the build environment is sane. | ||||
| # | ||||
| 
 | ||||
| # serial 3 | ||||
| 
 | ||||
| # AM_SANITY_CHECK | ||||
| # --------------- | ||||
| AC_DEFUN([AM_SANITY_CHECK], | ||||
| [AC_MSG_CHECKING([whether build environment is sane]) | ||||
| # Just in case | ||||
| sleep 1 | ||||
| echo timestamp > conftest.file | ||||
| echo timestamp > conftestfile | ||||
| # Do `set' in a subshell so we don't clobber the current shell's | ||||
| # arguments.  Must try -L first in case configure is actually a | ||||
| # symlink; some systems play weird games with the mod time of symlinks | ||||
| # (eg FreeBSD returns the mod time of the symlink's containing | ||||
| # directory). | ||||
| if ( | ||||
|    set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` | ||||
|    if test "$[*]" = "X"; then | ||||
|    set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` | ||||
|    if test "[$]*" = "X"; then | ||||
|       # -L didn't work. | ||||
|       set X `ls -t $srcdir/configure conftest.file` | ||||
|       set X `ls -t $srcdir/configure conftestfile` | ||||
|    fi | ||||
|    rm -f conftest.file | ||||
|    if test "$[*]" != "X $srcdir/configure conftest.file" \ | ||||
|       && test "$[*]" != "X conftest.file $srcdir/configure"; then | ||||
|    if test "[$]*" != "X $srcdir/configure conftestfile" \ | ||||
|       && test "[$]*" != "X conftestfile $srcdir/configure"; then | ||||
| 
 | ||||
|       # If neither matched, then we have a broken ls.  This can happen | ||||
|       # if, for instance, CONFIG_SHELL is bash and it inherits a | ||||
|  | @ -4145,7 +4082,7 @@ if ( | |||
| alias in your environment]) | ||||
|    fi | ||||
| 
 | ||||
|    test "$[2]" = conftest.file | ||||
|    test "[$]2" = conftestfile | ||||
|    ) | ||||
| then | ||||
|    # Ok. | ||||
|  | @ -4154,390 +4091,47 @@ else | |||
|    AC_MSG_ERROR([newly created file is older than distributed files! | ||||
| Check your system clock]) | ||||
| fi | ||||
| rm -f conftest* | ||||
| AC_MSG_RESULT(yes)]) | ||||
| 
 | ||||
| 
 | ||||
| # serial 2 | ||||
| 
 | ||||
| # AM_MISSING_PROG(NAME, PROGRAM) | ||||
| # ------------------------------ | ||||
| dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) | ||||
| dnl The program must properly implement --version. | ||||
| AC_DEFUN([AM_MISSING_PROG], | ||||
| [AC_REQUIRE([AM_MISSING_HAS_RUN]) | ||||
| $1=${$1-"${am_missing_run}$2"} | ||||
| [AC_MSG_CHECKING(for working $2) | ||||
| # Run test in a subshell; some versions of sh will print an error if | ||||
| # an executable is not found, even if stderr is redirected. | ||||
| # Redirect stdin to placate older versions of autoconf.  Sigh. | ||||
| if ($2 --version) < /dev/null > /dev/null 2>&1; then | ||||
|    $1=$2 | ||||
|    AC_MSG_RESULT(found) | ||||
| else | ||||
|    $1="$3/missing $2" | ||||
|    AC_MSG_RESULT(missing) | ||||
| fi | ||||
| AC_SUBST($1)]) | ||||
| 
 | ||||
| 
 | ||||
| # AM_MISSING_HAS_RUN | ||||
| # ------------------ | ||||
| # Define MISSING if not defined so far and test if it supports --run. | ||||
| # If it does, set am_missing_run to use it, otherwise, to nothing. | ||||
| AC_DEFUN([AM_MISSING_HAS_RUN], | ||||
| [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | ||||
| test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" | ||||
| # Use eval to expand $SHELL | ||||
| if eval "$MISSING --run true"; then | ||||
|   am_missing_run="$MISSING --run " | ||||
| else | ||||
|   am_missing_run= | ||||
|   am_backtick='`' | ||||
|   AC_MSG_WARN([${am_backtick}missing' script is too old or missing]) | ||||
| fi | ||||
| ]) | ||||
| 
 | ||||
| # AM_AUX_DIR_EXPAND | ||||
| 
 | ||||
| # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets | ||||
| # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to | ||||
| # `$srcdir', `$srcdir/..', or `$srcdir/../..'. | ||||
| # | ||||
| # Of course, Automake must honor this variable whenever it calls a | ||||
| # tool from the auxiliary directory.  The problem is that $srcdir (and | ||||
| # therefore $ac_aux_dir as well) can be either absolute or relative, | ||||
| # depending on how configure is run.  This is pretty annoying, since | ||||
| # it makes $ac_aux_dir quite unusable in subdirectories: in the top | ||||
| # source directory, any form will work fine, but in subdirectories a | ||||
| # relative path needs to be adjusted first. | ||||
| # | ||||
| # $ac_aux_dir/missing | ||||
| #    fails when called from a subdirectory if $ac_aux_dir is relative | ||||
| # $top_srcdir/$ac_aux_dir/missing | ||||
| #    fails if $ac_aux_dir is absolute, | ||||
| #    fails when called from a subdirectory in a VPATH build with | ||||
| #          a relative $ac_aux_dir | ||||
| # | ||||
| # The reason of the latter failure is that $top_srcdir and $ac_aux_dir | ||||
| # are both prefixed by $srcdir.  In an in-source build this is usually | ||||
| # harmless because $srcdir is `.', but things will broke when you | ||||
| # start a VPATH build or use an absolute $srcdir. | ||||
| # | ||||
| # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, | ||||
| # iff we strip the leading $srcdir from $ac_aux_dir.  That would be: | ||||
| #   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` | ||||
| # and then we would define $MISSING as | ||||
| #   MISSING="\${SHELL} $am_aux_dir/missing" | ||||
| # This will work as long as MISSING is not called from configure, because | ||||
| # unfortunately $(top_srcdir) has no meaning in configure. | ||||
| # However there are other variables, like CC, which are often used in | ||||
| # configure, and could therefore not use this "fixed" $ac_aux_dir. | ||||
| # | ||||
| # Another solution, used here, is to always expand $ac_aux_dir to an | ||||
| # absolute PATH.  The drawback is that using absolute paths prevent a | ||||
| # configured tree to be moved without reconfiguration. | ||||
| 
 | ||||
| AC_DEFUN([AM_AUX_DIR_EXPAND], [ | ||||
| # expand $ac_aux_dir to an absolute path | ||||
| am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` | ||||
| ]) | ||||
| 
 | ||||
| # AM_PROG_INSTALL_SH | ||||
| # ------------------ | ||||
| # Define $install_sh. | ||||
| AC_DEFUN([AM_PROG_INSTALL_SH], | ||||
| [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | ||||
| install_sh=${install_sh-"$am_aux_dir/install-sh"} | ||||
| AC_SUBST(install_sh)]) | ||||
| 
 | ||||
| # One issue with vendor `install' (even GNU) is that you can't | ||||
| # specify the program used to strip binaries.  This is especially | ||||
| # annoying in cross-compiling environments, where the build's strip | ||||
| # is unlikely to handle the host's binaries. | ||||
| # Fortunately install-sh will honor a STRIPPROG variable, so we | ||||
| # always use install-sh in `make install-strip', and initialize | ||||
| # STRIPPROG with the value of the STRIP variable (set by the user). | ||||
| AC_DEFUN([AM_PROG_INSTALL_STRIP], | ||||
| [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl | ||||
| INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" | ||||
| AC_SUBST([INSTALL_STRIP_PROGRAM])]) | ||||
| 
 | ||||
| # serial 4						-*- Autoconf -*- | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be | ||||
| # written in clear, in which case automake, when reading aclocal.m4, | ||||
| # will think it sees a *use*, and therefore will trigger all it's | ||||
| # C support machinery.  Also note that it means that autoscan, seeing | ||||
| # CC etc. in the Makefile, will ask for an AC_PROG_CC use... | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| # _AM_DEPENDENCIES(NAME) | ||||
| # --------------------- | ||||
| # See how the compiler implements dependency checking. | ||||
| # NAME is "CC", "CXX" or "OBJC". | ||||
| # We try a few techniques and use that to set a single cache variable. | ||||
| # | ||||
| # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was | ||||
| # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular | ||||
| # dependency, and given that the user is not expected to run this macro, | ||||
| # just rely on AC_PROG_CC. | ||||
| AC_DEFUN([_AM_DEPENDENCIES], | ||||
| [AC_REQUIRE([AM_SET_DEPDIR])dnl | ||||
| AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl | ||||
| AC_REQUIRE([AM_MAKE_INCLUDE])dnl | ||||
| AC_REQUIRE([AM_DEP_TRACK])dnl | ||||
| 
 | ||||
| ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=], | ||||
|        [$1], CXX,  [depcc="$CXX"  am_compiler_list=], | ||||
|        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'] | ||||
|        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'], | ||||
|                    [depcc="$$1"   am_compiler_list=]) | ||||
| 
 | ||||
| AC_CACHE_CHECK([dependency style of $depcc], | ||||
|                [am_cv_$1_dependencies_compiler_type], | ||||
| [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then | ||||
|   # We make a subdir and do the tests there.  Otherwise we can end up | ||||
|   # making bogus files that we don't know about and never remove.  For | ||||
|   # instance it was reported that on HP-UX the gcc test will end up | ||||
|   # making a dummy file named `D' -- because `-MD' means `put the output | ||||
|   # in D'. | ||||
|   mkdir conftest.dir | ||||
|   # Copy depcomp to subdir because otherwise we won't find it if we're | ||||
|   # using a relative directory. | ||||
|   cp "$am_depcomp" conftest.dir | ||||
|   cd conftest.dir | ||||
| 
 | ||||
|   am_cv_$1_dependencies_compiler_type=none | ||||
|   if test "$am_compiler_list" = ""; then | ||||
|      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` | ||||
|   fi | ||||
|   for depmode in $am_compiler_list; do | ||||
|     # We need to recreate these files for each test, as the compiler may | ||||
|     # overwrite some of them when testing with obscure command lines. | ||||
|     # This happens at least with the AIX C compiler. | ||||
|     echo '#include "conftest.h"' > conftest.c | ||||
|     echo 'int i;' > conftest.h | ||||
|     echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf | ||||
| 
 | ||||
|     case $depmode in | ||||
|     nosideeffect) | ||||
|       # after this tag, mechanisms are not by side-effect, so they'll | ||||
|       # only be used when explicitly requested | ||||
|       if test "x$enable_dependency_tracking" = xyes; then | ||||
| 	continue | ||||
|       else | ||||
| 	break | ||||
|       fi | ||||
|       ;; | ||||
|     none) break ;; | ||||
|     esac | ||||
|     # We check with `-c' and `-o' for the sake of the "dashmstdout" | ||||
|     # mode.  It turns out that the SunPro C++ compiler does not properly | ||||
|     # handle `-M -o', and we need to detect this. | ||||
|     if depmode=$depmode \ | ||||
|        source=conftest.c object=conftest.o \ | ||||
|        depfile=conftest.Po tmpdepfile=conftest.TPo \ | ||||
|        $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && | ||||
|        grep conftest.h conftest.Po > /dev/null 2>&1 && | ||||
|        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then | ||||
|       am_cv_$1_dependencies_compiler_type=$depmode | ||||
|       break | ||||
|     fi | ||||
|   done | ||||
| 
 | ||||
|   cd .. | ||||
|   rm -rf conftest.dir | ||||
| else | ||||
|   am_cv_$1_dependencies_compiler_type=none | ||||
| fi | ||||
| ]) | ||||
| $1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" | ||||
| AC_SUBST([$1DEPMODE]) | ||||
| ]) | ||||
| 
 | ||||
| 
 | ||||
| # AM_SET_DEPDIR | ||||
| # ------------- | ||||
| # Choose a directory name for dependency files. | ||||
| # This macro is AC_REQUIREd in _AM_DEPENDENCIES | ||||
| AC_DEFUN([AM_SET_DEPDIR], | ||||
| [rm -f .deps 2>/dev/null | ||||
| mkdir .deps 2>/dev/null | ||||
| if test -d .deps; then | ||||
|   DEPDIR=.deps | ||||
| else | ||||
|   # MS-DOS does not allow filenames that begin with a dot. | ||||
|   DEPDIR=_deps | ||||
| fi | ||||
| rmdir .deps 2>/dev/null | ||||
| AC_SUBST(DEPDIR) | ||||
| ]) | ||||
| 
 | ||||
| 
 | ||||
| # AM_DEP_TRACK | ||||
| # ------------ | ||||
| AC_DEFUN([AM_DEP_TRACK], | ||||
| [AC_ARG_ENABLE(dependency-tracking, | ||||
| [  --disable-dependency-tracking Speeds up one-time builds | ||||
|   --enable-dependency-tracking  Do not reject slow dependency extractors]) | ||||
| if test "x$enable_dependency_tracking" != xno; then | ||||
|   am_depcomp="$ac_aux_dir/depcomp" | ||||
|   AMDEPBACKSLASH='\' | ||||
| fi | ||||
| AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) | ||||
| pushdef([subst], defn([AC_SUBST])) | ||||
| subst(AMDEPBACKSLASH) | ||||
| popdef([subst]) | ||||
| ]) | ||||
| 
 | ||||
| # Generate code to set up dependency tracking. | ||||
| # This macro should only be invoked once -- use via AC_REQUIRE. | ||||
| # Usage: | ||||
| # AM_OUTPUT_DEPENDENCY_COMMANDS | ||||
| 
 | ||||
| # | ||||
| # This code is only required when automatic dependency tracking | ||||
| # is enabled.  FIXME.  This creates each `.P' file that we will | ||||
| # need in order to bootstrap the dependency handling code. | ||||
| AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[ | ||||
| AC_OUTPUT_COMMANDS([ | ||||
| test x"$AMDEP_TRUE" != x"" || | ||||
| for mf in $CONFIG_FILES; do | ||||
|   case "$mf" in | ||||
|   Makefile) dirpart=.;; | ||||
|   */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; | ||||
|   *) continue;; | ||||
|   esac | ||||
|   grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue | ||||
|   # Extract the definition of DEP_FILES from the Makefile without | ||||
|   # running `make'. | ||||
|   DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` | ||||
|   test -z "$DEPDIR" && continue | ||||
|   # When using ansi2knr, U may be empty or an underscore; expand it | ||||
|   U=`sed -n -e '/^U = / s///p' < "$mf"` | ||||
|   test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" | ||||
|   # We invoke sed twice because it is the simplest approach to | ||||
|   # changing $(DEPDIR) to its actual value in the expansion. | ||||
|   for file in `sed -n -e ' | ||||
|     /^DEP_FILES = .*\\\\$/ { | ||||
|       s/^DEP_FILES = // | ||||
|       :loop | ||||
| 	s/\\\\$// | ||||
| 	p | ||||
| 	n | ||||
| 	/\\\\$/ b loop | ||||
|       p | ||||
|     } | ||||
|     /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ | ||||
|        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | ||||
|     # Make sure the directory exists. | ||||
|     test -f "$dirpart/$file" && continue | ||||
|     fdir=`echo "$file" | sed -e 's|/[^/]*$||'` | ||||
|     $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 | ||||
|     # echo "creating $dirpart/$file" | ||||
|     echo '# dummy' > "$dirpart/$file" | ||||
|   done | ||||
| done | ||||
| ], [AMDEP_TRUE="$AMDEP_TRUE" | ||||
| ac_aux_dir="$ac_aux_dir"])]) | ||||
| 
 | ||||
| # AM_MAKE_INCLUDE() | ||||
| # ----------------- | ||||
| # Check to see how make treats includes. | ||||
| AC_DEFUN([AM_MAKE_INCLUDE], | ||||
| [am_make=${MAKE-make} | ||||
| cat > confinc << 'END' | ||||
| doit: | ||||
| 	@echo done | ||||
| END | ||||
| # If we don't find an include directive, just comment out the code. | ||||
| AC_MSG_CHECKING([for style of include used by $am_make]) | ||||
| am__include='#' | ||||
| am__quote= | ||||
| _am_result=none | ||||
| # First try GNU make style include. | ||||
| echo "include confinc" > confmf | ||||
| # We grep out `Entering directory' and `Leaving directory' | ||||
| # messages which can occur if `w' ends up in MAKEFLAGS. | ||||
| # In particular we don't look at `^make:' because GNU make might | ||||
| # be invoked under some other name (usually "gmake"), in which | ||||
| # case it prints its new name instead of `make'. | ||||
| if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then | ||||
|    am__include=include | ||||
|    am__quote= | ||||
|    _am_result=GNU | ||||
| fi | ||||
| # Now try BSD make style include. | ||||
| if test "$am__include" = "#"; then | ||||
|    echo '.include "confinc"' > confmf | ||||
|    if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then | ||||
|       am__include=.include | ||||
|       am__quote='"' | ||||
|       _am_result=BSD | ||||
|    fi | ||||
| fi | ||||
| AC_SUBST(am__include) | ||||
| AC_SUBST(am__quote) | ||||
| AC_MSG_RESULT($_am_result) | ||||
| rm -f confinc confmf | ||||
| ]) | ||||
| 
 | ||||
| # Like AC_CONFIG_HEADER, but automatically create stamp file. | ||||
| 
 | ||||
| # serial 3 | ||||
| 
 | ||||
| # When config.status generates a header, we must update the stamp-h file. | ||||
| # This file resides in the same directory as the config header | ||||
| # that is generated.  We must strip everything past the first ":", | ||||
| # and everything past the last "/". | ||||
| 
 | ||||
| AC_PREREQ([2.12]) | ||||
| 
 | ||||
| AC_DEFUN([AM_CONFIG_HEADER], | ||||
| [ifdef([AC_FOREACH],dnl | ||||
| 	 [dnl init our file count if it isn't already | ||||
| 	 m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0])) | ||||
| 	 dnl prepare to store our destination file list for use in config.status | ||||
| 	 AC_FOREACH([_AM_File], [$1], | ||||
| 		    [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*])) | ||||
| 		    m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index)) | ||||
| 		    dnl and add it to the list of files AC keeps track of, along | ||||
| 		    dnl with our hook | ||||
| 		    AC_CONFIG_HEADERS(_AM_File, | ||||
| dnl COMMANDS, [, INIT-CMDS] | ||||
| [# update the timestamp | ||||
| echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index[" | ||||
| ][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS | ||||
| 		    m4_popdef([_AM_Dest])])],dnl | ||||
| [AC_CONFIG_HEADER([$1]) | ||||
|   AC_OUTPUT_COMMANDS( | ||||
|    ifelse(patsubst([$1], [[^ ]], []), | ||||
| 	  [], | ||||
| 	  [test -z "$CONFIG_HEADERS" || echo timestamp >dnl | ||||
| 	   patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl | ||||
| [am_indx=1 | ||||
| for am_file in $1; do | ||||
|   case " \$CONFIG_HEADERS " in | ||||
|   *" \$am_file "*) | ||||
|     am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\` | ||||
|     if test -n "\$am_dir"; then | ||||
|       am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\` | ||||
|       for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do | ||||
|         am_tmpdir=\$am_tmpdir\$am_subdir/ | ||||
|         if test ! -d \$am_tmpdir; then | ||||
|           mkdir \$am_tmpdir | ||||
|         fi | ||||
|       done | ||||
|     fi | ||||
|     echo timestamp > "\$am_dir"stamp-h\$am_indx | ||||
| [AC_PREREQ([2.12]) | ||||
| AC_CONFIG_HEADER([$1]) | ||||
| dnl When config.status generates a header, we must update the stamp-h file. | ||||
| dnl This file resides in the same directory as the config header | ||||
| dnl that is generated.  We must strip everything past the first ":", | ||||
| dnl and everything past the last "/". | ||||
| AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl | ||||
| ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, | ||||
| <<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, | ||||
| <<am_indx=1 | ||||
| for am_file in <<$1>>; do | ||||
|   case " <<$>>CONFIG_HEADERS " in | ||||
|   *" <<$>>am_file "*<<)>> | ||||
|     echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx | ||||
|     ;; | ||||
|   esac | ||||
|   am_indx=\`expr \$am_indx + 1\` | ||||
| done]) | ||||
| ])]) # AM_CONFIG_HEADER | ||||
| 
 | ||||
| # _AM_DIRNAME(PATH) | ||||
| # ----------------- | ||||
| # Like AS_DIRNAME, only do it during macro expansion | ||||
| AC_DEFUN([_AM_DIRNAME], | ||||
|        [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, | ||||
| 	      m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1, | ||||
| 		    m4_if(m4_regexp([$1], [^/.*]), -1, | ||||
| 			  [.], | ||||
| 			  m4_patsubst([$1], [^\(/\).*], [\1])), | ||||
| 		    m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), | ||||
| 	      m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl | ||||
| ]) # _AM_DIRNAME | ||||
|   am_indx=`expr "<<$>>am_indx" + 1` | ||||
| done<<>>dnl>>) | ||||
| changequote([,]))]) | ||||
| 
 | ||||
| # Add --enable-maintainer-mode option to configure. | ||||
| # From Jim Meyering | ||||
|  | @ -4552,8 +4146,8 @@ AC_DEFUN([AM_MAINTAINER_MODE], | |||
|                           (and sometimes confusing) to the casual installer], | ||||
|       USE_MAINTAINER_MODE=$enableval, | ||||
|       USE_MAINTAINER_MODE=no) | ||||
|   AC_MSG_RESULT([$USE_MAINTAINER_MODE]) | ||||
|   AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) | ||||
|   AC_MSG_RESULT($USE_MAINTAINER_MODE) | ||||
|   AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) | ||||
|   MAINT=$MAINTAINER_MODE_TRUE | ||||
|   AC_SUBST(MAINT)dnl | ||||
| ] | ||||
|  |  | |||
|  | @ -1,4 +1,4 @@ | |||
| /* config-h.in.  Generated automatically from configure.in by autoheader 2.13.  */ | ||||
| /* config-h.in.  Generated automatically from configure.in by autoheader.  */ | ||||
| 
 | ||||
| /* Define to empty if the keyword does not work.  */ | ||||
| #undef const | ||||
|  |  | |||
										
											
												Plik diff jest za duży
												Load Diff
											
										
									
								
							
							
								
								
									
										205
									
								
								libltdl/ltdl.c
								
								
								
								
							
							
						
						
									
										205
									
								
								libltdl/ltdl.c
								
								
								
								
							|  | @ -209,7 +209,7 @@ static char * | |||
| strdup(str) | ||||
|      const char *str; | ||||
| { | ||||
|   char *tmp = 0; | ||||
|   char *tmp = NULL; | ||||
| 
 | ||||
|   if (str) | ||||
|     { | ||||
|  | @ -238,9 +238,9 @@ strcmp (str1, str2) | |||
| { | ||||
|   if (str1 == str2) | ||||
|     return 0; | ||||
|   if (str1 == 0) | ||||
|   if (str1 == NULL) | ||||
|     return -1; | ||||
|   if (str2 == 0) | ||||
|   if (str2 == NULL) | ||||
|     return 1; | ||||
| 
 | ||||
|   for (;*str1 && *str2; ++str1, ++str2) | ||||
|  | @ -294,7 +294,7 @@ strrchr(str, ch) | |||
|      const char *str; | ||||
|      int ch; | ||||
| { | ||||
|   const char *p, *q = 0; | ||||
|   const char *p, *q = NULL; | ||||
| 
 | ||||
|   for (p = str; *p != LT_EOS_CHAR; ++p) | ||||
|     { | ||||
|  | @ -390,14 +390,14 @@ realloc (ptr, size) | |||
|   if (size == 0) | ||||
|     { | ||||
|       /* For zero or less bytes, free the original memory */ | ||||
|       if (ptr != 0) | ||||
|       if (ptr != NULL) | ||||
| 	{ | ||||
| 	  lt_dlfree (ptr); | ||||
| 	} | ||||
| 
 | ||||
|       return (lt_ptr) 0; | ||||
|     } | ||||
|   else if (ptr == 0) | ||||
|   else if (ptr == NULL) | ||||
|     { | ||||
|       /* Allow reallocation of a NULL pointer.  */ | ||||
|       return lt_dlmalloc (size); | ||||
|  | @ -476,7 +476,7 @@ argz_create_sep (str, delim, pargz, pargz_len) | |||
|      size_t *pargz_len; | ||||
| { | ||||
|   size_t argz_len; | ||||
|   char *argz = 0; | ||||
|   char *argz = NULL; | ||||
| 
 | ||||
|   assert (str); | ||||
|   assert (pargz); | ||||
|  | @ -542,11 +542,6 @@ argz_insert (pargz, pargz_len, before, entry) | |||
|   assert (pargz_len); | ||||
|   assert (entry && *entry); | ||||
| 
 | ||||
|   /* Either PARGZ/PARGZ_LEN is empty and BEFORE is NULL,
 | ||||
|      or BEFORE points into an address within the ARGZ vector.  */ | ||||
|   assert ((!*pargz && !*pargz_len && !before) | ||||
| 	  || ((*pargz <= before) && (before < (*pargz + *pargz_len)))); | ||||
| 
 | ||||
|   /* No BEFORE address indicates ENTRY should be inserted after the
 | ||||
|      current last element.  */ | ||||
|   if (!before) | ||||
|  | @ -762,11 +757,11 @@ static	const char	sys_search_path[]	= LTDL_SYSSEARCHPATH; | |||
| 
 | ||||
| /* The mutex functions stored here are global, and are necessarily the
 | ||||
|    same for all threads that wish to share access to libltdl.  */ | ||||
| static	lt_dlmutex_lock	    *lt_dlmutex_lock_func     = 0; | ||||
| static	lt_dlmutex_unlock   *lt_dlmutex_unlock_func   = 0; | ||||
| static	lt_dlmutex_seterror *lt_dlmutex_seterror_func = 0; | ||||
| static	lt_dlmutex_geterror *lt_dlmutex_geterror_func = 0; | ||||
| static	const char	    *lt_dllast_error	      = 0; | ||||
| static	lt_dlmutex_lock	    *lt_dlmutex_lock_func     = NULL; | ||||
| static	lt_dlmutex_unlock   *lt_dlmutex_unlock_func   = NULL; | ||||
| static	lt_dlmutex_seterror *lt_dlmutex_seterror_func = NULL; | ||||
| static	lt_dlmutex_geterror *lt_dlmutex_geterror_func = NULL; | ||||
| static	const char	    *lt_dllast_error	      = NULL; | ||||
| 
 | ||||
| 
 | ||||
| /* Either set or reset the mutex functions.  Either all the arguments must
 | ||||
|  | @ -815,7 +810,7 @@ lt_dlmutex_register (lock, unlock, seterror, geterror) | |||
| /* --- ERROR HANDLING --- */ | ||||
| 
 | ||||
| 
 | ||||
| static	const char    **user_error_strings	= 0; | ||||
| static	const char    **user_error_strings	= NULL; | ||||
| static	int		errorcount		= LT_ERROR_MAX; | ||||
| 
 | ||||
| int | ||||
|  | @ -824,7 +819,7 @@ lt_dladderror (diagnostic) | |||
| { | ||||
|   int		errindex = 0; | ||||
|   int		result	 = -1; | ||||
|   const char  **temp     = (const char **) 0; | ||||
|   const char  **temp     = NULL; | ||||
| 
 | ||||
|   assert (diagnostic); | ||||
| 
 | ||||
|  | @ -1136,7 +1131,7 @@ sys_shl_sym (loader_data, module, symbol) | |||
|      lt_module module; | ||||
|      const char *symbol; | ||||
| { | ||||
|   lt_ptr address = 0; | ||||
|   lt_ptr address = NULL; | ||||
| 
 | ||||
|   /* sys_shl_open should never return a NULL module handle */ | ||||
|   if (module == (lt_module) 0) | ||||
|  | @ -1180,16 +1175,16 @@ sys_wll_open (loader_data, filename) | |||
|      const char *filename; | ||||
| { | ||||
|   lt_dlhandle	cur; | ||||
|   lt_module	module	   = 0; | ||||
|   const char   *errormsg   = 0; | ||||
|   char	       *searchname = 0; | ||||
|   lt_module	module	   = NULL; | ||||
|   const char   *errormsg   = NULL; | ||||
|   char	       *searchname = NULL; | ||||
|   char	       *ext; | ||||
|   char		self_name_buf[MAX_PATH]; | ||||
| 
 | ||||
|   if (!filename) | ||||
|     { | ||||
|       /* Get the name of main module */ | ||||
|       *self_name_buf = 0; | ||||
|       *self_name_buf = '\0'; | ||||
|       GetModuleFileName (NULL, self_name_buf, sizeof (self_name_buf)); | ||||
|       filename = ext = self_name_buf; | ||||
|     } | ||||
|  | @ -1239,7 +1234,7 @@ sys_wll_open (loader_data, filename) | |||
|     { | ||||
|       if (!cur->module) | ||||
| 	{ | ||||
| 	  cur = 0; | ||||
| 	  cur = NULL; | ||||
| 	  break; | ||||
| 	} | ||||
| 
 | ||||
|  | @ -1255,7 +1250,7 @@ sys_wll_open (loader_data, filename) | |||
|   if (cur || !module) | ||||
|     { | ||||
|       LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN)); | ||||
|       module = 0; | ||||
|       module = NULL; | ||||
|     } | ||||
| 
 | ||||
|   return module; | ||||
|  | @ -1361,13 +1356,13 @@ sys_bedl_sym (loader_data, module, symbol) | |||
|      lt_module module; | ||||
|      const char *symbol; | ||||
| { | ||||
|   lt_ptr address = 0; | ||||
|   lt_ptr address = NULL; | ||||
|   image_id image = (image_id) module; | ||||
| 
 | ||||
|   if (get_image_symbol (image, symbol, B_SYMBOL_TYPE_ANY, address) != B_OK) | ||||
|     { | ||||
|       LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND)); | ||||
|       address = 0; | ||||
|       address = NULL; | ||||
|     } | ||||
| 
 | ||||
|   return address; | ||||
|  | @ -1404,7 +1399,7 @@ sys_dld_open (loader_data, filename) | |||
|     { | ||||
|       LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN)); | ||||
|       LT_DLFREE (module); | ||||
|       module = 0; | ||||
|       module = NULL; | ||||
|     } | ||||
| 
 | ||||
|   return module; | ||||
|  | @ -1466,8 +1461,8 @@ typedef struct lt_dlsymlists_t | |||
|   const lt_dlsymlist	       *syms; | ||||
| } lt_dlsymlists_t; | ||||
| 
 | ||||
| static	const lt_dlsymlist     *default_preloaded_symbols	= 0; | ||||
| static	lt_dlsymlists_t	       *preloaded_symbols		= 0; | ||||
| static	const lt_dlsymlist     *default_preloaded_symbols	= NULL; | ||||
| static	lt_dlsymlists_t	       *preloaded_symbols		= NULL; | ||||
| 
 | ||||
| static int | ||||
| presym_init (loader_data) | ||||
|  | @ -1477,7 +1472,7 @@ presym_init (loader_data) | |||
| 
 | ||||
|   LT_DLMUTEX_LOCK (); | ||||
| 
 | ||||
|   preloaded_symbols = 0; | ||||
|   preloaded_symbols = NULL; | ||||
|   if (default_preloaded_symbols) | ||||
|     { | ||||
|       errors = lt_dlpreload (default_preloaded_symbols); | ||||
|  | @ -1503,7 +1498,7 @@ presym_free_symlists () | |||
|       lists = lists->next; | ||||
|       LT_DLFREE (tmp); | ||||
|     } | ||||
|   preloaded_symbols = 0; | ||||
|   preloaded_symbols = NULL; | ||||
| 
 | ||||
|   LT_DLMUTEX_UNLOCK (); | ||||
| 
 | ||||
|  | @ -1612,7 +1607,7 @@ presym_close (loader_data, module) | |||
|      lt_module module; | ||||
| { | ||||
|   /* Just to silence gcc -Wall */ | ||||
|   module = 0; | ||||
|   module = NULL; | ||||
|   return 0; | ||||
| } | ||||
| 
 | ||||
|  | @ -1715,9 +1710,9 @@ static	int	list_files_by_dir     LT_PARAMS((const char *dirnam, | |||
| 						 size_t *pargz_len)); | ||||
| static	int	file_not_found	      LT_PARAMS((void)); | ||||
| 
 | ||||
| static	char	       *user_search_path= 0; | ||||
| static	lt_dlloader    *loaders		= 0; | ||||
| static	lt_dlhandle	handles 	= 0; | ||||
| static	char	       *user_search_path= NULL; | ||||
| static	lt_dlloader    *loaders		= NULL; | ||||
| static	lt_dlhandle	handles 	= NULL; | ||||
| static	int		initialized 	= 0; | ||||
| 
 | ||||
| /* Initialize libltdl. */ | ||||
|  | @ -1731,8 +1726,8 @@ lt_dlinit () | |||
|   /* Initialize only at first call. */ | ||||
|   if (++initialized == 1) | ||||
|     { | ||||
|       handles = 0; | ||||
|       user_search_path = 0; /* empty search path */ | ||||
|       handles = NULL; | ||||
|       user_search_path = NULL; /* empty search path */ | ||||
| 
 | ||||
| #if HAVE_LIBDL && !defined(__CYGWIN__) | ||||
|       errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dl, "dlopen"); | ||||
|  | @ -1867,7 +1862,7 @@ lt_dlexit () | |||
| 
 | ||||
| 	  LT_DLMEM_REASSIGN (loader, next); | ||||
| 	} | ||||
|       loaders = 0; | ||||
|       loaders = NULL; | ||||
|     } | ||||
| 
 | ||||
|  done: | ||||
|  | @ -1928,7 +1923,7 @@ tryall_dlopen (handle, filename) | |||
|     } | ||||
|   else | ||||
|     { | ||||
|       cur->info.filename = 0; | ||||
|       cur->info.filename = NULL; | ||||
|     } | ||||
| 
 | ||||
|   while (loader) | ||||
|  | @ -1937,7 +1932,7 @@ tryall_dlopen (handle, filename) | |||
| 
 | ||||
|       cur->module = loader->module_open (data, filename); | ||||
| 
 | ||||
|       if (cur->module != 0) | ||||
|       if (cur->module != NULL) | ||||
| 	{ | ||||
| 	  break; | ||||
| 	} | ||||
|  | @ -1968,7 +1963,7 @@ tryall_dlopen_module (handle, prefix, dirname, dlname) | |||
|      const char *dlname; | ||||
| { | ||||
|   int      error	= 0; | ||||
|   char     *filename	= 0; | ||||
|   char     *filename	= NULL; | ||||
|   size_t   filename_len	= 0; | ||||
|   size_t   dirname_len	= LT_STRLEN (dirname); | ||||
| 
 | ||||
|  | @ -1978,7 +1973,7 @@ tryall_dlopen_module (handle, prefix, dirname, dlname) | |||
| #ifdef LT_DIRSEP_CHAR | ||||
|   /* Only canonicalized names (i.e. with DIRSEP chars already converted)
 | ||||
|      should make it into this function:  */ | ||||
|   assert (strchr (dirname, LT_DIRSEP_CHAR) == 0); | ||||
|   assert (strchr (dirname, LT_DIRSEP_CHAR) == NULL); | ||||
| #endif | ||||
| 
 | ||||
|   if (dirname[dirname_len -1] == '/') | ||||
|  | @ -2062,7 +2057,7 @@ canonicalize_path (path, pcanonical) | |||
|      const char *path; | ||||
|      char **pcanonical; | ||||
| { | ||||
|   char *canonical = 0; | ||||
|   char *canonical = NULL; | ||||
| 
 | ||||
|   assert (path && *path); | ||||
|   assert (pcanonical); | ||||
|  | @ -2166,9 +2161,9 @@ foreach_dirinpath (search_path, base_name, func, data1, data2) | |||
|   int	 filenamesize	= 0; | ||||
|   size_t lenbase	= LT_STRLEN (base_name); | ||||
|   size_t argz_len	= 0; | ||||
|   char *argz		= 0; | ||||
|   char *filename	= 0; | ||||
|   char *canonical	= 0; | ||||
|   char *argz		= NULL; | ||||
|   char *filename	= NULL; | ||||
|   char *canonical	= NULL; | ||||
| 
 | ||||
|   LT_DLMUTEX_LOCK (); | ||||
| 
 | ||||
|  | @ -2185,7 +2180,7 @@ foreach_dirinpath (search_path, base_name, func, data1, data2) | |||
|     goto cleanup; | ||||
| 
 | ||||
|   { | ||||
|     char *dir_name = 0; | ||||
|     char *dir_name = NULL; | ||||
|     while ((dir_name = argz_next (argz, argz_len, dir_name))) | ||||
|       { | ||||
| 	size_t lendir = LT_STRLEN (dir_name); | ||||
|  | @ -2199,7 +2194,9 @@ foreach_dirinpath (search_path, base_name, func, data1, data2) | |||
| 	    goto cleanup; | ||||
| 	} | ||||
| 
 | ||||
| 	strncpy (filename, dir_name, lendir); | ||||
| 	assert (filenamesize > lendir); | ||||
| 	strcpy (filename, dir_name); | ||||
| 
 | ||||
| 	if (base_name && *base_name) | ||||
| 	  { | ||||
| 	    if (filename[lendir -1] != '/') | ||||
|  | @ -2250,7 +2247,7 @@ find_file_callback (filename, data1, data2) | |||
| 
 | ||||
|       LT_DLFREE (*pdir); | ||||
|       *pdir   = lt_estrdup (filename); | ||||
|       is_done = (*pdir == 0) ? -1 : 1; | ||||
|       is_done = (*pdir == NULL) ? -1 : 1; | ||||
|     } | ||||
| 
 | ||||
|   return is_done; | ||||
|  | @ -2262,7 +2259,7 @@ find_file (search_path, base_name, pdir) | |||
|      const char *base_name; | ||||
|      char **pdir; | ||||
| { | ||||
|   FILE *file = 0; | ||||
|   FILE *file = NULL; | ||||
| 
 | ||||
|   foreach_dirinpath (search_path, base_name, find_file_callback, pdir, &file); | ||||
| 
 | ||||
|  | @ -2285,7 +2282,7 @@ find_handle_callback (filename, data, ignored) | |||
|   /* Try to dlopen the file, but do not continue searching in any
 | ||||
|      case.  */ | ||||
|   if (tryall_dlopen (handle, filename) != 0) | ||||
|     *handle = 0; | ||||
|     *handle = NULL; | ||||
| 
 | ||||
|   return 1; | ||||
| } | ||||
|  | @ -2314,10 +2311,10 @@ load_deplibs (handle, deplibs) | |||
|      char *deplibs; | ||||
| { | ||||
| #if LTDL_DLOPEN_DEPLIBS | ||||
|   char	*p, *save_search_path = 0; | ||||
|   char	*p, *save_search_path = NULL; | ||||
|   int   depcount = 0; | ||||
|   int	i; | ||||
|   char	**names = 0; | ||||
|   char	**names = NULL; | ||||
| #endif | ||||
|   int	errors = 0; | ||||
| 
 | ||||
|  | @ -2353,7 +2350,7 @@ load_deplibs (handle, deplibs) | |||
| 	  if (strncmp(p, "-L", 2) == 0 || strncmp(p, "-R", 2) == 0) | ||||
| 	    { | ||||
| 	      char save = *end; | ||||
| 	      *end = 0; /* set a temporary string terminator */ | ||||
| 	      *end = '\0'; /* set a temporary string terminator */ | ||||
| 	      if (lt_dladdsearchdir(p+2)) | ||||
| 		{ | ||||
| 		  goto cleanup; | ||||
|  | @ -2410,7 +2407,7 @@ load_deplibs (handle, deplibs) | |||
| 	    { | ||||
| 	      char *name; | ||||
| 	      char save = *end; | ||||
| 	      *end = 0; /* set a temporary string terminator */ | ||||
| 	      *end = '\0'; /* set a temporary string terminator */ | ||||
| 	      if (strncmp(p, "-l", 2) == 0) | ||||
| 		{ | ||||
| 		  size_t name_len = 3+ /* "lib" */ LT_STRLEN (p + 2); | ||||
|  | @ -2516,7 +2513,7 @@ trim (dest, str) | |||
|     } | ||||
|   else | ||||
|     { | ||||
|       *dest = 0; | ||||
|       *dest = NULL; | ||||
|     } | ||||
| 
 | ||||
|   return 0; | ||||
|  | @ -2542,17 +2539,17 @@ try_dlopen (phandle, filename) | |||
|      lt_dlhandle *phandle; | ||||
|      const char *filename; | ||||
| { | ||||
|   const char *	ext		= 0; | ||||
|   const char *	saved_error	= 0; | ||||
|   char *	canonical	= 0; | ||||
|   char *	base_name	= 0; | ||||
|   char *	dir		= 0; | ||||
|   char *	name		= 0; | ||||
|   const char *	ext		= NULL; | ||||
|   const char *	saved_error	= NULL; | ||||
|   char *	canonical	= NULL; | ||||
|   char *	base_name	= NULL; | ||||
|   char *	dir		= NULL; | ||||
|   char *	name		= NULL; | ||||
|   int		errors		= 0; | ||||
|   lt_dlhandle	newhandle; | ||||
| 
 | ||||
|   assert (phandle); | ||||
|   assert (*phandle == 0); | ||||
|   assert (*phandle == NULL); | ||||
| 
 | ||||
|   LT_DLMUTEX_GETERROR (saved_error); | ||||
| 
 | ||||
|  | @ -2560,7 +2557,7 @@ try_dlopen (phandle, filename) | |||
|   if (!filename) | ||||
|     { | ||||
|       *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1); | ||||
|       if (*phandle == 0) | ||||
|       if (*phandle == NULL) | ||||
| 	return 1; | ||||
| 
 | ||||
|       memset (*phandle, 0, sizeof(struct lt_dlhandle_struct)); | ||||
|  | @ -2617,12 +2614,12 @@ try_dlopen (phandle, filename) | |||
|   if (ext && strcmp (ext, archive_ext) == 0) | ||||
|     { | ||||
|       /* this seems to be a libtool module */ | ||||
|       FILE *	file	 = 0; | ||||
|       char *	dlname	 = 0; | ||||
|       char *	old_name = 0; | ||||
|       char *	libdir	 = 0; | ||||
|       char *	deplibs	 = 0; | ||||
|       char *    line	 = 0; | ||||
|       FILE *	file	 = NULL; | ||||
|       char *	dlname	 = NULL; | ||||
|       char *	old_name = NULL; | ||||
|       char *	libdir	 = NULL; | ||||
|       char *	deplibs	 = NULL; | ||||
|       char *    line	 = NULL; | ||||
|       size_t	line_len; | ||||
| 
 | ||||
|       /* if we can't find the installed flag, it is probably an
 | ||||
|  | @ -2785,7 +2782,7 @@ try_dlopen (phandle, filename) | |||
| 	      errors += trim (&dlname, &line[sizeof (STR_LIBRARY_NAMES) - 1]); | ||||
| 	      if (!errors | ||||
| 		  && dlname | ||||
| 		  && (last_libname = strrchr (dlname, ' ')) != 0) | ||||
| 		  && (last_libname = strrchr (dlname, ' ')) != NULL) | ||||
| 		{ | ||||
| 		  last_libname = lt_estrdup (last_libname + 1); | ||||
| 		  if (!last_libname) | ||||
|  | @ -2806,7 +2803,7 @@ try_dlopen (phandle, filename) | |||
| 
 | ||||
|       /* allocate the handle */ | ||||
|       *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1); | ||||
|       if (*phandle == 0) | ||||
|       if (*phandle == NULL) | ||||
| 	++errors; | ||||
| 
 | ||||
|       if (errors) | ||||
|  | @ -2850,7 +2847,7 @@ try_dlopen (phandle, filename) | |||
|     { | ||||
|       /* not a libtool module */ | ||||
|       *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1); | ||||
|       if (*phandle == 0) | ||||
|       if (*phandle == NULL) | ||||
| 	{ | ||||
| 	  ++errors; | ||||
| 	  goto cleanup; | ||||
|  | @ -2917,7 +2914,7 @@ lt_dlhandle | |||
| lt_dlopen (filename) | ||||
|      const char *filename; | ||||
| { | ||||
|   lt_dlhandle handle = 0; | ||||
|   lt_dlhandle handle = NULL; | ||||
| 
 | ||||
|   /* Just incase we missed a code path in try_dlopen() that reports
 | ||||
|      an error, but forgets to reset handle... */ | ||||
|  | @ -2932,7 +2929,7 @@ lt_dlopen (filename) | |||
| static int | ||||
| file_not_found () | ||||
| { | ||||
|   const char *error = 0; | ||||
|   const char *error = NULL; | ||||
| 
 | ||||
|   LT_DLMUTEX_GETERROR (error); | ||||
|   if (error == LT_DLSTRERROR (FILE_NOT_FOUND)) | ||||
|  | @ -2949,9 +2946,9 @@ lt_dlhandle | |||
| lt_dlopenext (filename) | ||||
|      const char *filename; | ||||
| { | ||||
|   lt_dlhandle	handle		= 0; | ||||
|   char *	tmp		= 0; | ||||
|   char *	ext		= 0; | ||||
|   lt_dlhandle	handle		= NULL; | ||||
|   char *	tmp		= NULL; | ||||
|   char *	ext		= NULL; | ||||
|   size_t	len; | ||||
|   int		errors		= 0; | ||||
| 
 | ||||
|  | @ -2990,7 +2987,7 @@ lt_dlopenext (filename) | |||
|      failed, it is better to return an error message here than to | ||||
|      report FILE_NOT_FOUND when the alternatives (foo.so etc) are not | ||||
|      in the module search path.  */ | ||||
|   if (handle || ((errors > 0) && file_not_found ())) | ||||
|   if (handle || ((errors > 0) && !file_not_found ())) | ||||
|     { | ||||
|       LT_DLFREE (tmp); | ||||
|       return handle; | ||||
|  | @ -3017,7 +3014,7 @@ lt_dlopenext (filename) | |||
| 
 | ||||
|   /* As before, if the file was found but loading failed, return now
 | ||||
|      with the current error message.  */ | ||||
|   if (handle || ((errors > 0) && file_not_found ())) | ||||
|   if (handle || ((errors > 0) && !file_not_found ())) | ||||
|     { | ||||
|       LT_DLFREE (tmp); | ||||
|       return handle; | ||||
|  | @ -3064,7 +3061,7 @@ lt_argz_insertinorder (pargz, pargz_len, entry) | |||
|      size_t *pargz_len; | ||||
|      const char *entry; | ||||
| { | ||||
|   char *before = 0; | ||||
|   char *before = NULL; | ||||
| 
 | ||||
|   assert (pargz); | ||||
|   assert (pargz_len); | ||||
|  | @ -3089,9 +3086,9 @@ lt_argz_insertdir (pargz, pargz_len, dirnam, dp) | |||
|      const char *dirnam; | ||||
|      struct dirent *dp; | ||||
| { | ||||
|   char   *buf	    = 0; | ||||
|   char   *buf	    = NULL; | ||||
|   size_t buf_len    = 0; | ||||
|   char   *end	    = 0; | ||||
|   char   *end	    = NULL; | ||||
|   size_t end_offset = 0; | ||||
|   size_t dir_len    = 0; | ||||
|   int    errors	    = 0; | ||||
|  | @ -3154,7 +3151,7 @@ list_files_by_dir (dirnam, pargz, pargz_len) | |||
|      char **pargz; | ||||
|      size_t *pargz_len; | ||||
| { | ||||
|   DIR	*dirp	  = 0; | ||||
|   DIR	*dirp	  = NULL; | ||||
|   int    errors	  = 0; | ||||
| 
 | ||||
|   assert (dirnam && *dirnam); | ||||
|  | @ -3165,7 +3162,7 @@ list_files_by_dir (dirnam, pargz, pargz_len) | |||
|   dirp = opendir (dirnam); | ||||
|   if (dirp) | ||||
|     { | ||||
|       struct dirent *dp	= 0; | ||||
|       struct dirent *dp	= NULL; | ||||
| 
 | ||||
|       while ((dp = readdir (dirp))) | ||||
| 	if (dp->d_name[0] != '.') | ||||
|  | @ -3196,7 +3193,7 @@ foreachfile_callback (dirname, data1, data2) | |||
| 	= (int (*) LT_PARAMS((const char *filename, lt_ptr data))) data1; | ||||
| 
 | ||||
|   int	  is_done  = 0; | ||||
|   char   *argz     = 0; | ||||
|   char   *argz     = NULL; | ||||
|   size_t  argz_len = 0; | ||||
| 
 | ||||
|   if (list_files_by_dir (dirname, &argz, &argz_len) != 0) | ||||
|  | @ -3205,7 +3202,7 @@ foreachfile_callback (dirname, data1, data2) | |||
|     goto cleanup; | ||||
| 
 | ||||
|   { | ||||
|     char *filename = 0; | ||||
|     char *filename = NULL; | ||||
|     while ((filename = argz_next (argz, argz_len, filename))) | ||||
|       if ((is_done = (*func) (filename, data2))) | ||||
| 	break; | ||||
|  | @ -3449,8 +3446,8 @@ lt_dlpath_insertdir (ppath, before, dir) | |||
|      const char *dir; | ||||
| { | ||||
|   int    errors		= 0; | ||||
|   char  *canonical	= 0; | ||||
|   char  *argz		= 0; | ||||
|   char  *canonical	= NULL; | ||||
|   char  *argz		= NULL; | ||||
|   size_t argz_len	= 0; | ||||
| 
 | ||||
|   assert (ppath); | ||||
|  | @ -3465,13 +3462,13 @@ lt_dlpath_insertdir (ppath, before, dir) | |||
|   assert (canonical && *canonical); | ||||
| 
 | ||||
|   /* If *PPATH is empty, set it to DIR.  */ | ||||
|   if (*ppath == 0) | ||||
|   if (*ppath == NULL) | ||||
|     { | ||||
|       assert (!before);		/* BEFORE cannot be set without PPATH.  */ | ||||
|       assert (dir);		/* Without DIR, don't call this function!  */ | ||||
| 
 | ||||
|       *ppath = lt_estrdup (dir); | ||||
|       if (*ppath == 0) | ||||
|       if (*ppath == NULL) | ||||
| 	++errors; | ||||
| 
 | ||||
|       return errors; | ||||
|  | @ -3705,7 +3702,7 @@ lt_dlcaller_set_data (key, handle, data) | |||
|      lt_ptr data; | ||||
| { | ||||
|   int n_elements = 0; | ||||
|   lt_ptr stale = (lt_ptr) 0; | ||||
|   lt_ptr stale = NULL; | ||||
|   int i; | ||||
| 
 | ||||
|   /* This needs to be locked so that the caller data can be updated
 | ||||
|  | @ -3734,7 +3731,7 @@ lt_dlcaller_set_data (key, handle, data) | |||
| 
 | ||||
|       if (!temp) | ||||
| 	{ | ||||
| 	  stale = 0; | ||||
| 	  stale = NULL; | ||||
| 	  goto done; | ||||
| 	} | ||||
| 
 | ||||
|  | @ -3794,12 +3791,12 @@ lt_dlloader_add (place, dlloader, loader_name) | |||
|      const char *loader_name; | ||||
| { | ||||
|   int errors = 0; | ||||
|   lt_dlloader *node = 0, *ptr = 0; | ||||
|   lt_dlloader *node = NULL, *ptr = NULL; | ||||
| 
 | ||||
|   if ((dlloader == 0)	/* diagnose null parameters */ | ||||
|       || (dlloader->module_open == 0) | ||||
|       || (dlloader->module_close == 0) | ||||
|       || (dlloader->find_sym == 0)) | ||||
|   if ((dlloader == NULL)	/* diagnose null parameters */ | ||||
|       || (dlloader->module_open == NULL) | ||||
|       || (dlloader->module_close == NULL) | ||||
|       || (dlloader->find_sym == NULL)) | ||||
|     { | ||||
|       LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER)); | ||||
|       return 1; | ||||
|  | @ -3810,7 +3807,7 @@ lt_dlloader_add (place, dlloader, loader_name) | |||
|   if (!node) | ||||
|     return 1; | ||||
| 
 | ||||
|   node->next		= 0; | ||||
|   node->next		= NULL; | ||||
|   node->loader_name	= loader_name; | ||||
|   node->sym_prefix	= dlloader->sym_prefix; | ||||
|   node->dlloader_exit	= dlloader->dlloader_exit; | ||||
|  | @ -3946,7 +3943,7 @@ const char * | |||
| lt_dlloader_name (place) | ||||
|      lt_dlloader *place; | ||||
| { | ||||
|   const char *name = 0; | ||||
|   const char *name = NULL; | ||||
| 
 | ||||
|   if (place) | ||||
|     { | ||||
|  | @ -3966,7 +3963,7 @@ lt_user_data * | |||
| lt_dlloader_data (place) | ||||
|      lt_dlloader *place; | ||||
| { | ||||
|   lt_user_data *data = 0; | ||||
|   lt_user_data *data = NULL; | ||||
| 
 | ||||
|   if (place) | ||||
|     { | ||||
|  | @ -3986,7 +3983,7 @@ lt_dlloader * | |||
| lt_dlloader_find (loader_name) | ||||
|      const char *loader_name; | ||||
| { | ||||
|   lt_dlloader *place = 0; | ||||
|   lt_dlloader *place = NULL; | ||||
| 
 | ||||
|   LT_DLMUTEX_LOCK (); | ||||
|   for (place = loaders; place; place = place->next) | ||||
|  |  | |||
							
								
								
									
										64
									
								
								ltmain.sh
								
								
								
								
							
							
						
						
									
										64
									
								
								ltmain.sh
								
								
								
								
							|  | @ -55,8 +55,8 @@ modename="$progname" | |||
| # Constants. | ||||
| PROGRAM=ltmain.sh | ||||
| PACKAGE=libtool | ||||
| VERSION=1.4.2a | ||||
| TIMESTAMP=" (1.922.2.94 2002/06/11 15:58:53)" | ||||
| VERSION=1.4.3 | ||||
| TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)" | ||||
| 
 | ||||
| default_mode= | ||||
| help="Try \`$progname --help' for more information." | ||||
|  | @ -226,7 +226,7 @@ if test -z "$show_help"; then | |||
|   # Infer the operation mode. | ||||
|   if test -z "$mode"; then | ||||
|     case $nonopt in | ||||
|     *cc | *++ | gcc* | *-gcc*) | ||||
|     *cc | *++ | gcc* | *-gcc* | g++* | xlc*) | ||||
|       mode=link | ||||
|       for arg | ||||
|       do | ||||
|  | @ -768,6 +768,7 @@ compiler." | |||
|     linker_flags= | ||||
|     dllsearchpath= | ||||
|     lib_search_path=`pwd` | ||||
|     inst_prefix_dir= | ||||
| 
 | ||||
|     avoid_version=no | ||||
|     dlfiles= | ||||
|  | @ -898,6 +899,11 @@ compiler." | |||
| 	  prev= | ||||
| 	  continue | ||||
| 	  ;; | ||||
| 	inst_prefix) | ||||
| 	  inst_prefix_dir="$arg" | ||||
| 	  prev= | ||||
| 	  continue | ||||
| 	  ;; | ||||
| 	release) | ||||
| 	  release="-$arg" | ||||
| 	  prev= | ||||
|  | @ -999,6 +1005,11 @@ compiler." | |||
| 	continue | ||||
| 	;; | ||||
| 
 | ||||
|       -inst-prefix-dir) | ||||
|        prev=inst_prefix | ||||
|        continue | ||||
|        ;; | ||||
| 
 | ||||
|       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* | ||||
|       # so, if we see these flags be careful not to treat them like -L | ||||
|       -L[A-Z][A-Z]*:*) | ||||
|  | @ -1846,6 +1857,14 @@ compiler." | |||
| 		add="$dir/$linklib" | ||||
| 	      elif test "$hardcode_minus_L" = yes; then | ||||
| 		add_dir="-L$dir" | ||||
| 		# Try looking first in the location we're being installed to. | ||||
| 		if test -n "$inst_prefix_dir"; then | ||||
| 		  case "$libdir" in | ||||
| 		  [\/]*) | ||||
| 		    add_dir="-L$inst_prefix_dir$libdir $add_dir" | ||||
| 		    ;; | ||||
| 		  esac | ||||
| 		fi | ||||
| 		add="-l$name" | ||||
| 	      elif test "$hardcode_shlibpath_var" = yes; then | ||||
| 		add_shlibpath="$dir" | ||||
|  | @ -1904,6 +1923,14 @@ compiler." | |||
| 	    else | ||||
| 	      # We cannot seem to hardcode it, guess we'll fake it. | ||||
| 	      add_dir="-L$libdir" | ||||
| 	      # Try looking first in the location we're being installed to. | ||||
| 	      if test -n "$inst_prefix_dir"; then | ||||
| 		case "$libdir" in | ||||
| 		[\/]*) | ||||
| 		  add_dir="-L$inst_prefix_dir$libdir $add_dir" | ||||
| 		  ;; | ||||
| 		esac | ||||
| 	      fi | ||||
| 	      add="-l$name" | ||||
| 	    fi | ||||
| 
 | ||||
|  | @ -2323,7 +2350,7 @@ compiler." | |||
| 	  ;; | ||||
| 
 | ||||
| 	osf) | ||||
| 	  major=`expr $current - $age` | ||||
| 	  major=.`expr $current - $age` | ||||
| 	  versuffix=".$current.$age.$revision" | ||||
| 	  verstring="$current.$age.$revision" | ||||
| 
 | ||||
|  | @ -3172,6 +3199,13 @@ EOF | |||
| 	# On Rhapsody replace the C library is the System framework | ||||
| 	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` | ||||
| 	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` | ||||
| 	case $host in | ||||
| 	*darwin*) | ||||
| 	  # Don't allow lazy linking, it breaks C++ global constructors | ||||
| 	  compile_command="$compile_command ${wl}-bind_at_load" | ||||
| 	  finalize_command="$finalize_command ${wl}-bind_at_load" | ||||
| 	  ;; | ||||
| 	esac | ||||
| 	;; | ||||
|       esac | ||||
| 
 | ||||
|  | @ -3921,7 +3955,7 @@ fi\ | |||
| 	fi | ||||
|       done | ||||
|       # Quote the link command for shipping. | ||||
|       relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)" | ||||
|       relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" | ||||
|       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` | ||||
| 
 | ||||
|       # Only create the output if not a dry run. | ||||
|  | @ -4222,12 +4256,30 @@ relink_command=\"$relink_command\"" | |||
| 	dir="$dir$objdir" | ||||
| 
 | ||||
| 	if test -n "$relink_command"; then | ||||
|           # Determine the prefix the user has applied to our future dir. | ||||
|           inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` | ||||
|   | ||||
|           # Don't allow the user to place us outside of our expected | ||||
|           # location b/c this prevents finding dependent libraries that | ||||
|           # are installed to the same prefix. | ||||
|           if test "$inst_prefix_dir" = "$destdir"; then | ||||
|             $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 | ||||
|             exit 1 | ||||
|           fi | ||||
|   | ||||
|           if test -n "$inst_prefix_dir"; then | ||||
|             # Stick the inst_prefix_dir data into the link command. | ||||
|             relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` | ||||
|           else | ||||
|             relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` | ||||
|           fi | ||||
| 
 | ||||
| 	  $echo "$modename: warning: relinking \`$file'" 1>&2 | ||||
| 	  $show "$relink_command" | ||||
| 	  if $run eval "$relink_command"; then : | ||||
| 	  else | ||||
| 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 | ||||
| 	    continue | ||||
| 	    exit 1 | ||||
| 	  fi | ||||
| 	fi | ||||
| 
 | ||||
|  |  | |||
|  | @ -221,6 +221,9 @@ hpux*) # Its linker distinguishes data from code symbols | |||
| irix* | nonstopux*) | ||||
|   symcode='[[BCDEGRST]]' | ||||
|   ;; | ||||
| osf*) | ||||
|   symcode='[[BCDEGQRST]]' | ||||
|   ;; | ||||
| solaris* | sysv5*) | ||||
|   symcode='[[BDT]]' | ||||
|   ;; | ||||
|  | @ -317,7 +320,7 @@ EOF | |||
| 	  save_CFLAGS="$CFLAGS" | ||||
| 	  LIBS="conftstm.$ac_objext" | ||||
| 	  CFLAGS="$CFLAGS$no_builtin_flag" | ||||
| 	  if AC_TRY_EVAL(ac_link) && test -s conftest; then | ||||
| 	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then | ||||
| 	    pipe_works=yes | ||||
| 	  fi | ||||
| 	  LIBS="$save_LIBS" | ||||
|  | @ -1461,10 +1464,12 @@ else | |||
|       # need to do runtime linking. | ||||
|       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) | ||||
| 	for ld_flag in $LDFLAGS; do | ||||
| 	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then | ||||
| 	  case $ld_flag in | ||||
| 	  *-brtl*) | ||||
| 	    aix_use_runtimelinking=yes | ||||
| 	    break | ||||
| 	  fi | ||||
| 	  ;; | ||||
| 	  esac | ||||
| 	done | ||||
|       esac | ||||
| 
 | ||||
|  | @ -1580,7 +1585,7 @@ else | |||
|     #        cross-compilation, but unfortunately the echo tests do not | ||||
|     #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles | ||||
|     #	     `"' quotes if we put them in here... so don't! | ||||
|     archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' | ||||
|     archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' | ||||
|     # We need to add '_' to the symbols in $export_symbols first | ||||
|     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' | ||||
|     hardcode_direct=yes | ||||
|  | @ -1635,10 +1640,11 @@ else | |||
|   irix5* | irix6* | nonstopux*) | ||||
|     if test "$GCC" = yes; then | ||||
|       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | ||||
|       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||||
|     else | ||||
|       archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' | ||||
|       hardcode_libdir_flag_spec='-rpath $libdir' | ||||
|     fi | ||||
|     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||||
|     hardcode_libdir_separator=: | ||||
|     link_all_deplibs=yes | ||||
|     ;; | ||||
|  | @ -1666,7 +1672,7 @@ else | |||
|     hardcode_direct=yes | ||||
|     hardcode_shlibpath_var=no | ||||
|     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | ||||
|       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' | ||||
|       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||||
|       hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||||
|       export_dynamic_flag_spec='${wl}-E' | ||||
|     else | ||||
|  | @ -1676,7 +1682,7 @@ else | |||
| 	hardcode_libdir_flag_spec='-R$libdir' | ||||
|         ;; | ||||
|       *) | ||||
|         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' | ||||
|         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||||
|         hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||||
|         ;; | ||||
|       esac | ||||
|  | @ -1957,6 +1963,9 @@ aix3*) | |||
| 
 | ||||
| aix4* | aix5*) | ||||
|   version_type=linux | ||||
|   need_lib_prefix=no | ||||
|   need_version=no | ||||
|   hardcode_into_libs=yes | ||||
|   if test "$host_cpu" = ia64; then | ||||
|     # AIX 5 supports IA64 | ||||
|     library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' | ||||
|  | @ -1995,6 +2004,7 @@ aix4* | aix5*) | |||
|     fi | ||||
|     shlibpath_var=LIBPATH | ||||
|   fi | ||||
|   hardcode_into_libs=yes | ||||
|   ;; | ||||
| 
 | ||||
| amigaos*) | ||||
|  | @ -2074,6 +2084,18 @@ freebsd1*) | |||
|   dynamic_linker=no | ||||
|   ;; | ||||
| 
 | ||||
| freebsd*-gnu*) | ||||
|   version_type=linux | ||||
|   need_lib_prefix=no | ||||
|   need_version=no | ||||
|   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' | ||||
|   soname_spec='${libname}${release}.so$major' | ||||
|   shlibpath_var=LD_LIBRARY_PATH | ||||
|   shlibpath_overrides_runpath=no | ||||
|   hardcode_into_libs=yes | ||||
|   dynamic_linker='GNU/FreeBSD ld.so' | ||||
|   ;; | ||||
| 
 | ||||
| freebsd*) | ||||
|   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` | ||||
|   version_type=freebsd-$objformat | ||||
|  | @ -2239,11 +2261,13 @@ os2*) | |||
| osf3* | osf4* | osf5*) | ||||
|   version_type=osf | ||||
|   need_version=no | ||||
|   soname_spec='${libname}${release}.so' | ||||
|   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' | ||||
|   need_lib_prefix=no | ||||
|   soname_spec='${libname}${release}.so$major' | ||||
|   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' | ||||
|   shlibpath_var=LD_LIBRARY_PATH | ||||
|   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" | ||||
|   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" | ||||
|   hardcode_into_libs=yes | ||||
|   ;; | ||||
| 
 | ||||
| sco3.2v5*) | ||||
|  | @ -3664,7 +3688,7 @@ $debug || | |||
|     # Check for GNU sed and select it if it is found. | ||||
|     if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then | ||||
|       lt_cv_path_SED=${_sed} | ||||
|       break; | ||||
|       break | ||||
|     fi | ||||
|     while true; do | ||||
|       cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" | ||||
|  |  | |||
		Ładowanie…
	
		Reference in New Issue
	
	 Stéphane Fillod, F8CFE
						Stéphane Fillod, F8CFE