diff -crN ./libgnomecanvas/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/Makefile.in *** ./libgnomecanvas/Makefile.in Thu Feb 27 23:22:28 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/Makefile.in Sat Aug 9 21:32:05 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ! # 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. --- 1,7 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 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. *************** *** 10,15 **** --- 11,17 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + @SET_MAKE@ SHELL = @SHELL@ *************** *** 31,43 **** mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . ACLOCAL = @ACLOCAL@ --- 33,41 ---- *************** *** 46,56 **** AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : --- 44,54 ---- AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : *************** *** 59,64 **** --- 57,63 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ CANVAS_GLADE_CFLAGS = @CANVAS_GLADE_CFLAGS@ *************** *** 69,74 **** --- 68,74 ---- CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 81,90 **** GTKDOC = @GTKDOC@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ HTML_DIR = @HTML_DIR@ INSTOBJEXT = @INSTOBJEXT@ - INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ - INTLOBJS = @INTLOBJS@ LDFLAGS = @LDFLAGS@ LIBGNOMECANVAS_AGE = @LIBGNOMECANVAS_AGE@ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@ --- 81,89 ---- GTKDOC = @GTKDOC@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LIBGNOMECANVAS_AGE = @LIBGNOMECANVAS_AGE@ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@ *************** *** 94,100 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 93,98 ---- *************** *** 104,109 **** --- 102,109 ---- PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ + PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ REBUILD = @REBUILD@ STRIP = @STRIP@ *************** *** 111,179 **** VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ cxxflags_set = @cxxflags_set@ SUBDIRS = libgnomecanvas glade demos po tests docs EXTRA_DIST = COPYING.LIB ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h ! CONFIG_CLEAN_FILES = ! DIST_COMMON = README ./stamp-h.in AUTHORS COPYING COPYING.LIB ChangeLog \ ! INSTALL Makefile.am Makefile.in NEWS aclocal.m4 config.guess \ ! config.h.in config.sub configure configure.in install-sh ltmain.sh \ ! missing mkinstalldirs ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - TAR = gtar - GZIP_ENV = --best - all: all-redirect .SUFFIXES: - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile ! 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 ! 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) cd $(srcdir) && $(AUTOCONF) config.h: stamp-h @if test ! -f $@; then \ rm -f stamp-h; \ $(MAKE) stamp-h; \ else :; fi stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=config.h \ $(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) ! @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null ! ! mostlyclean-hdr: ! ! clean-hdr: distclean-hdr: -rm -f config.h ! ! maintainer-clean-hdr: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. --- 111,195 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ + install_sh = @install_sh@ SUBDIRS = libgnomecanvas glade demos po tests docs EXTRA_DIST = COPYING.LIB ChangeLog + subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h ! CONFIG_CLEAN_FILES = ! depcomp = ! DIST_SOURCES = ! ! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ ! uninstall-info-recursive all-recursive install-data-recursive \ ! install-exec-recursive installdirs-recursive install-recursive \ ! uninstall-recursive check-recursive installcheck-recursive ! DIST_COMMON = README ./stamp-h.in AUTHORS COPYING COPYING.LIB ChangeLog \ ! INSTALL Makefile.am Makefile.in NEWS aclocal.m4 config.guess \ ! config.h.in config.sub configure configure.in install-sh \ ! ltmain.sh missing mkinstalldirs ! DIST_SUBDIRS = $(SUBDIRS) ! all: config.h ! $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: ! mostlyclean-libtool: ! -rm -f *.lo ! clean-libtool: ! -rm -rf .libs _libs ! distclean-libtool: ! -rm -f libtool ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps Makefile ! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && \ ! CONFIG_HEADERS= CONFIG_LINKS= \ ! CONFIG_FILES=$@ $(SHELL) ./config.status ! ! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h @if test ! -f $@; then \ rm -f stamp-h; \ $(MAKE) stamp-h; \ else :; fi stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h stamp-hT + @echo timestamp > stamp-hT 2> /dev/null cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=config.h \ $(SHELL) ./config.status ! @mv stamp-hT stamp-h ! $(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) ! @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT ! @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null cd $(top_srcdir) && $(AUTOHEADER) ! @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in distclean-hdr: -rm -f config.h ! uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. *************** *** 181,192 **** # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. ! ! @SET_MAKE@ ! ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ --- 197,203 ---- # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. ! $(RECURSIVE_TARGETS): @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ *************** *** 209,219 **** maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ ! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ ! rev="$$subdir $$rev"; \ ! test "$$subdir" != "." || dot_seen=yes; \ done; \ ! test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ --- 220,235 ---- maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ ! case "$@" in \ ! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ! *) list='$(SUBDIRS)' ;; \ ! esac; \ ! rev=''; for subdir in $$list; do \ ! if test "$$subdir" = "."; then :; else \ ! rev="$$subdir $$rev"; \ ! fi; \ done; \ ! rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ *************** *** 232,315 **** tags: TAGS ! 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; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! 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)config.h.in$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) ! ! mostlyclean-tags: ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! maintainer-clean-tags: distdir = $(PACKAGE)-$(VERSION) - 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 ! -rm -rf $(distdir) ! GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz ! mkdir $(distdir)/=build ! mkdir $(distdir)/=inst ! dc_install_base=`cd $(distdir)/=inst && pwd`; \ ! cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix=$$dc_install_base \ ! && $(MAKE) $(AM_MAKEFLAGS) \ ! && $(MAKE) $(AM_MAKEFLAGS) dvi \ ! && $(MAKE) $(AM_MAKEFLAGS) check \ ! && $(MAKE) $(AM_MAKEFLAGS) install \ ! && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ! && $(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 for subdir in $(SUBDIRS); do \ --- 248,313 ---- tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(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; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique $(LISP) ! TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! list='$(SOURCES) $(HEADERS) $(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; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + top_distdir = . + # Avoid unsightly `./'. distdir = $(PACKAGE)-$(VERSION) ! GZIP_ENV = --best ! distdir: $(DISTFILES) ! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) mkdir $(distdir) ! $(mkinstalldirs) $(distdir)/libgnomecanvas $(distdir)/po @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done for subdir in $(SUBDIRS); do \ *************** *** 317,401 **** test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ ! chmod 777 $(distdir)/$$subdir; \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ fi; \ done ! info-am: ! info: info-recursive ! dvi-am: ! dvi: dvi-recursive check-am: all-am check: check-recursive ! installcheck-am: ! installcheck: installcheck-recursive ! all-recursive-am: config.h ! $(MAKE) $(AM_MAKEFLAGS) all-recursive ! install-exec-am: install-exec: install-exec-recursive - - install-data-am: install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-recursive - uninstall-am: - uninstall: uninstall-recursive - all-am: Makefile config.h - all-redirect: all-recursive-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: installdirs-recursive - installdirs-am: - mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic ! mostlyclean: mostlyclean-recursive ! clean-am: clean-hdr clean-tags clean-generic mostlyclean-am ! clean: clean-recursive ! distclean-am: distclean-hdr distclean-tags distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-recursive ! -rm -f config.status ! maintainer-clean-am: maintainer-clean-hdr 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-recursive - -rm -f config.status ! .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ ! install-data-recursive uninstall-data-recursive install-exec-recursive \ ! uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ ! all-recursive check-recursive installcheck-recursive info-recursive \ ! dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ ! maintainer-clean-recursive tags tags-recursive 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-am \ ! installdirs mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean # 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. --- 315,454 ---- test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ ! (cd $$subdir && \ ! $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" \ ! distdir=../$(distdir)/$$subdir \ ! distdir) \ || 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: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(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 ! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ! chmod -R a-w $(distdir); chmod a+w $(distdir) ! mkdir $(distdir)/=build ! mkdir $(distdir)/=inst ! chmod a-w $(distdir) ! dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \ ! && cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix=$$dc_install_base \ ! && $(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" 1>&2; \ ! exit 1) ) \ ! && $(MAKE) $(AM_MAKEFLAGS) dist \ ! && $(MAKE) $(AM_MAKEFLAGS) distclean \ ! && rm -f $(distdir).tar.gz \ ! && (test `find . -type f -print | wc -l` -eq 0 \ ! || (echo "Error: files left after distclean" 1>&2; \ ! exit 1) ) ! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) ! @echo "$(distdir).tar.gz is ready for distribution" | \ ! sed 'h;s/./=/g;p;x;p;x' check-am: all-am check: check-recursive ! all-am: Makefile config.h ! installdirs: installdirs-recursive ! installdirs-am: ! install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive + uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-recursive + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) 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-recursive ! clean-am: clean-generic clean-libtool mostlyclean-am ! dist-all: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) ! distclean: distclean-recursive ! -rm -f config.status config.cache config.log ! distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ ! distclean-tags ! dvi: dvi-recursive ! dvi-am: ! info: info-recursive ! info-am: ! ! install-data-am: ! ! install-exec-am: ! ! install-info: install-info-recursive ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-recursive ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-recursive ! ! mostlyclean-am: mostlyclean-generic mostlyclean-libtool ! ! uninstall-am: uninstall-info-am ! ! uninstall-info: uninstall-info-recursive + .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-generic clean-libtool clean-recursive dist dist-all \ + distcheck distclean distclean-generic distclean-hdr \ + distclean-libtool distclean-recursive distclean-tags distdir \ + dvi dvi-am dvi-recursive info info-am info-recursive install \ + install-am install-data install-data-am install-data-recursive \ + install-exec install-exec-am install-exec-recursive \ + install-info install-info-am install-info-recursive install-man \ + install-recursive install-strip installcheck installcheck-am \ + installdirs installdirs-am installdirs-recursive \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive tags tags-recursive \ + uninstall uninstall-am uninstall-info-am \ + uninstall-info-recursive uninstall-recursive # 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. diff -crN ./libgnomecanvas/aclocal.m4 /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/aclocal.m4 *** ./libgnomecanvas/aclocal.m4 Thu Feb 27 23:22:13 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/aclocal.m4 Sat Aug 9 21:31:45 2003 *************** *** 1,93 **** ! dnl aclocal.m4 generated automatically by aclocal 1.4-p5 ! 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. ! ! 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. # Like AC_CONFIG_HEADER, but automatically create stamp file. AC_DEFUN([AM_CONFIG_HEADER], ! [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>>, <<[^ ]>>, <<>>), <<>>, ! <>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, ! <>; 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<<>>dnl>>) ! changequote([,]))]) # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. # But this isn't really a big deal. ! # serial 1 - dnl Usage: - dnl AM_INIT_AUTOMAKE(package,version, [no-define]) AC_DEFUN([AM_INIT_AUTOMAKE], ! [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 ifelse([$3],, ! 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. # AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 ! 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 conftestfile 2> /dev/null` ! if test "[$]*" = "X"; then # -L didn't work. ! set X `ls -t $srcdir/configure conftestfile` fi ! 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 --- 1,200 ---- ! # aclocal.m4 generated automatically by aclocal 1.5 ! # 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. ! ! # 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. # 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 ! ;; ! 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 # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. # But this isn't really a big deal. ! # serial 5 ! ! # 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... ! ! ! # 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]) 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 ! ]) # # 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 # 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 # -L didn't work. ! set X `ls -t $srcdir/configure conftest.file` fi ! rm -f conftest.file ! if test "$[*]" != "X $srcdir/configure conftest.file" \ ! && test "$[*]" != "X conftest.file $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 *************** *** 97,103 **** alias in your environment]) fi ! test "[$]2" = conftestfile ) then # Ok. --- 204,210 ---- alias in your environment]) fi ! test "$[2]" = conftest.file ) then # Ok. *************** *** 106,129 **** AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi - rm -f conftest* AC_MSG_RESULT(yes)]) ! dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) ! dnl The program must properly implement --version. AC_DEFUN([AM_MISSING_PROG], ! [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)]) # Add --enable-maintainer-mode option to configure. # From Jim Meyering --- 213,562 ---- AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi AC_MSG_RESULT(yes)]) ! ! # serial 2 ! ! # AM_MISSING_PROG(NAME, PROGRAM) ! # ------------------------------ AC_DEFUN([AM_MISSING_PROG], ! [AC_REQUIRE([AM_MISSING_HAS_RUN]) ! $1=${$1-"${am_missing_run}$2"} ! 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 ! ]) ! ! # 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]) ! if $2; then ! $1_TRUE= ! $1_FALSE='#' ! else ! $1_TRUE='#' ! $1_FALSE= ! fi]) # Add --enable-maintainer-mode option to configure. # From Jim Meyering *************** *** 138,163 **** (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) MAINT=$MAINTAINER_MODE_TRUE AC_SUBST(MAINT)dnl ] ) - # Define a conditional. - - AC_DEFUN([AM_CONDITIONAL], - [AC_SUBST($1_TRUE) - AC_SUBST($1_FALSE) - if $2; then - $1_TRUE= - $1_FALSE='#' - else - $1_TRUE='#' - $1_FALSE= - fi]) - #serial 1 # This test replaces the one in autoconf. # Currently this macro should have the same name as the autoconf macro --- 571,583 ---- (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]) MAINT=$MAINTAINER_MODE_TRUE AC_SUBST(MAINT)dnl ] ) #serial 1 # This test replaces the one in autoconf. # Currently this macro should have the same name as the autoconf macro *************** *** 179,184 **** --- 599,605 ---- # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- # serial 46 AC_PROG_LIBTOOL + AC_DEFUN([AC_PROG_LIBTOOL], [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl *************** *** 304,312 **** ]) # _LT_AC_CHECK_DLFCN # -------------------- ! AC_DEFUN(_LT_AC_CHECK_DLFCN, [AC_CHECK_HEADERS(dlfcn.h) ])# _LT_AC_CHECK_DLFCN --- 725,754 ---- ]) + # AC_LIBTOOL_HEADER_ASSERT + # ------------------------ + AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT], + [AC_CACHE_CHECK([whether $CC supports assert without backlinking], + [lt_cv_func_assert_works], + [case $host in + *-*-solaris*) + if test "$GCC" = yes && test "$with_gnu_ld" != yes; then + case `$CC --version 2>/dev/null` in + [[12]].*) lt_cv_func_assert_works=no ;; + *) lt_cv_func_assert_works=yes ;; + esac + fi + ;; + esac]) + + if test "x$lt_cv_func_assert_works" = xyes; then + AC_CHECK_HEADERS(assert.h) + fi + ])# AC_LIBTOOL_HEADER_ASSERT + # _LT_AC_CHECK_DLFCN # -------------------- ! AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h) ])# _LT_AC_CHECK_DLFCN *************** *** 324,333 **** # [They come from Ultrix. What could be older than Ultrix?!! ;)] # Character class describing NM global symbol codes. ! [symcode='[BCDEGRST]'] # Regexp to match symbols that can be accessed directly from C. ! [sympat='\([_A-Za-z][_A-Za-z0-9]*\)'] # Transform the above into a raw symbol and a C symbol. symxfrm='\1 \2\3 \3' --- 766,775 ---- # [They come from Ultrix. What could be older than Ultrix?!! ;)] # Character class describing NM global symbol codes. ! symcode='[[BCDEGRST]]' # Regexp to match symbols that can be accessed directly from C. ! sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' # Transform the above into a raw symbol and a C symbol. symxfrm='\1 \2\3 \3' *************** *** 335,359 **** # Transform an extracted symbol line into a proper C declaration lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" # Define system-specific variables. case $host_os in aix*) ! [symcode='[BCDT]'] ;; cygwin* | mingw* | pw32*) ! [symcode='[ABCDGISTW]'] ;; hpux*) # Its linker distinguishes data from code symbols lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ;; irix*) ! [symcode='[BCDEGRST]'] ;; solaris* | sysv5*) ! [symcode='[BDT]'] ;; sysv4) ! [symcode='[DFNSTU]'] ;; esac --- 777,805 ---- # Transform an extracted symbol line into a proper C declaration lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" + # Transform an extracted symbol line into symbol name and symbol address + lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + # Define system-specific variables. case $host_os in aix*) ! symcode='[[BCDT]]' ;; cygwin* | mingw* | pw32*) ! symcode='[[ABCDGISTW]]' ;; hpux*) # Its linker distinguishes data from code symbols lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; irix*) ! symcode='[[BCDEGRST]]' ;; solaris* | sysv5*) ! symcode='[[BDT]]' ;; sysv4) ! symcode='[[DFNSTU]]' ;; esac *************** *** 367,380 **** # If we're using GNU nm, then use its standard symbol codes. if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then ! [symcode='[ABCDGISTW]'] fi # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do # Write the raw and C identifiers. ! [lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"] # Check to see that the pipe works correctly. pipe_works=no --- 813,826 ---- # If we're using GNU nm, then use its standard symbol codes. if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then ! symcode='[[ABCDGISTW]]' fi # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do # Write the raw and C identifiers. ! lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no *************** *** 416,438 **** cat <> conftest.$ac_ext #if defined (__STDC__) && __STDC__ ! # define lt_ptr_t void * #else ! # define lt_ptr_t char * # define const #endif /* The mapping between symbol names and symbols. */ const struct { const char *name; ! lt_ptr_t address; } ! [lt_preloaded_symbols[] =] { EOF ! sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext cat <<\EOF >> conftest.$ac_ext ! {0, (lt_ptr_t) 0} }; #ifdef __cplusplus --- 862,884 ---- cat <> conftest.$ac_ext #if defined (__STDC__) && __STDC__ ! # define lt_ptr void * #else ! # define lt_ptr char * # define const #endif /* The mapping between symbol names and symbols. */ const struct { const char *name; ! lt_ptr address; } ! lt_preloaded_symbols[[]] = { EOF ! sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext cat <<\EOF >> conftest.$ac_ext ! {0, (lt_ptr) 0} }; #ifdef __cplusplus *************** *** 476,485 **** global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" if test -z "$lt_cv_sys_global_symbol_pipe"; then global_symbol_to_cdecl= else global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" fi ! if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then AC_MSG_RESULT(failed) else AC_MSG_RESULT(ok) --- 922,934 ---- global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" if test -z "$lt_cv_sys_global_symbol_pipe"; then global_symbol_to_cdecl= + global_symbol_to_c_name_address= else global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" + global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" fi ! if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; ! then AC_MSG_RESULT(failed) else AC_MSG_RESULT(ok) *************** *** 497,512 **** *-DOS) lt_cv_sys_path_separator=';' ;; *) lt_cv_sys_path_separator=':' ;; esac fi ])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR # _LT_AC_PROG_ECHO_BACKSLASH # -------------------------- # Add some code to the start of the generated configure script which ! # will find an echo command which doesn;t interpret backslashes. AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ! [AC_DIVERT_PUSH(NOTICE)]) _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR # Check that we are running under the correct shell. --- 946,962 ---- *-DOS) lt_cv_sys_path_separator=';' ;; *) lt_cv_sys_path_separator=':' ;; esac + PATH_SEPARATOR=$lt_cv_sys_path_separator fi ])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR # _LT_AC_PROG_ECHO_BACKSLASH # -------------------------- # Add some code to the start of the generated configure script which ! # will find an echo command which doesn't interpret backslashes. AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ! [AC_DIVERT_PUSH(NOTICE)]) _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR # Check that we are running under the correct shell. *************** *** 572,578 **** # # So, first we look for a working echo in the user's PATH. ! IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for dir in $PATH /usr/ucb; do if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && --- 1022,1028 ---- # # So, first we look for a working echo in the user's PATH. ! IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR for dir in $PATH /usr/ucb; do if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && *************** *** 661,667 **** # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ------------------------------------------------------------------ ! AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF, [if test "$cross_compiling" = yes; then : [$4] else --- 1111,1117 ---- # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ------------------------------------------------------------------ ! AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [if test "$cross_compiling" = yes; then : [$4] else *************** *** 748,754 **** # AC_LIBTOOL_DLOPEN_SELF # ------------------- ! AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF, [if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown --- 1198,1204 ---- # AC_LIBTOOL_DLOPEN_SELF # ------------------- ! AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown *************** *** 770,785 **** ;; *) ! AC_CHECK_LIB(dl, dlopen, [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ! [AC_CHECK_FUNC(dlopen, lt_cv_dlopen="dlopen", ! [AC_CHECK_FUNC(shl_load, lt_cv_dlopen="shl_load", ! [AC_CHECK_LIB(svld, dlopen, ! [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ! [AC_CHECK_LIB(dld, shl_load, ! [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) ]) ! ]) ! ]) ]) ;; esac --- 1220,1241 ---- ;; *) ! AC_CHECK_FUNC([shl_load], ! [lt_cv_dlopen="shl_load"], ! [AC_CHECK_LIB([dld], [shl_load], ! [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], ! [AC_CHECK_FUNC([dlopen], ! [lt_cv_dlopen="dlopen"], ! [AC_CHECK_LIB([dl], [dlopen], ! [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ! [AC_CHECK_LIB([svld], [dlopen], ! [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ! [AC_CHECK_LIB([dld], [dld_link], ! [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) ! ]) ]) ! ]) ! ]) ]) ;; esac *************** *** 842,851 **** # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. Xsed='sed -e s/^X//' ! [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. ! [double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] # Sed substitution to delay expansion of an escaped shell variable in a # double_quote_subst'ed string. --- 1298,1307 ---- # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. Xsed='sed -e s/^X//' ! sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g' # Same as above, but do not quote variable references. ! double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g' # Sed substitution to delay expansion of an escaped shell variable in a # double_quote_subst'ed string. *************** *** 914,921 **** old_postuninstall_cmds= if test -n "$RANLIB"; then old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" fi # Allow CC to be a program name with arguments. --- 1370,1384 ---- old_postuninstall_cmds= if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + ;; + *) + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + ;; + esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi # Allow CC to be a program name with arguments. *************** *** 935,941 **** AC_MSG_RESULT($objdir) ! AC_ARG_WITH(pic, [ --with-pic try to use only PIC/non-PIC objects [default=use both]], pic_mode="$withval", pic_mode=default) test -z "$pic_mode" && pic_mode=default --- 1398,1404 ---- AC_MSG_RESULT($objdir) ! AC_ARG_WITH(pic, [ --with-pic try to use only PIC/non-PIC objects [default=use both]], pic_mode="$withval", pic_mode=default) test -z "$pic_mode" && pic_mode=default *************** *** 963,969 **** # libC (AIX C++ library), which obviously doesn't included in libraries # list by gcc. This cause undefined symbols with -static flags. # This hack allows C programs to be linked with "-static -ldl", but ! # we not sure about C++ programs. lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" ;; amigaos*) --- 1426,1432 ---- # libC (AIX C++ library), which obviously doesn't included in libraries # list by gcc. This cause undefined symbols with -static flags. # This hack allows C programs to be linked with "-static -ldl", but ! # not sure about C++ programs. lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" ;; amigaos*) *************** *** 998,1010 **** # PORTME Check for PIC flags for the system compiler. case $host_os in aix3* | aix4* | aix5*) # All AIX code is PIC. if test "$host_cpu" = ia64; then ! # AIX 5 now supports IA64 processor ! lt_cv_prog_cc_static='-Bstatic' ! lt_cv_prog_cc_wl='-Wl,' else ! lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' fi ;; --- 1461,1473 ---- # PORTME Check for PIC flags for the system compiler. case $host_os in aix3* | aix4* | aix5*) + lt_cv_prog_cc_wl='-Wl,' # All AIX code is PIC. if test "$host_cpu" = ia64; then ! # AIX 5 now supports IA64 processor ! lt_cv_prog_cc_static='-Bstatic' else ! lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' fi ;; *************** *** 1060,1068 **** lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' if test "x$host_vendor" = xsni; then ! lt_cv_prog_cc_wl='-LD' else ! lt_cv_prog_cc_wl='-Wl,' fi ;; --- 1523,1531 ---- lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' if test "x$host_vendor" = xsni; then ! lt_cv_prog_cc_wl='-LD' else ! lt_cv_prog_cc_wl='-Wl,' fi ;; *************** *** 1129,1135 **** # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) ! if echo "$old_CC $old_CFLAGS " | [egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]"] >/dev/null; then : else AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) lt_cv_prog_cc_can_build_shared=no --- 1592,1598 ---- # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) ! if echo "$old_CC $old_CFLAGS " | egrep -e "[[ ]]$lt_cv_prog_cc_shlib[[ ]]" >/dev/null; then : else AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) lt_cv_prog_cc_can_build_shared=no *************** *** 1205,1210 **** --- 1668,1675 ---- lt_cv_compiler_o_lo=no save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" + save_objext="$ac_objext" + ac_objext=lo AC_TRY_COMPILE([], [int some_variable = 0;], [dnl # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings *************** *** 1214,1219 **** --- 1679,1685 ---- lt_cv_compiler_o_lo=yes fi ]) + ac_objext="$save_objext" CFLAGS="$save_CFLAGS" ]) compiler_o_lo=$lt_cv_compiler_o_lo *************** *** 1282,1287 **** --- 1748,1754 ---- old_archive_from_new_cmds= old_archive_from_expsyms_cmds= export_dynamic_flag_spec= + use_runtimelinking= whole_archive_flag_spec= thread_safe_flag_spec= hardcode_into_libs=no *************** *** 1310,1316 **** extract_expsyms_cmds= case $host_os in ! cygwin* | mingw* | pw32* ) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. --- 1777,1783 ---- extract_expsyms_cmds= case $host_os in ! cygwin* | mingw* | pw32*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. *************** *** 1318,1324 **** with_gnu_ld=no fi ;; ! esac ld_shlibs=yes --- 1785,1793 ---- with_gnu_ld=no fi ;; ! openbsd*) ! with_gnu_ld=no ! ;; esac ld_shlibs=yes *************** *** 1405,1411 **** # can override, but on older systems we have to supply one (in ltdll.c) if test "x$lt_cv_need_dllmain" = "xyes"; then ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " ! ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~ test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' else ltdll_obj= --- 1874,1880 ---- # can override, but on older systems we have to supply one (in ltdll.c) if test "x$lt_cv_need_dllmain" = "xyes"; then ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " ! ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' else ltdll_obj= *************** *** 1418,1441 **** # Be careful not to strip the DATA tag left be newer dlltools. export_symbols_cmds="$ltdll_cmds"' $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ ! [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then ! cp $export_symbols $output_objdir/$soname-def; else ! echo EXPORTS > $output_objdir/$soname-def; ! _lt_hint=1; ! cat $export_symbols | while read symbol; do ! set dummy \$symbol; ! case \[$]# in ! 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; ! *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; ! esac; ! _lt_hint=`expr 1 + \$_lt_hint`; ! done; fi~ '"$ltdll_cmds"' $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ --- 1887,1910 ---- # Be careful not to strip the DATA tag left be newer dlltools. export_symbols_cmds="$ltdll_cmds"' $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ ! sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then ! cp $export_symbols $output_objdir/$soname-def; else ! echo EXPORTS > $output_objdir/$soname-def; ! _lt_hint=1; ! cat $export_symbols | while read symbol; do ! set dummy \$symbol; ! case \[$]# in ! 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; ! *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; ! esac; ! _lt_hint=`expr 1 + \$_lt_hint`; ! done; fi~ '"$ltdll_cmds"' $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ *************** *** 1530,1609 **** ;; aix4* | aix5*) # When large executables or shared objects are built, AIX ld can # have problems creating the table of contents. If linking a library # or program results in "error TOC overflow" add -mminimal-toc to # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. archive_cmds='' hardcode_libdir_separator=':' if test "$GCC" = yes; then ! collect2name=`${CC} -print-prog-name=collect2` ! if test -f "$collect2name" && \ ! strings "$collect2name" | grep resolve_lib_name >/dev/null ! then ! # We have reworked collect2 ! hardcode_direct=yes ! else ! # We have old collect2 ! hardcode_direct=unsupported ! # It fails to find uninstalled libraries when the uninstalled ! # path is not listed in the libpath. Setting hardcode_minus_L ! # to unsupported forces relinking ! hardcode_minus_L=yes ! hardcode_libdir_flag_spec='-L$libdir' ! hardcode_libdir_separator= ! fi shared_flag='-shared' else ! if test "$host_cpu" = ia64; then ! shared_flag='-G' ! else ! shared_flag='${wl}-bM:SRE' ! fi ! hardcode_direct=yes fi - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # Test if we are trying to use run time linking, or normal AIX style linking. - # If -brtl is somewhere in LDFLAGS, we need to do run time linking. - aix_use_runtimelinking=no - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then - aix_use_runtimelinking=yes - break - fi - done - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi # It seems that -bexpall can do strange things, so it is better to # generate a list of symbols to export. always_export_symbols=yes if test "$aix_use_runtimelinking" = yes; then ! hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' ! allow_undefined_flag=' -Wl,-G' ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else if test "$host_cpu" = ia64; then ! hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' ! allow_undefined_flag="-znodefs" ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else ! hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' ! # Warning - without using the other run time loading flags, -berok will ! # link without error, but may produce a broken library. ! allow_undefined_flag='${wl}-berok' ! # This is a bit strange, but is similar to how AIX traditionally builds ! # it's shared libraries. ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' fi fi ;; --- 1999,2076 ---- ;; aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + use_runtimelinking="" + else + aix_use_runtimelinking=yes + export_dynamic_flag_spec='-bexpall' + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + use_runtimelinking='-brtl' + fi + # When large executables or shared objects are built, AIX ld can # have problems creating the table of contents. If linking a library # or program results in "error TOC overflow" add -mminimal-toc to # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + hardcode_direct=yes archive_cmds='' hardcode_libdir_separator=':' if test "$GCC" = yes; then ! case $host_os in aix4.[[012]]|aix4.[[012]].*) ! collect2name=`${CC} -print-prog-name=collect2` ! if test -f "$collect2name" && \ ! strings "$collect2name" | grep resolve_lib_name >/dev/null ! then ! # We have reworked collect2 ! hardcode_direct=yes ! else ! # We have old collect2 ! hardcode_direct=unsupported ! # It fails to find uninstalled libraries when the uninstalled ! # path is not listed in the libpath. Setting hardcode_minus_L ! # to unsupported forces relinking ! hardcode_minus_L=yes ! hardcode_libdir_flag_spec='-L$libdir' ! hardcode_libdir_separator= ! fi ! esac ! shared_flag='-shared' else ! # not using gcc ! shared_flag='${wl}-G' fi # It seems that -bexpall can do strange things, so it is better to # generate a list of symbols to export. always_export_symbols=yes if test "$aix_use_runtimelinking" = yes; then ! # Warning - without using the other runtime loading flags (-brtl), ! # -berok will link without error, but may produce a broken library. ! allow_undefined_flag='-berok' ! hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' else if test "$host_cpu" = ia64; then ! hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' ! allow_undefined_flag="-z nodefs" ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else ! hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' ! # Warning - without using the other run time loading flags, ! # -berok will link without error, but may produce a broken library. ! allow_undefined_flag='${wl}-berok' ! # This is a bit strange, but is similar to how AIX traditionally builds ! # it's shared libraries. ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; *************** *** 1635,1645 **** ;; darwin* | rhapsody*) ! allow_undefined_flag='-undefined suppress' # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. ! archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes --- 2102,2119 ---- ;; darwin* | rhapsody*) ! case "$host_os" in ! rhapsody* | darwin1.[[012]]) ! allow_undefined_flag='-undefined suppress' ! ;; ! *) # Darwin 1.3 on ! allow_undefined_flag='-flat_namespace -undefined suppress' ! ;; ! esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. ! archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -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 *************** *** 1714,1720 **** ;; newsos6) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_direct=yes hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: --- 2188,2194 ---- ;; newsos6) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: *************** *** 1722,1731 **** ;; openbsd*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no ;; os2*) --- 2196,2219 ---- ;; openbsd*) 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' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case "$host_os" in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi ;; os2*) *************** *** 1770,1779 **** --- 2258,2296 ---- hardcode_shlibpath_var=no runpath_var=LD_RUN_PATH hardcode_runpath_var=yes + export_dynamic_flag_spec='${wl}-Bexport' ;; solaris*) + # gcc --version < 3.0 without binutils cannot create self contained + # shared libraries reliably, requiring libgcc.a to resolve some of + # the object symbols generated in some cases. Libraries that use + # assert need libgcc.a to resolve __eprintf, for example. Linking + # a copy of libgcc.a into every shared library to guarantee resolving + # such symbols causes other problems: According to Tim Van Holder + # , C++ libraries end up with a separate + # (to the application) exception stack for one thing. no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + case `$CC --version 2>/dev/null` in + [[12]].*) + cat <&2 + + *** Warning: Releases of GCC earlier than version 3.0 cannot reliably + *** create self contained shared libraries on Solaris systems, without + *** introducing a dependency on libgcc.a. Therefore, libtool is disabling + *** -no-undefined support, which will at least allow you to build shared + *** libraries. However, you may find that when you link such libraries + *** into an application without using GCC, you have to manually add + *** \`gcc --print-libgcc-file-name\` to the link command. We urge you to + *** upgrade to a newer version of GCC. Another option is to rebuild your + *** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer. + + EOF + no_undefined_flag= + ;; + esac + fi # $CC -shared without GNU ld will not create a library from C++ # object files and a static libstdc++, better avoid it by now archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' *************** *** 1782,1788 **** hardcode_libdir_flag_spec='-R$libdir' hardcode_shlibpath_var=no case $host_os in ! [solaris2.[0-5] | solaris2.[0-5].*]) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; esac --- 2299,2305 ---- hardcode_libdir_flag_spec='-R$libdir' hardcode_shlibpath_var=no case $host_os in ! solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; esac *************** *** 1805,1811 **** sysv4) if test "x$host_vendor" = xsno; then ! archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_direct=yes # is this really true??? else archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' --- 2322,2328 ---- sysv4) if test "x$host_vendor" = xsno; then ! archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes # is this really true??? else archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' *************** *** 1962,1999 **** # depend on `.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in ! [ aix4 | aix4.[01] | aix4.[01].*)] ! if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ! echo ' yes ' ! echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ! : ! else ! can_build_shared=no ! fi ! ;; esac ! # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ! # soname into executable. Probably we can add versioning support to ! # collect2, so additional links can be useful in future. ! if test "$aix_use_runtimelinking" = yes; then ! # If using run time linking (on AIX 4.2 or later) use lib.so instead of ! # lib.a to let people know that these are not typical AIX shared libraries. ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' ! else ! # We preserve .a as extension for shared libraries through AIX4.2 ! # and later when we are not doing run time linking. ! library_names_spec='${libname}${release}.a $libname.a' ! soname_spec='${libname}${release}.so$major' ! fi shlibpath_var=LIBPATH ! deplibs_check_method=pass_all fi ;; amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. ! finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | [$Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\'']`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) --- 2479,2506 ---- # depend on `.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in ! aix4 | aix4.[[01]] | aix4.[[01]].*) ! if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ! echo ' yes ' ! echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ! : ! else ! can_build_shared=no ! fi ! ;; esac ! # We preserve .a as extension for shared libraries through AIX4.2 ! library_names_spec='${libname}${release}.a $libname.a' ! soname_spec='${libname}${release}.so$major' shlibpath_var=LIBPATH ! hardcode_into_libs=yes fi ;; amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. ! finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) *************** *** 2024,2030 **** case $GCC,$host_os in yes,cygwin*) library_names_spec='$libname.dll.a' ! soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll' postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ --- 2531,2537 ---- case $GCC,$host_os in yes,cygwin*) library_names_spec='$libname.dll.a' ! soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ *************** *** 2034,2047 **** $rm \$dlpath' ;; 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"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' ;; *) ! library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib' ;; esac dynamic_linker='Win32 ld.exe' --- 2541,2554 ---- $rm \$dlpath' ;; 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"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' ;; *) ! library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib' ;; esac dynamic_linker='Win32 ld.exe' *************** *** 2199,2207 **** openbsd*) version_type=sunos ! if test "$with_gnu_ld" = yes; then ! need_lib_prefix=no ! need_version=no fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' --- 2706,2724 ---- openbsd*) version_type=sunos ! need_lib_prefix=no ! need_version=no ! if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ! case "$host_os" in ! openbsd2.[[89]] | openbsd2.[[89]].*) ! shlibpath_overrides_runpath=no ! ;; ! *) ! shlibpath_overrides_runpath=yes ! ;; ! esac ! else ! shlibpath_overrides_runpath=yes fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' *************** *** 2312,2317 **** --- 2829,2861 ---- AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case "$host_os" in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix4*) + if test "$host_cpu" != ia64 ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + if test "$hardcode_action" = relink; then # Fast installation is not supported enable_fast_install=no *************** *** 2397,2402 **** --- 2941,2947 ---- AR AR_FLAGS CC LD LN_S NM SHELL \ reload_flag reload_cmds wl \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ + use_runtimelinking \ thread_safe_flag_spec whole_archive_flag_spec libname_spec \ library_names_spec soname_spec \ RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ *************** *** 2405,2410 **** --- 2950,2956 ---- old_striplib striplib file_magic_cmd export_symbols_cmds \ deplibs_check_method allow_undefined_flag no_undefined_flag \ finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ + global_symbol_to_c_name_address \ hardcode_libdir_flag_spec hardcode_libdir_separator \ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do *************** *** 2471,2482 **** # Whether or not to build shared libraries. build_libtool_libs=$enable_shared - # Whether or not to add -lc for building shared libraries. - build_libtool_need_lc=$need_lc - # Whether or not to build static libraries. build_old_libs=$enable_static # Whether or not to optimize for fast installation. fast_install=$enable_fast_install --- 3017,3028 ---- # Whether or not to build shared libraries. build_libtool_libs=$enable_shared # Whether or not to build static libraries. build_old_libs=$enable_static + # Whether or not to add -lc for building shared libraries. + build_libtool_need_lc=$need_lc + # Whether or not to optimize for fast installation. fast_install=$enable_fast_install *************** *** 2577,2582 **** --- 3123,3131 ---- # Compiler flag to allow reflexive dlopens. export_dynamic_flag_spec=$lt_export_dynamic_flag_spec + # Compiler flag to allow runtime linking + use_runtimelinking=$lt_use_runtimelinking + # Compiler flag to generate shared objects directly from archives. whole_archive_flag_spec=$lt_whole_archive_flag_spec *************** *** 2642,2647 **** --- 3191,3199 ---- # Transform the output of nm in a proper C declaration global_symbol_to_cdecl=$lt_global_symbol_to_cdecl + # Transform the output of nm in a C name address pair + global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address + # This is the shared library runtime path variable. runpath_var=$runpath_var *************** *** 2764,2772 **** # return TRUE; # } # /* ltdll.c ends here */ ! # This is a source program that is used to create import libraries ! # on Windows for dlls which lack them. Don't remove nor modify the ! # starting and closing comments # /* impgen.c starts here */ # /* Copyright (C) 1999-2000 Free Software Foundation, Inc. # --- 3316,3324 ---- # return TRUE; # } # /* ltdll.c ends here */ ! # This is a source program that is used to create import libraries ! # on Windows for dlls which lack them. Don't remove nor modify the ! # starting and closing comments # /* impgen.c starts here */ # /* Copyright (C) 1999-2000 Free Software Foundation, Inc. # *************** *** 3121,3126 **** --- 3673,3679 ---- AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl + AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. *************** *** 3134,3141 **** esac case $ac_prog in # Accept absolute paths. ! [[\\/]* | [A-Za-z]:[\\/]*)] ! [re_direlt='/[^/][^/]*/\.\./'] # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do --- 3687,3694 ---- esac case $ac_prog in # Accept absolute paths. ! [[\\/]]* | [[A-Za-z]]:[[\\/]]*) ! re_direlt='/[[^/]][[^/]]*/\.\./' # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do *************** *** 3159,3165 **** fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then --- 3712,3718 ---- fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then *************** *** 3223,3229 **** # `unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. ! # ['file_magic [regex]'] -- check by looking for files in library path # which responds to the $file_magic_cmd with a given egrep regex. # If you have `file' or equivalent on your system and you're not sure # whether `pass_all' will *always* work, you probably want this one. --- 3776,3782 ---- # `unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. ! # 'file_magic [[regex]]' -- check by looking for files in library path # which responds to the $file_magic_cmd with a given egrep regex. # If you have `file' or equivalent on your system and you're not sure # whether `pass_all' will *always* work, you probably want this one. *************** *** 3238,3244 **** ;; bsdi4*) ! [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'] lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; --- 3791,3797 ---- ;; bsdi4*) ! lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; *************** *** 3252,3258 **** lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' lt_cv_file_magic_cmd='/usr/bin/file -L' case "$host_os" in ! rhapsody* | darwin1.[012]) lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` ;; *) # Darwin 1.3 on --- 3805,3811 ---- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' lt_cv_file_magic_cmd='/usr/bin/file -L' case "$host_os" in ! rhapsody* | darwin1.[[012]]) lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` ;; *) # Darwin 1.3 on *************** *** 3267,3273 **** i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. ! [lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'] lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; --- 3820,3826 ---- i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. ! lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; *************** *** 3282,3288 **** ;; hpux10.20*|hpux11*) ! [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'] lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; --- 3835,3841 ---- ;; hpux10.20*|hpux11*) ! lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; *************** *** 3301,3307 **** *) libmagic=never-match;; esac # this will be overridden with pass_all, but let us keep it just in case ! [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"] ;; esac lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` --- 3854,3860 ---- *) libmagic=never-match;; esac # this will be overridden with pass_all, but let us keep it just in case ! lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" ;; esac lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` *************** *** 3311,3339 **** # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM ! [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;] esac lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ! [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'] else ! [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'] fi ;; newos6*) ! [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'] lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' --- 3864,3902 ---- # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM ! lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; esac lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ! lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' else ! lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$' fi ;; newos6*) ! lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; + openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' + else + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + fi + ;; + osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' *************** *** 3350,3363 **** lt_cv_file_magic_test_file=/lib/libc.so ;; ! [sysv5uw[78]* | sysv4*uw2*)] lt_cv_deplibs_check_method=pass_all ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in motorola) ! [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'] lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ;; ncr) --- 3913,3926 ---- lt_cv_file_magic_test_file=/lib/libc.so ;; ! sysv5uw[[78]]* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in motorola) ! lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ;; ncr) *************** *** 3365,3375 **** ;; sequent) lt_cv_file_magic_cmd='/bin/file' ! [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;; sni) lt_cv_file_magic_cmd='/bin/file' ! [lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"] lt_cv_file_magic_test_file=/lib/libc.so ;; esac --- 3928,3938 ---- ;; sequent) lt_cv_file_magic_cmd='/bin/file' ! lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; sni) lt_cv_file_magic_cmd='/bin/file' ! lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" lt_cv_file_magic_test_file=/lib/libc.so ;; esac *************** *** 3383,3395 **** # AC_PROG_NM - find the path to a BSD-compatible name lister AC_DEFUN([AC_PROG_NM], ! [AC_MSG_CHECKING([for BSD-compatible nm]) AC_CACHE_VAL(lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do test -z "$ac_dir" && ac_dir=. tmp_nm=$ac_dir/${ac_tool_prefix}nm --- 3946,3959 ---- # AC_PROG_NM - find the path to a BSD-compatible name lister AC_DEFUN([AC_PROG_NM], ! [AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl ! AC_MSG_CHECKING([for BSD-compatible nm]) AC_CACHE_VAL(lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do test -z "$ac_dir" && ac_dir=. tmp_nm=$ac_dir/${ac_tool_prefix}nm *************** *** 3399,3405 **** # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then ! lt_cv_path_NM="$tmp_nm -B" break elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then lt_cv_path_NM="$tmp_nm -p" --- 3963,3985 ---- # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then ! # AIX needs to suppress demangling for C++ to work correctly ! # AIX nm : The default is to demangle all C++ symbol names ! # GNU nm : The default is to not demangle low-level symbol names. ! case $host_os in ! aix*) ! # check if we are using GNU nm on AIX ! if $tmp_nm -V 2> /dev/null | grep GNU 2>&1 > /dev/null ! then ! lt_cv_path_NM="$tmp_nm -B" ! else ! lt_cv_path_NM="$tmp_nm -BC" ! fi ! ;; ! *) ! lt_cv_path_NM="$tmp_nm -B" ! ;; ! esac break elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then lt_cv_path_NM="$tmp_nm -p" *************** *** 3650,3670 **** # Modified to never use included libintl. # Owen Taylor , 12/15/1998 # # # This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU Public License # but which still want to provide support for the GNU gettext functionality. - # Please note that the actual code is *not* freely available. # # ! # If you make changes to this file, you MUST update the copy in ! # acinclude.m4. [ aclocal dies on duplicate macros, so if ! # we run 'aclocal -I macros/' then we'll run into problems ! # once we've installed glib-gettext.m4 :-( ] ! # ! AC_DEFUN([AM_GLIB_LC_MESSAGES], ! [if test $ac_cv_header_locale_h = yes; then AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, [AC_TRY_LINK([#include ], [return LC_MESSAGES], am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) --- 4230,4266 ---- # Modified to never use included libintl. # Owen Taylor , 12/15/1998 # + # Major rework to remove unused code + # Owen Taylor , 12/11/2002 # # This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU Public License # but which still want to provide support for the GNU gettext functionality. # + # ! # We need this here as well, since someone might use autoconf-2.5x ! # to configure GLib then an older version to configure a package ! # using AM_GLIB_GNU_GETTEXT ! AC_PREREQ(2.53) ! ! dnl ! dnl We go to great lengths to make sure that aclocal won't ! dnl try to pull in the installed version of these macros ! dnl when running aclocal in the glib directory. ! dnl ! m4_copy([AC_DEFUN],[glib_DEFUN]) ! m4_copy([AC_REQUIRE],[glib_REQUIRE]) ! dnl ! dnl At the end, if we're not within glib, we'll define the public ! dnl definitions in terms of our private definitions. ! dnl ! # GLIB_LC_MESSAGES ! #-------------------- ! glib_DEFUN([GLIB_LC_MESSAGES], ! [AC_CHECK_HEADERS([locale.h]) ! if test $ac_cv_header_locale_h = yes; then AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, [AC_TRY_LINK([#include ], [return LC_MESSAGES], am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) *************** *** 3674,3682 **** fi fi]) ! dnl AM_GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) ! AC_DEFUN([AM_GLIB_PATH_PROG_WITH_TEST], [# Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) --- 4270,4280 ---- fi fi]) ! # GLIB_PATH_PROG_WITH_TEST ! #---------------------------- ! dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) ! glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], [# Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) *************** *** 3712,3812 **** AC_SUBST($1)dnl ]) ! # serial 5 ! ! AC_DEFUN(AM_GLIB_WITH_NLS, dnl NLS is obligatory [USE_NLS=yes AC_SUBST(USE_NLS) ! dnl Figure out what method ! nls_cv_force_use_gnu_gettext="no" ! ! nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" ! if test "$nls_cv_force_use_gnu_gettext" != "yes"; then ! dnl User does not insist on using GNU NLS library. Figure out what ! dnl to use. If gettext or catgets are available (in this order) we ! dnl use this. Else we have to fall back to GNU NLS library. ! dnl catgets is only used if permitted by option --with-catgets. ! nls_cv_header_intl= ! nls_cv_header_libgt= ! CATOBJEXT=NONE ! XGETTEXT=: ! ! AC_CHECK_HEADER(libintl.h, ! [AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, ! [AC_TRY_LINK([#include ], [return (int) dgettext ("","")], ! gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no)]) ! ! gt_cv_func_dgettext_libintl="no" ! libintl_extra_libs="" ! ! if test "$gt_cv_func_dgettext_libc" != "yes" ; then ! AC_CHECK_LIB(intl, bindtextdomain, ! [AC_CHECK_LIB(intl, dgettext, ! gt_cv_func_dgettext_libintl=yes)]) ! ! if test "$gt_cv_func_dgettext_libc" != "yes" ; then ! AC_MSG_CHECKING([if -liconv is needed to use gettext]) ! AC_MSG_RESULT([]) ! AC_CHECK_LIB(intl, dcgettext, ! [gt_cv_func_dgettext_libintl=yes ! libintl_extra_libs=-liconv], ! :,-liconv) ! fi ! fi ! if test "$gt_cv_func_dgettext_libintl" = "yes"; then ! LIBS="$LIBS -lintl $libintl_extra_libs"; ! fi ! if test "$gt_cv_func_dgettext_libc" = "yes" \ ! || test "$gt_cv_func_dgettext_libintl" = "yes"; then ! AC_DEFINE(HAVE_GETTEXT,1, ! [Define if the GNU gettext() function is already present or preinstalled.]) ! AM_GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ! [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl ! if test "$MSGFMT" != "no"; then ! AC_CHECK_FUNCS(dcgettext) ! AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ! AM_GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ! [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) ! AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ! return _nl_msg_cat_cntr], ! [CATOBJEXT=.gmo ! DATADIRNAME=share], ! [CATOBJEXT=.mo ! DATADIRNAME=lib]) ! INSTOBJEXT=.mo ! fi ! fi ! # Added by Martin Baulig 12/15/98 for libc5 systems ! if test "$gt_cv_func_dgettext_libc" != "yes" \ ! && test "$gt_cv_func_dgettext_libintl" = "yes"; then ! INTLLIBS="-lintl $libintl_extra_libs" ! LIBS=`echo $LIBS | sed -e 's/-lintl//'` ! fi ! ]) ! if test "$CATOBJEXT" = "NONE"; then ! dnl Neither gettext nor catgets in included in the C library. ! dnl Fall back on GNU gettext library. ! nls_cv_use_gnu_gettext=yes fi ! fi ! if test "$nls_cv_use_gnu_gettext" != "yes"; then AC_DEFINE(ENABLE_NLS, 1, [always defined to indicate that i18n is enabled]) - else - dnl Unset this variable since we use the non-zero value as a flag. - CATOBJEXT= fi dnl Test whether we really found GNU xgettext. if test "$XGETTEXT" != ":"; then ! dnl If it is no GNU xgettext we define it as : so that the dnl Makefiles still can work. if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; --- 4310,4429 ---- AC_SUBST($1)dnl ]) ! # GLIB_WITH_NLS ! #----------------- ! glib_DEFUN([GLIB_WITH_NLS], dnl NLS is obligatory [USE_NLS=yes AC_SUBST(USE_NLS) ! gt_cv_have_gettext=no ! CATOBJEXT=NONE ! XGETTEXT=: ! INTLLIBS= ! ! AC_CHECK_HEADER(libintl.h, ! [gt_cv_func_dgettext_libintl="no" ! libintl_extra_libs="" ! ! # ! # First check in libc ! # ! AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, ! [AC_TRY_LINK([ ! #include ! ], ! [return (int) dgettext ("","")], ! gt_cv_func_dgettext_libc=yes, ! gt_cv_func_dgettext_libc=no) ! ]) ! ! if test "$gt_cv_func_dgettext_libc" = "yes" ; then ! AC_CHECK_FUNCS(bind_textdomain_codeset) ! fi ! # ! # If we don't have everything we want, check in libintl ! # ! if test "$gt_cv_func_dgettext_libc" != "yes" \ ! || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then ! ! AC_CHECK_LIB(intl, bindtextdomain, ! [AC_CHECK_LIB(intl, dgettext, ! gt_cv_func_dgettext_libintl=yes)]) ! ! if test "$gt_cv_func_dgettext_libintl" != "yes" ; then ! AC_MSG_CHECKING([if -liconv is needed to use gettext]) ! AC_MSG_RESULT([]) ! AC_CHECK_LIB(intl, dcgettext, ! [gt_cv_func_dgettext_libintl=yes ! libintl_extra_libs=-liconv], ! :,-liconv) ! fi ! # ! # If we found libintl, then check in it for bind_textdomain_codeset(); ! # we'll prefer libc if neither have bind_textdomain_codeset(), ! # and both have dgettext ! # ! if test "$gt_cv_func_dgettext_libintl" = "yes" ; then ! glib_save_LIBS="$LIBS" ! LIBS="$LIBS -lintl $libintl_extra_libs" ! unset ac_cv_func_bind_textdomain_codeset ! AC_CHECK_FUNCS(bind_textdomain_codeset) ! LIBS="$glib_save_LIBS" ! ! if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then ! gt_cv_func_dgettext_libc=no ! else ! if test "$gt_cv_func_dgettext_libc" = "yes"; then ! gt_cv_func_dgettext_libintl=no ! fi ! fi ! fi ! fi ! if test "$gt_cv_func_dgettext_libc" = "yes" \ ! || test "$gt_cv_func_dgettext_libintl" = "yes"; then ! gt_cv_have_gettext=yes fi ! ! if test "$gt_cv_func_dgettext_libintl" = "yes"; then ! INTLLIBS="-lintl $libintl_extra_libs" ! fi ! ! if test "$gt_cv_have_gettext" = "yes"; then ! AC_DEFINE(HAVE_GETTEXT,1, ! [Define if the GNU gettext() function is already present or preinstalled.]) ! GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ! [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl ! if test "$MSGFMT" != "no"; then ! AC_CHECK_FUNCS(dcgettext) ! AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ! GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ! [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) ! AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ! return _nl_msg_cat_cntr], ! [CATOBJEXT=.gmo ! DATADIRNAME=share], ! [CATOBJEXT=.mo ! DATADIRNAME=lib]) ! INSTOBJEXT=.mo ! else ! gt_cv_have_gettext=no ! fi ! fi ! ]) ! if test "$gt_cv_have_gettext" = "yes" ; then AC_DEFINE(ENABLE_NLS, 1, [always defined to indicate that i18n is enabled]) fi dnl Test whether we really found GNU xgettext. if test "$XGETTEXT" != ":"; then ! dnl If it is not GNU xgettext we define it as : so that the dnl Makefiles still can work. if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; *************** *** 3839,3872 **** AC_SUBST(DATADIRNAME) AC_SUBST(GMOFILES) AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLDEPS) AC_SUBST(INTLLIBS) ! AC_SUBST(INTLOBJS) AC_SUBST(POFILES) AC_SUBST(POSUB) ]) ! AC_DEFUN(AM_GLIB_GNU_GETTEXT, ! [AC_REQUIRE([AC_PROG_MAKE_SET])dnl ! AC_REQUIRE([AC_PROG_CC])dnl ! AC_REQUIRE([AC_PROG_RANLIB])dnl AC_REQUIRE([AC_HEADER_STDC])dnl ! AC_REQUIRE([AC_C_CONST])dnl ! AC_REQUIRE([AC_C_INLINE])dnl ! AC_REQUIRE([AC_TYPE_OFF_T])dnl ! AC_REQUIRE([AC_TYPE_SIZE_T])dnl ! AC_REQUIRE([AC_FUNC_ALLOCA])dnl ! AC_REQUIRE([AC_FUNC_MMAP])dnl ! ! AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ ! unistd.h sys/param.h]) ! AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ ! strdup __argz_count __argz_stringify __argz_next]) ! AM_GLIB_LC_MESSAGES ! AM_GLIB_WITH_NLS ! ! if test "x$CATOBJEXT" != "x"; then if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else --- 4456,4486 ---- AC_SUBST(DATADIRNAME) AC_SUBST(GMOFILES) AC_SUBST(INSTOBJEXT) AC_SUBST(INTLLIBS) ! AC_SUBST(PO_IN_DATADIR_TRUE) ! AC_SUBST(PO_IN_DATADIR_FALSE) AC_SUBST(POFILES) AC_SUBST(POSUB) ]) ! # AM_GLIB_GNU_GETTEXT ! # ------------------- ! # Do checks necessary for use of gettext. If a suitable implementation ! # of gettext is found in either in libintl or in the C library, ! # it will set INTLLIBS to the libraries needed for use of gettext ! # and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable ! # gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() ! # on various variables needed by the Makefile.in.in installed by ! # glib-gettextize. ! dnl ! glib_DEFUN(GLIB_GNU_GETTEXT, ! [AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_HEADER_STDC])dnl ! ! GLIB_LC_MESSAGES ! GLIB_WITH_NLS ! if test "$gt_cv_have_gettext" = "yes"; then if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else *************** *** 3887,3904 **** fi fi - dnl Determine which catalog format we have (if any is needed) - dnl For now we know about two different formats: - dnl Linux libc-5 and the normal X/Open format - test -d po || mkdir po - if test "$CATOBJEXT" = ".cat"; then - AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) - - dnl Transform the SED scripts while copying because some dumb SEDs - dnl cannot handle comments. - sed -e '/^#/d' $srcdir/po/$msgformat-msg.sed > po/po2msg.sed - fi - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly dnl find the mkinstalldirs script in another subdir but ($top_srcdir). dnl Try to locate is. --- 4501,4506 ---- *************** *** 3928,3933 **** --- 4530,4560 ---- < $srcdir/po/POTFILES.in > po/POTFILES ]) + # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) + # ------------------------------- + # Define VARIABLE to the location where catalog files will + # be installed by po/Makefile. + glib_DEFUN(GLIB_DEFINE_LOCALEDIR, + [glib_REQUIRE([GLIB_GNU_GETTEXT])dnl + glib_save_prefix="$prefix" + test "x$prefix" = xNONE && prefix=$ac_default_prefix + if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` + else + localedir=`eval echo "${datadir}/locale"` + fi + prefix="$glib_save_prefix" + AC_DEFINE_UNQUOTED($1, "$localedir", + [Define the location where the catalogs will be installed]) + ]) + + dnl + dnl Now the definitions that aclocal will find + dnl + ifdef(glib_configure_in,[],[ + AC_DEFUN(AM_GLIB_GNU_GETTEXT,[GLIB_GNU_GETTEXT($@)]) + AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,[GLIB_DEFINE_LOCALEDIR($@)]) + ])dnl dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) diff -crN ./libgnomecanvas/config.guess /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/config.guess *** ./libgnomecanvas/config.guess Thu Feb 27 23:22:13 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/config.guess Sat Aug 9 21:31:45 2003 *************** *** 3,9 **** # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. ! timestamp='2001-04-20' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by --- 3,9 ---- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. ! timestamp='2001-09-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by *************** *** 52,58 **** GNU config.guess ($timestamp) Originally written by Per Bothner. ! Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO --- 52,58 ---- GNU config.guess ($timestamp) Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO *************** *** 95,119 **** # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. ! case $CC_FOR_BUILD,$HOST_CC,$CC in ! ,,) echo "int dummy(){}" > $dummy.c for c in cc gcc c89 ; do ! ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 if test $? = 0 ; then ! CC_FOR_BUILD="$c"; break ! fi ! done ! rm -f $dummy.c $dummy.o $dummy.rel if test x"$CC_FOR_BUILD" = x ; then ! CC_FOR_BUILD=no_compiler_found fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac # This is needed to find uname on a Pyramid OSx when run in the BSD universe. ! # (ghazi@noc.rutgers.edu 8/24/94.) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi --- 95,119 ---- # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. ! set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in ! ,,) echo "int dummy(){}" > $dummy.c ; for c in cc gcc c89 ; do ! ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; if test $? = 0 ; then ! CC_FOR_BUILD="$c"; break ; ! fi ; ! done ; ! rm -f $dummy.c $dummy.o $dummy.rel ; if test x"$CC_FOR_BUILD" = x ; then ! CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. ! # (ghazi@noc.rutgers.edu 1994-08-24) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi *************** *** 150,155 **** --- 150,156 ---- # to ELF recently, or will in the future. case "${UNAME_MACHINE}" in i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null then *************** *** 204,209 **** --- 205,211 ---- jsr \$26,exit .end main EOF + eval $set_cc_for_build $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then case `./$dummy` in *************** *** 225,230 **** --- 227,235 ---- 2-307) UNAME_MACHINE="alphaev67" ;; + 2-1307) + UNAME_MACHINE="alphaev68" + ;; esac fi rm -f $dummy.s $dummy *************** *** 328,333 **** --- 333,341 ---- aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; + sparc*:NetBSD:*) + echo `uname -p`-unknown-netbsd${UNAME_RELEASE} + exit 0 ;; atari*:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; *************** *** 385,390 **** --- 393,399 ---- echo clipper-intergraph-clix${UNAME_RELEASE} exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus #include /* for printf() prototype */ *************** *** 475,480 **** --- 484,490 ---- exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include *************** *** 553,558 **** --- 563,569 ---- fi ;; esac if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE *************** *** 586,594 **** exit (0); } EOF ! (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` ! if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi ! rm -f $dummy.c $dummy fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} --- 597,605 ---- exit (0); } EOF ! (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` ! if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi ! rm -f $dummy.c $dummy fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} *************** *** 598,603 **** --- 609,615 ---- echo ia64-hp-hpux${HPUX_REV} exit 0 ;; 3050*:HI-UX:*:*) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include int *************** *** 633,639 **** 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; ! *9??*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) --- 645,651 ---- 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; ! *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) *************** *** 677,688 **** echo xmp-cray-unicos exit 0 ;; CRAY*Y-MP:*:*:*) ! echo ymp-cray-unicos${UNAME_RELEASE} exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ ! -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' --- 689,701 ---- echo xmp-cray-unicos exit 0 ;; CRAY*Y-MP:*:*:*) ! echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ ! -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ ! -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' *************** *** 763,859 **** echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) ! cat >$dummy.c < /* for printf() prototype */ ! int main (int argc, char *argv[]) { ! #else ! int main (argc, argv) int argc; char *argv[]; { ! #endif ! #ifdef __MIPSEB__ ! printf ("%s-unknown-linux-gnu\n", argv[1]); ! #endif ! #ifdef __MIPSEL__ ! printf ("%sel-unknown-linux-gnu\n", argv[1]); ! #endif ! return 0; ! } ! EOF ! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy ;; ppc:Linux:*:*) ! # Determine Lib Version ! cat >$dummy.c < ! #if defined(__GLIBC__) ! extern char __libc_version[]; ! extern char __libc_release[]; ! #endif ! main(argc, argv) ! int argc; ! char *argv[]; ! { ! #if defined(__GLIBC__) ! printf("%s %s\n", __libc_version, __libc_release); ! #else ! printf("unknown\n"); ! #endif ! return 0; ! } ! EOF ! LIBC="" ! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ! if test "$?" = 0 ; then ! ./$dummy | grep 1\.99 > /dev/null ! if test "$?" = 0 ; then LIBC="libc1" ; fi ! fi ! rm -f $dummy.c $dummy ! echo powerpc-unknown-linux-gnu${LIBC} exit 0 ;; alpha:Linux:*:*) ! cat <$dummy.s ! .data ! \$Lformat: ! .byte 37,100,45,37,120,10,0 # "%d-%x\n" ! .text ! .globl main ! .align 4 ! .ent main ! main: ! .frame \$30,16,\$26,0 ! ldgp \$29,0(\$27) ! .prologue 1 ! .long 0x47e03d80 # implver \$0 ! lda \$2,-1 ! .long 0x47e20c21 # amask \$2,\$1 ! lda \$16,\$Lformat ! mov \$0,\$17 ! not \$1,\$18 ! jsr \$26,printf ! ldgp \$29,0(\$26) ! mov 0,\$16 ! jsr \$26,exit ! .end main ! EOF ! LIBC="" ! $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null ! if test "$?" = 0 ; then ! case `./$dummy` in ! 0-0) UNAME_MACHINE="alpha" ;; ! 1-0) UNAME_MACHINE="alphaev5" ;; ! 1-1) UNAME_MACHINE="alphaev56" ;; ! 1-101) UNAME_MACHINE="alphapca56" ;; ! 2-303) UNAME_MACHINE="alphaev6" ;; ! 2-307) UNAME_MACHINE="alphaev67" ;; ! esac ! objdump --private-headers $dummy | \ ! grep ld.so.1 > /dev/null ! if test "$?" = 0 ; then ! LIBC="libc1" ! fi ! fi ! rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) --- 776,804 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) ! case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in ! big) echo mips-unknown-linux-gnu && exit 0 ;; ! little) echo mipsel-unknown-linux-gnu && exit 0 ;; ! esac ;; ppc:Linux:*:*) ! echo powerpc-unknown-linux-gnu ! exit 0 ;; ! ppc64:Linux:*:*) ! echo powerpc64-unknown-linux-gnu exit 0 ;; alpha:Linux:*:*) ! case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ! EV5) UNAME_MACHINE=alphaev5 ;; ! EV56) UNAME_MACHINE=alphaev56 ;; ! PCA56) UNAME_MACHINE=alphapca56 ;; ! PCA57) UNAME_MACHINE=alphapca56 ;; ! EV6) UNAME_MACHINE=alphaev6 ;; ! EV67) UNAME_MACHINE=alphaev67 ;; ! EV68*) UNAME_MACHINE=alphaev68 ;; ! esac ! objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null ! if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) *************** *** 883,922 **** # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. ! ld_supported_emulations=`cd /; ld --help 2>&1 \ ! | sed -ne '/supported emulations:/!d s/[ ][ ]*/ /g ! s/.*supported emulations: *// s/ .*// p'` ! case "$ld_supported_emulations" in ! i*86linux) ! echo "${UNAME_MACHINE}-pc-linux-gnuaout" ! exit 0 ! ;; ! elf_i*86) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; ! i*86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ! exit 0 ! ;; ! esac ! # Either a pre-BFD a.out linker (linux-gnuoldld) ! # or one that does not give us useful --help. ! # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. ! # If ld does not provide *any* "supported emulations:" ! # that means it is gnuoldld. ! test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 ! case "${UNAME_MACHINE}" in ! i*86) ! VENDOR=pc; ! ;; ! *) ! VENDOR=unknown; ! ;; esac # Determine whether the default compiler is a.out or elf cat >$dummy.c < #ifdef __cplusplus --- 828,857 ---- # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. ! ld_supported_targets=`cd /; ld --help 2>&1 \ ! | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g ! s/.*supported targets: *// s/ .*// p'` ! case "$ld_supported_targets" in ! elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; ! a.out-i386-linux) ! echo "${UNAME_MACHINE}-pc-linux-gnuaout" ! exit 0 ;; ! coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ! exit 0 ;; ! "") ! # Either a pre-BFD a.out linker (linux-gnuoldld) or ! # one that does not give us useful --help. ! echo "${UNAME_MACHINE}-pc-linux-gnuoldld" ! exit 0 ;; esac # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build cat >$dummy.c < #ifdef __cplusplus *************** *** 928,942 **** #ifdef __ELF__ # ifdef __GLIBC__ # if __GLIBC__ >= 2 ! printf ("%s-${VENDOR}-linux-gnu\n", argv[1]); # else ! printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); # endif # else ! printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); # endif #else ! printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]); #endif return 0; } --- 863,877 ---- #ifdef __ELF__ # ifdef __GLIBC__ # if __GLIBC__ >= 2 ! printf ("%s-pc-linux-gnu\n", argv[1]); # else ! printf ("%s-pc-linux-gnulibc1\n", argv[1]); # endif # else ! printf ("%s-pc-linux-gnulibc1\n", argv[1]); # endif #else ! printf ("%s-pc-linux-gnuaout\n", argv[1]); #endif return 0; } *************** *** 945,953 **** rm -f $dummy.c $dummy test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions - # are messed up and put the nodename in both sysname and nodename. i*86:DYNIX/ptx:4*:*) echo i386-sequent-sysv4 exit 0 ;; i*86:UNIX_SV:4.2MP:2.*) --- 880,889 ---- rm -f $dummy.c $dummy test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. echo i386-sequent-sysv4 exit 0 ;; i*86:UNIX_SV:4.2MP:2.*) *************** *** 966,979 **** echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit 0 ;; ! i*86:*:5:7*) ! # Fixed at (any) Pentium or better ! UNAME_MACHINE=i586 ! if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then ! echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} ! else ! echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} ! fi exit 0 ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then --- 902,914 ---- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit 0 ;; ! i*86:*:5:[78]*) ! case `/bin/uname -X | grep "^Machine"` in ! *486*) UNAME_MACHINE=i486 ;; ! *Pentium) UNAME_MACHINE=i586 ;; ! *Pent*|*Celeron) UNAME_MACHINE=i686 ;; ! esac ! echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} exit 0 ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then *************** *** 1067,1074 **** echo ns32k-sni-sysv fi exit 0 ;; ! PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ! # says echo i586-unisys-sysv4 exit 0 ;; *:UNIX_System_V:4*:FTX*) --- 1002,1009 ---- echo ns32k-sni-sysv fi exit 0 ;; ! PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ! # says echo i586-unisys-sysv4 exit 0 ;; *:UNIX_System_V:4*:FTX*) *************** *** 1080,1085 **** --- 1015,1024 ---- # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 exit 0 ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit 0 ;; *************** *** 1172,1182 **** --- 1111,1128 ---- *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + eval $set_cc_for_build cat >$dummy.c < diff -crN ./libgnomecanvas/config.h.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/config.h.in *** ./libgnomecanvas/config.h.in Tue Jan 14 17:52:14 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/config.h.in Sat Aug 9 21:32:02 2003 *************** *** 1,12 **** ! /* config.h.in. Generated automatically from configure.in by autoheader. */ ! ! /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP ! systems. This function is required for `alloca.c' support on those systems. ! */ ! #undef CRAY_STACKSEG_END ! ! /* Define if using `alloca.c'. */ ! #undef C_ALLOCA /* always defined to indicate that i18n is enabled */ #undef ENABLE_NLS --- 1,4 ---- ! /* config.h.in. Generated from configure.in by autoheader. */ /* always defined to indicate that i18n is enabled */ #undef ENABLE_NLS *************** *** 14,147 **** /* Gettext package */ #undef GETTEXT_PACKAGE ! /* Define if you have `alloca', as a function or macro. */ ! #undef HAVE_ALLOCA ! ! /* Define if you have and it should be used (not on Ultrix). */ ! #undef HAVE_ALLOCA_H ! ! /* Define if you have the header file. */ ! #undef HAVE_ARGZ_H ! /* Define if you have the `dcgettext' function. */ #undef HAVE_DCGETTEXT ! /* Define if you have the header file. */ #undef HAVE_DLFCN_H - /* Define if you have the `getcwd' function. */ - #undef HAVE_GETCWD - - /* Define if you have the `getpagesize' function. */ - #undef HAVE_GETPAGESIZE - /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT ! /* Define if you have the header file. */ #undef HAVE_INTTYPES_H /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES ! /* Define if you have the header file. */ ! #undef HAVE_LIMITS_H ! ! /* Define if you have the header file. */ #undef HAVE_LOCALE_H ! /* Define if you have the header file. */ ! #undef HAVE_MALLOC_H ! ! /* Define if you have the header file. */ #undef HAVE_MEMORY_H ! /* Define if you have a working `mmap' system call. */ ! #undef HAVE_MMAP ! ! /* Define if you have the `munmap' function. */ ! #undef HAVE_MUNMAP ! ! /* Define if you have the header file. */ ! #undef HAVE_NL_TYPES_H ! ! /* Define if you have the `putenv' function. */ ! #undef HAVE_PUTENV ! ! /* Define if you have the `setenv' function. */ ! #undef HAVE_SETENV ! ! /* Define if you have the `setlocale' function. */ ! #undef HAVE_SETLOCALE ! ! /* Define if you have the header file. */ #undef HAVE_STDINT_H ! /* Define if you have the header file. */ #undef HAVE_STDLIB_H ! /* Define if you have the `strcasecmp' function. */ ! #undef HAVE_STRCASECMP ! ! /* Define if you have the `strchr' function. */ ! #undef HAVE_STRCHR ! ! /* Define if you have the `strdup' function. */ ! #undef HAVE_STRDUP ! ! /* Define if you have the header file. */ #undef HAVE_STRINGS_H ! /* Define if you have the header file. */ #undef HAVE_STRING_H ! /* Define if you have the header file. */ ! #undef HAVE_SYS_PARAM_H ! ! /* Define if you have the header file. */ #undef HAVE_SYS_STAT_H ! /* Define if you have the header file. */ #undef HAVE_SYS_TYPES_H ! /* Define if you have the header file. */ #undef HAVE_UNISTD_H - /* Define if you have the `__argz_count' function. */ - #undef HAVE___ARGZ_COUNT - - /* Define if you have the `__argz_next' function. */ - #undef HAVE___ARGZ_NEXT - - /* Define if you have the `__argz_stringify' function. */ - #undef HAVE___ARGZ_STRINGIFY - /* Name of package */ #undef PACKAGE ! /* If using the C implementation of alloca, define if you know the ! direction of stack growth for your system; otherwise it will be ! automatically deduced at run-time. ! STACK_DIRECTION > 0 => grows toward higher addresses ! STACK_DIRECTION < 0 => grows toward lower addresses ! STACK_DIRECTION = 0 => direction of growth unknown */ ! #undef STACK_DIRECTION ! /* Define if you have the ANSI C header files. */ ! #undef STDC_HEADERS ! /* Version number of package */ ! #undef VERSION ! /* Define to empty if `const' does not conform to ANSI C. */ ! #undef const ! /* Define as `__inline' if that's what the C compiler calls it, or to nothing ! if it is not supported. */ ! #undef inline ! /* Define to `long' if does not define. */ ! #undef off_t ! /* Define to `unsigned' if does not define. */ ! #undef size_t --- 6,76 ---- /* Gettext package */ #undef GETTEXT_PACKAGE ! /* Define to 1 if you have the `bind_textdomain_codeset' function. */ ! #undef HAVE_BIND_TEXTDOMAIN_CODESET ! /* Define to 1 if you have the `dcgettext' function. */ #undef HAVE_DCGETTEXT ! /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT ! /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES ! /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H ! /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H ! /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H ! /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H ! /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H ! /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H ! /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H ! /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H ! /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H /* Name of package */ #undef PACKAGE ! /* Define to the address where bug reports for this package should be sent. */ ! #undef PACKAGE_BUGREPORT ! /* Define to the full name of this package. */ ! #undef PACKAGE_NAME ! /* Define to the full name and version of this package. */ ! #undef PACKAGE_STRING ! /* Define to the one symbol short name of this package. */ ! #undef PACKAGE_TARNAME ! /* Define to the version of this package. */ ! #undef PACKAGE_VERSION ! /* Define to 1 if you have the ANSI C header files. */ ! #undef STDC_HEADERS ! /* Version number of package */ ! #undef VERSION diff -crN ./libgnomecanvas/config.sub /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/config.sub *** ./libgnomecanvas/config.sub Thu Feb 27 23:22:13 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/config.sub Sat Aug 9 21:31:45 2003 *************** *** 3,9 **** # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. ! timestamp='2001-04-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software --- 3,9 ---- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. ! timestamp='2001-09-07' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software *************** *** 117,123 **** # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; --- 117,123 ---- # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; *************** *** 157,162 **** --- 157,170 ---- os=-vxworks basic_machine=$1 ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; *************** *** 215,240 **** case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. ! tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ ! | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \ ! | pyramid | mn10200 | mn10300 | tron | a29k \ ! | 580 | i960 | h8300 \ ! | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ ! | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ ! | hppa64 \ ! | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ ! | alphaev6[78] \ ! | we32k | ns16k | clipper | i370 | sh | sh[34] \ ! | powerpc | powerpcle \ ! | 1750a | dsp16xx | pdp10 | pdp11 \ ! | mips16 | mips64 | mipsel | mips64el \ ! | mips64orion | mips64orionel | mipstx39 | mipstx39el \ ! | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ ! | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \ ! | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \ ! | v850 | c4x \ ! | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ ! | pj | pjl | h8500) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) --- 223,258 ---- case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. ! 1750a | 580 \ ! | a29k \ ! | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ ! | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ! | c4x | clipper \ ! | d10v | d30v | dsp16xx \ ! | fr30 \ ! | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ! | i370 | i860 | i960 | ia64 \ ! | m32r | m68000 | m68k | m88k | mcore \ ! | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ ! | mips64vr4100 | mips64vr4100el | mips64vr4300 \ ! | mips64vr4300el | mips64vr5000 | mips64vr5000el \ ! | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ ! | mipsisa32 \ ! | mn10200 | mn10300 \ ! | ns16k | ns32k \ ! | openrisc \ ! | pdp10 | pdp11 | pj | pjl \ ! | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ! | pyramid \ ! | s390 | s390x \ ! | sh | sh[34] | sh[34]eb | shbe | shle \ ! | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ ! | stormy16 | strongarm \ ! | tahoe | thumb | tic80 | tron \ ! | v850 \ ! | we32k \ ! | x86 | xscale \ ! | z8k) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) *************** *** 242,248 **** basic_machine=$basic_machine-unknown os=-none ;; ! m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65) ;; # We use `pc' rather than `unknown' --- 260,266 ---- basic_machine=$basic_machine-unknown os=-none ;; ! m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; # We use `pc' rather than `unknown' *************** *** 257,287 **** exit 1 ;; # Recognize the basic CPU types with company name. ! # FIXME: clean up the formatting here. ! vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ ! | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ ! | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ ! | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ ! | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ ! | xmp-* | ymp-* \ ! | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ ! | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ ! | hppa2.0n-* | hppa64-* \ ! | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ ! | alphaev6[78]-* \ ! | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ ! | clipper-* | orion-* \ ! | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ ! | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ ! | mips16-* | mips64-* | mipsel-* \ ! | mips64el-* | mips64orion-* | mips64orionel-* \ ! | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ ! | mipstx39-* | mipstx39el-* | mcore-* \ ! | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ ! | [cjt]90-* \ ! | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ ! | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \ ! | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. --- 275,317 ---- exit 1 ;; # Recognize the basic CPU types with company name. ! 580-* \ ! | a29k-* \ ! | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ! | alphapca5[67]-* | arc-* \ ! | arm-* | armbe-* | armle-* | armv*-* \ ! | bs2000-* \ ! | c[123]* | c30-* | [cjt]90-* | c54x-* \ ! | clipper-* | cray2-* | cydra-* \ ! | d10v-* | d30v-* \ ! | elxsi-* \ ! | f30[01]-* | f700-* | fr30-* | fx80-* \ ! | h8300-* | h8500-* \ ! | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ! | i*86-* | i860-* | i960-* | ia64-* \ ! | m32r-* \ ! | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | mcore-* \ ! | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ ! | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ ! | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ ! | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ ! | none-* | np1-* | ns16k-* | ns32k-* \ ! | orion-* \ ! | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ ! | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ! | pyramid-* \ ! | romp-* | rs6000-* \ ! | s390-* | s390x-* \ ! | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ ! | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ ! | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ ! | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ ! | v850-* | vax-* \ ! | we32k-* \ ! | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ ! | ymp-* \ ! | z8k-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. *************** *** 727,732 **** --- 757,772 ---- ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ps2) basic_machine=i386-ibm ;; *************** *** 881,886 **** --- 921,930 ---- basic_machine=hppa1.1-winbond os=-proelf ;; + windows32) + basic_machine=i386-pc + os=-windows32-msvcrt + ;; xmp) basic_machine=xmp-cray os=-unicos *************** *** 934,940 **** we32k) basic_machine=we32k-att ;; ! sh3 | sh4) basic_machine=sh-unknown ;; sparc | sparcv9 | sparcv9b) --- 978,984 ---- we32k) basic_machine=we32k-att ;; ! sh3 | sh4 | sh3eb | sh4eb) basic_machine=sh-unknown ;; sparc | sparcv9 | sparcv9b) *************** *** 1018,1028 **** | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ ! | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) --- 1062,1074 ---- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ ! | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ ! | -os2* | -vos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) *************** *** 1346,1351 **** --- 1392,1400 ---- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; + -vos*) + vendor=stratus + ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; diff -crN ./libgnomecanvas/configure /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/configure *** ./libgnomecanvas/configure Thu Feb 27 23:22:16 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/configure Sat Aug 9 21:32:11 2003 *************** *** 1,8 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by Autoconf 2.52. # ! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. --- 1,8 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.53. # ! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. *************** *** 15,22 **** --- 15,24 ---- *-DOS) lt_cv_sys_path_separator=';' ;; *) lt_cv_sys_path_separator=':' ;; esac + PATH_SEPARATOR=$lt_cv_sys_path_separator fi + # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} *************** *** 80,86 **** # # So, first we look for a working echo in the user's PATH. ! IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for dir in $PATH /usr/ucb; do if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && --- 82,88 ---- # # So, first we look for a working echo in the user's PATH. ! IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR for dir in $PATH /usr/ucb; do if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && *************** *** 162,179 **** ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" fi - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' - as_cr_Letters=$as_cr_letters$as_cr_LETTERS - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - # Sed expression to map a string onto a valid variable name. - as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" ! # Sed expression to map a string onto a valid CPP name. ! as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then --- 164,181 ---- ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" fi ! if expr a : '\(a\)' >/dev/null 2>&1; then ! as_expr=expr ! else ! as_expr=false ! fi ! ! ! ## --------------------- ## ! ## M4sh Initialization. ## ! ## --------------------- ## # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then *************** *** 183,190 **** set -o posix fi # Name of the executable. ! as_me=`echo "$0" |sed 's,.*[\\/],,'` if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr --- 185,349 ---- set -o posix fi + # NLS nuisances. + # Support unset when possible. + if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset + else + as_unset=false + fi + + (set +x; test -n "`(LANG=C; export LANG) 2>&1`") && + { $as_unset LANG || test "${LANG+set}" != set; } || + { LANG=C; export LANG; } + (set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && + { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || + { LC_ALL=C; export LC_ALL; } + (set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && + { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || + { LC_TIME=C; export LC_TIME; } + (set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && + { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || + { LC_CTYPE=C; export LC_CTYPE; } + (set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && + { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || + { LANGUAGE=C; export LANGUAGE; } + (set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && + { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || + { LC_COLLATE=C; export LC_COLLATE; } + (set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && + { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || + { LC_NUMERIC=C; export LC_NUMERIC; } + (set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && + { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || + { LC_MESSAGES=C; export LC_MESSAGES; } + + # Name of the executable. ! as_me=`(basename "$0") 2>/dev/null || ! $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ! X"$0" : 'X\(//\)$' \| \ ! X"$0" : 'X\(/\)$' \| \ ! . : '\(.\)' 2>/dev/null || ! echo X/"$0" | ! sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } ! /^X\/\(\/\/\)$/{ s//\1/; q; } ! /^X\/\(\/\).*/{ s//\1/; q; } ! s/.*/./; q'` ! ! # PATH needs CR, and LINENO needs CR and PATH. ! # Avoid depending upon Character Ranges. ! as_cr_letters='abcdefghijklmnopqrstuvwxyz' ! as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ! as_cr_Letters=$as_cr_letters$as_cr_LETTERS ! as_cr_digits='0123456789' ! as_cr_alnum=$as_cr_Letters$as_cr_digits ! ! # The user is always right. ! if test "${PATH_SEPARATOR+set}" != set; then ! echo "#! /bin/sh" >conftest.sh ! echo "exit 0" >>conftest.sh ! chmod +x conftest.sh ! if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then ! PATH_SEPARATOR=';' ! else ! PATH_SEPARATOR=: ! fi ! rm -f conftest.sh ! fi ! ! ! as_lineno_1=$LINENO ! as_lineno_2=$LINENO ! as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` ! test "x$as_lineno_1" != "x$as_lineno_2" && ! test "x$as_lineno_3" = "x$as_lineno_2" || { ! # Find who we are. Look in the path if we contain no path at all ! # relative or not. ! case $0 in ! *[\\/]* ) as_myself=$0 ;; ! *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ! done ! ! ;; ! esac ! # We did not find ourselves, most probably we were run as `sh COMMAND' ! # in which case we are not to be found in the path. ! if test "x$as_myself" = x; then ! as_myself=$0 ! fi ! if test ! -f "$as_myself"; then ! { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 ! { (exit 1); exit 1; }; } ! fi ! case $CONFIG_SHELL in ! '') ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for as_base in sh bash ksh sh5; do ! case $as_dir in ! /*) ! if ("$as_dir/$as_base" -c ' ! as_lineno_1=$LINENO ! as_lineno_2=$LINENO ! as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` ! test "x$as_lineno_1" != "x$as_lineno_2" && ! test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then ! CONFIG_SHELL=$as_dir/$as_base ! export CONFIG_SHELL ! exec "$CONFIG_SHELL" "$0" ${1+"$@"} ! fi;; ! esac ! done ! done ! ;; ! esac ! ! # Create $as_me.lineno as a copy of $as_myself, but with $LINENO ! # uniformly replaced by the line number. The first 'sed' inserts a ! # line-number line before each line; the second 'sed' does the real ! # work. The second script uses 'N' to pair each line-number line ! # with the numbered line, and appends trailing '-' during ! # substitution so that $LINENO is not a special case at line end. ! # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the ! # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) ! sed '=' <$as_myself | ! sed ' ! N ! s,$,-, ! : loop ! s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, ! t loop ! s,-$,, ! s,^['$as_cr_digits']*\n,, ! ' >$as_me.lineno && ! chmod +x $as_me.lineno || ! { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ! { (exit 1); exit 1; }; } ! ! # Don't try to exec as it changes $[0], causing all sort of problems ! # (the dirname of $[0] is not the place where we might find the ! # original and so on. Autoconf is especially sensible to this). ! . ./$as_me.lineno ! # Exit status is that of the last command. ! exit ! } ! ! ! case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in ! *c*,-n*) ECHO_N= ECHO_C=' ! ' ECHO_T=' ' ;; ! *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; ! *) ECHO_N= ECHO_C='\c' ECHO_T= ;; ! esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr *************** *** 212,233 **** as_executable_p="test -f" ! # Support unset when possible. ! if (FOO=FOO; unset FOO) >/dev/null 2>&1; then ! as_unset=unset ! else ! as_unset=false ! fi - # NLS nuisances. - $as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } - $as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } - $as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } - $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } - $as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } - $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } - $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } - $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } # IFS # We need space, tab and new line, in precisely that order. --- 371,382 ---- as_executable_p="test -f" ! # Sed expression to map a string onto a valid CPP name. ! as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" ! ! # Sed expression to map a string onto a valid variable name. ! as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" # IFS # We need space, tab and new line, in precisely that order. *************** *** 236,242 **** IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, --- 385,392 ---- IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } ! # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, *************** *** 251,257 **** ac_default_prefix=/usr/local cross_compiling=no subdirs= ! MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. --- 401,408 ---- ac_default_prefix=/usr/local cross_compiling=no subdirs= ! MFLAGS= ! MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. *************** *** 259,264 **** --- 410,422 ---- # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} + # Identity of this package. + PACKAGE_NAME= + PACKAGE_TARNAME= + PACKAGE_VERSION= + PACKAGE_STRING= + PACKAGE_BUGREPORT= + ac_unique_file="libgnomecanvas" # Factoring default headers for most tests. ac_includes_default="\ *************** *** 297,302 **** --- 455,461 ---- # include #endif" + # Initialize some variables set by options. ac_init_help= ac_init_version=false *************** *** 335,347 **** infodir='${prefix}/info' mandir='${prefix}/man' - # Identity of this package. - PACKAGE_NAME= - PACKAGE_TARNAME= - PACKAGE_VERSION= - PACKAGE_STRING= - PACKAGE_BUGREPORT= - ac_prev= for ac_option do --- 494,499 ---- *************** *** 474,480 **** with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ! | --no-cr | --no-c) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ --- 626,632 ---- with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ! | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ *************** *** 653,659 **** eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; ! *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done --- 805,811 ---- eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; ! *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done *************** *** 665,682 **** eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; ! *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. build=$build_alias host=$host_alias target=$target_alias ! # FIXME: should be removed in autoconf 3.0. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe --- 817,835 ---- eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; ! *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. + # FIXME: To remove some day. build=$build_alias host=$host_alias target=$target_alias ! # FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe *************** *** 692,704 **** test "$silent" = yes && exec 6>/dev/null # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. ! ac_prog=$0 ! ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` ! test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. --- 845,867 ---- test "$silent" = yes && exec 6>/dev/null + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. ! ac_confdir=`(dirname "$0") 2>/dev/null || ! $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$0" : 'X\(//\)[^/]' \| \ ! X"$0" : 'X\(//\)$' \| \ ! X"$0" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || ! echo X"$0" | ! sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ! /^X\(\/\/\)[^/].*/{ s//\1/; q; } ! /^X\(\/\/\)$/{ s//\1/; q; } ! /^X\(\/\).*/{ s//\1/; q; } ! s/.*/./; q'` srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. *************** *** 708,717 **** fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then ! { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else ! { echo "$as_me: error: cannot find sources in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi --- 871,880 ---- fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then ! { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else ! { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi *************** *** 755,761 **** if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. ! cat <&2 fi cd $ac_popdir done --- 1022,1081 ---- Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. ! _ACEOF fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. ac_popdir=`pwd` ! for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue ! test -d $ac_dir || continue ! ac_builddir=. ! ! if test "$ac_dir" != .; then ! ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ! # A "../" for each directory in $ac_dir_suffix. ! ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` ! else ! ac_dir_suffix= ac_top_builddir= ! fi ! ! case $srcdir in ! .) # No --srcdir option. We are building in place. ! ac_srcdir=. ! if test -z "$ac_top_builddir"; then ! ac_top_srcdir=. ! else ! ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` ! fi ;; ! [\\/]* | ?:[\\/]* ) # Absolute path. ! ac_srcdir=$srcdir$ac_dir_suffix; ! ac_top_srcdir=$srcdir ;; ! *) # Relative path. ! ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ! ac_top_srcdir=$ac_top_builddir$srcdir ;; ! esac ! # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be ! # absolute. ! ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` ! ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` ! ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ! ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. ! if test -f $ac_srcdir/configure.gnu; then echo ! $SHELL $ac_srcdir/configure.gnu --help=recursive ! elif test -f $ac_srcdir/configure; then echo ! $SHELL $ac_srcdir/configure --help=recursive ! elif test -f $ac_srcdir/configure.ac || ! test -f $ac_srcdir/configure.in; then echo $ac_configure --help else ! echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi cd $ac_popdir done *************** *** 898,928 **** test -n "$ac_init_help" && exit 0 if $ac_init_version; then ! cat <<\EOF ! Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. ! EOF exit 0 fi exec 5>config.log ! cat >&5 </dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` --- 1083,1113 ---- test -n "$ac_init_help" && exit 0 if $ac_init_version; then ! cat <<\_ACEOF ! Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. ! _ACEOF exit 0 fi exec 5>config.log ! cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ ! _ACEOF { cat <<_ASUNAME ! ## --------- ## ! ## Platform. ## ! ## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` *************** *** 941,957 **** /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - PATH = $PATH - _ASUNAME } >&5 ! cat >&5 </dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` _ASUNAME + + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" + done + } >&5 ! cat >&5 <<_ACEOF ! ! ! ## ----------- ## ! ## Core tests. ## ! ## ----------- ## ! ! _ACEOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. *************** *** 962,976 **** do case $ac_arg in -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ! | --no-cr | --no-c) ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ ! | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ! ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ! ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" ! ac_sep=" " ;; ! *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" ! ac_sep=" " ;; esac # Get rid of the leading space. done --- 1157,1173 ---- do case $ac_arg in -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ! | --no-cr | --no-c | -n ) continue ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ ! | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ! continue ;; *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ! ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ! esac ! case " $ac_configure_args " in ! *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. ! *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" ! ac_sep=" " ;; esac # Get rid of the leading space. done *************** *** 978,991 **** # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. trap 'exit_status=$? # Save into config.log some information that might help in debugging. ! echo >&5 ! echo "## ----------------- ##" >&5 ! echo "## Cache variables. ##" >&5 ! echo "## ----------------- ##" >&5 ! echo >&5 ! # The following way of writing the cache mishandles newlines in values, { (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in --- 1175,1193 ---- # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. + # WARNING: Be sure not to use single quotes in there, as some shells, + # such as our DU 5.0 friend, will then `close' the trap. trap 'exit_status=$? # Save into config.log some information that might help in debugging. ! { ! echo ! cat <<\_ASBOX ! ## ---------------- ## ! ## Cache variables. ## ! ## ---------------- ## ! _ASBOX ! echo ! # The following way of writing the cache mishandles newlines in values, { (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *************** *** 999,1019 **** "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; ! } >&5 ! sed "/^$/d" confdefs.h >conftest.log ! if test -s conftest.log; then ! echo >&5 ! echo "## ------------ ##" >&5 ! echo "## confdefs.h. ##" >&5 ! echo "## ------------ ##" >&5 ! echo >&5 ! cat conftest.log >&5 ! fi ! (echo; echo) >&5 ! test "$ac_signal" != 0 && ! echo "$as_me: caught signal $ac_signal" >&5 ! echo "$as_me: exit $exit_status" >&5 ! rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do --- 1201,1224 ---- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; ! } ! echo ! if test -s confdefs.h; then ! cat <<\_ASBOX ! ## ----------- ## ! ## confdefs.h. ## ! ## ----------- ## ! _ASBOX ! echo ! sed "/^$/d" confdefs.h ! echo ! fi ! test "$ac_signal" != 0 && ! echo "$as_me: caught signal $ac_signal" ! echo "$as_me: exit $exit_status" ! } >&5 ! rm -f core core.* *.core && ! rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do *************** *** 1026,1031 **** --- 1231,1263 ---- # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo >confdefs.h + # Predefined preprocessor variables. + + cat >>confdefs.h <<_ACEOF + #define PACKAGE_NAME "$PACKAGE_NAME" + _ACEOF + + + cat >>confdefs.h <<_ACEOF + #define PACKAGE_TARNAME "$PACKAGE_TARNAME" + _ACEOF + + + cat >>confdefs.h <<_ACEOF + #define PACKAGE_VERSION "$PACKAGE_VERSION" + _ACEOF + + + cat >>confdefs.h <<_ACEOF + #define PACKAGE_STRING "$PACKAGE_STRING" + _ACEOF + + + cat >>confdefs.h <<_ACEOF + #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" + _ACEOF + + # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then *************** *** 1037,1045 **** fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then ! { echo "$as_me:1040: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} ! cat "$ac_site_file" >&5 . "$ac_site_file" fi done --- 1269,1277 ---- fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then ! { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} ! sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done *************** *** 1048,1054 **** # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then ! { echo "$as_me:1051: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; --- 1280,1286 ---- # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then ! { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; *************** *** 1056,1062 **** esac fi else ! { echo "$as_me:1059: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi --- 1288,1294 ---- esac fi else ! { echo "$as_me:$LINENO: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi *************** *** 1072,1113 **** eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) ! { echo "$as_me:1075: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) ! { echo "$as_me:1079: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then ! { echo "$as_me:1085: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ! { echo "$as_me:1087: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} ! { echo "$as_me:1089: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; esac ! # Pass precious variables to config.status. It doesn't matter if ! # we pass some twice (in addition to the command line arguments). if test "$ac_new_set" = set; then case $ac_new_val in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ! ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ! ac_configure_args="$ac_configure_args '$ac_arg'" ! ;; ! *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" ! ;; esac fi done if $ac_cache_corrupted; then ! { echo "$as_me:1108: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} ! { { echo "$as_me:1110: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi --- 1304,1345 ---- eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) ! { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) ! { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then ! { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ! { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} ! { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; esac ! # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ! ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ! *) ac_arg=$ac_var=$ac_new_val ;; ! esac ! case " $ac_configure_args " in ! *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. ! *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then ! { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} ! { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi *************** *** 1118,1143 **** ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ! case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in ! *c*,-n*) ECHO_N= ECHO_C=' ! ' ECHO_T=' ' ;; ! *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; ! *) ECHO_N= ECHO_C='\c' ECHO_T= ;; ! esac ! echo "#! $SHELL" >conftest.sh ! echo "exit 0" >>conftest.sh ! chmod +x conftest.sh ! if { (echo "$as_me:1130: PATH=\".;.\"; conftest.sh") >&5 ! (PATH=".;."; conftest.sh) 2>&5 ! ac_status=$? ! echo "$as_me:1133: \$? = $ac_status" >&5 ! (exit $ac_status); }; then ! ac_path_separator=';' ! else ! ac_path_separator=: ! fi ! PATH_SEPARATOR="$ac_path_separator" ! rm -f conftest.sh # Making releases: # LIBGNOMECANVAS_MICRO_VERSION += 1; --- 1350,1372 ---- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! # Making releases: # LIBGNOMECANVAS_MICRO_VERSION += 1; *************** *** 1156,1169 **** # Normally empty, but can be used to make "fixup" releases. LIBGNOMECANVAS_EXTRAVERSION=.2 LIBGNOMECANVAS_CURRENT=`expr 100 '*' $LIBGNOMECANVAS_MINOR_VERSION + $LIBGNOMECANVAS_MICRO_VERSION - $LIBGNOMECANVAS_INTERFACE_AGE` LIBGNOMECANVAS_REVISION=$LIBGNOMECANVAS_INTERFACE_AGE LIBGNOMECANVAS_AGE=`expr $LIBGNOMECANVAS_BINARY_AGE - $LIBGNOMECANVAS_INTERFACE_AGE` LIBGNOMECANVAS_VERSION=$LIBGNOMECANVAS_MAJOR_VERSION.$LIBGNOMECANVAS_MINOR_VERSION.$LIBGNOMECANVAS_MICRO_VERSION$LIBGNOMECANVAS_EXTRAVERSION - ac_config_headers="$ac_config_headers config.h" ! ac_config_commands="$ac_config_commands default-1" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do --- 1385,1404 ---- # Normally empty, but can be used to make "fixup" releases. LIBGNOMECANVAS_EXTRAVERSION=.2 + LIBGNOMECANVAS_CURRENT=`expr 100 '*' $LIBGNOMECANVAS_MINOR_VERSION + $LIBGNOMECANVAS_MICRO_VERSION - $LIBGNOMECANVAS_INTERFACE_AGE` LIBGNOMECANVAS_REVISION=$LIBGNOMECANVAS_INTERFACE_AGE LIBGNOMECANVAS_AGE=`expr $LIBGNOMECANVAS_BINARY_AGE - $LIBGNOMECANVAS_INTERFACE_AGE` LIBGNOMECANVAS_VERSION=$LIBGNOMECANVAS_MAJOR_VERSION.$LIBGNOMECANVAS_MINOR_VERSION.$LIBGNOMECANVAS_MICRO_VERSION$LIBGNOMECANVAS_EXTRAVERSION ! ! ! ! ! ! ! ac_config_headers="$ac_config_headers config.h" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do *************** *** 1182,1188 **** fi done if test -z "$ac_aux_dir"; then ! { { echo "$as_me:1185: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi --- 1417,1423 ---- fi done if test -z "$ac_aux_dir"; then ! { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi *************** *** 1202,1244 **** # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. ! echo "$as_me:1205: checking for a BSD compatible install" >&5 ! echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! for ac_dir in $PATH; do ! IFS=$ac_save_IFS ! # Account for people who put trailing slashes in PATH elements. ! case $ac_dir/ in ! / | ./ | .// | /cC/* \ ! | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ ! | /usr/ucb/* ) ;; ! *) ! # OSF1 and SCO ODT 3.0 have their own names for install. ! # Don't use installbsd from OSF since it installs stuff as root ! # by default. ! for ac_prog in ginstall scoinst install; do ! if $as_executable_p "$ac_dir/$ac_prog"; then ! if test $ac_prog = install && ! grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then ! # AIX install. It has an incompatible calling convention. ! : ! elif test $ac_prog = install && ! grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then ! # program-specific install script used by HP pwplus--don't use. ! : ! else ! ac_cv_path_install="$ac_dir/$ac_prog -c" ! break 2 ! fi ! fi done ! ;; ! esac ! done fi if test "${ac_cv_path_install+set}" = set; then --- 1437,1484 ---- # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. ! echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ! echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! # Account for people who put trailing slashes in PATH elements. ! case $as_dir/ in ! ./ | .// | /cC/* | \ ! /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ! /usr/ucb/* ) ;; ! *) ! # OSF1 and SCO ODT 3.0 have their own names for install. ! # Don't use installbsd from OSF since it installs stuff as root ! # by default. ! for ac_prog in ginstall scoinst install; do ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then ! if test $ac_prog = install && ! grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then ! # AIX install. It has an incompatible calling convention. ! : ! elif test $ac_prog = install && ! grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then ! # program-specific install script used by HP pwplus--don't use. ! : ! else ! ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ! break 3 ! fi ! fi done ! done ! ;; ! esac ! done ! fi if test "${ac_cv_path_install+set}" = set; then *************** *** 1251,1257 **** INSTALL=$ac_install_sh fi fi ! echo "$as_me:1254: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. --- 1491,1497 ---- INSTALL=$ac_install_sh fi fi ! echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. *************** *** 1262,1311 **** test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ! echo "$as_me:1265: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 ! 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 conftestfile 2> /dev/null` if test "$*" = "X"; then # -L didn't work. ! set X `ls -t $srcdir/configure conftestfile` fi ! 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 # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". ! { { echo "$as_me:1288: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} { (exit 1); exit 1; }; } fi ! test "$2" = conftestfile ) then # Ok. : else ! { { echo "$as_me:1301: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi ! rm -f conftest* ! echo "$as_me:1308: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" --- 1502,1551 ---- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ! echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 ! echo timestamp > conftest.file # 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 # -L didn't work. ! set X `ls -t $srcdir/configure conftest.file` fi ! rm -f conftest.file ! if test "$*" != "X $srcdir/configure conftest.file" \ ! && test "$*" != "X conftest.file $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 # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". ! { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} { (exit 1); exit 1; }; } fi ! test "$2" = conftest.file ) then # Ok. : else ! { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi ! echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" *************** *** 1320,1335 **** program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed ! echo "$as_me:1323: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! cat >conftest.make <<\EOF all: @echo 'ac_maketemp="${MAKE}"' ! EOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then --- 1560,1630 ---- program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed ! ! # expand $ac_aux_dir to an absolute path ! am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` ! ! 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='`' ! { echo "$as_me:$LINENO: WARNING: ${am_backtick}missing' script is too old or missing" >&5 ! echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} ! fi ! ! for ac_prog in gawk mawk nawk awk ! do ! # Extract the first word of "$ac_prog", so it can be a program name with args. ! set dummy $ac_prog; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_prog_AWK+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! if test -n "$AWK"; then ! ac_cv_prog_AWK="$AWK" # Let the user override the test. ! else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_AWK="$ac_prog" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done ! done ! ! fi ! fi ! AWK=$ac_cv_prog_AWK ! if test -n "$AWK"; then ! echo "$as_me:$LINENO: result: $AWK" >&5 ! echo "${ECHO_T}$AWK" >&6 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! fi ! ! test -n "$AWK" && break ! done ! ! echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! cat >conftest.make <<\_ACEOF all: @echo 'ac_maketemp="${MAKE}"' ! _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then *************** *** 1340,1460 **** rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then ! echo "$as_me:1343: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else ! echo "$as_me:1347: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi ! PACKAGE=libgnomecanvas ! VERSION=$LIBGNOMECANVAS_VERSION ! if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then ! { { echo "$as_me:1357: error: source directory already configured; run \"make distclean\" there first" >&5 ! echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} ! { (exit 1); exit 1; }; } fi - cat >>confdefs.h <>confdefs.h <&5 - echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6 - # 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 (aclocal --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL=aclocal - echo "$as_me:1378: result: found" >&5 - echo "${ECHO_T}found" >&6 - else - ACLOCAL="$missing_dir/missing aclocal" - echo "$as_me:1382: result: missing" >&5 - echo "${ECHO_T}missing" >&6 - fi - - echo "$as_me:1386: checking for working autoconf" >&5 - echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6 - # 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 (autoconf --version) < /dev/null > /dev/null 2>&1; then - AUTOCONF=autoconf - echo "$as_me:1393: result: found" >&5 - echo "${ECHO_T}found" >&6 - else - AUTOCONF="$missing_dir/missing autoconf" - echo "$as_me:1397: result: missing" >&5 - echo "${ECHO_T}missing" >&6 - fi - - echo "$as_me:1401: checking for working automake" >&5 - echo $ECHO_N "checking for working automake... $ECHO_C" >&6 - # 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 (automake --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake - echo "$as_me:1408: result: found" >&5 - echo "${ECHO_T}found" >&6 - else - AUTOMAKE="$missing_dir/missing automake" - echo "$as_me:1412: result: missing" >&5 - echo "${ECHO_T}missing" >&6 - fi - - echo "$as_me:1416: checking for working autoheader" >&5 - echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6 - # 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 (autoheader --version) < /dev/null > /dev/null 2>&1; then - AUTOHEADER=autoheader - echo "$as_me:1423: result: found" >&5 - echo "${ECHO_T}found" >&6 - else - AUTOHEADER="$missing_dir/missing autoheader" - echo "$as_me:1427: result: missing" >&5 - echo "${ECHO_T}missing" >&6 - fi - - echo "$as_me:1431: checking for working makeinfo" >&5 - echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6 - # 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 (makeinfo --version) < /dev/null > /dev/null 2>&1; then - MAKEINFO=makeinfo - echo "$as_me:1438: result: found" >&5 - echo "${ECHO_T}found" >&6 - else - MAKEINFO="$missing_dir/missing makeinfo" - echo "$as_me:1442: result: missing" >&5 - echo "${ECHO_T}missing" >&6 - fi ! echo "$as_me:1446: checking whether to enable maintainer-specific portions of Makefiles" >&5 ! echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 ! # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. ! if test "${enable_maintainer_mode+set}" = set; then ! enableval="$enable_maintainer_mode" ! USE_MAINTAINER_MODE=$enableval else ! USE_MAINTAINER_MODE=no fi; ! echo "$as_me:1455: result: $USE_MAINTAINER_MODE" >&5 echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' --- 1635,1756 ---- rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then ! echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi ! # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. ! if test "${enable_dependency_tracking+set}" = set; then ! enableval="$enable_dependency_tracking" ! fi; ! if test "x$enable_dependency_tracking" != xno; then ! am_depcomp="$ac_aux_dir/depcomp" ! AMDEPBACKSLASH='\' ! fi ! ! if test "x$enable_dependency_tracking" != xno; then ! AMDEP_TRUE= ! AMDEP_FALSE='#' ! else ! AMDEP_TRUE='#' ! AMDEP_FALSE= fi ! 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 ! ! ! # test to see if srcdir already configured ! if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && ! test -f $srcdir/config.status; then ! { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 ! echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} ! { (exit 1); exit 1; }; } ! fi ! ! # Define the identity of the package. ! PACKAGE=libgnomecanvas ! VERSION=$LIBGNOMECANVAS_VERSION ! ! cat >>confdefs.h <<_ACEOF ! #define PACKAGE "$PACKAGE" ! _ACEOF ! ! ! cat >>confdefs.h <<_ACEOF ! #define VERSION "$VERSION" ! _ACEOF ! ! ! # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow ! # the ones we care about. ! ! # 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. ! ! # Similar for OBJEXT -- only we only use OBJEXT if the user actually ! # requests that it be used. This is a bit dumb. ! : ${OBJEXT=o} ! ! ! # Some tools Automake needs. ! ! ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} ! ! ! AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} ! ! ! AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} ! ! ! AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} ! ! ! MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} ! ! ! AMTAR=${AMTAR-"${am_missing_run}tar"} ! ! install_sh=${install_sh-"$am_aux_dir/install-sh"} ! ! INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ! ! # We need awk for the "check" target. The system "awk" is bad on ! # some platforms. ! ! ! echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ! echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 ! # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. ! if test "${enable_maintainer_mode+set}" = set; then ! enableval="$enable_maintainer_mode" ! USE_MAINTAINER_MODE=$enableval ! else ! USE_MAINTAINER_MODE=no fi; ! echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 + if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' *************** *** 1464,1469 **** --- 1760,1808 ---- fi MAINT=$MAINTAINER_MODE_TRUE + + + + ac_config_commands="$ac_config_commands default-1" + + am_make=${MAKE-make} + cat > confinc << 'END' + doit: + @echo done + END + # If we don't find an include directive, just comment out the code. + echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 + echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 + 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 + + + echo "$as_me:$LINENO: result: $_am_result" >&5 + echo "${ECHO_T}$_am_result" >&6 + rm -f confinc confmf + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' *************** *** 1472,1478 **** if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 ! echo "$as_me:1475: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 1811,1817 ---- if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 1480,1504 **** if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_CC="${ac_tool_prefix}gcc" ! echo "$as_me:1490: found $ac_dir/$ac_word" >&5 ! break done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:1498: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:1501: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 1819,1846 ---- if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_CC="${ac_tool_prefix}gcc" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 1507,1513 **** ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 ! echo "$as_me:1510: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 1849,1855 ---- ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 1515,1539 **** if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_ac_ct_CC="gcc" ! echo "$as_me:1525: found $ac_dir/$ac_word" >&5 ! break done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then ! echo "$as_me:1533: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else ! echo "$as_me:1536: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 1857,1884 ---- if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_ac_ct_CC="gcc" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then ! echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 1546,1552 **** if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 ! echo "$as_me:1549: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 1891,1897 ---- if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 1554,1578 **** if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_CC="${ac_tool_prefix}cc" ! echo "$as_me:1564: found $ac_dir/$ac_word" >&5 ! break done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:1572: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:1575: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 1899,1926 ---- if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_CC="${ac_tool_prefix}cc" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 1581,1587 **** ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 ! echo "$as_me:1584: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 1929,1935 ---- ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 1589,1613 **** if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_ac_ct_CC="cc" ! echo "$as_me:1599: found $ac_dir/$ac_word" >&5 ! break done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then ! echo "$as_me:1607: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else ! echo "$as_me:1610: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 1937,1964 ---- if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_ac_ct_CC="cc" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then ! echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 1620,1626 **** if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 ! echo "$as_me:1623: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 1971,1977 ---- if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 1629,1647 **** ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then ! ac_prog_rejected=yes ! continue ! fi ! ac_cv_prog_CC="cc" ! echo "$as_me:1643: found $ac_dir/$ac_word" >&5 ! break done if test $ac_prog_rejected = yes; then --- 1980,2001 ---- ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ! ac_prog_rejected=yes ! continue ! fi ! ac_cv_prog_CC="cc" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done if test $ac_prog_rejected = yes; then *************** *** 1653,1659 **** # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift ! set dummy "$ac_dir/$ac_word" ${1+"$@"} shift ac_cv_prog_CC="$@" fi --- 2007,2013 ---- # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift ! set dummy "$as_dir/$ac_word" ${1+"$@"} shift ac_cv_prog_CC="$@" fi *************** *** 1662,1671 **** fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:1665: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:1668: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 2016,2025 ---- fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 1676,1682 **** do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ! echo "$as_me:1679: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 2030,2036 ---- do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 1684,1708 **** if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_CC="$ac_tool_prefix$ac_prog" ! echo "$as_me:1694: found $ac_dir/$ac_word" >&5 ! break done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:1702: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:1705: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 2038,2065 ---- if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_CC="$ac_tool_prefix$ac_prog" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 1715,1721 **** do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 ! echo "$as_me:1718: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 2072,2078 ---- do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 1723,1747 **** if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_ac_ct_CC="$ac_prog" ! echo "$as_me:1733: found $ac_dir/$ac_word" >&5 ! break done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then ! echo "$as_me:1741: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else ! echo "$as_me:1744: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 2080,2107 ---- if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_ac_ct_CC="$ac_prog" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then ! echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 1753,1786 **** fi ! test -z "$CC" && { { echo "$as_me:1756: error: no acceptable cc found in \$PATH" >&5 ! echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. ! echo "$as_me:1761:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` ! { (eval echo "$as_me:1764: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? ! echo "$as_me:1767: \$? = $ac_status" >&5 (exit $ac_status); } ! { (eval echo "$as_me:1769: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? ! echo "$as_me:1772: \$? = $ac_status" >&5 (exit $ac_status); } ! { (eval echo "$as_me:1774: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? ! echo "$as_me:1777: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF ! #line 1781 "configure" #include "confdefs.h" int main () { --- 2113,2153 ---- fi ! ! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 ! echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. ! echo "$as_me:$LINENO:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` ! { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } ! { (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } ! { (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 1794,1815 **** # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. ! echo "$as_me:1797: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ! if { (eval echo "$as_me:1800: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? ! echo "$as_me:1803: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. ! for ac_file in `ls a.exe conftest.exe 2>/dev/null; ls a.out conftest 2>/dev/null; ls a.* conftest.* 2>/dev/null`; do case $ac_file in ! *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; a.out ) # We found the default executable, but exeext='' is most # certainly right. break;; --- 2161,2186 ---- # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. ! echo "$as_me:$LINENO: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ! if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. ! ! # Be careful to initialize this variable, since it used to be cached. ! # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. ! ac_cv_exeext= ! for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; ls a.out conftest 2>/dev/null; ls a.* conftest.* 2>/dev/null`; do case $ac_file in ! *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; a.out ) # We found the default executable, but exeext='' is most # certainly right. break;; *************** *** 1823,1856 **** else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! { { echo "$as_me:1826: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext ! echo "$as_me:1832: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. ! echo "$as_me:1837: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' ! { (eval echo "$as_me:1843: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:1846: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else ! { { echo "$as_me:1853: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} --- 2194,2227 ---- else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! { { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext ! echo "$as_me:$LINENO: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. ! echo "$as_me:$LINENO: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else ! { { echo "$as_me:$LINENO: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} *************** *** 1858,1881 **** fi fi fi ! echo "$as_me:1861: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. ! echo "$as_me:1868: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 ! echo "$as_me:1870: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 ! echo "$as_me:1873: checking for executable suffix" >&5 ! echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 ! if { (eval echo "$as_me:1875: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:1878: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will --- 2229,2252 ---- fi fi fi ! echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. ! echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 ! echo "$as_me:$LINENO: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 ! echo "$as_me:$LINENO: checking for suffix of executables" >&5 ! echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will *************** *** 1891,1917 **** esac done else ! { { echo "$as_me:1894: error: cannot compute EXEEXT: cannot compile and link" >&5 ! echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext ! echo "$as_me:1900: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT ! echo "$as_me:1906: checking for object suffix" >&5 ! echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line 1912 "configure" #include "confdefs.h" int main () { --- 2262,2294 ---- esac done else ! { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5 ! echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext ! echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT ! echo "$as_me:$LINENO: checking for suffix of object files" >&5 ! echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 1921,1930 **** } _ACEOF rm -f conftest.o conftest.obj ! if { (eval echo "$as_me:1924: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:1927: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in --- 2298,2307 ---- } _ACEOF rm -f conftest.o conftest.obj ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in *************** *** 1936,1961 **** else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! { { echo "$as_me:1939: error: cannot compute OBJEXT: cannot compile" >&5 ! echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi ! echo "$as_me:1946: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT ! echo "$as_me:1950: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line 1956 "configure" #include "confdefs.h" int main () { --- 2313,2344 ---- else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! { { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5 ! echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT ! echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 1968,1983 **** } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:1971: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:1974: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:1977: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:1980: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else --- 2351,2366 ---- } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else *************** *** 1989,2009 **** ac_cv_c_compiler_gnu=$ac_compiler_gnu fi ! echo "$as_me:1992: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" ! echo "$as_me:1998: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line 2004 "configure" #include "confdefs.h" int main () { --- 2372,2398 ---- ac_cv_c_compiler_gnu=$ac_compiler_gnu fi ! echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" ! echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2013,2028 **** } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:2016: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:2019: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:2022: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:2025: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else --- 2402,2417 ---- } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else *************** *** 2032,2038 **** fi rm -f conftest.$ac_objext conftest.$ac_ext fi ! echo "$as_me:2035: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS --- 2421,2427 ---- fi rm -f conftest.$ac_objext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS *************** *** 2059,2074 **** #endif _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:2062: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:2065: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:2068: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:2071: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ --- 2448,2463 ---- #endif _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ *************** *** 2080,2089 **** 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF ! #line 2083 "configure" #include "confdefs.h" #include $ac_declaration int main () { --- 2469,2484 ---- 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" #include $ac_declaration + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2093,2108 **** } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:2096: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:2099: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:2102: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:2105: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else --- 2488,2503 ---- } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else *************** *** 2112,2120 **** fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF ! #line 2115 "configure" #include "confdefs.h" $ac_declaration int main () { --- 2507,2521 ---- fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" $ac_declaration + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2124,2139 **** } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:2127: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:2130: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:2133: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:2136: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else --- 2525,2540 ---- } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else *************** *** 2160,2166 **** ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ! echo "$as_me:2163: checking for strerror in -lcposix" >&5 echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6 if test "${ac_cv_lib_cposix_strerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 2561,2638 ---- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ! depcc="$CC" am_compiler_list= ! ! echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ! echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 ! if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! 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_CC_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_CC_dependencies_compiler_type=$depmode ! break ! fi ! done ! ! cd .. ! rm -rf conftest.dir ! else ! am_cv_CC_dependencies_compiler_type=none ! fi ! ! fi ! echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ! echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 ! CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" ! ! ! ! ! echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6 if test "${ac_cv_lib_cposix_strerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 2168,2174 **** ac_check_lib_save_LIBS=$LIBS LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF ! #line 2171 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ --- 2640,2646 ---- ac_check_lib_save_LIBS=$LIBS LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ *************** *** 2178,2183 **** --- 2650,2661 ---- /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char strerror (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2187,2202 **** } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:2190: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:2193: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:2196: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:2199: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cposix_strerror=yes else --- 2665,2680 ---- } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cposix_strerror=yes else *************** *** 2207,2218 **** rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:2210: result: $ac_cv_lib_cposix_strerror" >&5 echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6 if test $ac_cv_lib_cposix_strerror = yes; then LIBS="$LIBS -lcposix" fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --- 2685,2698 ---- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5 echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6 if test $ac_cv_lib_cposix_strerror = yes; then LIBS="$LIBS -lcposix" fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' *************** *** 2221,2227 **** if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 ! echo "$as_me:2224: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 2701,2707 ---- if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 2229,2253 **** if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_CC="${ac_tool_prefix}gcc" ! echo "$as_me:2239: found $ac_dir/$ac_word" >&5 ! break done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:2247: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:2250: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 2709,2736 ---- if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_CC="${ac_tool_prefix}gcc" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 2256,2262 **** ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 ! echo "$as_me:2259: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 2739,2745 ---- ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 2264,2288 **** if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_ac_ct_CC="gcc" ! echo "$as_me:2274: found $ac_dir/$ac_word" >&5 ! break done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then ! echo "$as_me:2282: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else ! echo "$as_me:2285: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 2747,2774 ---- if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_ac_ct_CC="gcc" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then ! echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 2295,2301 **** if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 ! echo "$as_me:2298: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 2781,2787 ---- if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 2303,2327 **** if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_CC="${ac_tool_prefix}cc" ! echo "$as_me:2313: found $ac_dir/$ac_word" >&5 ! break done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:2321: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:2324: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 2789,2816 ---- if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_CC="${ac_tool_prefix}cc" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 2330,2336 **** ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 ! echo "$as_me:2333: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 2819,2825 ---- ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 2338,2362 **** if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_ac_ct_CC="cc" ! echo "$as_me:2348: found $ac_dir/$ac_word" >&5 ! break done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then ! echo "$as_me:2356: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else ! echo "$as_me:2359: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 2827,2854 ---- if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_ac_ct_CC="cc" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then ! echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 2369,2375 **** if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 ! echo "$as_me:2372: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 2861,2867 ---- if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 2378,2396 **** ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then ! ac_prog_rejected=yes ! continue ! fi ! ac_cv_prog_CC="cc" ! echo "$as_me:2392: found $ac_dir/$ac_word" >&5 ! break done if test $ac_prog_rejected = yes; then --- 2870,2891 ---- ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ! ac_prog_rejected=yes ! continue ! fi ! ac_cv_prog_CC="cc" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done if test $ac_prog_rejected = yes; then *************** *** 2402,2408 **** # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift ! set dummy "$ac_dir/$ac_word" ${1+"$@"} shift ac_cv_prog_CC="$@" fi --- 2897,2903 ---- # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift ! set dummy "$as_dir/$ac_word" ${1+"$@"} shift ac_cv_prog_CC="$@" fi *************** *** 2411,2420 **** fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:2414: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:2417: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 2906,2915 ---- fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 2425,2431 **** do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ! echo "$as_me:2428: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 2920,2926 ---- do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 2433,2457 **** if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_CC="$ac_tool_prefix$ac_prog" ! echo "$as_me:2443: found $ac_dir/$ac_word" >&5 ! break done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:2451: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:2454: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 2928,2955 ---- if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_CC="$ac_tool_prefix$ac_prog" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then ! echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 2464,2470 **** do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 ! echo "$as_me:2467: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 2962,2968 ---- do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 2472,2496 **** if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_ac_ct_CC="$ac_prog" ! echo "$as_me:2482: found $ac_dir/$ac_word" >&5 ! break done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then ! echo "$as_me:2490: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else ! echo "$as_me:2493: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 2970,2997 ---- if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_ac_ct_CC="$ac_prog" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then ! echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 2502,2540 **** fi ! test -z "$CC" && { { echo "$as_me:2505: error: no acceptable cc found in \$PATH" >&5 ! echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. ! echo "$as_me:2510:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` ! { (eval echo "$as_me:2513: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? ! echo "$as_me:2516: \$? = $ac_status" >&5 (exit $ac_status); } ! { (eval echo "$as_me:2518: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? ! echo "$as_me:2521: \$? = $ac_status" >&5 (exit $ac_status); } ! { (eval echo "$as_me:2523: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? ! echo "$as_me:2526: \$? = $ac_status" >&5 (exit $ac_status); } ! echo "$as_me:2529: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line 2535 "configure" #include "confdefs.h" int main () { --- 3003,3048 ---- fi ! ! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 ! echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. ! echo "$as_me:$LINENO:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` ! { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } ! { (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } ! { (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } ! echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2547,2562 **** } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:2550: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:2553: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:2556: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:2559: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else --- 3055,3070 ---- } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else *************** *** 2568,2588 **** ac_cv_c_compiler_gnu=$ac_compiler_gnu fi ! echo "$as_me:2571: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" ! echo "$as_me:2577: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line 2583 "configure" #include "confdefs.h" int main () { --- 3076,3102 ---- ac_cv_c_compiler_gnu=$ac_compiler_gnu fi ! echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" ! echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2592,2607 **** } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:2595: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:2598: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:2601: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:2604: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else --- 3106,3121 ---- } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else *************** *** 2611,2617 **** fi rm -f conftest.$ac_objext conftest.$ac_ext fi ! echo "$as_me:2614: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS --- 3125,3131 ---- fi rm -f conftest.$ac_objext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS *************** *** 2638,2653 **** #endif _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:2641: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:2644: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:2647: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:2650: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ --- 3152,3167 ---- #endif _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ *************** *** 2659,2668 **** 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF ! #line 2662 "configure" #include "confdefs.h" #include $ac_declaration int main () { --- 3173,3188 ---- 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" #include $ac_declaration + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2672,2687 **** } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:2675: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:2678: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:2681: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:2684: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else --- 3192,3207 ---- } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else *************** *** 2691,2699 **** fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF ! #line 2694 "configure" #include "confdefs.h" $ac_declaration int main () { --- 3211,3225 ---- fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" $ac_declaration + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2703,2718 **** } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:2706: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:2709: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:2712: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:2715: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else --- 3229,3244 ---- } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else *************** *** 2739,2750 **** ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ! echo "$as_me:2747: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then --- 3265,3345 ---- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + depcc="$CC" am_compiler_list= + + echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 + echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 + if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + 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_CC_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_CC_dependencies_compiler_type=$depmode + break + fi + done + + cd .. + rm -rf conftest.dir + else + am_cv_CC_dependencies_compiler_type=none + fi + + fi + echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 + echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 + CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ! echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then *************** *** 2765,2782 **** # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF ! #line 2768 "configure" #include "confdefs.h" #include Syntax error _ACEOF ! if { (eval echo "$as_me:2773: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 ! echo "$as_me:2779: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag --- 3360,3377 ---- # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" #include Syntax error _ACEOF ! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag *************** *** 2799,2815 **** # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF ! #line 2802 "configure" #include "confdefs.h" #include _ACEOF ! if { (eval echo "$as_me:2806: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 ! echo "$as_me:2812: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag --- 3394,3410 ---- # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" #include _ACEOF ! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag *************** *** 2846,2852 **** else ac_cv_prog_CPP=$CPP fi ! echo "$as_me:2849: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes --- 3441,3447 ---- else ac_cv_prog_CPP=$CPP fi ! echo "$as_me:$LINENO: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes *************** *** 2856,2873 **** # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF ! #line 2859 "configure" #include "confdefs.h" #include Syntax error _ACEOF ! if { (eval echo "$as_me:2864: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 ! echo "$as_me:2870: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag --- 3451,3468 ---- # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" #include Syntax error _ACEOF ! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag *************** *** 2890,2906 **** # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF ! #line 2893 "configure" #include "confdefs.h" #include _ACEOF ! if { (eval echo "$as_me:2897: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 ! echo "$as_me:2903: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag --- 3485,3501 ---- # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" #include _ACEOF ! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag *************** *** 2928,2934 **** if $ac_preproc_ok; then : else ! { { echo "$as_me:2931: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi --- 3523,3529 ---- if $ac_preproc_ok; then : else ! { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi *************** *** 2939,2951 **** ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ! echo "$as_me:2942: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line 2948 "configure" #include "confdefs.h" #include #include --- 3534,3547 ---- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ! ! echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" #include #include *************** *** 2953,2965 **** #include _ACEOF ! if { (eval echo "$as_me:2956: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 ! echo "$as_me:2962: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag --- 3549,3561 ---- #include _ACEOF ! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag *************** *** 2981,2987 **** if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF ! #line 2984 "configure" #include "confdefs.h" #include --- 3577,3583 ---- if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" #include *************** *** 2999,3005 **** if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF ! #line 3002 "configure" #include "confdefs.h" #include --- 3595,3601 ---- if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" #include *************** *** 3020,3026 **** : else cat >conftest.$ac_ext <<_ACEOF ! #line 3023 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) --- 3616,3622 ---- : else cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) *************** *** 3046,3082 **** } _ACEOF rm -f conftest$ac_exeext ! if { (eval echo "$as_me:3049: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:3052: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ! { (eval echo "$as_me:3054: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:3057: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ac_cv_header_stdc=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi ! echo "$as_me:3070: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then ! cat >>confdefs.h <<\EOF #define STDC_HEADERS 1 ! EOF fi # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" --- 3642,3680 ---- } _ACEOF rm -f conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 + ( exit $ac_status ) ac_cv_header_stdc=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi ! echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then ! cat >>confdefs.h <<\_ACEOF #define STDC_HEADERS 1 ! _ACEOF fi + # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" *************** *** 3145,3155 **** fi; # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || ! { { echo "$as_me:3148: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } ! echo "$as_me:3152: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 3743,3753 ---- fi; # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || ! { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } ! echo "$as_me:$LINENO: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 3158,3180 **** test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && ! { { echo "$as_me:3161: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || ! { { echo "$as_me:3165: error: $ac_config_sub $ac_cv_build_alias failed." >&5 ! echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi ! echo "$as_me:3170: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ! echo "$as_me:3177: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 3756,3779 ---- test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && ! { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || ! { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 ! echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi ! echo "$as_me:$LINENO: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ! ! echo "$as_me:$LINENO: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 3183,3200 **** test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || ! { { echo "$as_me:3186: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi ! echo "$as_me:3191: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` # Check whether --with-gnu-ld or --without-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then withval="$with_gnu_ld" --- 3782,3812 ---- test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || ! { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi ! echo "$as_me:$LINENO: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + # Find the correct PATH separator. Usually this is `:', but + # DJGPP uses `;' like DOS. + if test "X${PATH_SEPARATOR+set}" != Xset; then + UNAME=${UNAME-`uname 2>/dev/null`} + case X$UNAME in + *-DOS) lt_cv_sys_path_separator=';' ;; + *) lt_cv_sys_path_separator=':' ;; + esac + PATH_SEPARATOR=$lt_cv_sys_path_separator + fi + + # Check whether --with-gnu-ld or --without-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then withval="$with_gnu_ld" *************** *** 3205,3211 **** ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. ! echo "$as_me:3208: checking for ld used by GCC" >&5 echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 case $host in *-*-mingw*) --- 3817,3823 ---- ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. ! echo "$as_me:$LINENO: checking for ld used by GCC" >&5 echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 case $host in *-*-mingw*) *************** *** 3235,3251 **** ;; esac elif test "$with_gnu_ld" = yes; then ! echo "$as_me:3238: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else ! echo "$as_me:3241: checking for non-GNU ld" >&5 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -z "$LD"; then ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then --- 3847,3863 ---- ;; esac elif test "$with_gnu_ld" = yes; then ! echo "$as_me:$LINENO: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else ! echo "$as_me:$LINENO: checking for non-GNU ld" >&5 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -z "$LD"; then ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then *************** *** 3268,3283 **** LD="$lt_cv_path_LD" if test -n "$LD"; then ! echo "$as_me:3271: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else ! echo "$as_me:3274: result: no" >&5 echo "${ECHO_T}no" >&6 fi ! test -z "$LD" && { { echo "$as_me:3277: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } ! echo "$as_me:3280: checking if the linker ($LD) is GNU ld" >&5 echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 3880,3895 ---- LD="$lt_cv_path_LD" if test -n "$LD"; then ! echo "$as_me:$LINENO: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi ! test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } ! echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 3289,3311 **** lt_cv_prog_gnu_ld=no fi fi ! echo "$as_me:3292: result: $lt_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 with_gnu_ld=$lt_cv_prog_gnu_ld ! echo "$as_me:3296: checking for $LD option to reload object files" >&5 echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi ! echo "$as_me:3303: result: $lt_cv_ld_reload_flag" >&5 echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" ! echo "$as_me:3308: checking for BSD-compatible nm" >&5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 3901,3924 ---- lt_cv_prog_gnu_ld=no fi fi ! echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 with_gnu_ld=$lt_cv_prog_gnu_ld ! ! echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi ! echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" ! echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 3314,3320 **** # Let the user override the test. lt_cv_path_NM="$NM" else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do test -z "$ac_dir" && ac_dir=. tmp_nm=$ac_dir/${ac_tool_prefix}nm --- 3927,3933 ---- # Let the user override the test. lt_cv_path_NM="$NM" else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do test -z "$ac_dir" && ac_dir=. tmp_nm=$ac_dir/${ac_tool_prefix}nm *************** *** 3324,3330 **** # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then ! lt_cv_path_NM="$tmp_nm -B" break elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then lt_cv_path_NM="$tmp_nm -p" --- 3937,3959 ---- # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then ! # AIX needs to suppress demangling for C++ to work correctly ! # AIX nm : The default is to demangle all C++ symbol names ! # GNU nm : The default is to not demangle low-level symbol names. ! case $host_os in ! aix*) ! # check if we are using GNU nm on AIX ! if $tmp_nm -V 2> /dev/null | grep GNU 2>&1 > /dev/null ! then ! lt_cv_path_NM="$tmp_nm -B" ! else ! lt_cv_path_NM="$tmp_nm -BC" ! fi ! ;; ! *) ! lt_cv_path_NM="$tmp_nm -B" ! ;; ! esac break elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then lt_cv_path_NM="$tmp_nm -p" *************** *** 3341,3361 **** fi NM="$lt_cv_path_NM" ! echo "$as_me:3344: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 ! echo "$as_me:3347: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then ! echo "$as_me:3351: result: yes" >&5 echo "${ECHO_T}yes" >&6 else ! echo "$as_me:3354: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi ! echo "$as_me:3358: checking how to recognise dependant libraries" >&5 echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6 if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 3970,3990 ---- fi NM="$lt_cv_path_NM" ! echo "$as_me:$LINENO: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 ! echo "$as_me:$LINENO: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then ! echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else ! echo "$as_me:$LINENO: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi ! echo "$as_me:$LINENO: checking how to recognise dependant libraries" >&5 echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6 if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 3369,3375 **** # `unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. ! # ['file_magic [regex]'] -- check by looking for files in library path # which responds to the $file_magic_cmd with a given egrep regex. # If you have `file' or equivalent on your system and you're not sure # whether `pass_all' will *always* work, you probably want this one. --- 3998,4004 ---- # `unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. ! # 'file_magic [[regex]]' -- check by looking for files in library path # which responds to the $file_magic_cmd with a given egrep regex. # If you have `file' or equivalent on your system and you're not sure # whether `pass_all' will *always* work, you probably want this one. *************** *** 3398,3404 **** lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' lt_cv_file_magic_cmd='/usr/bin/file -L' case "$host_os" in ! rhapsody* | darwin1.012) lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` ;; *) # Darwin 1.3 on --- 4027,4033 ---- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' lt_cv_file_magic_cmd='/usr/bin/file -L' case "$host_os" in ! rhapsody* | darwin1.[012]) lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` ;; *) # Darwin 1.3 on *************** *** 3457,3463 **** # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM --- 4086,4092 ---- # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM *************** *** 3480,3485 **** --- 4109,4124 ---- lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; + openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' + else + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + fi + ;; + osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' *************** *** 3523,3535 **** esac fi ! echo "$as_me:3526: result: $lt_cv_deplibs_check_method" >&5 echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method # Check for command to grab the raw symbol name followed by C symbol from nm. ! echo "$as_me:3532: checking command to parse $NM output" >&5 echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 4162,4180 ---- esac fi ! echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method + + + + + + # Check for command to grab the raw symbol name followed by C symbol from nm. ! echo "$as_me:$LINENO: checking command to parse $NM output" >&5 echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 3550,3555 **** --- 4195,4203 ---- # Transform an extracted symbol line into a proper C declaration lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" + # Transform an extracted symbol line into symbol name and symbol address + lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + # Define system-specific variables. case $host_os in aix*) *************** *** 3560,3565 **** --- 4208,4214 ---- ;; hpux*) # Its linker distinguishes data from code symbols lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; irix*) symcode='[BCDEGRST]' *************** *** 3606,3622 **** int main(){nm_test_var='a';nm_test_func();return(0);} EOF ! if { (eval echo "$as_me:3609: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:3612: \$? = $ac_status" >&5 (exit $ac_status); }; then # Now try to grab the symbols. nlist=conftest.nm ! if { (eval echo "$as_me:3616: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? ! echo "$as_me:3619: \$? = $ac_status" >&5 (exit $ac_status); } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then --- 4255,4271 ---- int main(){nm_test_var='a';nm_test_func();return(0);} EOF ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Now try to grab the symbols. nlist=conftest.nm ! if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then *************** *** 3639,3661 **** cat <> conftest.$ac_ext #if defined (__STDC__) && __STDC__ ! # define lt_ptr_t void * #else ! # define lt_ptr_t char * # define const #endif /* The mapping between symbol names and symbols. */ const struct { const char *name; ! lt_ptr_t address; } lt_preloaded_symbols[] = { EOF ! sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext cat <<\EOF >> conftest.$ac_ext ! {0, (lt_ptr_t) 0} }; #ifdef __cplusplus --- 4288,4310 ---- cat <> conftest.$ac_ext #if defined (__STDC__) && __STDC__ ! # define lt_ptr void * #else ! # define lt_ptr char * # define const #endif /* The mapping between symbol names and symbols. */ const struct { const char *name; ! lt_ptr address; } lt_preloaded_symbols[] = { EOF ! sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext cat <<\EOF >> conftest.$ac_ext ! {0, (lt_ptr) 0} }; #ifdef __cplusplus *************** *** 3668,3677 **** save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" ! if { (eval echo "$as_me:3671: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:3674: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest; then pipe_works=yes fi --- 4317,4326 ---- save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest; then pipe_works=yes fi *************** *** 3705,3774 **** global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" if test -z "$lt_cv_sys_global_symbol_pipe"; then global_symbol_to_cdecl= else global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" fi ! if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then ! echo "$as_me:3712: result: failed" >&5 echo "${ECHO_T}failed" >&6 else ! echo "$as_me:3715: result: ok" >&5 echo "${ECHO_T}ok" >&6 fi ! for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ! echo "$as_me:3722: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line 3728 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF ! if { (eval echo "$as_me:3732: \"$ac_cpp conftest.$ac_ext\"") >&5 ! (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:3738: \$? = $ac_status" >&5 ! (exit $ac_status); } >/dev/null; then ! if test -s conftest.err; then ! ac_cpp_err=$ac_c_preproc_warn_flag ! else ! ac_cpp_err= ! fi ! else ! ac_cpp_err=yes ! fi ! if test -z "$ac_cpp_err"; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! eval "$as_ac_Header=no" fi ! rm -f conftest.err conftest.$ac_ext fi ! echo "$as_me:3757: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then ! cat >>confdefs.h <&5 echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 4354,4554 ---- global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" if test -z "$lt_cv_sys_global_symbol_pipe"; then global_symbol_to_cdecl= + global_symbol_to_c_name_address= else global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" + global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" fi ! if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; ! then ! echo "$as_me:$LINENO: result: failed" >&5 echo "${ECHO_T}failed" >&6 else ! echo "$as_me:$LINENO: result: ok" >&5 echo "${ECHO_T}ok" >&6 fi ! # On IRIX 5.3, sys/types and inttypes.h are conflicting. ! ! ! ! ! ! ! ! ! ! for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ! inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ! echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" + $ac_includes_default + #include <$ac_header> _ACEOF ! rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! eval "$as_ac_Header=no" fi ! rm -f conftest.$ac_objext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then ! cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ! _ACEOF fi + + done + + + + for ac_header in dlfcn.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else + # Is the header compilable? + echo "$as_me:$LINENO: checking $ac_header usability" >&5 + echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_header_compiler=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? + echo "$as_me:$LINENO: checking $ac_header presence" >&5 + echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_header_preproc=no + fi + rm -f conftest.err conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 + echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 + echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + esac + echo "$as_me:$LINENO: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=$ac_header_preproc" + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + + fi + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi + done + + + + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then ! echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 3823,3838 **** MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then ! echo "$as_me:3826: result: $MAGIC_CMD" >&5 echo "${ECHO_T}$MAGIC_CMD" >&6 else ! echo "$as_me:3829: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then ! echo "$as_me:3835: checking for file" >&5 echo $ECHO_N "checking for file... $ECHO_C" >&6 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 4603,4618 ---- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then ! echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 echo "${ECHO_T}$MAGIC_CMD" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then ! echo "$as_me:$LINENO: checking for file" >&5 echo $ECHO_N "checking for file... $ECHO_C" >&6 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 3887,3896 **** MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then ! echo "$as_me:3890: result: $MAGIC_CMD" >&5 echo "${ECHO_T}$MAGIC_CMD" >&6 else ! echo "$as_me:3893: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 4667,4676 ---- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then ! echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 echo "${ECHO_T}$MAGIC_CMD" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 3906,3912 **** if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 ! echo "$as_me:3909: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 4686,4692 ---- if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 3914,3938 **** if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" ! echo "$as_me:3924: found $ac_dir/$ac_word" >&5 ! break done fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then ! echo "$as_me:3932: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else ! echo "$as_me:3935: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 4694,4721 ---- if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then ! echo "$as_me:$LINENO: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 3941,3947 **** ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 ! echo "$as_me:3944: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 4724,4730 ---- ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 3949,3963 **** if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_ac_ct_RANLIB="ranlib" ! echo "$as_me:3959: found $ac_dir/$ac_word" >&5 ! break done test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" --- 4732,4749 ---- if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_ac_ct_RANLIB="ranlib" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" *************** *** 3965,3974 **** fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then ! echo "$as_me:3968: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else ! echo "$as_me:3971: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 4751,4760 ---- fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then ! echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 3980,3986 **** if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 ! echo "$as_me:3983: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 4766,4772 ---- if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 3988,4012 **** if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_STRIP="${ac_tool_prefix}strip" ! echo "$as_me:3998: found $ac_dir/$ac_word" >&5 ! break done fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then ! echo "$as_me:4006: result: $STRIP" >&5 echo "${ECHO_T}$STRIP" >&6 else ! echo "$as_me:4009: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 4774,4801 ---- if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_STRIP="${ac_tool_prefix}strip" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then ! echo "$as_me:$LINENO: result: $STRIP" >&5 echo "${ECHO_T}$STRIP" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 4015,4021 **** ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 ! echo "$as_me:4018: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 4804,4810 ---- ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 4023,4037 **** if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_ac_ct_STRIP="strip" ! echo "$as_me:4033: found $ac_dir/$ac_word" >&5 ! break done test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" --- 4812,4829 ---- if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_ac_ct_STRIP="strip" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" *************** *** 4039,4048 **** fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then ! echo "$as_me:4042: result: $ac_ct_STRIP" >&5 echo "${ECHO_T}$ac_ct_STRIP" >&6 else ! echo "$as_me:4045: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 4831,4840 ---- fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then ! echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 echo "${ECHO_T}$ac_ct_STRIP" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 4051,4058 **** STRIP="$ac_cv_prog_STRIP" fi enable_dlopen=no ! enable_win32_dll=yes # Check whether --enable-libtool-lock or --disable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then --- 4843,4851 ---- STRIP="$ac_cv_prog_STRIP" fi + enable_dlopen=no ! enable_win32_dll=no # Check whether --enable-libtool-lock or --disable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then *************** *** 4066,4076 **** case $host in *-*-irix6*) # Find out which ABI we are using. ! echo '#line 4069 "configure"' > conftest.$ac_ext ! if { (eval echo "$as_me:4070: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:4073: \$? = $ac_status" >&5 (exit $ac_status); }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) --- 4859,4869 ---- case $host in *-*-irix6*) # Find out which ABI we are using. ! echo '#line 4862 "configure"' > conftest.$ac_ext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) *************** *** 4091,4102 **** # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" ! echo "$as_me:4094: checking whether the C compiler needs -belf" >&5 echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --- 4884,4896 ---- # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" ! echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' *************** *** 4104,4112 **** ac_compiler_gnu=$ac_cv_c_compiler_gnu cat >conftest.$ac_ext <<_ACEOF ! #line 4107 "configure" #include "confdefs.h" int main () { --- 4898,4912 ---- ac_compiler_gnu=$ac_cv_c_compiler_gnu cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 4116,4131 **** } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:4119: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:4122: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:4125: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:4128: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_cc_needs_belf=yes else --- 4916,4931 ---- } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_cc_needs_belf=yes else *************** *** 4141,4147 **** ac_compiler_gnu=$ac_cv_c_compiler_gnu fi ! echo "$as_me:4144: result: $lt_cv_cc_needs_belf" >&5 echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf --- 4941,4947 ---- ac_compiler_gnu=$ac_cv_c_compiler_gnu fi ! echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf *************** *** 4149,4472 **** fi ;; - *-*-cygwin* | *-*-mingw* | *-*-pw32*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. - set dummy ${ac_tool_prefix}dlltool; ac_word=$2 - echo "$as_me:4156: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. - else - ac_save_IFS=$IFS; IFS=$ac_path_separator - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - echo "$as_me:4171: found $ac_dir/$ac_word" >&5 - break - done - - fi - fi - DLLTOOL=$ac_cv_prog_DLLTOOL - if test -n "$DLLTOOL"; then - echo "$as_me:4179: result: $DLLTOOL" >&5 - echo "${ECHO_T}$DLLTOOL" >&6 - else - echo "$as_me:4182: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - - fi - if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. - set dummy dlltool; ac_word=$2 - echo "$as_me:4191: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. - else - ac_save_IFS=$IFS; IFS=$ac_path_separator - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_DLLTOOL="dlltool" - echo "$as_me:4206: found $ac_dir/$ac_word" >&5 - break - done - - test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false" - fi - fi - ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL - if test -n "$ac_ct_DLLTOOL"; then - echo "$as_me:4215: result: $ac_ct_DLLTOOL" >&5 - echo "${ECHO_T}$ac_ct_DLLTOOL" >&6 - else - echo "$as_me:4218: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - - DLLTOOL=$ac_ct_DLLTOOL - else - DLLTOOL="$ac_cv_prog_DLLTOOL" - fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. - set dummy ${ac_tool_prefix}as; ac_word=$2 - echo "$as_me:4230: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_AS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. - else - ac_save_IFS=$IFS; IFS=$ac_path_separator - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_AS="${ac_tool_prefix}as" - echo "$as_me:4245: found $ac_dir/$ac_word" >&5 - break - done - - fi - fi - AS=$ac_cv_prog_AS - if test -n "$AS"; then - echo "$as_me:4253: result: $AS" >&5 - echo "${ECHO_T}$AS" >&6 - else - echo "$as_me:4256: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - - fi - if test -z "$ac_cv_prog_AS"; then - ac_ct_AS=$AS - # Extract the first word of "as", so it can be a program name with args. - set dummy as; ac_word=$2 - echo "$as_me:4265: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_AS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_AS"; then - ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. - else - ac_save_IFS=$IFS; IFS=$ac_path_separator - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_AS="as" - echo "$as_me:4280: found $ac_dir/$ac_word" >&5 - break - done - - test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false" - fi - fi - ac_ct_AS=$ac_cv_prog_ac_ct_AS - if test -n "$ac_ct_AS"; then - echo "$as_me:4289: result: $ac_ct_AS" >&5 - echo "${ECHO_T}$ac_ct_AS" >&6 - else - echo "$as_me:4292: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - - AS=$ac_ct_AS - else - AS="$ac_cv_prog_AS" - fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. - set dummy ${ac_tool_prefix}objdump; ac_word=$2 - echo "$as_me:4304: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_OBJDUMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. - else - ac_save_IFS=$IFS; IFS=$ac_path_separator - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - echo "$as_me:4319: found $ac_dir/$ac_word" >&5 - break - done - - fi - fi - OBJDUMP=$ac_cv_prog_OBJDUMP - if test -n "$OBJDUMP"; then - echo "$as_me:4327: result: $OBJDUMP" >&5 - echo "${ECHO_T}$OBJDUMP" >&6 - else - echo "$as_me:4330: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - - fi - if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. - set dummy objdump; ac_word=$2 - echo "$as_me:4339: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. - else - ac_save_IFS=$IFS; IFS=$ac_path_separator - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_OBJDUMP="objdump" - echo "$as_me:4354: found $ac_dir/$ac_word" >&5 - break - done - - test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false" - fi - fi - ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP - if test -n "$ac_ct_OBJDUMP"; then - echo "$as_me:4363: result: $ac_ct_OBJDUMP" >&5 - echo "${ECHO_T}$ac_ct_OBJDUMP" >&6 - else - echo "$as_me:4366: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - - OBJDUMP=$ac_ct_OBJDUMP - else - OBJDUMP="$ac_cv_prog_OBJDUMP" - fi - - # recent cygwin and mingw systems supply a stub DllMain which the user - # can override, but on older systems we have to supply one - echo "$as_me:4377: checking if libtool should supply DllMain function" >&5 - echo $ECHO_N "checking if libtool should supply DllMain function... $ECHO_C" >&6 - if test "${lt_cv_need_dllmain+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - #line 4383 "configure" - #include "confdefs.h" - - int - main () - { - extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); - DllMain (0, 0, 0); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:4396: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4399: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4402: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4405: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - lt_cv_need_dllmain=no - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - lt_cv_need_dllmain=yes - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi - echo "$as_me:4415: result: $lt_cv_need_dllmain" >&5 - echo "${ECHO_T}$lt_cv_need_dllmain" >&6 - - case $host/$CC in - *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) - # old mingw systems require "-dll" to link a DLL, while more recent ones - # require "-mdll" - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mdll" - echo "$as_me:4424: checking how to link DLLs" >&5 - echo $ECHO_N "checking how to link DLLs... $ECHO_C" >&6 - if test "${lt_cv_cc_dll_switch+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - #line 4430 "configure" - #include "confdefs.h" - - int - main () - { - - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:4442: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4445: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4448: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4451: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - lt_cv_cc_dll_switch=-mdll - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - lt_cv_cc_dll_switch=-dll - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi - echo "$as_me:4461: result: $lt_cv_cc_dll_switch" >&5 - echo "${ECHO_T}$lt_cv_cc_dll_switch" >&6 - CFLAGS="$SAVE_CFLAGS" ;; - *-*-cygwin* | *-*-pw32*) - # cygwin systems need to pass --dll to the linker, and not link - # crt.o which will require a WinMain@16 definition. - lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;; - esac - ;; esac --- 4949,4954 ---- *************** *** 4545,4559 **** old_postuninstall_cmds= if test -n "$RANLIB"; then old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" fi # Allow CC to be a program name with arguments. set dummy $CC compiler="$2" ! echo "$as_me:4556: checking for objdir" >&5 echo $ECHO_N "checking for objdir... $ECHO_C" >&6 rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null --- 5027,5048 ---- old_postuninstall_cmds= if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + ;; + *) + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + ;; + esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi # Allow CC to be a program name with arguments. set dummy $CC compiler="$2" ! echo "$as_me:$LINENO: checking for objdir" >&5 echo $ECHO_N "checking for objdir... $ECHO_C" >&6 rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null *************** *** 4564,4572 **** objdir=_libs fi rmdir .libs 2>/dev/null ! echo "$as_me:4567: result: $objdir" >&5 echo "${ECHO_T}$objdir" >&6 # Check whether --with-pic or --without-pic was given. if test "${with_pic+set}" = set; then withval="$with_pic" --- 5053,5063 ---- objdir=_libs fi rmdir .libs 2>/dev/null ! echo "$as_me:$LINENO: result: $objdir" >&5 echo "${ECHO_T}$objdir" >&6 + + # Check whether --with-pic or --without-pic was given. if test "${with_pic+set}" = set; then withval="$with_pic" *************** *** 4579,4585 **** # We assume here that the value for lt_cv_prog_cc_pic will not be cached # in isolation, and that seeing it set (from the cache) indicates that # the associated values are set (in the cache) correctly too. ! echo "$as_me:4582: checking for $compiler option to produce PIC" >&5 echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 5070,5076 ---- # We assume here that the value for lt_cv_prog_cc_pic will not be cached # in isolation, and that seeing it set (from the cache) indicates that # the associated values are set (in the cache) correctly too. ! echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 4602,4608 **** # libC (AIX C++ library), which obviously doesn't included in libraries # list by gcc. This cause undefined symbols with -static flags. # This hack allows C programs to be linked with "-static -ldl", but ! # we not sure about C++ programs. lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" ;; amigaos*) --- 5093,5099 ---- # libC (AIX C++ library), which obviously doesn't included in libraries # list by gcc. This cause undefined symbols with -static flags. # This hack allows C programs to be linked with "-static -ldl", but ! # not sure about C++ programs. lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" ;; amigaos*) *************** *** 4637,4649 **** # PORTME Check for PIC flags for the system compiler. case $host_os in aix3* | aix4* | aix5*) # All AIX code is PIC. if test "$host_cpu" = ia64; then ! # AIX 5 now supports IA64 processor ! lt_cv_prog_cc_static='-Bstatic' ! lt_cv_prog_cc_wl='-Wl,' else ! lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' fi ;; --- 5128,5140 ---- # PORTME Check for PIC flags for the system compiler. case $host_os in aix3* | aix4* | aix5*) + lt_cv_prog_cc_wl='-Wl,' # All AIX code is PIC. if test "$host_cpu" = ia64; then ! # AIX 5 now supports IA64 processor ! lt_cv_prog_cc_static='-Bstatic' else ! lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' fi ;; *************** *** 4699,4707 **** lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' if test "x$host_vendor" = xsni; then ! lt_cv_prog_cc_wl='-LD' else ! lt_cv_prog_cc_wl='-Wl,' fi ;; --- 5190,5198 ---- lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' if test "x$host_vendor" = xsni; then ! lt_cv_prog_cc_wl='-LD' else ! lt_cv_prog_cc_wl='-Wl,' fi ;; *************** *** 4726,4739 **** fi if test -z "$lt_cv_prog_cc_pic"; then ! echo "$as_me:4729: result: none" >&5 echo "${ECHO_T}none" >&6 else ! echo "$as_me:4732: result: $lt_cv_prog_cc_pic" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6 # Check to make sure the pic_flag actually works. ! echo "$as_me:4736: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 5217,5230 ---- fi if test -z "$lt_cv_prog_cc_pic"; then ! echo "$as_me:$LINENO: result: none" >&5 echo "${ECHO_T}none" >&6 else ! echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6 # Check to make sure the pic_flag actually works. ! echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 4741,4749 **** save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat >conftest.$ac_ext <<_ACEOF ! #line 4744 "configure" #include "confdefs.h" int main () { --- 5232,5246 ---- save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 4753,4768 **** } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:4756: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:4759: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:4762: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:4765: \$? = $ac_status" >&5 (exit $ac_status); }; }; then case $host_os in hpux9* | hpux10* | hpux11*) --- 5250,5265 ---- } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then case $host_os in hpux9* | hpux10* | hpux11*) *************** *** 4791,4796 **** --- 5288,5294 ---- fi + if test "X$lt_cv_prog_cc_pic_works" = Xno; then lt_cv_prog_cc_pic= lt_cv_prog_cc_can_build_shared=no *************** *** 4798,4820 **** lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" fi ! echo "$as_me:4801: result: $lt_cv_prog_cc_pic_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6 fi # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then ! { echo "$as_me:4807: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : else ! { echo "$as_me:4811: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} lt_cv_prog_cc_can_build_shared=no fi fi ! echo "$as_me:4817: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 5296,5318 ---- lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" fi ! echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6 fi # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then ! { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : else ! { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} lt_cv_prog_cc_can_build_shared=no fi fi ! echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 4823,4831 **** save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat >conftest.$ac_ext <<_ACEOF ! #line 4826 "configure" #include "confdefs.h" int main () { --- 5321,5335 ---- save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 4835,4850 **** } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:4838: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:4841: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:4844: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:4847: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_prog_cc_static_works=yes else --- 5339,5354 ---- } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_prog_cc_static_works=yes else *************** *** 4856,4864 **** fi # Belt *and* braces to stop my trousers falling down: test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= ! echo "$as_me:4861: result: $lt_cv_prog_cc_static_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6 pic_flag="$lt_cv_prog_cc_pic" --- 5360,5369 ---- fi + # Belt *and* braces to stop my trousers falling down: test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= ! echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6 pic_flag="$lt_cv_prog_cc_pic" *************** *** 4868,4875 **** no_builtin_flag="$lt_cv_prog_cc_no_builtin" can_build_shared="$lt_cv_prog_cc_can_build_shared" # Check to see if options -o and -c are simultaneously supported by compiler ! echo "$as_me:4872: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_compiler_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 5373,5381 ---- no_builtin_flag="$lt_cv_prog_cc_no_builtin" can_build_shared="$lt_cv_prog_cc_can_build_shared" + # Check to see if options -o and -c are simultaneously supported by compiler ! echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_compiler_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 4889,4895 **** save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no ! if { (eval echo configure:4892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then --- 5395,5401 ---- save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no ! if { (eval echo configure:5398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then *************** *** 4913,4924 **** fi compiler_c_o=$lt_cv_compiler_c_o ! echo "$as_me:4916: result: $compiler_c_o" >&5 echo "${ECHO_T}$compiler_c_o" >&6 if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo ! echo "$as_me:4921: checking if $compiler supports -c -o file.lo" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6 if test "${lt_cv_compiler_o_lo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 5419,5430 ---- fi compiler_c_o=$lt_cv_compiler_c_o ! echo "$as_me:$LINENO: result: $compiler_c_o" >&5 echo "${ECHO_T}$compiler_c_o" >&6 if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo ! echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6 if test "${lt_cv_compiler_o_lo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 4927,4936 **** lt_cv_compiler_o_lo=no save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" cat >conftest.$ac_ext <<_ACEOF ! #line 4931 "configure" #include "confdefs.h" int main () { --- 5433,5450 ---- lt_cv_compiler_o_lo=no save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" + save_objext="$ac_objext" + ac_objext=lo cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 4940,4955 **** } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:4943: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:4946: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:4949: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:4952: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings --- 5454,5469 ---- } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings *************** *** 4964,4975 **** cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" fi compiler_o_lo=$lt_cv_compiler_o_lo ! echo "$as_me:4972: result: $compiler_o_lo" >&5 echo "${ECHO_T}$compiler_o_lo" >&6 else compiler_o_lo=no --- 5478,5490 ---- cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext + ac_objext="$save_objext" CFLAGS="$save_CFLAGS" fi compiler_o_lo=$lt_cv_compiler_o_lo ! echo "$as_me:$LINENO: result: $compiler_o_lo" >&5 echo "${ECHO_T}$compiler_o_lo" >&6 else compiler_o_lo=no *************** *** 4979,4985 **** hard_links="nottested" if test "$compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user ! echo "$as_me:4982: checking if we can lock with hard links" >&5 echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 hard_links=yes $rm conftest* --- 5494,5500 ---- hard_links="nottested" if test "$compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user ! echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 hard_links=yes $rm conftest* *************** *** 4987,4996 **** touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no ! echo "$as_me:4990: result: $hard_links" >&5 echo "${ECHO_T}$hard_links" >&6 if test "$hard_links" = no; then ! { echo "$as_me:4993: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi --- 5502,5511 ---- touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no ! echo "$as_me:$LINENO: result: $hard_links" >&5 echo "${ECHO_T}$hard_links" >&6 if test "$hard_links" = no; then ! { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi *************** *** 5000,5015 **** if test "$GCC" = yes; then # Check to see if options -fno-rtti -fno-exceptions are supported by compiler ! echo "$as_me:5003: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 echo "int some_variable = 0;" > conftest.$ac_ext save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" compiler_rtti_exceptions=no cat >conftest.$ac_ext <<_ACEOF ! #line 5010 "configure" #include "confdefs.h" int main () { --- 5515,5536 ---- if test "$GCC" = yes; then # Check to see if options -fno-rtti -fno-exceptions are supported by compiler ! echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 echo "int some_variable = 0;" > conftest.$ac_ext save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" compiler_rtti_exceptions=no cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 5019,5034 **** } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:5022: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:5025: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:5028: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:5031: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings --- 5540,5555 ---- } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings *************** *** 5044,5050 **** fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" ! echo "$as_me:5047: result: $compiler_rtti_exceptions" >&5 echo "${ECHO_T}$compiler_rtti_exceptions" >&6 if test "$compiler_rtti_exceptions" = "yes"; then --- 5565,5571 ---- fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" ! echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5 echo "${ECHO_T}$compiler_rtti_exceptions" >&6 if test "$compiler_rtti_exceptions" = "yes"; then *************** *** 5055,5061 **** fi # See if the linker supports building shared libraries. ! echo "$as_me:5058: checking whether the linker ($LD) supports shared libraries" >&5 echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6 allow_undefined_flag= --- 5576,5582 ---- fi # See if the linker supports building shared libraries. ! echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5 echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6 allow_undefined_flag= *************** *** 5069,5074 **** --- 5590,5596 ---- old_archive_from_new_cmds= old_archive_from_expsyms_cmds= export_dynamic_flag_spec= + use_runtimelinking= whole_archive_flag_spec= thread_safe_flag_spec= hardcode_into_libs=no *************** *** 5097,5103 **** extract_expsyms_cmds= case $host_os in ! cygwin* | mingw* | pw32* ) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. --- 5619,5625 ---- extract_expsyms_cmds= case $host_os in ! cygwin* | mingw* | pw32*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. *************** *** 5105,5111 **** with_gnu_ld=no fi ;; ! esac ld_shlibs=yes --- 5627,5635 ---- with_gnu_ld=no fi ;; ! openbsd*) ! with_gnu_ld=no ! ;; esac ld_shlibs=yes *************** *** 5192,5198 **** # can override, but on older systems we have to supply one (in ltdll.c) if test "x$lt_cv_need_dllmain" = "xyes"; then ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " ! ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~ test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' else ltdll_obj= --- 5716,5722 ---- # can override, but on older systems we have to supply one (in ltdll.c) if test "x$lt_cv_need_dllmain" = "xyes"; then ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " ! ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' else ltdll_obj= *************** *** 5211,5228 **** # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then ! cp $export_symbols $output_objdir/$soname-def; else ! echo EXPORTS > $output_objdir/$soname-def; ! _lt_hint=1; ! cat $export_symbols | while read symbol; do ! set dummy \$symbol; ! case \$# in ! 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; ! *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; ! esac; ! _lt_hint=`expr 1 + \$_lt_hint`; ! done; fi~ '"$ltdll_cmds"' $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ --- 5735,5752 ---- # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then ! cp $export_symbols $output_objdir/$soname-def; else ! echo EXPORTS > $output_objdir/$soname-def; ! _lt_hint=1; ! cat $export_symbols | while read symbol; do ! set dummy \$symbol; ! case \$# in ! 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; ! *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; ! esac; ! _lt_hint=`expr 1 + \$_lt_hint`; ! done; fi~ '"$ltdll_cmds"' $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ *************** *** 5317,5396 **** ;; aix4* | aix5*) # When large executables or shared objects are built, AIX ld can # have problems creating the table of contents. If linking a library # or program results in "error TOC overflow" add -mminimal-toc to # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. archive_cmds='' hardcode_libdir_separator=':' if test "$GCC" = yes; then ! collect2name=`${CC} -print-prog-name=collect2` ! if test -f "$collect2name" && \ ! strings "$collect2name" | grep resolve_lib_name >/dev/null ! then ! # We have reworked collect2 ! hardcode_direct=yes ! else ! # We have old collect2 ! hardcode_direct=unsupported ! # It fails to find uninstalled libraries when the uninstalled ! # path is not listed in the libpath. Setting hardcode_minus_L ! # to unsupported forces relinking ! hardcode_minus_L=yes ! hardcode_libdir_flag_spec='-L$libdir' ! hardcode_libdir_separator= ! fi shared_flag='-shared' else ! if test "$host_cpu" = ia64; then ! shared_flag='-G' ! else ! shared_flag='${wl}-bM:SRE' ! fi ! hardcode_direct=yes fi - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # Test if we are trying to use run time linking, or normal AIX style linking. - # If -brtl is somewhere in LDFLAGS, we need to do run time linking. - aix_use_runtimelinking=no - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then - aix_use_runtimelinking=yes - break - fi - done - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi # It seems that -bexpall can do strange things, so it is better to # generate a list of symbols to export. always_export_symbols=yes if test "$aix_use_runtimelinking" = yes; then ! hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' ! allow_undefined_flag=' -Wl,-G' ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else if test "$host_cpu" = ia64; then ! hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' ! allow_undefined_flag="-znodefs" ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else ! hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' ! # Warning - without using the other run time loading flags, -berok will ! # link without error, but may produce a broken library. ! allow_undefined_flag='${wl}-berok' ! # This is a bit strange, but is similar to how AIX traditionally builds ! # it's shared libraries. ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' fi fi ;; --- 5841,5918 ---- ;; aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + use_runtimelinking="" + else + aix_use_runtimelinking=yes + export_dynamic_flag_spec='-bexpall' + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + use_runtimelinking='-brtl' + fi + # When large executables or shared objects are built, AIX ld can # have problems creating the table of contents. If linking a library # or program results in "error TOC overflow" add -mminimal-toc to # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + hardcode_direct=yes archive_cmds='' hardcode_libdir_separator=':' if test "$GCC" = yes; then ! case $host_os in aix4.[012]|aix4.[012].*) ! collect2name=`${CC} -print-prog-name=collect2` ! if test -f "$collect2name" && \ ! strings "$collect2name" | grep resolve_lib_name >/dev/null ! then ! # We have reworked collect2 ! hardcode_direct=yes ! else ! # We have old collect2 ! hardcode_direct=unsupported ! # It fails to find uninstalled libraries when the uninstalled ! # path is not listed in the libpath. Setting hardcode_minus_L ! # to unsupported forces relinking ! hardcode_minus_L=yes ! hardcode_libdir_flag_spec='-L$libdir' ! hardcode_libdir_separator= ! fi ! esac ! shared_flag='-shared' else ! # not using gcc ! shared_flag='${wl}-G' fi # It seems that -bexpall can do strange things, so it is better to # generate a list of symbols to export. always_export_symbols=yes if test "$aix_use_runtimelinking" = yes; then ! # Warning - without using the other runtime loading flags (-brtl), ! # -berok will link without error, but may produce a broken library. ! allow_undefined_flag='-berok' ! hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' else if test "$host_cpu" = ia64; then ! hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' ! allow_undefined_flag="-z nodefs" ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else ! hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' ! # Warning - without using the other run time loading flags, ! # -berok will link without error, but may produce a broken library. ! allow_undefined_flag='${wl}-berok' ! # This is a bit strange, but is similar to how AIX traditionally builds ! # it's shared libraries. ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; *************** *** 5422,5432 **** ;; darwin* | rhapsody*) ! allow_undefined_flag='-undefined suppress' # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. ! archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes --- 5944,5961 ---- ;; darwin* | rhapsody*) ! case "$host_os" in ! rhapsody* | darwin1.[012]) ! allow_undefined_flag='-undefined suppress' ! ;; ! *) # Darwin 1.3 on ! allow_undefined_flag='-flat_namespace -undefined suppress' ! ;; ! esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. ! archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -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 *************** *** 5501,5507 **** ;; newsos6) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_direct=yes hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: --- 6030,6036 ---- ;; newsos6) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: *************** *** 5509,5518 **** ;; openbsd*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no ;; os2*) --- 6038,6061 ---- ;; openbsd*) 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' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case "$host_os" in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi ;; os2*) *************** *** 5557,5566 **** --- 6100,6138 ---- hardcode_shlibpath_var=no runpath_var=LD_RUN_PATH hardcode_runpath_var=yes + export_dynamic_flag_spec='${wl}-Bexport' ;; solaris*) + # gcc --version < 3.0 without binutils cannot create self contained + # shared libraries reliably, requiring libgcc.a to resolve some of + # the object symbols generated in some cases. Libraries that use + # assert need libgcc.a to resolve __eprintf, for example. Linking + # a copy of libgcc.a into every shared library to guarantee resolving + # such symbols causes other problems: According to Tim Van Holder + # , C++ libraries end up with a separate + # (to the application) exception stack for one thing. no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + case `$CC --version 2>/dev/null` in + [12].*) + cat <&2 + + *** Warning: Releases of GCC earlier than version 3.0 cannot reliably + *** create self contained shared libraries on Solaris systems, without + *** introducing a dependency on libgcc.a. Therefore, libtool is disabling + *** -no-undefined support, which will at least allow you to build shared + *** libraries. However, you may find that when you link such libraries + *** into an application without using GCC, you have to manually add + *** \`gcc --print-libgcc-file-name\` to the link command. We urge you to + *** upgrade to a newer version of GCC. Another option is to rebuild your + *** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer. + + EOF + no_undefined_flag= + ;; + esac + fi # $CC -shared without GNU ld will not create a library from C++ # object files and a static libstdc++, better avoid it by now archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' *************** *** 5592,5598 **** sysv4) if test "x$host_vendor" = xsno; then ! archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_direct=yes # is this really true??? else archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' --- 6164,6170 ---- sysv4) if test "x$host_vendor" = xsno; then ! archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes # is this really true??? else archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' *************** *** 5667,5678 **** ;; esac fi ! echo "$as_me:5670: result: $ld_shlibs" >&5 echo "${ECHO_T}$ld_shlibs" >&6 test "$ld_shlibs" = no && can_build_shared=no # Check hardcoding attributes. ! echo "$as_me:5675: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ --- 6239,6250 ---- ;; esac fi ! echo "$as_me:$LINENO: result: $ld_shlibs" >&5 echo "${ECHO_T}$ld_shlibs" >&6 test "$ld_shlibs" = no && can_build_shared=no # Check hardcoding attributes. ! echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ *************** *** 5696,5715 **** # directories. hardcode_action=unsupported fi ! echo "$as_me:5699: result: $hardcode_action" >&5 echo "${ECHO_T}$hardcode_action" >&6 striplib= old_striplib= ! echo "$as_me:5704: checking whether stripping libraries is possible" >&5 echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" ! echo "$as_me:5709: result: yes" >&5 echo "${ECHO_T}yes" >&6 else ! echo "$as_me:5712: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 6268,6287 ---- # directories. hardcode_action=unsupported fi ! echo "$as_me:$LINENO: result: $hardcode_action" >&5 echo "${ECHO_T}$hardcode_action" >&6 striplib= old_striplib= ! echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" ! echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 5717,5723 **** test -z "$deplibs_check_method" && deplibs_check_method=unknown # PORTME Fill in your ld.so characteristics ! echo "$as_me:5720: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' --- 6289,6295 ---- test -z "$deplibs_check_method" && deplibs_check_method=unknown # PORTME Fill in your ld.so characteristics ! echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' *************** *** 5756,5786 **** # depend on `.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in ! aix4 | aix4.[01] | aix4.[01].*) ! if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ! echo ' yes ' ! echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ! : ! else ! can_build_shared=no ! fi ! ;; esac ! # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ! # soname into executable. Probably we can add versioning support to ! # collect2, so additional links can be useful in future. ! if test "$aix_use_runtimelinking" = yes; then ! # If using run time linking (on AIX 4.2 or later) use lib.so instead of ! # lib.a to let people know that these are not typical AIX shared libraries. ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' ! else ! # We preserve .a as extension for shared libraries through AIX4.2 ! # and later when we are not doing run time linking. ! library_names_spec='${libname}${release}.a $libname.a' ! soname_spec='${libname}${release}.so$major' ! fi shlibpath_var=LIBPATH ! deplibs_check_method=pass_all fi ;; --- 6328,6348 ---- # depend on `.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in ! aix4 | aix4.[01] | aix4.[01].*) ! if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ! echo ' yes ' ! echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ! : ! else ! can_build_shared=no ! fi ! ;; esac ! # We preserve .a as extension for shared libraries through AIX4.2 ! library_names_spec='${libname}${release}.a $libname.a' ! soname_spec='${libname}${release}.so$major' shlibpath_var=LIBPATH ! hardcode_into_libs=yes fi ;; *************** *** 5993,6001 **** openbsd*) version_type=sunos ! if test "$with_gnu_ld" = yes; then ! need_lib_prefix=no ! need_version=no fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' --- 6555,6573 ---- openbsd*) version_type=sunos ! need_lib_prefix=no ! need_version=no ! if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ! case "$host_os" in ! openbsd2.[89] | openbsd2.[89].*) ! shlibpath_overrides_runpath=no ! ;; ! *) ! shlibpath_overrides_runpath=yes ! ;; ! esac ! else ! shlibpath_overrides_runpath=yes fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' *************** *** 6099,6114 **** dynamic_linker=no ;; esac ! echo "$as_me:6102: result: $dynamic_linker" >&5 echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no # Report the final consequences. ! echo "$as_me:6107: checking if libtool supports shared libraries" >&5 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 ! echo "$as_me:6109: result: $can_build_shared" >&5 echo "${ECHO_T}$can_build_shared" >&6 if test "$hardcode_action" = relink; then # Fast installation is not supported enable_fast_install=no --- 6671,6717 ---- dynamic_linker=no ;; esac ! echo "$as_me:$LINENO: result: $dynamic_linker" >&5 echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no # Report the final consequences. ! echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 ! echo "$as_me:$LINENO: result: $can_build_shared" >&5 echo "${ECHO_T}$can_build_shared" >&6 + echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 + echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case "$host_os" in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix4*) + if test "$host_cpu" != ia64 ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + echo "$as_me:$LINENO: result: $enable_shared" >&5 + echo "${ECHO_T}$enable_shared" >&6 + + echo "$as_me:$LINENO: checking whether to build static libraries" >&5 + echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + echo "$as_me:$LINENO: result: $enable_static" >&5 + echo "${ECHO_T}$enable_static" >&6 + if test "$hardcode_action" = relink; then # Fast installation is not supported enable_fast_install=no *************** *** 6144,6158 **** ;; *) ! echo "$as_me:6147: checking for dlopen in -ldl" >&5 ! echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 ! if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS ! LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF ! #line 6155 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ --- 6747,6828 ---- ;; *) ! echo "$as_me:$LINENO: checking for shl_load" >&5 ! echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 ! if test "${ac_cv_func_shl_load+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! #include "confdefs.h" ! /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char shl_load (); below. */ ! #include ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" ! #endif ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char shl_load (); ! char (*f) (); ! ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif ! int ! main () ! { ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_shl_load) || defined (__stub___shl_load) ! choke me ! #else ! f = shl_load; ! #endif ! ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! ac_cv_func_shl_load=yes ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! ac_cv_func_shl_load=no ! fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! fi ! echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 ! echo "${ECHO_T}$ac_cv_func_shl_load" >&6 ! if test $ac_cv_func_shl_load = yes; then ! lt_cv_dlopen="shl_load" ! else ! echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 ! echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 ! if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS ! LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ *************** *** 6161,6208 **** #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ ! char dlopen (); int main () { ! dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:6174: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:6177: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:6180: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:6183: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:6194: result: $ac_cv_lib_dl_dlopen" >&5 ! echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 ! if test $ac_cv_lib_dl_dlopen = yes; then ! lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else ! echo "$as_me:6199: checking for dlopen" >&5 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line 6205 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. */ --- 6831,6884 ---- #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ ! char shl_load (); ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif int main () { ! shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 ! echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 ! if test $ac_cv_lib_dld_shl_load = yes; then ! lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else ! echo "$as_me:$LINENO: checking for dlopen" >&5 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. */ *************** *** 6216,6221 **** --- 6892,6903 ---- char dlopen (); char (*f) (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 6233,6248 **** } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:6236: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:6239: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:6242: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:6245: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlopen=yes else --- 6915,6930 ---- } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlopen=yes else *************** *** 6252,6324 **** fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:6255: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else ! echo "$as_me:6260: checking for shl_load" >&5 ! echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 ! if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! cat >conftest.$ac_ext <<_ACEOF ! #line 6266 "configure" #include "confdefs.h" ! /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char shl_load (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ ! char shl_load (); ! char (*f) (); ! int main () { ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_shl_load) || defined (__stub___shl_load) ! choke me ! #else ! f = shl_load; ! #endif ! ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:6297: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:6300: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:6303: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:6306: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:6316: result: $ac_cv_func_shl_load" >&5 ! echo "${ECHO_T}$ac_cv_func_shl_load" >&6 ! if test $ac_cv_func_shl_load = yes; then ! lt_cv_dlopen="shl_load" else ! echo "$as_me:6321: checking for dlopen in -lsvld" >&5 echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 6934,7003 ---- fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else ! echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ! echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 ! if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! ac_check_lib_save_LIBS=$LIBS ! LIBS="-ldl $LIBS" ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" ! /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ ! char dlopen (); ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif int main () { ! dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ! echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 ! if test $ac_cv_lib_dl_dlopen = yes; then ! lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else ! echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 6326,6332 **** ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF ! #line 6329 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ --- 7005,7011 ---- ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ *************** *** 6336,6341 **** --- 7015,7026 ---- /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 6345,6360 **** } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:6348: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:6351: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:6354: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:6357: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_svld_dlopen=yes else --- 7030,7045 ---- } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_svld_dlopen=yes else *************** *** 6365,6384 **** rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:6368: result: $ac_cv_lib_svld_dlopen" >&5 echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else ! echo "$as_me:6373: checking for shl_load in -ldld" >&5 ! echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 ! if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF ! #line 6381 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ --- 7050,7069 ---- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else ! echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 ! echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 ! if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ *************** *** 6387,6434 **** #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ ! char shl_load (); int main () { ! shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:6400: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:6403: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:6406: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:6409: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:6420: result: $ac_cv_lib_dld_shl_load" >&5 ! echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 ! if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi fi fi fi fi ;; --- 7072,7132 ---- #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ ! char dld_link (); ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif int main () { ! dld_link (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 ! echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 ! if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi + + fi + + fi + fi + fi + fi ;; *************** *** 6451,6457 **** save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" ! echo "$as_me:6454: checking whether a program can dlopen itself" >&5 echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 7149,7155 ---- save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" ! echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 6462,6468 **** lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:6529: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? --- 7221,7230 ---- exit (status); } EOF ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? *************** *** 6542,6554 **** fi rm -fr conftest* fi ! echo "$as_me:6546: result: $lt_cv_dlopen_self" >&5 echo "${ECHO_T}$lt_cv_dlopen_self" >&6 if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" ! echo "$as_me:6551: checking whether a statically linked program can dlopen itself" >&5 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 7240,7253 ---- fi rm -fr conftest* + fi ! echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 echo "${ECHO_T}$lt_cv_dlopen_self" >&6 if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" ! echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 6559,6565 **** lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:6626: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? --- 7319,7328 ---- exit (status); } EOF ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? *************** *** 6639,6646 **** fi rm -fr conftest* fi ! echo "$as_me:6643: result: $lt_cv_dlopen_self_static" >&5 echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 fi --- 7338,7346 ---- fi rm -fr conftest* + fi ! echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 fi *************** *** 6661,6666 **** --- 7361,7367 ---- esac fi + if test "$enable_shared" = yes && test "$GCC" = yes; then case $archive_cmds in *'~'*) *************** *** 6670,6676 **** # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. ! echo "$as_me:6673: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 if test "${lt_cv_archive_cmds_need_lc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 7371,7377 ---- # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. ! echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 if test "${lt_cv_archive_cmds_need_lc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 6678,6687 **** $rm conftest* echo 'static int dummy;' > conftest.$ac_ext ! if { (eval echo "$as_me:6681: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:6684: \$? = $ac_status" >&5 (exit $ac_status); }; then soname=conftest lib=conftest --- 7379,7388 ---- $rm conftest* echo 'static int dummy;' > conftest.$ac_ext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then soname=conftest lib=conftest *************** *** 6695,6704 **** libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= ! if { (eval echo "$as_me:6698: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? ! echo "$as_me:6701: \$? = $ac_status" >&5 (exit $ac_status); } then lt_cv_archive_cmds_need_lc=no --- 7396,7405 ---- libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= ! if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } then lt_cv_archive_cmds_need_lc=no *************** *** 6711,6717 **** fi fi ! echo "$as_me:6714: result: $lt_cv_archive_cmds_need_lc" >&5 echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 ;; esac --- 7412,7418 ---- fi fi ! echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5 echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 ;; esac *************** *** 6744,6749 **** --- 7445,7451 ---- AR AR_FLAGS CC LD LN_S NM SHELL \ reload_flag reload_cmds wl \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ + use_runtimelinking \ thread_safe_flag_spec whole_archive_flag_spec libname_spec \ library_names_spec soname_spec \ RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ *************** *** 6752,6757 **** --- 7454,7460 ---- old_striplib striplib file_magic_cmd export_symbols_cmds \ deplibs_check_method allow_undefined_flag no_undefined_flag \ finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ + global_symbol_to_c_name_address \ hardcode_libdir_flag_spec hardcode_libdir_separator \ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do *************** *** 6818,6829 **** # Whether or not to build shared libraries. build_libtool_libs=$enable_shared - # Whether or not to add -lc for building shared libraries. - build_libtool_need_lc=$need_lc - # Whether or not to build static libraries. build_old_libs=$enable_static # Whether or not to optimize for fast installation. fast_install=$enable_fast_install --- 7521,7532 ---- # Whether or not to build shared libraries. build_libtool_libs=$enable_shared # Whether or not to build static libraries. build_old_libs=$enable_static + # Whether or not to add -lc for building shared libraries. + build_libtool_need_lc=$need_lc + # Whether or not to optimize for fast installation. fast_install=$enable_fast_install *************** *** 6924,6929 **** --- 7627,7635 ---- # Compiler flag to allow reflexive dlopens. export_dynamic_flag_spec=$lt_export_dynamic_flag_spec + # Compiler flag to allow runtime linking + use_runtimelinking=$lt_use_runtimelinking + # Compiler flag to generate shared objects directly from archives. whole_archive_flag_spec=$lt_whole_archive_flag_spec *************** *** 6989,6994 **** --- 7695,7703 ---- # Transform the output of nm in a proper C declaration global_symbol_to_cdecl=$lt_global_symbol_to_cdecl + # Transform the output of nm in a C name address pair + global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address + # This is the shared library runtime path variable. runpath_var=$runpath_var *************** *** 7111,7119 **** # return TRUE; # } # /* ltdll.c ends here */ ! # This is a source program that is used to create import libraries ! # on Windows for dlls which lack them. Don't remove nor modify the ! # starting and closing comments # /* impgen.c starts here */ # /* Copyright (C) 1999-2000 Free Software Foundation, Inc. # --- 7820,7828 ---- # return TRUE; # } # /* ltdll.c ends here */ ! # This is a source program that is used to create import libraries ! # on Windows for dlls which lack them. Don't remove nor modify the ! # starting and closing comments # /* impgen.c starts here */ # /* Copyright (C) 1999-2000 Free Software Foundation, Inc. # *************** *** 7264,7269 **** --- 7973,7982 ---- chmod +x "$ofile" fi + + + + # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" *************** *** 7272,7282 **** # Prevent multiple expansion for ac_prog in 'bison -y' byacc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 ! echo "$as_me:7279: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_YACC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 7985,7996 ---- # Prevent multiple expansion + for ac_prog in 'bison -y' byacc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_YACC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 7284,7308 **** if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_YACC="$ac_prog" ! echo "$as_me:7294: found $ac_dir/$ac_word" >&5 ! break done fi fi YACC=$ac_cv_prog_YACC if test -n "$YACC"; then ! echo "$as_me:7302: result: $YACC" >&5 echo "${ECHO_T}$YACC" >&6 else ! echo "$as_me:7305: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 7998,8025 ---- if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_YACC="$ac_prog" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done fi fi YACC=$ac_cv_prog_YACC if test -n "$YACC"; then ! echo "$as_me:$LINENO: result: $YACC" >&5 echo "${ECHO_T}$YACC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 7314,7320 **** do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 ! echo "$as_me:7317: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PATH_TO_XRDB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 8031,8037 ---- do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PATH_TO_XRDB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 7324,7339 **** ac_cv_path_PATH_TO_XRDB="$PATH_TO_XRDB" # Let the user override the test with a path. ;; *) ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! if $as_executable_p "$ac_dir/$ac_word"; then ! ac_cv_path_PATH_TO_XRDB="$ac_dir/$ac_word" ! echo "$as_me:7334: found $ac_dir/$ac_word" >&5 ! break ! fi done ;; --- 8041,8058 ---- ac_cv_path_PATH_TO_XRDB="$PATH_TO_XRDB" # Let the user override the test with a path. ;; *) ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_path_PATH_TO_XRDB="$as_dir/$ac_word$ac_exec_ext" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done ;; *************** *** 7342,7357 **** PATH_TO_XRDB=$ac_cv_path_PATH_TO_XRDB if test -n "$PATH_TO_XRDB"; then ! echo "$as_me:7345: result: $PATH_TO_XRDB" >&5 echo "${ECHO_T}$PATH_TO_XRDB" >&6 else ! echo "$as_me:7348: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$PATH_TO_XRDB" && break done if test -z "" ; then default_compile_warnings=no else --- 8061,8079 ---- PATH_TO_XRDB=$ac_cv_path_PATH_TO_XRDB if test -n "$PATH_TO_XRDB"; then ! echo "$as_me:$LINENO: result: $PATH_TO_XRDB" >&5 echo "${ECHO_T}$PATH_TO_XRDB" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$PATH_TO_XRDB" && break done + + + if test -z "" ; then default_compile_warnings=no else *************** *** 7390,7401 **** for option in -Wsign-promo -Wno-sign-compare; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" ! echo "$as_me:7393: checking whether gcc understands $option" >&5 echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF ! #line 7396 "configure" #include "confdefs.h" int main () { --- 8112,8129 ---- for option in -Wsign-promo -Wno-sign-compare; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" ! echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 7405,7420 **** } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:7408: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:7411: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:7414: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:7417: \$? = $ac_status" >&5 (exit $ac_status); }; }; then has_option=yes else --- 8133,8148 ---- } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then has_option=yes else *************** *** 7424,7430 **** fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$SAVE_CFLAGS" ! echo "$as_me:7427: result: $has_option" >&5 echo "${ECHO_T}$has_option" >&6 if test $has_option = yes; then warning_flags="$warning_flags $option" --- 8152,8158 ---- fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$SAVE_CFLAGS" ! echo "$as_me:$LINENO: result: $has_option" >&5 echo "${ECHO_T}$has_option" >&6 if test $has_option = yes; then warning_flags="$warning_flags $option" *************** *** 7438,7452 **** fi ;; *) ! { { echo "$as_me:7441: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} { (exit 1); exit 1; }; } ;; esac CFLAGS="$realsave_CFLAGS" ! echo "$as_me:7447: checking what warning flags to pass to the C compiler" >&5 echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6 ! echo "$as_me:7449: result: $warning_flags" >&5 echo "${ECHO_T}$warning_flags" >&6 # Check whether --enable-iso-c or --disable-iso-c was given. --- 8166,8180 ---- fi ;; *) ! { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} { (exit 1); exit 1; }; } ;; esac CFLAGS="$realsave_CFLAGS" ! echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6 ! echo "$as_me:$LINENO: result: $warning_flags" >&5 echo "${ECHO_T}$warning_flags" >&6 # Check whether --enable-iso-c or --disable-iso-c was given. *************** *** 7457,7463 **** enable_iso_c=no fi; ! echo "$as_me:7460: checking what language compliance flags to pass to the C compiler" >&5 echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6 complCFLAGS= if test "x$enable_iso_c" != "xno"; then --- 8185,8191 ---- enable_iso_c=no fi; ! echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6 complCFLAGS= if test "x$enable_iso_c" != "xno"; then *************** *** 7472,8716 **** esac fi fi ! echo "$as_me:7475: result: $complCFLAGS" >&5 echo "${ECHO_T}$complCFLAGS" >&6 WARN_CFLAGS="$warning_flags $complCFLAGS" GETTEXT_PACKAGE=libgnomecanvas-2.0 ! cat >>confdefs.h <&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. - else - ac_save_IFS=$IFS; IFS=$ac_path_separator - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:7505: found $ac_dir/$ac_word" >&5 - break - done - fi - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then - echo "$as_me:7513: result: $RANLIB" >&5 - echo "${ECHO_T}$RANLIB" >&6 - else - echo "$as_me:7516: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi ! fi ! if test -z "$ac_cv_prog_RANLIB"; then ! ac_ct_RANLIB=$RANLIB ! # Extract the first word of "ranlib", so it can be a program name with args. ! set dummy ranlib; ac_word=$2 ! echo "$as_me:7525: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. - else - ac_save_IFS=$IFS; IFS=$ac_path_separator - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:7540: found $ac_dir/$ac_word" >&5 - break - done - - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" - fi - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then - echo "$as_me:7549: result: $ac_ct_RANLIB" >&5 - echo "${ECHO_T}$ac_ct_RANLIB" >&6 - else - echo "$as_me:7552: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - - RANLIB=$ac_ct_RANLIB - else - RANLIB="$ac_cv_prog_RANLIB" fi ! ! echo "$as_me:7561: checking for $CC option to accept ANSI C" >&5 ! echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 ! if test "${ac_cv_prog_cc_stdc+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 else ! ac_cv_prog_cc_stdc=no ! ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF ! #line 7569 "configure" ! #include "confdefs.h" ! #include ! #include ! #include ! #include ! /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ ! struct buf { int x; }; ! FILE * (*rcsopen) (struct buf *, struct stat *, int); ! static char *e (p, i) ! char **p; ! int i; ! { ! return p[i]; ! } ! static char *f (char * (*g) (char **, int), char **p, ...) ! { ! char *s; ! va_list v; ! va_start (v,p); ! s = g (p, va_arg (v,int)); ! va_end (v); ! return s; ! } ! int test (int i, double x); ! struct s1 {int (*f) (int a);}; ! struct s2 {int (*f) (double a);}; ! int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); ! int argc; ! char **argv; ! int ! main () ! { ! return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ! ; ! return 0; ! } ! _ACEOF ! # Don't try gcc -ansi; that turns off useful extensions and ! # breaks some systems' header files. ! # AIX -qlanglvl=ansi ! # Ultrix and OSF/1 -std1 ! # HP-UX 10.20 and later -Ae ! # HP-UX older versions -Aa -D_HPUX_SOURCE ! # SVR4 -Xc -D__EXTENSIONS__ ! for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ! do ! CC="$ac_save_CC $ac_arg" ! rm -f conftest.$ac_objext ! if { (eval echo "$as_me:7618: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ! ac_status=$? ! echo "$as_me:7621: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:7624: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:7627: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! ac_cv_prog_cc_stdc=$ac_arg ! break ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! fi ! rm -f conftest.$ac_objext ! done ! rm -f conftest.$ac_ext conftest.$ac_objext ! CC=$ac_save_CC ! ! fi ! ! case "x$ac_cv_prog_cc_stdc" in ! x|xno) ! echo "$as_me:7644: result: none needed" >&5 ! echo "${ECHO_T}none needed" >&6 ;; ! *) ! echo "$as_me:7647: result: $ac_cv_prog_cc_stdc" >&5 ! echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 ! CC="$CC $ac_cv_prog_cc_stdc" ;; ! esac ! ! echo "$as_me:7652: checking for an ANSI C-conforming const" >&5 ! echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 ! if test "${ac_cv_c_const+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line 7658 "configure" #include "confdefs.h" ! ! int ! main () ! { ! /* FIXME: Include the comments suggested by Paul. */ ! #ifndef __cplusplus ! /* Ultrix mips cc rejects this. */ ! typedef int charset[2]; ! const charset x; ! /* SunOS 4.1.1 cc rejects this. */ ! char const *const *ccp; ! char **p; ! /* NEC SVR4.0.2 mips cc rejects this. */ ! struct point {int x, y;}; ! static struct point const zero = {0,0}; ! /* AIX XL C 1.02.0.0 rejects this. ! It does not let you subtract one const X* pointer from another in ! an arm of an if-expression whose if-part is not a constant ! expression */ ! const char *g = "string"; ! ccp = &g + (g ? g-g : 0); ! /* HPUX 7.0 cc rejects these. */ ! ++ccp; ! p = (char**) ccp; ! ccp = (char const *const *) p; ! { /* SCO 3.2v4 cc rejects this. */ ! char *t; ! char const *s = 0 ? (char *) 0 : (char const *) 0; ! ! *t++ = 0; ! } ! { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ ! int x[] = {25, 17}; ! const int *foo = &x[0]; ! ++foo; ! } ! { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ ! typedef const int *iptr; ! iptr p = 0; ! ++p; ! } ! { /* AIX XL C 1.02.0.0 rejects this saying ! "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ ! struct s { int j; const int *ap[3]; }; ! struct s *b; b->j = 5; ! } ! { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ ! const int foo = 10; ! } ! #endif ! ! ; ! return 0; ! } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:7716: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:7719: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:7722: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:7725: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext ! fi ! echo "$as_me:7735: result: $ac_cv_c_const" >&5 ! echo "${ECHO_T}$ac_cv_c_const" >&6 ! if test $ac_cv_c_const = no; then ! ! cat >>confdefs.h <<\EOF ! #define const ! EOF ! ! fi ! echo "$as_me:7745: checking for inline" >&5 ! echo $ECHO_N "checking for inline... $ECHO_C" >&6 ! if test "${ac_cv_c_inline+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! ac_cv_c_inline=no ! for ac_kw in inline __inline__ __inline; do ! cat >conftest.$ac_ext <<_ACEOF ! #line 7753 "configure" #include "confdefs.h" ! #ifndef __cplusplus ! static $ac_kw int static_foo () {return 0; } ! $ac_kw int foo () {return 0; } ! #endif ! _ACEOF ! rm -f conftest.$ac_objext ! if { (eval echo "$as_me:7762: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ! ac_status=$? ! echo "$as_me:7765: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:7768: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:7771: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! ac_cv_c_inline=$ac_kw; break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi ! rm -f conftest.$ac_objext conftest.$ac_ext ! done ! fi ! echo "$as_me:7782: result: $ac_cv_c_inline" >&5 ! echo "${ECHO_T}$ac_cv_c_inline" >&6 ! case $ac_cv_c_inline in ! inline | yes) ;; ! no) ! cat >>confdefs.h <<\EOF ! #define inline ! EOF ! ;; ! *) cat >>confdefs.h <&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! cat >conftest.$ac_ext <<_ACEOF ! #line 7809 "configure" ! #include "confdefs.h" ! $ac_includes_default ! #include <$ac_header> ! _ACEOF ! rm -f conftest.$ac_objext ! if { (eval echo "$as_me:7815: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ! ac_status=$? ! echo "$as_me:7818: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:7821: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:7824: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! eval "$as_ac_Header=yes" ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! eval "$as_ac_Header=no" ! fi ! rm -f conftest.$ac_objext conftest.$ac_ext fi ! echo "$as_me:7834: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then ! cat >>confdefs.h <&5 ! echo $ECHO_N "checking for off_t... $ECHO_C" >&6 ! if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line 7850 "configure" #include "confdefs.h" ! $ac_includes_default int main () { ! if ((off_t *) 0) ! return 0; ! if (sizeof (off_t)) ! return 0; ; return 0; } _ACEOF ! rm -f conftest.$ac_objext ! if { (eval echo "$as_me:7865: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:7868: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:7871: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:7874: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_type_off_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_type_off_t=no fi ! rm -f conftest.$ac_objext conftest.$ac_ext fi ! echo "$as_me:7884: result: $ac_cv_type_off_t" >&5 ! echo "${ECHO_T}$ac_cv_type_off_t" >&6 ! if test $ac_cv_type_off_t = yes; then ! : ! else ! cat >>confdefs.h <&5 ! echo $ECHO_N "checking for size_t... $ECHO_C" >&6 ! if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! cat >conftest.$ac_ext <<_ACEOF ! #line 7902 "configure" #include "confdefs.h" $ac_includes_default ! int ! main () ! { ! if ((size_t *) 0) ! return 0; ! if (sizeof (size_t)) ! return 0; ! ; ! return 0; ! } _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:7917: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:7920: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:7923: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:7926: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_type_size_t=no ! fi ! rm -f conftest.$ac_objext conftest.$ac_ext ! fi ! echo "$as_me:7936: result: $ac_cv_type_size_t" >&5 ! echo "${ECHO_T}$ac_cv_type_size_t" >&6 ! if test $ac_cv_type_size_t = yes; then ! : ! else ! ! cat >>confdefs.h <&5 ! echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 ! if test "${ac_cv_working_alloca_h+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line 7956 "configure" ! #include "confdefs.h" ! #include ! int ! main () ! { ! char *p = (char *) alloca (2 * sizeof (int)); ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:7968: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:7971: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:7974: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:7977: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! ac_cv_working_alloca_h=yes ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! ac_cv_working_alloca_h=no ! fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! fi ! echo "$as_me:7987: result: $ac_cv_working_alloca_h" >&5 ! echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 ! if test $ac_cv_working_alloca_h = yes; then ! ! cat >>confdefs.h <<\EOF ! #define HAVE_ALLOCA_H 1 ! EOF ! ! fi ! ! echo "$as_me:7997: checking for alloca" >&5 ! echo $ECHO_N "checking for alloca... $ECHO_C" >&6 ! if test "${ac_cv_func_alloca_works+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line 8003 "configure" ! #include "confdefs.h" ! #ifdef __GNUC__ ! # define alloca __builtin_alloca ! #else ! # ifdef _MSC_VER ! # include ! # define alloca _alloca ! # else ! # if HAVE_ALLOCA_H ! # include ! # else ! # ifdef _AIX ! #pragma alloca ! # else ! # ifndef alloca /* predefined by HP cc +Olibcalls */ ! char *alloca (); ! # endif ! # endif ! # endif ! # endif ! #endif ! ! int ! main () ! { ! char *p = (char *) alloca (1); ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:8035: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:8038: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:8041: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:8044: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! ac_cv_func_alloca_works=yes ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! ac_cv_func_alloca_works=no ! fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! fi ! echo "$as_me:8054: result: $ac_cv_func_alloca_works" >&5 ! echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 ! ! if test $ac_cv_func_alloca_works = yes; then ! ! cat >>confdefs.h <<\EOF ! #define HAVE_ALLOCA 1 ! EOF ! ! else ! # The SVR3 libPW and SVR4 libucb both contain incompatible functions ! # that cause trouble. Some versions do not even contain alloca or ! # contain a buggy version. If you still want to use their alloca, ! # use ar to extract alloca.o from them instead of compiling alloca.c. ! ! ALLOCA=alloca.$ac_objext ! ! cat >>confdefs.h <<\EOF ! #define C_ALLOCA 1 ! EOF ! ! echo "$as_me:8075: checking whether \`alloca.c' needs Cray hooks" >&5 ! echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 ! if test "${ac_cv_os_cray+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line 8081 "configure" ! #include "confdefs.h" ! #if defined(CRAY) && ! defined(CRAY2) ! webecray ! #else ! wenotbecray ! #endif ! ! _ACEOF ! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "webecray" >/dev/null 2>&1; then ! ac_cv_os_cray=yes ! else ! ac_cv_os_cray=no ! fi ! rm -f conftest* ! ! fi ! echo "$as_me:8099: result: $ac_cv_os_cray" >&5 ! echo "${ECHO_T}$ac_cv_os_cray" >&6 ! if test $ac_cv_os_cray = yes; then ! for ac_func in _getb67 GETB67 getb67; do ! as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ! echo "$as_me:8104: checking for $ac_func" >&5 ! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ! if eval "test \"\${$as_ac_var+set}\" = set"; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line 8110 "configure" ! #include "confdefs.h" ! /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" ! #endif ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char $ac_func (); ! char (*f) (); ! ! int ! main () ! { ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_$ac_func) || defined (__stub___$ac_func) ! choke me ! #else ! f = $ac_func; ! #endif ! ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:8141: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:8144: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:8147: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:8150: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! eval "$as_ac_var=yes" ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! eval "$as_ac_var=no" ! fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! fi ! echo "$as_me:8160: result: `eval echo '${'$as_ac_var'}'`" >&5 ! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ! if test `eval echo '${'$as_ac_var'}'` = yes; then ! ! cat >>confdefs.h <&5 ! echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 ! if test "${ac_cv_c_stack_direction+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! if test "$cross_compiling" = yes; then ! ac_cv_c_stack_direction=0 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line 8183 "configure" ! #include "confdefs.h" ! int ! find_stack_direction () ! { ! static char *addr = 0; ! auto char dummy; ! if (addr == 0) ! { ! addr = &dummy; ! return find_stack_direction (); ! } ! else ! return (&dummy > addr) ? 1 : -1; ! } ! ! int ! main () ! { ! exit (find_stack_direction () < 0); ! } ! _ACEOF ! rm -f conftest$ac_exeext ! if { (eval echo "$as_me:8206: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:8209: \$? = $ac_status" >&5 ! (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ! { (eval echo "$as_me:8211: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:8214: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! ac_cv_c_stack_direction=1 ! else ! echo "$as_me: program exited with status $ac_status" >&5 ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! ac_cv_c_stack_direction=-1 ! fi ! rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ! fi ! fi ! echo "$as_me:8226: result: $ac_cv_c_stack_direction" >&5 ! echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 ! ! cat >>confdefs.h <&5 ! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ! if eval "test \"\${$as_ac_Header+set}\" = set"; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line 8244 "configure" ! #include "confdefs.h" ! #include <$ac_header> ! _ACEOF ! if { (eval echo "$as_me:8248: \"$ac_cpp conftest.$ac_ext\"") >&5 ! (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ! ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:8254: \$? = $ac_status" >&5 ! (exit $ac_status); } >/dev/null; then ! if test -s conftest.err; then ! ac_cpp_err=$ac_c_preproc_warn_flag ! else ! ac_cpp_err= ! fi ! else ! ac_cpp_err=yes ! fi ! if test -z "$ac_cpp_err"; then ! eval "$as_ac_Header=yes" ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! eval "$as_ac_Header=no" ! fi ! rm -f conftest.err conftest.$ac_ext ! fi ! echo "$as_me:8273: result: `eval echo '${'$as_ac_Header'}'`" >&5 ! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ! if test `eval echo '${'$as_ac_Header'}'` = yes; then ! cat >>confdefs.h <&5 ! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ! if eval "test \"\${$as_ac_var+set}\" = set"; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line 8292 "configure" ! #include "confdefs.h" ! /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" ! #endif ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char $ac_func (); ! char (*f) (); ! ! int ! main () ! { ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_$ac_func) || defined (__stub___$ac_func) ! choke me ! #else ! f = $ac_func; ! #endif ! ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:8323: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:8326: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:8329: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:8332: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! eval "$as_ac_var=yes" ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! eval "$as_ac_var=no" ! fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! fi ! echo "$as_me:8342: result: `eval echo '${'$as_ac_var'}'`" >&5 ! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ! if test `eval echo '${'$as_ac_var'}'` = yes; then ! cat >>confdefs.h <&5 ! echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 ! if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! if test "$cross_compiling" = yes; then ! ac_cv_func_mmap_fixed_mapped=no ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line 8361 "configure" ! #include "confdefs.h" ! $ac_includes_default ! /* Thanks to Mike Haertel and Jim Avera for this test. ! Here is a matrix of mmap possibilities: ! mmap private not fixed ! mmap private fixed at somewhere currently unmapped ! mmap private fixed at somewhere already mapped ! mmap shared not fixed ! mmap shared fixed at somewhere currently unmapped ! mmap shared fixed at somewhere already mapped ! For private mappings, we should verify that changes cannot be read() ! back from the file, nor mmap's back from the file at a different ! address. (There have been systems where private was not correctly ! implemented like the infamous i386 svr4.0, and systems where the ! VM page cache was not coherent with the file system buffer cache ! like early versions of FreeBSD and possibly contemporary NetBSD.) ! For shared mappings, we should conversely verify that changes get ! propogated back to all the places they're supposed to be. ! ! Grep wants private fixed already mapped. ! The main things grep needs to know about mmap are: ! * does it exist and is it safe to write into the mmap'd area ! * how to use it (BSD variants) */ ! ! #include ! #include ! ! #if !STDC_HEADERS && !HAVE_STDLIB_H ! char *malloc (); ! #endif ! ! /* This mess was copied from the GNU getpagesize.h. */ ! #if !HAVE_GETPAGESIZE ! /* Assume that all systems that can run configure have sys/param.h. */ ! # if !HAVE_SYS_PARAM_H ! # define HAVE_SYS_PARAM_H 1 ! # endif ! ! # ifdef _SC_PAGESIZE ! # define getpagesize() sysconf(_SC_PAGESIZE) ! # else /* no _SC_PAGESIZE */ ! # if HAVE_SYS_PARAM_H ! # include ! # ifdef EXEC_PAGESIZE ! # define getpagesize() EXEC_PAGESIZE ! # else /* no EXEC_PAGESIZE */ ! # ifdef NBPG ! # define getpagesize() NBPG * CLSIZE ! # ifndef CLSIZE ! # define CLSIZE 1 ! # endif /* no CLSIZE */ ! # else /* no NBPG */ ! # ifdef NBPC ! # define getpagesize() NBPC ! # else /* no NBPC */ ! # ifdef PAGESIZE ! # define getpagesize() PAGESIZE ! # endif /* PAGESIZE */ ! # endif /* no NBPC */ ! # endif /* no NBPG */ ! # endif /* no EXEC_PAGESIZE */ ! # else /* no HAVE_SYS_PARAM_H */ ! # define getpagesize() 8192 /* punt totally */ ! # endif /* no HAVE_SYS_PARAM_H */ ! # endif /* no _SC_PAGESIZE */ ! ! #endif /* no HAVE_GETPAGESIZE */ ! ! int ! main () ! { ! char *data, *data2, *data3; ! int i, pagesize; ! int fd; ! ! pagesize = getpagesize (); ! ! /* First, make a file with some known garbage in it. */ ! data = (char *) malloc (pagesize); ! if (!data) ! exit (1); ! for (i = 0; i < pagesize; ++i) ! *(data + i) = rand (); ! umask (0); ! fd = creat ("conftest.mmap", 0600); ! if (fd < 0) ! exit (1); ! if (write (fd, data, pagesize) != pagesize) ! exit (1); ! close (fd); ! ! /* Next, try to mmap the file at a fixed address which already has ! something else allocated at it. If we can, also make sure that ! we see the same garbage. */ ! fd = open ("conftest.mmap", O_RDWR); ! if (fd < 0) ! exit (1); ! data2 = (char *) malloc (2 * pagesize); ! if (!data2) ! exit (1); ! data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); ! if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, ! MAP_PRIVATE | MAP_FIXED, fd, 0L)) ! exit (1); ! for (i = 0; i < pagesize; ++i) ! if (*(data + i) != *(data2 + i)) ! exit (1); ! ! /* Finally, make sure that changes to the mapped area do not ! percolate back to the file as seen by read(). (This is a bug on ! some variants of i386 svr4.0.) */ ! for (i = 0; i < pagesize; ++i) ! *(data2 + i) = *(data2 + i) + 1; ! data3 = (char *) malloc (pagesize); ! if (!data3) ! exit (1); ! if (read (fd, data3, pagesize) != pagesize) ! exit (1); ! for (i = 0; i < pagesize; ++i) ! if (*(data + i) != *(data3 + i)) ! exit (1); ! close (fd); ! exit (0); ! } ! _ACEOF ! rm -f conftest$ac_exeext ! if { (eval echo "$as_me:8488: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:8491: \$? = $ac_status" >&5 ! (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ! { (eval echo "$as_me:8493: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:8496: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! ac_cv_func_mmap_fixed_mapped=yes ! else ! echo "$as_me: program exited with status $ac_status" >&5 ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! ac_cv_func_mmap_fixed_mapped=no ! fi ! rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ! fi ! fi ! echo "$as_me:8508: result: $ac_cv_func_mmap_fixed_mapped" >&5 ! echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 ! if test $ac_cv_func_mmap_fixed_mapped = yes; then ! ! cat >>confdefs.h <<\EOF ! #define HAVE_MMAP 1 ! EOF ! ! fi ! rm -f conftest.mmap ! ! for ac_header in argz.h limits.h locale.h nl_types.h malloc.h string.h \ ! unistd.h sys/param.h ! do ! as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ! echo "$as_me:8523: checking for $ac_header" >&5 ! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ! if eval "test \"\${$as_ac_Header+set}\" = set"; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line 8529 "configure" ! #include "confdefs.h" ! #include <$ac_header> ! _ACEOF ! if { (eval echo "$as_me:8533: \"$ac_cpp conftest.$ac_ext\"") >&5 ! (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ! ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:8539: \$? = $ac_status" >&5 ! (exit $ac_status); } >/dev/null; then ! if test -s conftest.err; then ! ac_cpp_err=$ac_c_preproc_warn_flag ! else ! ac_cpp_err= ! fi ! else ! ac_cpp_err=yes ! fi ! if test -z "$ac_cpp_err"; then ! eval "$as_ac_Header=yes" ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! eval "$as_ac_Header=no" ! fi ! rm -f conftest.err conftest.$ac_ext ! fi ! echo "$as_me:8558: result: `eval echo '${'$as_ac_Header'}'`" >&5 ! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ! if test `eval echo '${'$as_ac_Header'}'` = yes; then ! cat >>confdefs.h <&5 ! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ! if eval "test \"\${$as_ac_var+set}\" = set"; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line 8578 "configure" ! #include "confdefs.h" ! /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" ! #endif ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char $ac_func (); ! char (*f) (); ! ! int ! main () ! { ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_$ac_func) || defined (__stub___$ac_func) ! choke me ! #else ! f = $ac_func; ! #endif ! ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:8609: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:8612: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:8615: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:8618: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! eval "$as_ac_var=yes" ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! eval "$as_ac_var=no" ! fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! fi ! echo "$as_me:8628: result: `eval echo '${'$as_ac_var'}'`" >&5 ! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ! if test `eval echo '${'$as_ac_var'}'` = yes; then ! cat >>confdefs.h <&5 ! echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 ! if test "${am_cv_val_LC_MESSAGES+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line 8645 "configure" ! #include "confdefs.h" ! #include ! int ! main () ! { ! return LC_MESSAGES ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:8657: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:8660: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:8663: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:8666: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! am_cv_val_LC_MESSAGES=yes ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! am_cv_val_LC_MESSAGES=no ! fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:8676: result: $am_cv_val_LC_MESSAGES" >&5 ! echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 ! if test $am_cv_val_LC_MESSAGES = yes; then ! ! cat >>confdefs.h <<\EOF ! #define HAVE_LC_MESSAGES 1 ! EOF ! ! fi ! fi ! USE_NLS=yes ! ! nls_cv_force_use_gnu_gettext="no" ! ! nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" ! if test "$nls_cv_force_use_gnu_gettext" != "yes"; then ! nls_cv_header_intl= ! nls_cv_header_libgt= ! CATOBJEXT=NONE ! XGETTEXT=: ! echo "$as_me:8697: checking for libintl.h" >&5 ! echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 ! if test "${ac_cv_header_libintl_h+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line 8703 "configure" #include "confdefs.h" #include _ACEOF ! if { (eval echo "$as_me:8707: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 ! echo "$as_me:8713: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag --- 8200,8454 ---- esac fi fi ! echo "$as_me:$LINENO: result: $complCFLAGS" >&5 echo "${ECHO_T}$complCFLAGS" >&6 WARN_CFLAGS="$warning_flags $complCFLAGS" + + GETTEXT_PACKAGE=libgnomecanvas-2.0 ! ! cat >>confdefs.h <<_ACEOF #define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" ! _ACEOF ! ALL_LINGUAS="am ar az be bg ca da de el es et fa fi fr he hi hu id it ja kn ko lv mk mn ms nl nn no pl pt pt_BR ro ru sk sl sv ta tr uk vi wa zh_CN zh_TW" ! for ac_header in locale.h ! do ! as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ! if eval "test \"\${$as_ac_Header+set}\" = set"; then ! echo "$as_me:$LINENO: checking for $ac_header" >&5 ! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ! if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi ! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else ! # Is the header compilable? ! echo "$as_me:$LINENO: checking $ac_header usability" >&5 ! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" ! $ac_includes_default ! #include <$ac_header> _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext ! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ! echo "${ECHO_T}$ac_header_compiler" >&6 ! # Is the header present? ! echo "$as_me:$LINENO: checking $ac_header presence" >&5 ! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" ! #include <$ac_header> _ACEOF ! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ! (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } >/dev/null; then ! if test -s conftest.err; then ! ac_cpp_err=$ac_c_preproc_warn_flag ! else ! ac_cpp_err= ! fi ! else ! ac_cpp_err=yes ! fi ! if test -z "$ac_cpp_err"; then ! ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! ac_header_preproc=no fi ! rm -f conftest.err conftest.$ac_ext ! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ! echo "${ECHO_T}$ac_header_preproc" >&6 ! # So? What about this header? ! case $ac_header_compiler:$ac_header_preproc in ! yes:no ) ! { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ! echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ! { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; ! no:yes ) ! { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ! echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ! { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ! echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ! { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac ! echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! eval "$as_ac_Header=$ac_header_preproc" fi ! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + + fi if test `eval echo '${'$as_ac_Header'}'` = yes; then ! cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ! _ACEOF fi + done ! if test $ac_cv_header_locale_h = yes; then ! echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 ! echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 ! if test "${am_cv_val_LC_MESSAGES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" ! #include ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif int main () { ! return LC_MESSAGES ; return 0; } _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! am_cv_val_LC_MESSAGES=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! am_cv_val_LC_MESSAGES=no fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 ! echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 ! if test $am_cv_val_LC_MESSAGES = yes; then ! cat >>confdefs.h <<\_ACEOF ! #define HAVE_LC_MESSAGES 1 ! _ACEOF ! fi ! fi ! USE_NLS=yes ! ! ! gt_cv_have_gettext=no ! CATOBJEXT=NONE ! XGETTEXT=: ! INTLLIBS= ! ! if test "${ac_cv_header_libintl_h+set}" = set; then ! echo "$as_me:$LINENO: checking for libintl.h" >&5 ! echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 ! if test "${ac_cv_header_libintl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 + fi + echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 + echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 else ! # Is the header compilable? ! echo "$as_me:$LINENO: checking libintl.h usability" >&5 ! echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" $ac_includes_default ! #include _ACEOF rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_header_compiler=no fi ! rm -f conftest.$ac_objext conftest.$ac_ext ! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ! echo "${ECHO_T}$ac_header_compiler" >&6 ! # Is the header present? ! echo "$as_me:$LINENO: checking libintl.h presence" >&5 ! echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" #include _ACEOF ! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag *************** *** 8721,8746 **** ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then ! ac_cv_header_libintl_h=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_header_libintl_h=no fi rm -f conftest.err conftest.$ac_ext fi ! echo "$as_me:8732: result: $ac_cv_header_libintl_h" >&5 echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 if test $ac_cv_header_libintl_h = yes; then ! echo "$as_me:8735: checking for dgettext in libc" >&5 echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6 if test "${gt_cv_func_dgettext_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line 8741 "configure" #include "confdefs.h" #include int main () { --- 8459,8524 ---- ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then ! ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 + echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};; + esac + echo "$as_me:$LINENO: checking for libintl.h" >&5 + echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 + if test "${ac_cv_header_libintl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_libintl_h=$ac_header_preproc fi ! echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 + + fi if test $ac_cv_header_libintl_h = yes; then ! gt_cv_func_dgettext_libintl="no" ! libintl_extra_libs="" ! ! # ! # First check in libc ! # ! echo "$as_me:$LINENO: checking for dgettext in libc" >&5 echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6 if test "${gt_cv_func_dgettext_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" + #include + + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 8750,8765 **** } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:8753: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:8756: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:8759: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:8762: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_func_dgettext_libc=yes else --- 8528,8543 ---- } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_func_dgettext_libc=yes else *************** *** 8768,8782 **** gt_cv_func_dgettext_libc=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:8772: result: $gt_cv_func_dgettext_libc" >&5 echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6 ! gt_cv_func_dgettext_libintl="no" ! libintl_extra_libs="" ! if test "$gt_cv_func_dgettext_libc" != "yes" ; then ! echo "$as_me:8779: checking for bindtextdomain in -lintl" >&5 echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6 if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 8546,8642 ---- gt_cv_func_dgettext_libc=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi ! echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6 ! if test "$gt_cv_func_dgettext_libc" = "yes" ; then ! ! for ac_func in bind_textdomain_codeset ! do ! as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ! echo "$as_me:$LINENO: checking for $ac_func" >&5 ! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ! if eval "test \"\${$as_ac_var+set}\" = set"; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! #include "confdefs.h" ! /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" ! #endif ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char $ac_func (); ! char (*f) (); ! ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif ! int ! main () ! { ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_$ac_func) || defined (__stub___$ac_func) ! choke me ! #else ! f = $ac_func; ! #endif ! ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! eval "$as_ac_var=yes" ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! eval "$as_ac_var=no" ! fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! fi ! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ! if test `eval echo '${'$as_ac_var'}'` = yes; then ! cat >>confdefs.h <<_ACEOF ! #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ! _ACEOF ! ! fi ! done ! ! fi ! ! # ! # If we don't have everything we want, check in libintl ! # ! if test "$gt_cv_func_dgettext_libc" != "yes" \ ! || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then ! echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6 if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 8784,8790 **** ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF ! #line 8787 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ --- 8644,8650 ---- ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ *************** *** 8794,8799 **** --- 8654,8665 ---- /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char bindtextdomain (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 8803,8818 **** } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:8806: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:8809: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:8812: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:8815: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_intl_bindtextdomain=yes else --- 8669,8684 ---- } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_intl_bindtextdomain=yes else *************** *** 8823,8832 **** rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:8826: result: $ac_cv_lib_intl_bindtextdomain" >&5 echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6 if test $ac_cv_lib_intl_bindtextdomain = yes; then ! echo "$as_me:8829: checking for dgettext in -lintl" >&5 echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6 if test "${ac_cv_lib_intl_dgettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 8689,8698 ---- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6 if test $ac_cv_lib_intl_bindtextdomain = yes; then ! echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6 if test "${ac_cv_lib_intl_dgettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 8834,8840 **** ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF ! #line 8837 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ --- 8700,8706 ---- ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ *************** *** 8844,8849 **** --- 8710,8721 ---- /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dgettext (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 8853,8868 **** } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:8856: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:8859: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:8862: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:8865: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_intl_dgettext=yes else --- 8725,8740 ---- } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_intl_dgettext=yes else *************** *** 8873,8879 **** rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:8876: result: $ac_cv_lib_intl_dgettext" >&5 echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6 if test $ac_cv_lib_intl_dgettext = yes; then gt_cv_func_dgettext_libintl=yes --- 8745,8751 ---- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6 if test $ac_cv_lib_intl_dgettext = yes; then gt_cv_func_dgettext_libintl=yes *************** *** 8881,8892 **** fi ! if test "$gt_cv_func_dgettext_libc" != "yes" ; then ! echo "$as_me:8885: checking if -liconv is needed to use gettext" >&5 echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6 ! echo "$as_me:8887: result: " >&5 echo "${ECHO_T}" >&6 ! echo "$as_me:8889: checking for dcgettext in -lintl" >&5 echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6 if test "${ac_cv_lib_intl_dcgettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 8753,8765 ---- fi ! ! if test "$gt_cv_func_dgettext_libintl" != "yes" ; then ! echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6 ! echo "$as_me:$LINENO: result: " >&5 echo "${ECHO_T}" >&6 ! echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6 if test "${ac_cv_lib_intl_dcgettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 8894,8900 **** ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" cat >conftest.$ac_ext <<_ACEOF ! #line 8897 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ --- 8767,8773 ---- ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ *************** *** 8904,8909 **** --- 8777,8788 ---- /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dcgettext (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 8913,8928 **** } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:8916: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:8919: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:8922: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:8925: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_intl_dcgettext=yes else --- 8792,8807 ---- } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_intl_dcgettext=yes else *************** *** 8933,8964 **** rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:8936: result: $ac_cv_lib_intl_dcgettext" >&5 echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6 if test $ac_cv_lib_intl_dcgettext = yes; then gt_cv_func_dgettext_libintl=yes ! libintl_extra_libs=-liconv else : fi fi fi ! if test "$gt_cv_func_dgettext_libintl" = "yes"; then ! LIBS="$LIBS -lintl $libintl_extra_libs"; ! fi ! if test "$gt_cv_func_dgettext_libc" = "yes" \ ! || test "$gt_cv_func_dgettext_libintl" = "yes"; then ! cat >>confdefs.h <<\EOF #define HAVE_GETTEXT 1 ! EOF ! # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 ! echo "$as_me:8961: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 8812,8943 ---- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6 if test $ac_cv_lib_intl_dcgettext = yes; then gt_cv_func_dgettext_libintl=yes ! libintl_extra_libs=-liconv else : fi + fi + + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), + # and both have dgettext + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset + + for ac_func in bind_textdomain_codeset + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ + #include + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char $ac_func (); + char (*f) (); + + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif + int + main () + { + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else + f = $ac_func; + #endif + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_var=no" + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi + done + + LIBS="$glib_save_LIBS" + + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else + if test "$gt_cv_func_dgettext_libc" = "yes"; then + gt_cv_func_dgettext_libintl=no fi fi + fi + fi ! if test "$gt_cv_func_dgettext_libc" = "yes" \ ! || test "$gt_cv_func_dgettext_libintl" = "yes"; then ! gt_cv_have_gettext=yes ! fi ! ! if test "$gt_cv_func_dgettext_libintl" = "yes"; then ! INTLLIBS="-lintl $libintl_extra_libs" ! fi ! if test "$gt_cv_have_gettext" = "yes"; then ! cat >>confdefs.h <<\_ACEOF #define HAVE_GETTEXT 1 ! _ACEOF ! # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 8985,9008 **** fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then ! echo "$as_me:8988: result: $MSGFMT" >&5 echo "${ECHO_T}$MSGFMT" >&6 else ! echo "$as_me:8991: result: no" >&5 echo "${ECHO_T}no" >&6 fi ! if test "$MSGFMT" != "no"; then for ac_func in dcgettext do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ! echo "$as_me:8999: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line 9005 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ --- 8964,8987 ---- fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then ! echo "$as_me:$LINENO: result: $MSGFMT" >&5 echo "${ECHO_T}$MSGFMT" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi ! if test "$MSGFMT" != "no"; then for ac_func in dcgettext do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ! echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ *************** *** 9016,9021 **** --- 8995,9006 ---- char $ac_func (); char (*f) (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 9033,9048 **** } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:9036: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:9039: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:9042: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:9045: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else --- 9018,9033 ---- } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else *************** *** 9052,9070 **** fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:9055: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then ! cat >>confdefs.h <&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 9037,9055 ---- fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then ! cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ! _ACEOF fi done ! # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 9074,9089 **** ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; *) ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! if $as_executable_p "$ac_dir/$ac_word"; then ! ac_cv_path_GMSGFMT="$ac_dir/$ac_word" ! echo "$as_me:9084: found $ac_dir/$ac_word" >&5 ! break ! fi done test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" --- 9059,9076 ---- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; *) ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" *************** *** 9093,9108 **** GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then ! echo "$as_me:9096: result: $GMSGFMT" >&5 echo "${ECHO_T}$GMSGFMT" >&6 else ! echo "$as_me:9099: result: no" >&5 echo "${ECHO_T}no" >&6 fi ! # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 ! echo "$as_me:9105: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 9080,9095 ---- GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then ! echo "$as_me:$LINENO: result: $GMSGFMT" >&5 echo "${ECHO_T}$GMSGFMT" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi ! # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 9129,9208 **** fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then ! echo "$as_me:9132: result: $XGETTEXT" >&5 echo "${ECHO_T}$XGETTEXT" >&6 else ! echo "$as_me:9135: result: no" >&5 echo "${ECHO_T}no" >&6 fi ! cat >conftest.$ac_ext <<_ACEOF ! #line 9140 "configure" #include "confdefs.h" int main () { extern int _nl_msg_cat_cntr; ! return _nl_msg_cat_cntr ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:9153: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:9156: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:9159: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:9162: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CATOBJEXT=.gmo ! DATADIRNAME=share else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 CATOBJEXT=.mo ! DATADIRNAME=lib fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! INSTOBJEXT=.mo ! fi ! fi ! ! # Added by Martin Baulig 12/15/98 for libc5 systems ! if test "$gt_cv_func_dgettext_libc" != "yes" \ ! && test "$gt_cv_func_dgettext_libintl" = "yes"; then ! INTLLIBS="-lintl $libintl_extra_libs" ! LIBS=`echo $LIBS | sed -e 's/-lintl//'` ! fi fi - if test "$CATOBJEXT" = "NONE"; then - nls_cv_use_gnu_gettext=yes - fi - fi - if test "$nls_cv_use_gnu_gettext" != "yes"; then ! cat >>confdefs.h <<\EOF #define ENABLE_NLS 1 ! EOF - else - CATOBJEXT= fi if test "$XGETTEXT" != ":"; then if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else ! echo "$as_me:9205: result: found xgettext program is not GNU xgettext; ignore it" >&5 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 XGETTEXT=":" fi --- 9116,9191 ---- fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then ! echo "$as_me:$LINENO: result: $XGETTEXT" >&5 echo "${ECHO_T}$XGETTEXT" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { extern int _nl_msg_cat_cntr; ! return _nl_msg_cat_cntr ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CATOBJEXT=.gmo ! DATADIRNAME=share else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 CATOBJEXT=.mo ! DATADIRNAME=lib fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! INSTOBJEXT=.mo ! else ! gt_cv_have_gettext=no ! fi ! fi fi ! if test "$gt_cv_have_gettext" = "yes" ; then ! ! cat >>confdefs.h <<\_ACEOF #define ENABLE_NLS 1 ! _ACEOF fi if test "$XGETTEXT" != ":"; then if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else ! echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 XGETTEXT=":" fi *************** *** 9213,9291 **** ac_config_commands="$ac_config_commands default-2" for lang in $ALL_LINGUAS; do GMOFILES="$GMOFILES $lang.gmo" POFILES="$POFILES $lang.po" done ! if test "x$CATOBJEXT" != "x"; then if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else ! echo "$as_me:9225: checking for catalogs to be installed" >&5 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 ! NEW_LINGUAS= ! for lang in ${LINGUAS=$ALL_LINGUAS}; do ! case "$ALL_LINGUAS" in ! *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; ! esac ! done ! LINGUAS=$NEW_LINGUAS ! echo "$as_me:9234: result: $LINGUAS" >&5 ! echo "${ECHO_T}$LINGUAS" >&6 ! fi ! ! if test -n "$LINGUAS"; then ! for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ! fi ! fi ! ! test -d po || mkdir po ! if test "$CATOBJEXT" = ".cat"; then ! echo "$as_me:9245: checking for linux/version.h" >&5 ! echo $ECHO_N "checking for linux/version.h... $ECHO_C" >&6 ! if test "${ac_cv_header_linux_version_h+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line 9251 "configure" ! #include "confdefs.h" ! #include ! _ACEOF ! if { (eval echo "$as_me:9255: \"$ac_cpp conftest.$ac_ext\"") >&5 ! (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ! ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:9261: \$? = $ac_status" >&5 ! (exit $ac_status); } >/dev/null; then ! if test -s conftest.err; then ! ac_cpp_err=$ac_c_preproc_warn_flag ! else ! ac_cpp_err= ! fi ! else ! ac_cpp_err=yes ! fi ! if test -z "$ac_cpp_err"; then ! ac_cv_header_linux_version_h=yes ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! ac_cv_header_linux_version_h=no ! fi ! rm -f conftest.err conftest.$ac_ext ! fi ! echo "$as_me:9280: result: $ac_cv_header_linux_version_h" >&5 ! echo "${ECHO_T}$ac_cv_header_linux_version_h" >&6 ! if test $ac_cv_header_linux_version_h = yes; then ! msgformat=linux ! else ! msgformat=xopen ! fi ! sed -e '/^#/d' $srcdir/po/$msgformat-msg.sed > po/po2msg.sed fi MKINSTALLDIRS= --- 9196,9239 ---- ac_config_commands="$ac_config_commands default-2" + for lang in $ALL_LINGUAS; do GMOFILES="$GMOFILES $lang.gmo" POFILES="$POFILES $lang.po" done ! ! ! ! ! ! ! ! ! ! ! ! ! if test "$gt_cv_have_gettext" = "yes"; then if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else ! echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 ! NEW_LINGUAS= ! for lang in ${LINGUAS=$ALL_LINGUAS}; do ! case "$ALL_LINGUAS" in ! *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; ! esac ! done ! LINGUAS=$NEW_LINGUAS ! echo "$as_me:$LINENO: result: $LINGUAS" >&5 ! echo "${ECHO_T}$LINGUAS" >&6 ! fi ! if test -n "$LINGUAS"; then ! for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ! fi fi MKINSTALLDIRS= *************** *** 9296,9301 **** --- 9244,9250 ---- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" fi + test -d po || mkdir po if test "x$srcdir" != "x."; then if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then *************** *** 9310,9315 **** --- 9259,9269 ---- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ < $srcdir/po/POTFILES.in > po/POTFILES + + + + + GTK_REQUIRED=2.0.3 LIBART_REQUIRED=2.3.8 PANGO_REQUIRED=1.0.1 *************** *** 9322,9328 **** if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 ! echo "$as_me:9325: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 9276,9282 ---- if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 9332,9347 **** ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; *) ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! if $as_executable_p "$ac_dir/$ac_word"; then ! ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" ! echo "$as_me:9342: found $ac_dir/$ac_word" >&5 ! break ! fi done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" --- 9286,9303 ---- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; *) ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" *************** *** 9351,9360 **** PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then ! echo "$as_me:9354: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else ! echo "$as_me:9357: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 9307,9316 ---- PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then ! echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 9368,9391 **** else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ! echo "$as_me:9371: checking for $CANVAS_MODULES" >&5 echo $ECHO_N "checking for $CANVAS_MODULES... $ECHO_C" >&6 if $PKG_CONFIG --exists "$CANVAS_MODULES" ; then ! echo "$as_me:9375: result: yes" >&5 echo "${ECHO_T}yes" >&6 succeeded=yes ! echo "$as_me:9379: checking LIBGNOMECANVAS_CFLAGS" >&5 echo $ECHO_N "checking LIBGNOMECANVAS_CFLAGS... $ECHO_C" >&6 LIBGNOMECANVAS_CFLAGS=`$PKG_CONFIG --cflags "$CANVAS_MODULES"` ! echo "$as_me:9382: result: $LIBGNOMECANVAS_CFLAGS" >&5 echo "${ECHO_T}$LIBGNOMECANVAS_CFLAGS" >&6 ! echo "$as_me:9385: checking LIBGNOMECANVAS_LIBS" >&5 echo $ECHO_N "checking LIBGNOMECANVAS_LIBS... $ECHO_C" >&6 LIBGNOMECANVAS_LIBS=`$PKG_CONFIG --libs "$CANVAS_MODULES"` ! echo "$as_me:9388: result: $LIBGNOMECANVAS_LIBS" >&5 echo "${ECHO_T}$LIBGNOMECANVAS_LIBS" >&6 else LIBGNOMECANVAS_CFLAGS="" --- 9324,9347 ---- else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ! echo "$as_me:$LINENO: checking for $CANVAS_MODULES" >&5 echo $ECHO_N "checking for $CANVAS_MODULES... $ECHO_C" >&6 if $PKG_CONFIG --exists "$CANVAS_MODULES" ; then ! echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 succeeded=yes ! echo "$as_me:$LINENO: checking LIBGNOMECANVAS_CFLAGS" >&5 echo $ECHO_N "checking LIBGNOMECANVAS_CFLAGS... $ECHO_C" >&6 LIBGNOMECANVAS_CFLAGS=`$PKG_CONFIG --cflags "$CANVAS_MODULES"` ! echo "$as_me:$LINENO: result: $LIBGNOMECANVAS_CFLAGS" >&5 echo "${ECHO_T}$LIBGNOMECANVAS_CFLAGS" >&6 ! echo "$as_me:$LINENO: checking LIBGNOMECANVAS_LIBS" >&5 echo $ECHO_N "checking LIBGNOMECANVAS_LIBS... $ECHO_C" >&6 LIBGNOMECANVAS_LIBS=`$PKG_CONFIG --libs "$CANVAS_MODULES"` ! echo "$as_me:$LINENO: result: $LIBGNOMECANVAS_LIBS" >&5 echo "${ECHO_T}$LIBGNOMECANVAS_LIBS" >&6 else LIBGNOMECANVAS_CFLAGS="" *************** *** 9396,9401 **** --- 9352,9359 ---- echo $LIBGNOMECANVAS_PKG_ERRORS fi + + else echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." echo "*** See http://www.freedesktop.org/software/pkgconfig" *************** *** 9405,9421 **** if test $succeeded = yes; then : else ! { { echo "$as_me:9408: error: Library requirements ($CANVAS_MODULES) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 echo "$as_me: error: Library requirements ($CANVAS_MODULES) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 ! echo "$as_me:9418: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 9363,9383 ---- if test $succeeded = yes; then : else ! { { echo "$as_me:$LINENO: error: Library requirements ($CANVAS_MODULES) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 echo "$as_me: error: Library requirements ($CANVAS_MODULES) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi + + + + succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 9425,9440 **** ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; *) ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! if $as_executable_p "$ac_dir/$ac_word"; then ! ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" ! echo "$as_me:9435: found $ac_dir/$ac_word" >&5 ! break ! fi done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" --- 9387,9404 ---- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; *) ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" *************** *** 9444,9453 **** PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then ! echo "$as_me:9447: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else ! echo "$as_me:9450: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 9408,9417 ---- PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then ! echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 9461,9484 **** else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ! echo "$as_me:9464: checking for $CANVAS_MODULES libglade-2.0 >= $LIBGLADE_REQUIRED" >&5 echo $ECHO_N "checking for $CANVAS_MODULES libglade-2.0 >= $LIBGLADE_REQUIRED... $ECHO_C" >&6 if $PKG_CONFIG --exists "$CANVAS_MODULES libglade-2.0 >= $LIBGLADE_REQUIRED" ; then ! echo "$as_me:9468: result: yes" >&5 echo "${ECHO_T}yes" >&6 succeeded=yes ! echo "$as_me:9472: checking CANVAS_GLADE_CFLAGS" >&5 echo $ECHO_N "checking CANVAS_GLADE_CFLAGS... $ECHO_C" >&6 CANVAS_GLADE_CFLAGS=`$PKG_CONFIG --cflags "$CANVAS_MODULES libglade-2.0 >= $LIBGLADE_REQUIRED"` ! echo "$as_me:9475: result: $CANVAS_GLADE_CFLAGS" >&5 echo "${ECHO_T}$CANVAS_GLADE_CFLAGS" >&6 ! echo "$as_me:9478: checking CANVAS_GLADE_LIBS" >&5 echo $ECHO_N "checking CANVAS_GLADE_LIBS... $ECHO_C" >&6 CANVAS_GLADE_LIBS=`$PKG_CONFIG --libs "$CANVAS_MODULES libglade-2.0 >= $LIBGLADE_REQUIRED"` ! echo "$as_me:9481: result: $CANVAS_GLADE_LIBS" >&5 echo "${ECHO_T}$CANVAS_GLADE_LIBS" >&6 else CANVAS_GLADE_CFLAGS="" --- 9425,9448 ---- else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ! echo "$as_me:$LINENO: checking for $CANVAS_MODULES libglade-2.0 >= $LIBGLADE_REQUIRED" >&5 echo $ECHO_N "checking for $CANVAS_MODULES libglade-2.0 >= $LIBGLADE_REQUIRED... $ECHO_C" >&6 if $PKG_CONFIG --exists "$CANVAS_MODULES libglade-2.0 >= $LIBGLADE_REQUIRED" ; then ! echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 succeeded=yes ! echo "$as_me:$LINENO: checking CANVAS_GLADE_CFLAGS" >&5 echo $ECHO_N "checking CANVAS_GLADE_CFLAGS... $ECHO_C" >&6 CANVAS_GLADE_CFLAGS=`$PKG_CONFIG --cflags "$CANVAS_MODULES libglade-2.0 >= $LIBGLADE_REQUIRED"` ! echo "$as_me:$LINENO: result: $CANVAS_GLADE_CFLAGS" >&5 echo "${ECHO_T}$CANVAS_GLADE_CFLAGS" >&6 ! echo "$as_me:$LINENO: checking CANVAS_GLADE_LIBS" >&5 echo $ECHO_N "checking CANVAS_GLADE_LIBS... $ECHO_C" >&6 CANVAS_GLADE_LIBS=`$PKG_CONFIG --libs "$CANVAS_MODULES libglade-2.0 >= $LIBGLADE_REQUIRED"` ! echo "$as_me:$LINENO: result: $CANVAS_GLADE_LIBS" >&5 echo "${ECHO_T}$CANVAS_GLADE_LIBS" >&6 else CANVAS_GLADE_CFLAGS="" *************** *** 9489,9494 **** --- 9453,9460 ---- echo $CANVAS_GLADE_PKG_ERRORS fi + + else echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." echo "*** See http://www.freedesktop.org/software/pkgconfig" *************** *** 9498,9509 **** if test $succeeded = yes; then : else ! { { echo "$as_me:9501: error: Library requirements ($CANVAS_MODULES libglade-2.0 >= $LIBGLADE_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 echo "$as_me: error: Library requirements ($CANVAS_MODULES libglade-2.0 >= $LIBGLADE_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi ! echo "$as_me:9506: checking for native Win32" >&5 echo $ECHO_N "checking for native Win32... $ECHO_C" >&6 case "$host" in *-*-mingw*) --- 9464,9478 ---- if test $succeeded = yes; then : else ! { { echo "$as_me:$LINENO: error: Library requirements ($CANVAS_MODULES libglade-2.0 >= $LIBGLADE_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 echo "$as_me: error: Library requirements ($CANVAS_MODULES libglade-2.0 >= $LIBGLADE_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi ! ! ! ! echo "$as_me:$LINENO: checking for native Win32" >&5 echo $ECHO_N "checking for native Win32... $ECHO_C" >&6 case "$host" in *-*-mingw*) *************** *** 9513,9521 **** native_win32=no ;; esac ! echo "$as_me:9516: result: $native_win32" >&5 echo "${ECHO_T}$native_win32" >&6 if test "$native_win32" = yes; then OS_WIN32_TRUE= OS_WIN32_FALSE='#' --- 9482,9491 ---- native_win32=no ;; esac ! echo "$as_me:$LINENO: result: $native_win32" >&5 echo "${ECHO_T}$native_win32" >&6 + if test "$native_win32" = yes; then OS_WIN32_TRUE= OS_WIN32_FALSE='#' *************** *** 9524,9530 **** OS_WIN32_FALSE= fi ! echo "$as_me:9527: checking for Win32 platform in general" >&5 echo $ECHO_N "checking for Win32 platform in general... $ECHO_C" >&6 case "$host" in *-*-mingw*|*-*-cygwin*) --- 9494,9500 ---- OS_WIN32_FALSE= fi ! echo "$as_me:$LINENO: checking for Win32 platform in general" >&5 echo $ECHO_N "checking for Win32 platform in general... $ECHO_C" >&6 case "$host" in *-*-mingw*|*-*-cygwin*) *************** *** 9534,9542 **** platform_win32=no ;; esac ! echo "$as_me:9537: result: $platform_win32" >&5 echo "${ECHO_T}$platform_win32" >&6 if test "$platform_win32" = yes; then PLATFORM_WIN32_TRUE= PLATFORM_WIN32_FALSE='#' --- 9504,9513 ---- platform_win32=no ;; esac ! echo "$as_me:$LINENO: result: $platform_win32" >&5 echo "${ECHO_T}$platform_win32" >&6 + if test "$platform_win32" = yes; then PLATFORM_WIN32_TRUE= PLATFORM_WIN32_FALSE='#' *************** *** 9552,9558 **** if test x"$native_win32" = xyes; then if test x"$GCC" = xyes; then msnative_struct='' ! echo "$as_me:9555: checking how to get MSVC-compatible struct packing" >&5 echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6 if test -z "$ac_cv_prog_CC"; then our_gcc="$CC" --- 9523,9529 ---- if test x"$native_win32" = xyes; then if test x"$GCC" = xyes; then msnative_struct='' ! echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6 if test -z "$ac_cv_prog_CC"; then our_gcc="$CC" *************** *** 9572,9584 **** ;; esac if test x"$msnative_struct" = x ; then ! echo "$as_me:9575: result: no way" >&5 echo "${ECHO_T}no way" >&6 ! { echo "$as_me:9577: WARNING: produced libraries will be incompatible with prebuilt GTK+ DLLs" >&5 echo "$as_me: WARNING: produced libraries will be incompatible with prebuilt GTK+ DLLs" >&2;} else CFLAGS="$CFLAGS $msnative_struct" ! echo "$as_me:9581: result: ${msnative_struct}" >&5 echo "${ECHO_T}${msnative_struct}" >&6 fi fi --- 9543,9555 ---- ;; esac if test x"$msnative_struct" = x ; then ! echo "$as_me:$LINENO: result: no way" >&5 echo "${ECHO_T}no way" >&6 ! { echo "$as_me:$LINENO: WARNING: produced libraries will be incompatible with prebuilt GTK+ DLLs" >&5 echo "$as_me: WARNING: produced libraries will be incompatible with prebuilt GTK+ DLLs" >&2;} else CFLAGS="$CFLAGS $msnative_struct" ! echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 echo "${ECHO_T}${msnative_struct}" >&6 fi fi *************** *** 9588,9594 **** do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 ! echo "$as_me:9591: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 9559,9565 ---- do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 9598,9613 **** ac_cv_path_AWK="$AWK" # Let the user override the test with a path. ;; *) ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! if $as_executable_p "$ac_dir/$ac_word"; then ! ac_cv_path_AWK="$ac_dir/$ac_word" ! echo "$as_me:9608: found $ac_dir/$ac_word" >&5 ! break ! fi done ;; --- 9569,9586 ---- ac_cv_path_AWK="$AWK" # Let the user override the test with a path. ;; *) ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done ;; *************** *** 9616,9625 **** AWK=$ac_cv_path_AWK if test -n "$AWK"; then ! echo "$as_me:9619: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else ! echo "$as_me:9622: result: no" >&5 echo "${ECHO_T}no" >&6 fi --- 9589,9598 ---- AWK=$ac_cv_path_AWK if test -n "$AWK"; then ! echo "$as_me:$LINENO: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi *************** *** 9630,9636 **** do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 ! echo "$as_me:9633: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 9603,9609 ---- do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 9640,9655 **** ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; *) ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! if $as_executable_p "$ac_dir/$ac_word"; then ! ac_cv_path_PERL="$ac_dir/$ac_word" ! echo "$as_me:9650: found $ac_dir/$ac_word" >&5 ! break ! fi done ;; --- 9613,9630 ---- ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; *) ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done ;; *************** *** 9658,9677 **** PERL=$ac_cv_path_PERL if test -n "$PERL"; then ! echo "$as_me:9661: result: $PERL" >&5 echo "${ECHO_T}$PERL" >&6 else ! echo "$as_me:9664: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$PERL" && break done # glib-genmarshal # Extract the first word of "glib-genmarshal", so it can be a program name with args. set dummy glib-genmarshal; ac_word=$2 ! echo "$as_me:9674: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 9633,9653 ---- PERL=$ac_cv_path_PERL if test -n "$PERL"; then ! echo "$as_me:$LINENO: result: $PERL" >&5 echo "${ECHO_T}$PERL" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$PERL" && break done + # glib-genmarshal # Extract the first word of "glib-genmarshal", so it can be a program name with args. set dummy glib-genmarshal; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 9681,9696 **** ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path. ;; *) ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! if $as_executable_p "$ac_dir/$ac_word"; then ! ac_cv_path_GLIB_GENMARSHAL="$ac_dir/$ac_word" ! echo "$as_me:9691: found $ac_dir/$ac_word" >&5 ! break ! fi done ;; --- 9657,9674 ---- ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path. ;; *) ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done ;; *************** *** 9699,9711 **** GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL if test -n "$GLIB_GENMARSHAL"; then ! echo "$as_me:9702: result: $GLIB_GENMARSHAL" >&5 echo "${ECHO_T}$GLIB_GENMARSHAL" >&6 else ! echo "$as_me:9705: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Check whether --with-html-dir or --without-html-dir was given. if test "${with_html_dir+set}" = set; then withval="$with_html_dir" --- 9677,9691 ---- GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL if test -n "$GLIB_GENMARSHAL"; then ! echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5 echo "${ECHO_T}$GLIB_GENMARSHAL" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi + + # Check whether --with-html-dir or --without-html-dir was given. if test "${with_html_dir+set}" = set; then withval="$with_html_dir" *************** *** 9718,9726 **** HTML_DIR=$with_html_dir fi # Extract the first word of "gtkdoc-mkdb", so it can be a program name with args. set dummy gtkdoc-mkdb; ac_word=$2 ! echo "$as_me:9723: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_GTKDOC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 9698,9708 ---- HTML_DIR=$with_html_dir fi + + # Extract the first word of "gtkdoc-mkdb", so it can be a program name with args. set dummy gtkdoc-mkdb; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_GTKDOC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 9728,9742 **** if test -n "$GTKDOC"; then ac_cv_prog_GTKDOC="$GTKDOC" # Let the user override the test. else ! ac_save_IFS=$IFS; IFS=$ac_path_separator ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do ! IFS=$ac_save_IFS ! test -z "$ac_dir" && ac_dir=. ! $as_executable_p "$ac_dir/$ac_word" || continue ! ac_cv_prog_GTKDOC="true" ! echo "$as_me:9738: found $ac_dir/$ac_word" >&5 ! break done test -z "$ac_cv_prog_GTKDOC" && ac_cv_prog_GTKDOC="false" --- 9710,9727 ---- if test -n "$GTKDOC"; then ac_cv_prog_GTKDOC="$GTKDOC" # Let the user override the test. else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_GTKDOC="true" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done done test -z "$ac_cv_prog_GTKDOC" && ac_cv_prog_GTKDOC="false" *************** *** 9744,9756 **** fi GTKDOC=$ac_cv_prog_GTKDOC if test -n "$GTKDOC"; then ! echo "$as_me:9747: result: $GTKDOC" >&5 echo "${ECHO_T}$GTKDOC" >&6 else ! echo "$as_me:9750: result: no" >&5 echo "${ECHO_T}no" >&6 fi if $GTKDOC; then HAVE_GTK_DOC_TRUE= HAVE_GTK_DOC_FALSE='#' --- 9729,9743 ---- fi GTKDOC=$ac_cv_prog_GTKDOC if test -n "$GTKDOC"; then ! echo "$as_me:$LINENO: result: $GTKDOC" >&5 echo "${ECHO_T}$GTKDOC" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi + + if $GTKDOC; then HAVE_GTK_DOC_TRUE= HAVE_GTK_DOC_FALSE='#' *************** *** 9759,9764 **** --- 9746,9752 ---- HAVE_GTK_DOC_FALSE= fi + # Check whether --enable-gtk-doc or --disable-gtk-doc was given. if test "${enable_gtk_doc+set}" = set; then enableval="$enable_gtk_doc" *************** *** 9775,9780 **** --- 9763,9770 ---- fi fi + + if test x$enable_gtk_doc = xyes; then ENABLE_GTK_DOC_TRUE= ENABLE_GTK_DOC_FALSE='#' *************** *** 9783,9788 **** --- 9773,9779 ---- ENABLE_GTK_DOC_FALSE= fi + # define a MAINT-like variable REBUILD which is set if Perl # and awk are found, so autogenerated sources can be rebuilt # Check whether --enable-rebuilds or --disable-rebuilds was given. *************** *** 9800,9805 **** --- 9791,9797 ---- REBUILD= fi + ac_config_files="$ac_config_files Makefile po/Makefile.in libgnomecanvas/Makefile libgnomecanvas/libgnomecanvas-2.0.pc glade/Makefile demos/Makefile tests/Makefile docs/Makefile docs/reference/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure *************** *** 9877,9901 **** DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" ! { echo "$as_me:9883: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL ! # Generated automatically by configure. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. debug=false SHELL=\${CONFIG_SHELL-$SHELL} - ac_cs_invocation="\$0 \$@" - _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh --- 9869,9897 ---- DEFS=-DHAVE_CONFIG_H + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" ! { echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL ! # Generated by $as_me. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. debug=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF + + ## --------------------- ## + ## M4sh Initialization. ## + ## --------------------- ## + # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh *************** *** 9904,9911 **** set -o posix fi # Name of the executable. ! as_me=`echo "$0" |sed 's,.*[\\/],,'` if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr --- 9900,10066 ---- set -o posix fi + # NLS nuisances. + # Support unset when possible. + if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset + else + as_unset=false + fi + + (set +x; test -n "`(LANG=C; export LANG) 2>&1`") && + { $as_unset LANG || test "${LANG+set}" != set; } || + { LANG=C; export LANG; } + (set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && + { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || + { LC_ALL=C; export LC_ALL; } + (set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && + { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || + { LC_TIME=C; export LC_TIME; } + (set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && + { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || + { LC_CTYPE=C; export LC_CTYPE; } + (set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && + { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || + { LANGUAGE=C; export LANGUAGE; } + (set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && + { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || + { LC_COLLATE=C; export LC_COLLATE; } + (set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && + { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || + { LC_NUMERIC=C; export LC_NUMERIC; } + (set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && + { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || + { LC_MESSAGES=C; export LC_MESSAGES; } + + # Name of the executable. ! as_me=`(basename "$0") 2>/dev/null || ! $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ! X"$0" : 'X\(//\)$' \| \ ! X"$0" : 'X\(/\)$' \| \ ! . : '\(.\)' 2>/dev/null || ! echo X/"$0" | ! sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } ! /^X\/\(\/\/\)$/{ s//\1/; q; } ! /^X\/\(\/\).*/{ s//\1/; q; } ! s/.*/./; q'` ! ! # PATH needs CR, and LINENO needs CR and PATH. ! # Avoid depending upon Character Ranges. ! as_cr_letters='abcdefghijklmnopqrstuvwxyz' ! as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ! as_cr_Letters=$as_cr_letters$as_cr_LETTERS ! as_cr_digits='0123456789' ! as_cr_alnum=$as_cr_Letters$as_cr_digits ! ! # The user is always right. ! if test "${PATH_SEPARATOR+set}" != set; then ! echo "#! /bin/sh" >conftest.sh ! echo "exit 0" >>conftest.sh ! chmod +x conftest.sh ! if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then ! PATH_SEPARATOR=';' ! else ! PATH_SEPARATOR=: ! fi ! rm -f conftest.sh ! fi ! ! ! as_lineno_1=$LINENO ! as_lineno_2=$LINENO ! as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` ! test "x$as_lineno_1" != "x$as_lineno_2" && ! test "x$as_lineno_3" = "x$as_lineno_2" || { ! # Find who we are. Look in the path if we contain no path at all ! # relative or not. ! case $0 in ! *[\\/]* ) as_myself=$0 ;; ! *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ! done ! ! ;; ! esac ! # We did not find ourselves, most probably we were run as `sh COMMAND' ! # in which case we are not to be found in the path. ! if test "x$as_myself" = x; then ! as_myself=$0 ! fi ! if test ! -f "$as_myself"; then ! { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 ! echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} ! { (exit 1); exit 1; }; } ! fi ! case $CONFIG_SHELL in ! '') ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for as_base in sh bash ksh sh5; do ! case $as_dir in ! /*) ! if ("$as_dir/$as_base" -c ' ! as_lineno_1=$LINENO ! as_lineno_2=$LINENO ! as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` ! test "x$as_lineno_1" != "x$as_lineno_2" && ! test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then ! CONFIG_SHELL=$as_dir/$as_base ! export CONFIG_SHELL ! exec "$CONFIG_SHELL" "$0" ${1+"$@"} ! fi;; ! esac ! done ! done ! ;; ! esac ! ! # Create $as_me.lineno as a copy of $as_myself, but with $LINENO ! # uniformly replaced by the line number. The first 'sed' inserts a ! # line-number line before each line; the second 'sed' does the real ! # work. The second script uses 'N' to pair each line-number line ! # with the numbered line, and appends trailing '-' during ! # substitution so that $LINENO is not a special case at line end. ! # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the ! # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) ! sed '=' <$as_myself | ! sed ' ! N ! s,$,-, ! : loop ! s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, ! t loop ! s,-$,, ! s,^['$as_cr_digits']*\n,, ! ' >$as_me.lineno && ! chmod +x $as_me.lineno || ! { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 ! echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} ! { (exit 1); exit 1; }; } ! ! # Don't try to exec as it changes $[0], causing all sort of problems ! # (the dirname of $[0] is not the place where we might find the ! # original and so on. Autoconf is especially sensible to this). ! . ./$as_me.lineno ! # Exit status is that of the last command. ! exit ! } ! ! ! case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in ! *c*,-n*) ECHO_N= ECHO_C=' ! ' ECHO_T=' ' ;; ! *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; ! *) ECHO_N= ECHO_C='\c' ECHO_T= ;; ! esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr *************** *** 9933,9954 **** as_executable_p="test -f" ! # Support unset when possible. ! if (FOO=FOO; unset FOO) >/dev/null 2>&1; then ! as_unset=unset ! else ! as_unset=false ! fi - # NLS nuisances. - $as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } - $as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } - $as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } - $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } - $as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } - $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } - $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } - $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } # IFS # We need space, tab and new line, in precisely that order. --- 10088,10099 ---- as_executable_p="test -f" ! # Sed expression to map a string onto a valid CPP name. ! as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" ! ! # Sed expression to map a string onto a valid variable name. ! as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" # IFS # We need space, tab and new line, in precisely that order. *************** *** 9957,9966 **** IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } exec 6>&1 _ACEOF # Files that config.status was made for. --- 10102,10135 ---- IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } exec 6>&1 + # Open the log real soon, to keep \$[0] and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. Logging --version etc. is OK. + exec 5>>config.log + { + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX + ## Running $as_me. ## + _ASBOX + } >&5 + cat >&5 <<_CSEOF + + This file was extended by $as_me, which was + generated by GNU Autoconf 2.53. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + + _CSEOF + echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 + echo >&5 _ACEOF # Files that config.status was made for. *************** *** 9980,9986 **** echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi ! cat >>$CONFIG_STATUS <<\EOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the --- 10149,10155 ---- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi ! cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the *************** *** 10007,10018 **** $config_commands Report bugs to ." ! EOF ! cat >>$CONFIG_STATUS <." ! _ACEOF ! cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 *************** *** 10021,10029 **** gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir INSTALL="$INSTALL" ! EOF ! cat >>$CONFIG_STATUS <<\EOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: --- 10190,10198 ---- gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir INSTALL="$INSTALL" ! _ACEOF ! cat >>$CONFIG_STATUS <<\_ACEOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: *************** *** 10045,10062 **** case $1 in # Handling of the options. ! EOF ! cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header ! { { echo "$as_me:10059: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} --- 10214,10231 ---- case $1 in # Handling of the options. ! _ACEOF ! cat >>$CONFIG_STATUS <<_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; ! _ACEOF ! cat >>$CONFIG_STATUS <<\_ACEOF --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header ! { { echo "$as_me:$LINENO: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} *************** *** 10075,10081 **** ac_need_defaults=false;; # This is an error. ! -*) { { echo "$as_me:10078: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} --- 10244,10250 ---- ac_need_defaults=false;; # This is an error. ! -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} *************** *** 10087,10118 **** shift done - exec 5>>config.log - cat >&5 << _ACEOF - - ## ----------------------- ## - ## Running config.status. ## - ## ----------------------- ## - - This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation - on `(hostname || uname -n) 2>/dev/null | sed 1q` - _ACEOF - EOF ! cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in --- 10256,10277 ---- shift done _ACEOF ! cat >>$CONFIG_STATUS <<_ACEOF # # INIT-COMMANDS section. # ! AMDEP_TRUE="$AMDEP_TRUE" ! ac_aux_dir="$ac_aux_dir" ! ! _ACEOF ! ! ! ! cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in *************** *** 10129,10135 **** "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ! *) { { echo "$as_me:10132: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac --- 10288,10294 ---- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ! *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac *************** *** 10167,10175 **** { (exit 1); exit 1; } } ! EOF ! cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # CONFIG_FILES section. *************** *** 10182,10187 **** --- 10341,10352 ---- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t + s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t + s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t + s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t + s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t + s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t + s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t *************** *** 10197,10215 **** s,@oldincludedir@,$oldincludedir,;t t s,@infodir@,$infodir,;t t s,@mandir@,$mandir,;t t - s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t - s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t - s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t - s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t - s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@build_alias@,$build_alias,;t t s,@host_alias@,$host_alias,;t t s,@target_alias@,$target_alias,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t - s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t - s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t s,@LIBGNOMECANVAS_CURRENT@,$LIBGNOMECANVAS_CURRENT,;t t s,@LIBGNOMECANVAS_REVISION@,$LIBGNOMECANVAS_REVISION,;t t --- 10362,10374 ---- s,@oldincludedir@,$oldincludedir,;t t s,@infodir@,$infodir,;t t s,@mandir@,$mandir,;t t s,@build_alias@,$build_alias,;t t s,@host_alias@,$host_alias,;t t s,@target_alias@,$target_alias,;t t + s,@DEFS@,$DEFS,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t s,@LIBS@,$LIBS,;t t s,@LIBGNOMECANVAS_CURRENT@,$LIBGNOMECANVAS_CURRENT,;t t s,@LIBGNOMECANVAS_REVISION@,$LIBGNOMECANVAS_REVISION,;t t *************** *** 10219,10230 **** --- 10378,10399 ---- s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@PACKAGE@,$PACKAGE,;t t s,@VERSION@,$VERSION,;t t + s,@EXEEXT@,$EXEEXT,;t t + s,@OBJEXT@,$OBJEXT,;t t s,@ACLOCAL@,$ACLOCAL,;t t s,@AUTOCONF@,$AUTOCONF,;t t s,@AUTOMAKE@,$AUTOMAKE,;t t s,@AUTOHEADER@,$AUTOHEADER,;t t s,@MAKEINFO@,$MAKEINFO,;t t + s,@AMTAR@,$AMTAR,;t t + s,@install_sh@,$install_sh,;t t + s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t + s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t + s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t + s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t + s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t + s,@DEPDIR@,$DEPDIR,;t t s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t s,@MAINT@,$MAINT,;t t *************** *** 10233,10240 **** s,@LDFLAGS@,$LDFLAGS,;t t s,@CPPFLAGS@,$CPPFLAGS,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t ! s,@EXEEXT@,$EXEEXT,;t t ! s,@OBJEXT@,$OBJEXT,;t t s,@CPP@,$CPP,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t --- 10402,10410 ---- s,@LDFLAGS@,$LDFLAGS,;t t s,@CPPFLAGS@,$CPPFLAGS,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t ! s,@am__include@,$am__include,;t t ! s,@am__quote@,$am__quote,;t t ! s,@CCDEPMODE@,$CCDEPMODE,;t t s,@CPP@,$CPP,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t *************** *** 10250,10267 **** s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@STRIP@,$STRIP,;t t s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t - s,@DLLTOOL@,$DLLTOOL,;t t - s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t - s,@AS@,$AS,;t t - s,@ac_ct_AS@,$ac_ct_AS,;t t - s,@OBJDUMP@,$OBJDUMP,;t t - s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@YACC@,$YACC,;t t s,@PATH_TO_XRDB@,$PATH_TO_XRDB,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t - s,@ALLOCA@,$ALLOCA,;t t s,@USE_NLS@,$USE_NLS,;t t s,@MSGFMT@,$MSGFMT,;t t s,@GMSGFMT@,$GMSGFMT,;t t --- 10420,10430 ---- *************** *** 10271,10279 **** s,@DATADIRNAME@,$DATADIRNAME,;t t s,@GMOFILES@,$GMOFILES,;t t s,@INSTOBJEXT@,$INSTOBJEXT,;t t - s,@INTLDEPS@,$INTLDEPS,;t t s,@INTLLIBS@,$INTLLIBS,;t t ! s,@INTLOBJS@,$INTLOBJS,;t t s,@POFILES@,$POFILES,;t t s,@POSUB@,$POSUB,;t t s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t --- 10434,10442 ---- s,@DATADIRNAME@,$DATADIRNAME,;t t s,@GMOFILES@,$GMOFILES,;t t s,@INSTOBJEXT@,$INSTOBJEXT,;t t s,@INTLLIBS@,$INTLLIBS,;t t ! s,@PO_IN_DATADIR_TRUE@,$PO_IN_DATADIR_TRUE,;t t ! s,@PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t s,@POFILES@,$POFILES,;t t s,@POSUB@,$POSUB,;t t s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t *************** *** 10286,10292 **** s,@OS_WIN32_FALSE@,$OS_WIN32_FALSE,;t t s,@PLATFORM_WIN32_TRUE@,$PLATFORM_WIN32_TRUE,;t t s,@PLATFORM_WIN32_FALSE@,$PLATFORM_WIN32_FALSE,;t t - s,@AWK@,$AWK,;t t s,@PERL@,$PERL,;t t s,@GLIB_GENMARSHAL@,$GLIB_GENMARSHAL,;t t s,@HTML_DIR@,$HTML_DIR,;t t --- 10449,10454 ---- *************** *** 10299,10307 **** s,@REBUILD@,$REBUILD,;t t CEOF ! EOF ! cat >>$CONFIG_STATUS <<\EOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 --- 10461,10469 ---- s,@REBUILD@,$REBUILD,;t t CEOF ! _ACEOF ! cat >>$CONFIG_STATUS <<\_ACEOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 *************** *** 10340,10347 **** fi fi # test -n "$CONFIG_FILES" ! EOF ! cat >>$CONFIG_STATUS <<\EOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in --- 10502,10509 ---- fi fi # test -n "$CONFIG_FILES" ! _ACEOF ! cat >>$CONFIG_STATUS <<\_ACEOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in *************** *** 10355,10361 **** esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. ! ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| \ --- 10517,10524 ---- esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. ! ac_dir=`(dirname "$ac_file") 2>/dev/null || ! $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| \ *************** *** 10366,10373 **** /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then ! { case "$ac_dir" in [\\/]* | ?:[\\/]* ) as_incr_dir=;; *) as_incr_dir=.;; esac --- 10529,10535 ---- /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! { case "$ac_dir" in [\\/]* | ?:[\\/]* ) as_incr_dir=;; *) as_incr_dir=.;; esac *************** *** 10378,10425 **** ?:) as_incr_dir=$as_mkdir_dir ;; *) as_incr_dir=$as_incr_dir/$as_mkdir_dir ! test -d "$as_incr_dir" || mkdir "$as_incr_dir" ;; esac done; } ! ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" ! # A "../" for each directory in $ac_dir_suffix. ! ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` ! else ! ac_dir_suffix= ac_dots= ! fi ! case $srcdir in ! .) ac_srcdir=. ! if test -z "$ac_dots"; then ! ac_top_srcdir=. ! else ! ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` ! fi ;; ! [\\/]* | ?:[\\/]* ) ! ac_srcdir=$srcdir$ac_dir_suffix; ! ac_top_srcdir=$srcdir ;; *) # Relative path. ! ac_srcdir=$ac_dots$srcdir$ac_dir_suffix ! ac_top_srcdir=$ac_dots$srcdir ;; ! esac case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; ! *) ac_INSTALL=$ac_dots$INSTALL ;; esac if test x"$ac_file" != x-; then ! { echo "$as_me:10414: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: ! # /* config.h. Generated automatically by config.status. */ ! configure_input="Generated automatically from `echo $ac_file_in | ! sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. --- 10540,10607 ---- ?:) as_incr_dir=$as_mkdir_dir ;; *) as_incr_dir=$as_incr_dir/$as_mkdir_dir ! test -d "$as_incr_dir" || ! mkdir "$as_incr_dir" || ! { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 ! echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} ! { (exit 1); exit 1; }; } ;; esac done; } ! ac_builddir=. ! if test "$ac_dir" != .; then ! ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ! # A "../" for each directory in $ac_dir_suffix. ! ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` ! else ! ac_dir_suffix= ac_top_builddir= ! fi ! ! case $srcdir in ! .) # No --srcdir option. We are building in place. ! ac_srcdir=. ! if test -z "$ac_top_builddir"; then ! ac_top_srcdir=. ! else ! ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` ! fi ;; ! [\\/]* | ?:[\\/]* ) # Absolute path. ! ac_srcdir=$srcdir$ac_dir_suffix; ! ac_top_srcdir=$srcdir ;; *) # Relative path. ! ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ! ac_top_srcdir=$ac_top_builddir$srcdir ;; ! esac ! # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be ! # absolute. ! ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` ! ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` ! ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ! ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` ! case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; ! *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac if test x"$ac_file" != x-; then ! { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: ! # /* config.h. Generated by config.status. */ ! if test x"$ac_file" = x-; then ! configure_input= ! else ! configure_input="$ac_file. " ! fi ! configure_input=$configure_input"Generated from `echo $ac_file_in | ! sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. *************** *** 10429,10435 **** -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) ! test -f "$f" || { { echo "$as_me:10432: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; --- 10611,10617 ---- -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) ! test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; *************** *** 10442,10464 **** echo $srcdir/$f else # /dev/null tree ! { { echo "$as_me:10445: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } ! EOF ! cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin --- 10624,10652 ---- echo $srcdir/$f else # /dev/null tree ! { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } ! _ACEOF ! cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub ! _ACEOF ! cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t + s,@abs_srcdir@,$ac_abs_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t + s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t + s,@builddir@,$ac_builddir,;t t + s,@abs_builddir@,$ac_abs_builddir,;t t + s,@top_builddir@,$ac_top_builddir,;t t + s,@abs_top_builddir@,$ac_abs_top_builddir,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin *************** *** 10470,10477 **** fi done ! EOF ! cat >>$CONFIG_STATUS <<\EOF # # CONFIG_HEADER section. --- 10658,10665 ---- fi done ! _ACEOF ! cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_HEADER section. *************** *** 10503,10509 **** * ) ac_file_in=$ac_file.in ;; esac ! test x"$ac_file" != x- && { echo "$as_me:10506: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the --- 10691,10697 ---- * ) ac_file_in=$ac_file.in ;; esac ! test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the *************** *** 10514,10520 **** -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) ! test -f "$f" || { { echo "$as_me:10517: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; --- 10702,10708 ---- -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) ! test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; *************** *** 10527,10533 **** echo $srcdir/$f else # /dev/null tree ! { { echo "$as_me:10530: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; --- 10715,10721 ---- echo $srcdir/$f else # /dev/null tree ! { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; *************** *** 10536,10542 **** # Remove the trailing spaces. sed 's/[ ]*$//' $ac_file_inputs >$tmp/in ! EOF # Transform confdefs.h into two sed scripts, `conftest.defines' and # `conftest.undefs', that substitutes the proper values into --- 10724,10730 ---- # Remove the trailing spaces. sed 's/[ ]*$//' $ac_file_inputs >$tmp/in ! _ACEOF # Transform confdefs.h into two sed scripts, `conftest.defines' and # `conftest.undefs', that substitutes the proper values into *************** *** 10552,10567 **** # `end' is used to avoid that the second main sed command (meant for # 0-ary CPP macros) applies to n-ary macro definitions. # See the Autoconf documentation for `clear'. ! cat >confdef2sed.sed <<\EOF s/[\\&,]/\\&/g s,[\\$`],\\&,g t clear : clear ! s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp t end s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp : end ! EOF # If some macros were called several times there might be several times # the same #defines, which is useless. Nevertheless, we may not want to # sort them, since we want the *last* AC-DEFINE to be honored. --- 10740,10755 ---- # `end' is used to avoid that the second main sed command (meant for # 0-ary CPP macros) applies to n-ary macro definitions. # See the Autoconf documentation for `clear'. ! cat >confdef2sed.sed <<\_ACEOF s/[\\&,]/\\&/g s,[\\$`],\\&,g t clear : clear ! s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp t end s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp : end ! _ACEOF # If some macros were called several times there might be several times # the same #defines, which is useless. Nevertheless, we may not want to # sort them, since we want the *last* AC-DEFINE to be honored. *************** *** 10572,10580 **** # This sed command replaces #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. ! cat >>conftest.undefs <<\EOF s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, ! EOF # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). --- 10760,10768 ---- # This sed command replaces #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. ! cat >>conftest.undefs <<\_ACEOF s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, ! _ACEOF # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). *************** *** 10631,10653 **** done rm -f conftest.undefs ! cat >>$CONFIG_STATUS <<\EOF # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: ! # /* config.h. Generated automatically by config.status. */ if test x"$ac_file" = x-; then ! echo "/* Generated automatically by configure. */" >$tmp/config.h else ! echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h fi cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then ! { echo "$as_me:10647: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ! ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| \ --- 10819,10842 ---- done rm -f conftest.undefs ! cat >>$CONFIG_STATUS <<\_ACEOF # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: ! # /* config.h. Generated by config.status. */ if test x"$ac_file" = x-; then ! echo "/* Generated by configure. */" >$tmp/config.h else ! echo "/* $ac_file. Generated by configure. */" >$tmp/config.h fi cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then ! { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ! ac_dir=`(dirname "$ac_file") 2>/dev/null || ! $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| \ *************** *** 10658,10665 **** /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then ! { case "$ac_dir" in [\\/]* | ?:[\\/]* ) as_incr_dir=;; *) as_incr_dir=.;; esac --- 10847,10853 ---- /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! { case "$ac_dir" in [\\/]* | ?:[\\/]* ) as_incr_dir=;; *) as_incr_dir=.;; esac *************** *** 10670,10681 **** ?:) as_incr_dir=$as_mkdir_dir ;; *) as_incr_dir=$as_incr_dir/$as_mkdir_dir ! test -d "$as_incr_dir" || mkdir "$as_incr_dir" ;; esac done; } - fi rm -f $ac_file mv $tmp/config.h $ac_file fi --- 10858,10872 ---- ?:) as_incr_dir=$as_mkdir_dir ;; *) as_incr_dir=$as_incr_dir/$as_mkdir_dir ! test -d "$as_incr_dir" || ! mkdir "$as_incr_dir" || ! { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 ! echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} ! { (exit 1); exit 1; }; } ;; esac done; } rm -f $ac_file mv $tmp/config.h $ac_file fi *************** *** 10683,10691 **** cat $tmp/config.h rm -f $tmp/config.h fi done ! EOF ! cat >>$CONFIG_STATUS <<\EOF # # CONFIG_COMMANDS section. --- 10874,10888 ---- cat $tmp/config.h rm -f $tmp/config.h fi + # Run the commands associated with the file. + case $ac_file in + config.h ) # update the timestamp + echo timestamp >"./stamp-h1" + ;; + esac done ! _ACEOF ! cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_COMMANDS section. *************** *** 10693,10715 **** for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue ac_dest=`echo "$ac_file" | sed 's,:.*,,'` ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` case $ac_dest in ! default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;; default-2 ) case "$CONFIG_FILES" in *po/Makefile.in*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; esac done ! EOF ! cat >>$CONFIG_STATUS <<\EOF { (exit 0); exit 0; } ! EOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open --- 10890,10997 ---- for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue ac_dest=`echo "$ac_file" | sed 's,:.*,,'` ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_dir=`(dirname "$ac_dest") 2>/dev/null || + $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || + echo X"$ac_dest" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + ac_builddir=. + + if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` + else + ac_dir_suffix= ac_top_builddir= + fi + + case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; + esac + # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be + # absolute. + ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` + ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` + ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` + ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 + echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in ! default-1 ) ! 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 ! ;; default-2 ) case "$CONFIG_FILES" in *po/Makefile.in*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; esac done ! _ACEOF ! cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } ! _ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open *************** *** 10728,10730 **** --- 11010,11014 ---- $ac_cs_success || { (exit 1); exit 1; } fi + + diff -crN ./libgnomecanvas/demos/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/demos/Makefile.in *** ./libgnomecanvas/demos/Makefile.in Thu Feb 27 23:22:28 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/demos/Makefile.in Sat Aug 9 21:32:05 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ! # 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. --- 1,7 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 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. *************** *** 10,15 **** --- 11,17 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + @SET_MAKE@ SHELL = @SHELL@ *************** *** 31,43 **** mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ --- 33,41 ---- *************** *** 46,56 **** AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : --- 44,54 ---- AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : *************** *** 59,64 **** --- 57,63 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ CANVAS_GLADE_CFLAGS = @CANVAS_GLADE_CFLAGS@ *************** *** 69,74 **** --- 68,74 ---- CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 81,90 **** GTKDOC = @GTKDOC@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ HTML_DIR = @HTML_DIR@ INSTOBJEXT = @INSTOBJEXT@ - INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ - INTLOBJS = @INTLOBJS@ LDFLAGS = @LDFLAGS@ LIBGNOMECANVAS_AGE = @LIBGNOMECANVAS_AGE@ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@ --- 81,89 ---- GTKDOC = @GTKDOC@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LIBGNOMECANVAS_AGE = @LIBGNOMECANVAS_AGE@ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@ *************** *** 94,100 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 93,98 ---- *************** *** 104,109 **** --- 102,109 ---- PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ + PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ REBUILD = @REBUILD@ STRIP = @STRIP@ *************** *** 111,117 **** --- 111,120 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ + install_sh = @install_sh@ INCLUDES = \ -I$(top_srcdir) \ *************** *** 150,373 **** EXTRA_DIST = \ toroid.png mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! noinst_PROGRAMS = canvas_demo$(EXEEXT) ! PROGRAMS = $(noinst_PROGRAMS) ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. LIBS = @LIBS@ ! canvas_demo_OBJECTS = canvas.$(OBJEXT) canvas-primitives.$(OBJEXT) \ ! canvas-arrowhead.$(OBJEXT) canvas-features.$(OBJEXT) \ ! canvas-fifteen.$(OBJEXT) canvas-rich-text.$(OBJEXT) \ ! canvas-curve.$(OBJEXT) ! canvas_demo_LDADD = $(LDADD) ! canvas_demo_DEPENDENCIES = \ ! $(top_builddir)/libgnomecanvas/libgnomecanvas-2.la ! canvas_demo_LDFLAGS = ! 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 $@ ! DIST_COMMON = Makefile.am Makefile.in ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! ! TAR = gtar ! GZIP_ENV = --best SOURCES = $(canvas_demo_SOURCES) - OBJECTS = $(canvas_demo_OBJECTS) ! all: all-redirect .SUFFIXES: ! .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) --gnu --include-deps demos/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! mostlyclean-noinstPROGRAMS: clean-noinstPROGRAMS: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) ! distclean-noinstPROGRAMS: ! maintainer-clean-noinstPROGRAMS: .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 *.o core *.core - -rm -f *.$(OBJEXT) - - clean-compile: - - distclean-compile: - -rm -f *.tab.c - - maintainer-clean-compile: - .c.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! .s.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! .S.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! mostlyclean-libtool: ! -rm -f *.lo ! ! clean-libtool: ! -rm -rf .libs _libs ! ! distclean-libtool: ! ! maintainer-clean-libtool: ! ! canvas_demo$(EXEEXT): $(canvas_demo_OBJECTS) $(canvas_demo_DEPENDENCIES) ! @rm -f canvas_demo$(EXEEXT) ! $(LINK) $(canvas_demo_LDFLAGS) $(canvas_demo_OBJECTS) $(canvas_demo_LDADD) $(LIBS) tags: TAGS ! 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; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! 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)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ! mostlyclean-tags: ! ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! ! maintainer-clean-tags: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! subdir = demos distdir: $(DISTFILES) @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 ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: ! install-exec: install-exec-am ! install-data-am: ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall: uninstall-am - all-am: Makefile $(PROGRAMS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \ ! clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-noinstPROGRAMS distclean-compile \ ! distclean-libtool distclean-tags distclean-generic \ ! clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-noinstPROGRAMS \ ! 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 ! .PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ ! clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ ! mostlyclean-compile distclean-compile clean-compile \ ! maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck 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 # 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. --- 153,366 ---- EXTRA_DIST = \ toroid.png + subdir = demos mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! noinst_PROGRAMS = canvas_demo$(EXEEXT) ! PROGRAMS = $(noinst_PROGRAMS) ! ! am_canvas_demo_OBJECTS = canvas.$(OBJEXT) canvas-primitives.$(OBJEXT) \ ! canvas-arrowhead.$(OBJEXT) canvas-features.$(OBJEXT) \ ! canvas-fifteen.$(OBJEXT) canvas-rich-text.$(OBJEXT) \ ! canvas-curve.$(OBJEXT) ! canvas_demo_OBJECTS = $(am_canvas_demo_OBJECTS) ! canvas_demo_LDADD = $(LDADD) ! canvas_demo_DEPENDENCIES = \ ! $(top_builddir)/libgnomecanvas/libgnomecanvas-2.la ! canvas_demo_LDFLAGS = ! DEFS = @DEFS@ ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! depcomp = ! 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 $@ ! DIST_SOURCES = $(canvas_demo_SOURCES) ! DIST_COMMON = Makefile.am Makefile.in SOURCES = $(canvas_demo_SOURCES) ! all: all-am ! .SUFFIXES: ! .SUFFIXES: .c .lo .o .obj ! mostlyclean-libtool: ! -rm -f *.lo + clean-libtool: + -rm -rf .libs _libs ! distclean-libtool: ! -rm -f libtool ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps demos/Makefile ! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && \ ! CONFIG_HEADERS= CONFIG_LINKS= \ ! CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status clean-noinstPROGRAMS: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) + canvas_demo$(EXEEXT): $(canvas_demo_OBJECTS) $(canvas_demo_DEPENDENCIES) + @rm -f canvas_demo$(EXEEXT) + $(LINK) $(canvas_demo_LDFLAGS) $(canvas_demo_OBJECTS) $(canvas_demo_LDADD) $(LIBS) ! mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core ! distclean-compile: ! -rm -f *.tab.c .c.o: ! $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< .c.obj: $(COMPILE) -c `cygpath -w $<` .c.lo: ! $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ! uninstall-info-am: tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(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; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(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; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done check-am: all-am check: check-am ! all-am: Makefile $(PROGRAMS) ! installdirs: install: install-am ! install-exec: install-exec-am ! 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-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) 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-libtool clean-noinstPROGRAMS \ ! mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: ! ! install-exec-am: ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool ! ! uninstall-am: uninstall-info-am + .PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool tags uninstall \ + uninstall-am uninstall-info-am # 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. diff -crN ./libgnomecanvas/docs/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/Makefile.in *** ./libgnomecanvas/docs/Makefile.in Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/Makefile.in Sat Aug 9 21:32:06 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ! # 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. --- 1,7 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 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. *************** *** 10,15 **** --- 11,17 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + @SET_MAKE@ SHELL = @SHELL@ *************** *** 31,43 **** mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ --- 33,41 ---- *************** *** 46,56 **** AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : --- 44,54 ---- AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : *************** *** 59,64 **** --- 57,63 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ CANVAS_GLADE_CFLAGS = @CANVAS_GLADE_CFLAGS@ *************** *** 69,74 **** --- 68,74 ---- CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 81,90 **** GTKDOC = @GTKDOC@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ HTML_DIR = @HTML_DIR@ INSTOBJEXT = @INSTOBJEXT@ - INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ - INTLOBJS = @INTLOBJS@ LDFLAGS = @LDFLAGS@ LIBGNOMECANVAS_AGE = @LIBGNOMECANVAS_AGE@ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@ --- 81,89 ---- GTKDOC = @GTKDOC@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LIBGNOMECANVAS_AGE = @LIBGNOMECANVAS_AGE@ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@ *************** *** 94,100 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 93,98 ---- *************** *** 104,109 **** --- 102,109 ---- PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ + PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ REBUILD = @REBUILD@ STRIP = @STRIP@ *************** *** 111,138 **** VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ cxxflags_set = @cxxflags_set@ SUBDIRS = reference mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! DIST_COMMON = Makefile.am Makefile.in ! - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - - TAR = gtar - GZIP_ENV = --best - all: all-redirect .SUFFIXES: - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps docs/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. --- 111,155 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ + install_sh = @install_sh@ SUBDIRS = reference + subdir = docs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! depcomp = ! DIST_SOURCES = ! ! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ ! uninstall-info-recursive all-recursive install-data-recursive \ ! install-exec-recursive installdirs-recursive install-recursive \ ! uninstall-recursive check-recursive installcheck-recursive ! DIST_COMMON = Makefile.am Makefile.in ! DIST_SUBDIRS = $(SUBDIRS) ! all: all-recursive .SUFFIXES: ! mostlyclean-libtool: ! -rm -f *.lo ! ! clean-libtool: ! -rm -rf .libs _libs + distclean-libtool: + -rm -f libtool + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu --ignore-deps docs/Makefile + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status + uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. *************** *** 140,151 **** # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. ! ! @SET_MAKE@ ! ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ --- 157,163 ---- # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. ! $(RECURSIVE_TARGETS): @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ *************** *** 168,178 **** maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ ! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ ! rev="$$subdir $$rev"; \ ! test "$$subdir" != "." || dot_seen=yes; \ done; \ ! test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ --- 180,195 ---- maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ ! case "$@" in \ ! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ! *) list='$(SUBDIRS)' ;; \ ! esac; \ ! rev=''; for subdir in $$list; do \ ! if test "$$subdir" = "."; then :; else \ ! rev="$$subdir $$rev"; \ ! fi; \ done; \ ! rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ *************** *** 191,241 **** tags: TAGS ! 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; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! 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)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ! mostlyclean-tags: ! ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! ! maintainer-clean-tags: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! subdir = docs distdir: $(DISTFILES) @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 for subdir in $(SUBDIRS); do \ --- 208,267 ---- tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(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; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique $(LISP) ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! list='$(SOURCES) $(HEADERS) $(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; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done for subdir in $(SUBDIRS); do \ *************** *** 243,322 **** test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ ! chmod 777 $(distdir)/$$subdir; \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ fi; \ done - info-am: - info: info-recursive - dvi-am: - dvi: dvi-recursive check-am: all-am check: check-recursive ! installcheck-am: ! installcheck: installcheck-recursive ! install-exec-am: ! install-exec: install-exec-recursive ! install-data-am: install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-recursive - uninstall-am: - uninstall: uninstall-recursive - all-am: Makefile - all-redirect: all-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: installdirs-recursive - installdirs-am: - mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-tags mostlyclean-generic ! mostlyclean: mostlyclean-recursive ! clean-am: clean-tags clean-generic mostlyclean-am ! clean: clean-recursive ! distclean-am: distclean-tags distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-recursive ! maintainer-clean-am: 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-recursive ! .PHONY: install-data-recursive uninstall-data-recursive \ ! install-exec-recursive uninstall-exec-recursive installdirs-recursive \ ! uninstalldirs-recursive all-recursive check-recursive \ ! installcheck-recursive info-recursive dvi-recursive \ ! mostlyclean-recursive distclean-recursive clean-recursive \ ! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs-am \ ! installdirs mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean # 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. --- 269,364 ---- test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ ! (cd $$subdir && \ ! $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" \ ! distdir=../$(distdir)/$$subdir \ ! distdir) \ || exit 1; \ fi; \ done check-am: all-am check: check-recursive ! all-am: Makefile ! installdirs: installdirs-recursive ! installdirs-am: ! install: install-recursive ! install-exec: install-exec-recursive install-data: install-data-recursive + uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-recursive + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) 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-recursive ! clean-am: clean-generic clean-libtool mostlyclean-am ! distclean: distclean-recursive ! distclean-am: clean-am distclean-generic distclean-libtool \ ! distclean-tags ! dvi: dvi-recursive ! dvi-am: ! info: info-recursive ! ! info-am: ! ! install-data-am: ! ! install-exec-am: ! ! install-info: install-info-recursive ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-recursive ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-recursive ! ! mostlyclean-am: mostlyclean-generic mostlyclean-libtool ! ! uninstall-am: uninstall-info-am ! ! uninstall-info: uninstall-info-recursive + .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-generic clean-libtool clean-recursive distclean \ + distclean-generic distclean-libtool distclean-recursive \ + distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ + info-recursive install install-am install-data install-data-am \ + install-data-recursive install-exec install-exec-am \ + install-exec-recursive install-info install-info-am \ + install-info-recursive install-man install-recursive \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am installdirs-recursive maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive mostlyclean \ + mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ + tags tags-recursive uninstall uninstall-am uninstall-info-am \ + uninstall-info-recursive uninstall-recursive # 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. diff -crN ./libgnomecanvas/docs/reference/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/Makefile.in *** ./libgnomecanvas/docs/reference/Makefile.in Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/Makefile.in Sat Aug 9 21:32:06 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ! # 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. --- 1,7 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 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. *************** *** 10,15 **** --- 11,18 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + @SET_MAKE@ + # This is a blank Makefile.am for using gtk-doc. # Copy this to your project's API docs directory and modify the variables to # suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples *************** *** 17,23 **** # The name of the module, e.g. 'glib'. - SHELL = @SHELL@ srcdir = @srcdir@ --- 20,25 ---- *************** *** 38,50 **** mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ --- 40,48 ---- *************** *** 53,63 **** AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : --- 51,61 ---- AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : *************** *** 66,71 **** --- 64,70 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ CANVAS_GLADE_CFLAGS = @CANVAS_GLADE_CFLAGS@ *************** *** 76,81 **** --- 75,81 ---- CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 88,97 **** GTKDOC = @GTKDOC@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ HTML_DIR = @HTML_DIR@ INSTOBJEXT = @INSTOBJEXT@ - INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ - INTLOBJS = @INTLOBJS@ LDFLAGS = @LDFLAGS@ LIBGNOMECANVAS_AGE = @LIBGNOMECANVAS_AGE@ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@ --- 88,96 ---- GTKDOC = @GTKDOC@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LIBGNOMECANVAS_AGE = @LIBGNOMECANVAS_AGE@ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@ *************** *** 101,107 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 100,105 ---- *************** *** 111,116 **** --- 109,116 ---- PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ + PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ REBUILD = @REBUILD@ STRIP = @STRIP@ *************** *** 118,124 **** --- 118,127 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ + install_sh = @install_sh@ DOC_MODULE = libgnomecanvas *************** *** 166,177 **** # If you need to override some of the declarations, place them in the # $(DOC_MODULE)-overrides.txt file and uncomment the second line here. DOC_OVERRIDES = #DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt ########################################################################### # Everything below here is generic and you shouldn't need to change it. ########################################################################### - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) EXTRA_DIST = \ --- 169,180 ---- # If you need to override some of the declarations, place them in the # $(DOC_MODULE)-overrides.txt file and uncomment the second line here. DOC_OVERRIDES = + #DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt ########################################################################### # Everything below here is generic and you shouldn't need to change it. ########################################################################### TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) EXTRA_DIST = \ *************** *** 193,298 **** $(DOC_MODULE).hierarchy \ $(DOC_MODULE).signals mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../../config.h ! CONFIG_CLEAN_FILES = ! DIST_COMMON = Makefile.am Makefile.in - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - - TAR = gtar - GZIP_ENV = --best - all: all-redirect .SUFFIXES: - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps docs/reference/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status tags: TAGS TAGS: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! subdir = docs/reference distdir: $(DISTFILES) @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 ! $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook ! info-am: ! info: info-am ! dvi-am: ! dvi: dvi-am check-am: all-am check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: ! install-exec: install-exec-am ! install-data-am: install-data-local ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall: uninstall-am - all-am: Makefile all-local - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-generic mostlyclean-am clean-local ! clean: clean-am ! distclean-am: distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-generic distclean-am \ ! maintainer-clean-local ! @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 ! .PHONY: tags distdir info-am info dvi-am dvi check check-am \ ! installcheck-am installcheck install-exec-am install-exec \ ! install-data-local install-data-am install-data install-am install \ ! uninstall-am uninstall all-local all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp --- 196,331 ---- $(DOC_MODULE).hierarchy \ $(DOC_MODULE).signals + subdir = docs/reference mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! depcomp = ! DIST_SOURCES = ! DIST_COMMON = Makefile.am Makefile.in ! all: all-am .SUFFIXES: ! mostlyclean-libtool: ! -rm -f *.lo + clean-libtool: + -rm -rf .libs _libs + + distclean-libtool: + -rm -f libtool + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu --ignore-deps docs/reference/Makefile + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status + uninstall-info-am: tags: TAGS TAGS: ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = ../.. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done ! $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="${top_distdir}" distdir="$(distdir)" \ ! dist-hook check-am: all-am check: check-am ! all-am: Makefile all-local ! installdirs: install: install-am ! install-exec: install-exec-am ! 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-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) 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-libtool clean-local mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-generic distclean-libtool ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: install-data-local ! ! install-exec-am: ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic \ ! maintainer-clean-local ! ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-generic mostlyclean-libtool ! ! uninstall-am: uninstall-info-am ! ! .PHONY: all all-am all-local check check-am clean clean-generic \ ! clean-libtool clean-local distclean distclean-generic \ ! distclean-libtool distdir dvi dvi-am info info-am install \ ! install-am install-data install-data-am install-data-local \ ! install-exec install-exec-am install-info install-info-am \ ! install-man install-strip installcheck installcheck-am \ ! installdirs maintainer-clean maintainer-clean-generic \ ! maintainer-clean-local mostlyclean mostlyclean-generic \ ! mostlyclean-libtool uninstall uninstall-am uninstall-info-am @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp *************** *** 393,399 **** done .PHONY : dist-hook-local - # 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: --- 426,431 ---- diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-bpath.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-bpath.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-bpath.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-bpath.sgml Sat Aug 9 21:34:07 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 39,44 **** --- 40,46 ---- <anchor id="GnomeCanvasBpath">struct GnomeCanvasBpath struct GnomeCanvasBpath { + GnomeCanvasShape item; }; diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-clipgroup.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-clipgroup.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-clipgroup.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-clipgroup.sgml Sat Aug 9 21:34:07 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 38,43 **** --- 39,45 ---- <anchor id="GnomeCanvasClipgroup">struct GnomeCanvasClipgroup struct GnomeCanvasClipgroup { + GnomeCanvasGroup group; GnomeCanvasPathDef * path; diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-ellipse.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-ellipse.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-ellipse.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-ellipse.sgml Sat Aug 9 21:34:08 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 38,43 **** --- 39,45 ---- <anchor id="GnomeCanvasEllipse">struct GnomeCanvasEllipse struct GnomeCanvasEllipse { + GnomeCanvasRE re; }; diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-group.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-group.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-group.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-group.sgml Sat Aug 9 21:34:08 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 38,43 **** --- 39,45 ---- <anchor id="GnomeCanvasGroup">struct GnomeCanvasGroup struct GnomeCanvasGroup { + GnomeCanvasItem item; /* Children of the group */ diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-item.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-item.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-item.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-item.sgml Sat Aug 9 21:34:08 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 97,102 **** --- 98,104 ---- <anchor id="GnomeCanvasItem">struct GnomeCanvasItem struct GnomeCanvasItem { + GtkObject object; /* Parent canvas for this item */ diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-line.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-line.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-line.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-line.sgml Sat Aug 9 21:34:08 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 38,43 **** --- 39,45 ---- <anchor id="GnomeCanvasLine">struct GnomeCanvasLine struct GnomeCanvasLine { + GnomeCanvasItem item; double *coords; /* Array of coordinates for the line's points. X coords are in the diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-path-def.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-path-def.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-path-def.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-path-def.sgml Sat Aug 9 21:34:09 2003 *************** *** 1,15 **** ! gnome-canvas-path-def 3 LIBGNOMECANVAS Library ! gnome-canvas-path-def Synopsis #include <libgnomecanvas/libgnomecanvas.h> --- 1,16 ---- ! GnomeCanvasPathDef 3 LIBGNOMECANVAS Library ! GnomeCanvasPathDef Synopsis + #include <libgnomecanvas/libgnomecanvas.h> diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-pixbuf.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-pixbuf.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-pixbuf.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-pixbuf.sgml Sat Aug 9 21:34:08 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 38,43 **** --- 39,45 ---- <anchor id="GnomeCanvasPixbuf">struct GnomeCanvasPixbuf struct GnomeCanvasPixbuf { + GnomeCanvasItem item; /* Private data */ diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-polygon.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-polygon.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-polygon.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-polygon.sgml Sat Aug 9 21:34:08 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 38,43 **** --- 39,45 ---- <anchor id="GnomeCanvasPolygon">struct GnomeCanvasPolygon struct GnomeCanvasPolygon { + GnomeCanvasShape item; GnomeCanvasPathDef *path_def; diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-re.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-re.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-re.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-re.sgml Sat Aug 9 21:34:08 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 38,43 **** --- 39,45 ---- <anchor id="GnomeCanvasRE">struct GnomeCanvasRE struct GnomeCanvasRE { + GnomeCanvasShape item; double x1, y1, x2, y2; /* Corners of item */ diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-rect.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-rect.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-rect.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-rect.sgml Sat Aug 9 21:34:08 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 38,43 **** --- 39,45 ---- <anchor id="GnomeCanvasRect">struct GnomeCanvasRect struct GnomeCanvasRect { + GnomeCanvasRE re; }; diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-rich-text.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-rich-text.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-rich-text.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-rich-text.sgml Sat Aug 9 21:34:08 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 60,65 **** --- 61,67 ---- <anchor id="GnomeCanvasRichText">struct GnomeCanvasRichText struct GnomeCanvasRichText { + GnomeCanvasItem item; GnomeCanvasRichTextPrivate *_priv; diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-shape.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-shape.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-shape.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-shape.sgml Sat Aug 9 21:34:08 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 44,49 **** --- 45,51 ---- <anchor id="GnomeCanvasShape">struct GnomeCanvasShape struct GnomeCanvasShape { + GnomeCanvasItem item; GnomeCanvasShapePriv *priv; /* Private data */ diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-text.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-text.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-text.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-text.sgml Sat Aug 9 21:34:08 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 39,44 **** --- 40,46 ---- <anchor id="GnomeCanvasText">struct GnomeCanvasText struct GnomeCanvasText { + GnomeCanvasItem item; PangoFontDescription *font_desc; /* Font description for text */ diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-util.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-util.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-util.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-util.sgml Sun Aug 10 04:19:03 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 22,41 **** #define dcgettext (Domain,Message,Type) #define textdomain (String) #define bindtextdomain (Domain,Directory) - void gnome_canvas_marshal_BOOLEAN__BOXED - (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - void gnome_canvas_marshal_VOID__OBJECT_INT_INT_INT_INT - (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); --- 23,28 ---- *************** *** 87,112 **** # define bindtextdomain(Domain,Directory) (Domain) - - <anchor id="gnome-canvas-marshal-BOOLEAN--BOXED">gnome_canvas_marshal_BOOLEAN__BOXED () - void gnome_canvas_marshal_BOOLEAN__BOXED - (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - - - <anchor id="gnome-canvas-marshal-VOID--OBJECT-INT-INT-INT-INT">gnome_canvas_marshal_VOID__OBJECT_INT_INT_INT_INT () - void gnome_canvas_marshal_VOID__OBJECT_INT_INT_INT_INT - (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - --- 74,79 ---- diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas-widget.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-widget.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas-widget.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas-widget.sgml Sat Aug 9 21:34:08 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 38,43 **** --- 39,45 ---- <anchor id="GnomeCanvasWidget">struct GnomeCanvasWidget struct GnomeCanvasWidget { + GnomeCanvasItem item; GtkWidget *widget; /* The child widget */ diff -crN ./libgnomecanvas/docs/reference/sgml/gnome-canvas.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas.sgml *** ./libgnomecanvas/docs/reference/sgml/gnome-canvas.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/sgml/gnome-canvas.sgml Sat Aug 9 21:34:08 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + #include <libgnomecanvas/libgnomecanvas.h> *************** *** 115,120 **** --- 116,122 ---- <anchor id="GnomeCanvas">struct GnomeCanvas struct GnomeCanvas { + GtkLayout layout; /* Root canvas group */ diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-clipgroup.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-clipgroup.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-clipgroup.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-clipgroup.sgml Sat Aug 9 21:34:05 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-ellipse.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-ellipse.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-ellipse.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-ellipse.sgml Sat Aug 9 21:34:05 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-group.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-group.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-group.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-group.sgml Sat Aug 9 21:34:05 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-item.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-item.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-item.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-item.sgml Sat Aug 9 21:34:06 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-line.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-line.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-line.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-line.sgml Sat Aug 9 21:34:06 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-path-def.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-path-def.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-path-def.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-path-def.sgml Sat Aug 9 21:34:06 2003 *************** *** 1,5 **** ! gnome-canvas-path-def --- 1,5 ---- ! GnomeCanvasPathDef *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-pixbuf.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-pixbuf.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-pixbuf.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-pixbuf.sgml Sat Aug 9 21:34:06 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-polygon.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-polygon.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-polygon.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-polygon.sgml Sat Aug 9 21:34:06 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-re.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-re.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-re.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-re.sgml Sat Aug 9 21:34:06 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-rect.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-rect.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-rect.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-rect.sgml Sat Aug 9 21:34:06 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-rich-text.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-rich-text.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-rich-text.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-rich-text.sgml Sat Aug 9 21:34:06 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-shape.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-shape.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-shape.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-shape.sgml Sat Aug 9 21:34:06 2003 *************** *** 9,19 **** --- 9,21 ---- + + *************** *** 35,42 **** @shape: @def: - - @object: --- 37,42 ---- *************** *** 46,52 **** @shape: @Returns: - - @object: --- 46,50 ---- diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-text.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-text.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-text.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-text.sgml Sat Aug 9 21:34:06 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-util.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-util.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-util.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-util.sgml Sat Aug 9 21:34:06 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-util.sgml.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-util.sgml.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-util.sgml.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-util.sgml.sgml Sat Aug 9 21:34:06 2003 *************** *** 9,19 **** --- 9,21 ---- + + *************** *** 74,102 **** @Directory: - - - - - - @closure: - @return_value: - @n_param_values: - @param_values: - @invocation_hint: - @marshal_data: - - - - - - - - @closure: - @return_value: - @n_param_values: - @param_values: - @invocation_hint: - @marshal_data: - - --- 76,78 ---- diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-widget.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-widget.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas-widget.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas-widget.sgml Sat Aug 9 21:34:06 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libgnomecanvas/docs/reference/tmpl/gnome-canvas.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas.sgml *** ./libgnomecanvas/docs/reference/tmpl/gnome-canvas.sgml Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/docs/reference/tmpl/gnome-canvas.sgml Sat Aug 9 21:34:06 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libgnomecanvas/glade/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/glade/Makefile.in *** ./libgnomecanvas/glade/Makefile.in Thu Feb 27 23:22:28 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/glade/Makefile.in Sat Aug 9 21:32:07 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ! # 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. --- 1,7 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 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. *************** *** 10,15 **** --- 11,17 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + @SET_MAKE@ SHELL = @SHELL@ *************** *** 31,43 **** mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ --- 33,41 ---- *************** *** 46,56 **** AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : --- 44,54 ---- AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : *************** *** 59,64 **** --- 57,63 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ CANVAS_GLADE_CFLAGS = @CANVAS_GLADE_CFLAGS@ *************** *** 69,74 **** --- 68,74 ---- CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 81,90 **** GTKDOC = @GTKDOC@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ HTML_DIR = @HTML_DIR@ INSTOBJEXT = @INSTOBJEXT@ - INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ - INTLOBJS = @INTLOBJS@ LDFLAGS = @LDFLAGS@ LIBGNOMECANVAS_AGE = @LIBGNOMECANVAS_AGE@ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@ --- 81,89 ---- GTKDOC = @GTKDOC@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LIBGNOMECANVAS_AGE = @LIBGNOMECANVAS_AGE@ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@ *************** *** 94,100 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 93,98 ---- *************** *** 104,109 **** --- 102,109 ---- PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ + PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ REBUILD = @REBUILD@ STRIP = @STRIP@ *************** *** 111,119 **** VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ cxxflags_set = @cxxflags_set@ ! @PLATFORM_WIN32_TRUE@no_undefined = @PLATFORM_WIN32_TRUE@-no-undefined INCLUDES = \ -I$(top_builddir) \ --- 111,122 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ + install_sh = @install_sh@ ! @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined INCLUDES = \ -I$(top_builddir) \ *************** *** 137,372 **** libcanvas_la_SOURCES = \ glade-canvas.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(glademodule_LTLIBRARIES) ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. LIBS = @LIBS@ ! libcanvas_la_DEPENDENCIES = \ ! $(top_builddir)/libgnomecanvas/libgnomecanvas-2.la ! libcanvas_la_OBJECTS = glade-canvas.lo ! 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 $@ ! DIST_COMMON = Makefile.am Makefile.in ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! ! TAR = gtar ! GZIP_ENV = --best SOURCES = $(libcanvas_la_SOURCES) - OBJECTS = $(libcanvas_la_OBJECTS) - - all: all-redirect - .SUFFIXES: - .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) --gnu --include-deps glade/Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! mostlyclean-glademoduleLTLIBRARIES: ! ! clean-glademoduleLTLIBRARIES: ! -test -z "$(glademodule_LTLIBRARIES)" || rm -f $(glademodule_LTLIBRARIES) ! distclean-glademoduleLTLIBRARIES: ! maintainer-clean-glademoduleLTLIBRARIES: install-glademoduleLTLIBRARIES: $(glademodule_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(glademoduledir) @list='$(glademodule_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(glademoduledir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(glademoduledir)/$$p; \ else :; fi; \ done uninstall-glademoduleLTLIBRARIES: @$(NORMAL_UNINSTALL) ! list='$(glademodule_LTLIBRARIES)'; for p in $$list; do \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(glademoduledir)/$$p; \ done ! .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 *.o core *.core ! -rm -f *.$(OBJEXT) ! ! clean-compile: distclean-compile: -rm -f *.tab.c ! maintainer-clean-compile: ! ! .c.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! .s.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! .S.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! mostlyclean-libtool: ! -rm -f *.lo ! ! clean-libtool: ! -rm -rf .libs _libs ! ! distclean-libtool: ! maintainer-clean-libtool: ! libcanvas.la: $(libcanvas_la_OBJECTS) $(libcanvas_la_DEPENDENCIES) ! $(LINK) -rpath $(glademoduledir) $(libcanvas_la_LDFLAGS) $(libcanvas_la_OBJECTS) $(libcanvas_la_LIBADD) $(LIBS) tags: TAGS ! 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; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! 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)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ! ! mostlyclean-tags: ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! maintainer-clean-tags: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! ! subdir = glade distdir: $(DISTFILES) @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 ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: ! install-exec: install-exec-am ! install-data-am: install-glademoduleLTLIBRARIES ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall-glademoduleLTLIBRARIES uninstall: uninstall-am - all-am: Makefile $(LTLIBRARIES) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(glademoduledir) mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-glademoduleLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-glademoduleLTLIBRARIES clean-compile clean-libtool \ ! clean-tags clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-glademoduleLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-generic \ ! clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-glademoduleLTLIBRARIES \ ! 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 ! .PHONY: mostlyclean-glademoduleLTLIBRARIES \ ! distclean-glademoduleLTLIBRARIES clean-glademoduleLTLIBRARIES \ ! maintainer-clean-glademoduleLTLIBRARIES \ ! uninstall-glademoduleLTLIBRARIES install-glademoduleLTLIBRARIES \ ! mostlyclean-compile distclean-compile clean-compile \ ! maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck 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 # 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. --- 140,364 ---- libcanvas_la_SOURCES = \ glade-canvas.c + subdir = glade mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(glademodule_LTLIBRARIES) ! ! libcanvas_la_DEPENDENCIES = \ ! $(top_builddir)/libgnomecanvas/libgnomecanvas-2.la ! am_libcanvas_la_OBJECTS = glade-canvas.lo ! libcanvas_la_OBJECTS = $(am_libcanvas_la_OBJECTS) ! DEFS = @DEFS@ ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! depcomp = ! 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 $@ ! DIST_SOURCES = $(libcanvas_la_SOURCES) ! DIST_COMMON = Makefile.am Makefile.in SOURCES = $(libcanvas_la_SOURCES) + all: all-am ! .SUFFIXES: ! .SUFFIXES: .c .lo .o .obj ! mostlyclean-libtool: ! -rm -f *.lo ! clean-libtool: ! -rm -rf .libs _libs + distclean-libtool: + -rm -f libtool + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu --ignore-deps glade/Makefile + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status install-glademoduleLTLIBRARIES: $(glademodule_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(glademoduledir) @list='$(glademodule_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(glademoduledir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(glademoduledir)/$$p; \ else :; fi; \ done uninstall-glademoduleLTLIBRARIES: @$(NORMAL_UNINSTALL) ! @list='$(glademodule_LTLIBRARIES)'; for p in $$list; do \ ! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(glademoduledir)/$$p"; \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(glademoduledir)/$$p; \ done ! clean-glademoduleLTLIBRARIES: ! -test -z "$(glademodule_LTLIBRARIES)" || rm -f $(glademodule_LTLIBRARIES) ! libcanvas.la: $(libcanvas_la_OBJECTS) $(libcanvas_la_DEPENDENCIES) ! $(LINK) -rpath $(glademoduledir) $(libcanvas_la_LDFLAGS) $(libcanvas_la_OBJECTS) $(libcanvas_la_LIBADD) $(LIBS) mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c ! .c.o: ! $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< ! .c.obj: ! $(COMPILE) -c `cygpath -w $<` ! .c.lo: ! $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ! uninstall-info-am: tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(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; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(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; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done check-am: all-am check: check-am ! all-am: Makefile $(LTLIBRARIES) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(glademoduledir) install: install-am ! install-exec: install-exec-am ! 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-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) 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-glademoduleLTLIBRARIES clean-libtool \ ! mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: install-glademoduleLTLIBRARIES ! ! install-exec-am: ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool ! ! uninstall-am: uninstall-glademoduleLTLIBRARIES uninstall-info-am + .PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-glademoduleLTLIBRARIES clean-libtool distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-glademoduleLTLIBRARIES install-info \ + install-info-am 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-glademoduleLTLIBRARIES uninstall-info-am # 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. diff -crN ./libgnomecanvas/install-sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/install-sh *** ./libgnomecanvas/install-sh Fri Aug 24 13:42:34 2001 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/install-sh Sat Aug 9 21:32:04 2003 *************** *** 196,202 **** if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi else --- 196,202 ---- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst || true; else true ; fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi else *************** *** 237,243 **** if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && # Now rename the file to the real destination. --- 237,243 ---- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp || true; else true;fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && # Now rename the file to the real destination. diff -crN ./libgnomecanvas/libgnomecanvas/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/libgnomecanvas/Makefile.in *** ./libgnomecanvas/libgnomecanvas/Makefile.in Thu Feb 27 23:22:28 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/libgnomecanvas/Makefile.in Sat Aug 9 21:32:07 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ! # 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. --- 1,7 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 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. *************** *** 10,15 **** --- 11,17 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + @SET_MAKE@ SHELL = @SHELL@ *************** *** 31,43 **** mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ --- 33,41 ---- *************** *** 46,56 **** AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : --- 44,54 ---- AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : *************** *** 59,64 **** --- 57,63 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ CANVAS_GLADE_CFLAGS = @CANVAS_GLADE_CFLAGS@ *************** *** 69,74 **** --- 68,74 ---- CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 81,90 **** GTKDOC = @GTKDOC@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ HTML_DIR = @HTML_DIR@ INSTOBJEXT = @INSTOBJEXT@ - INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ - INTLOBJS = @INTLOBJS@ LDFLAGS = @LDFLAGS@ LIBGNOMECANVAS_AGE = @LIBGNOMECANVAS_AGE@ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@ --- 81,89 ---- GTKDOC = @GTKDOC@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LIBGNOMECANVAS_AGE = @LIBGNOMECANVAS_AGE@ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@ *************** *** 94,100 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 93,98 ---- *************** *** 104,109 **** --- 102,109 ---- PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ + PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ REBUILD = @REBUILD@ STRIP = @STRIP@ *************** *** 111,119 **** VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ cxxflags_set = @cxxflags_set@ ! @PLATFORM_WIN32_TRUE@no_undefined = @PLATFORM_WIN32_TRUE@-no-undefined INCLUDES = \ -I$(top_srcdir) \ --- 111,122 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ + install_sh = @install_sh@ ! @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined INCLUDES = \ -I$(top_srcdir) \ *************** *** 197,481 **** pkgconfig_DATA = libgnomecanvas-2.0.pc DONT_DIST_SOURCE = $(marshal_sources) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = libgnomecanvas-2.0.pc ! LTLIBRARIES = $(lib_LTLIBRARIES) ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. LIBS = @LIBS@ ! libgnomecanvas_2_la_DEPENDENCIES = ! libgnomecanvas_2_la_OBJECTS = gnome-canvas-shape.lo \ ! gnome-canvas-bpath.lo gnome-canvas-path-def.lo \ ! gnome-canvas-clipgroup.lo gnome-canvas-line.lo gnome-canvas-pixbuf.lo \ ! gnome-canvas-polygon.lo gnome-canvas-rect-ellipse.lo \ ! gnome-canvas-text.lo gnome-canvas-rich-text.lo gnome-canvas-util.lo \ ! gnome-canvas-widget.lo gnome-canvas.lo libgnomecanvastypes.lo ! 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 $@ ! DATA = $(pkgconfig_DATA) ! ! HEADERS = $(libgnomecanvasinclude_HEADERS) ! ! DIST_COMMON = Makefile.am Makefile.in libgnomecanvas-2.0.pc.in ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = gtar ! GZIP_ENV = --best SOURCES = $(libgnomecanvas_2_la_SOURCES) - OBJECTS = $(libgnomecanvas_2_la_OBJECTS) - - all: all-redirect - .SUFFIXES: - .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) --gnu --include-deps libgnomecanvas/Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! libgnomecanvas-2.0.pc: $(top_builddir)/config.status libgnomecanvas-2.0.pc.in ! cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! ! 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 \ ! 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 \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done ! .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 *.o core *.core ! -rm -f *.$(OBJEXT) ! ! clean-compile: distclean-compile: -rm -f *.tab.c ! maintainer-clean-compile: ! ! .c.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! .s.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! .S.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! mostlyclean-libtool: ! -rm -f *.lo ! ! clean-libtool: ! -rm -rf .libs _libs ! ! distclean-libtool: ! ! maintainer-clean-libtool: ! libgnomecanvas-2.la: $(libgnomecanvas_2_la_OBJECTS) $(libgnomecanvas_2_la_DEPENDENCIES) ! $(LINK) -rpath $(libdir) $(libgnomecanvas_2_la_LDFLAGS) $(libgnomecanvas_2_la_OBJECTS) $(libgnomecanvas_2_la_LIBADD) $(LIBS) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \ ! fi; fi; \ done uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) ! list='$(pkgconfig_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \ done - install-libgnomecanvasincludeHEADERS: $(libgnomecanvasinclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libgnomecanvasincludedir) @list='$(libgnomecanvasinclude_HEADERS)'; for p in $$list; do \ ! if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ ! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libgnomecanvasincludedir)/$$p"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libgnomecanvasincludedir)/$$p; \ done uninstall-libgnomecanvasincludeHEADERS: @$(NORMAL_UNINSTALL) ! list='$(libgnomecanvasinclude_HEADERS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(libgnomecanvasincludedir)/$$p; \ done tags: TAGS ! 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; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! 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)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ! ! mostlyclean-tags: ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! maintainer-clean-tags: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! ! subdir = libgnomecanvas distdir: $(DISTFILES) @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 ! $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook ! ! info-am: ! info: info-am ! dvi-am: ! dvi: dvi-am check-am: all-am check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: install-libLTLIBRARIES ! install-exec: install-exec-am ! install-data-am: install-pkgconfigDATA \ ! install-libgnomecanvasincludeHEADERS install-data-local ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \ ! uninstall-libgnomecanvasincludeHEADERS uninstall-local uninstall: uninstall-am - all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) \ - $(DESTDIR)$(libgnomecanvasincludedir) mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) ! mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ ! clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-libLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-generic \ ! clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ ! 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 ! .PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ ! clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ ! uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ ! distclean-compile clean-compile maintainer-clean-compile \ ! mostlyclean-libtool distclean-libtool clean-libtool \ ! maintainer-clean-libtool uninstall-pkgconfigDATA install-pkgconfigDATA \ ! uninstall-libgnomecanvasincludeHEADERS \ ! install-libgnomecanvasincludeHEADERS tags mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-local install-data-am install-data install-am \ ! install uninstall-local uninstall-am uninstall all-redirect all-am all \ ! installdirs mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean @OS_WIN32_TRUE@install-libtool-import-lib: --- 200,481 ---- pkgconfig_DATA = libgnomecanvas-2.0.pc DONT_DIST_SOURCE = $(marshal_sources) + subdir = libgnomecanvas mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = libgnomecanvas-2.0.pc ! LTLIBRARIES = $(lib_LTLIBRARIES) ! ! libgnomecanvas_2_la_DEPENDENCIES = ! am_libgnomecanvas_2_la_OBJECTS = gnome-canvas-shape.lo \ ! gnome-canvas-bpath.lo gnome-canvas-path-def.lo \ ! gnome-canvas-clipgroup.lo gnome-canvas-line.lo \ ! gnome-canvas-pixbuf.lo gnome-canvas-polygon.lo \ ! gnome-canvas-rect-ellipse.lo gnome-canvas-text.lo \ ! gnome-canvas-rich-text.lo gnome-canvas-util.lo \ ! gnome-canvas-widget.lo gnome-canvas.lo libgnomecanvastypes.lo ! libgnomecanvas_2_la_OBJECTS = $(am_libgnomecanvas_2_la_OBJECTS) ! DEFS = @DEFS@ ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! depcomp = ! 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 $@ ! DIST_SOURCES = $(libgnomecanvas_2_la_SOURCES) ! DATA = $(pkgconfig_DATA) ! HEADERS = $(libgnomecanvasinclude_HEADERS) ! DIST_COMMON = $(libgnomecanvasinclude_HEADERS) Makefile.am Makefile.in \ ! libgnomecanvas-2.0.pc.in SOURCES = $(libgnomecanvas_2_la_SOURCES) ! all: $(BUILT_SOURCES) ! $(MAKE) $(AM_MAKEFLAGS) all-am ! .SUFFIXES: ! .SUFFIXES: .c .lo .o .obj ! mostlyclean-libtool: ! -rm -f *.lo ! clean-libtool: ! -rm -rf .libs _libs + distclean-libtool: + -rm -f libtool + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu --ignore-deps libgnomecanvas/Makefile + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status + libgnomecanvas-2.0.pc: $(top_builddir)/config.status libgnomecanvas-2.0.pc.in + cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ else :; fi; \ done uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) ! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done ! clean-libLTLIBRARIES: ! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ! libgnomecanvas-2.la: $(libgnomecanvas_2_la_OBJECTS) $(libgnomecanvas_2_la_DEPENDENCIES) ! $(LINK) -rpath $(libdir) $(libgnomecanvas_2_la_LDFLAGS) $(libgnomecanvas_2_la_OBJECTS) $(libgnomecanvas_2_la_LIBADD) $(LIBS) mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c ! .c.o: ! $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< ! .c.obj: ! $(COMPILE) -c `cygpath -w $<` + .c.lo: + $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + uninstall-info-am: install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \ done uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) ! @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \ ! rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \ done install-libgnomecanvasincludeHEADERS: $(libgnomecanvasinclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libgnomecanvasincludedir) @list='$(libgnomecanvasinclude_HEADERS)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(libgnomecanvasincludedir)/$$f"; \ ! $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(libgnomecanvasincludedir)/$$f; \ done uninstall-libgnomecanvasincludeHEADERS: @$(NORMAL_UNINSTALL) ! @list='$(libgnomecanvasinclude_HEADERS)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(libgnomecanvasincludedir)/$$f"; \ ! rm -f $(DESTDIR)$(libgnomecanvasincludedir)/$$f; \ done tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(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; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(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; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done ! $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="${top_distdir}" distdir="$(distdir)" \ ! dist-hook check-am: all-am check: check-am ! all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libgnomecanvasincludedir) install: install-am ! install-exec: install-exec-am ! 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-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) 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." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) ! clean: clean-am ! clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ ! mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: install-data-local install-libgnomecanvasincludeHEADERS \ ! install-pkgconfigDATA ! ! 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: mostlyclean-am ! ! mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool ! ! uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ ! uninstall-libgnomecanvasincludeHEADERS uninstall-local \ ! uninstall-pkgconfigDATA ! ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libLTLIBRARIES clean-libtool distclean distclean-compile \ ! distclean-generic distclean-libtool distclean-tags distdir dvi \ ! dvi-am info info-am install install-am install-data \ ! install-data-am install-data-local install-exec install-exec-am \ ! install-info install-info-am install-libLTLIBRARIES \ ! install-libgnomecanvasincludeHEADERS install-man \ ! install-pkgconfigDATA install-strip installcheck \ ! installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool tags uninstall \ ! uninstall-am uninstall-info-am uninstall-libLTLIBRARIES \ ! uninstall-libgnomecanvasincludeHEADERS uninstall-local \ ! uninstall-pkgconfigDATA @OS_WIN32_TRUE@install-libtool-import-lib: *************** *** 501,507 **** install-data-local: install-libtool-import-lib uninstall-local: uninstall-libtool-import-lib - # 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: --- 501,506 ---- diff -crN ./libgnomecanvas/ltmain.sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/ltmain.sh *** ./libgnomecanvas/ltmain.sh Thu Feb 27 23:22:13 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/ltmain.sh Sat Aug 9 21:31:45 2003 *************** *** 55,62 **** # Constants. PROGRAM=ltmain.sh PACKAGE=libtool ! VERSION=1.4 ! TIMESTAMP=" (1.920 2001/04/24 23:26:18)" default_mode= help="Try \`$progname --help' for more information." --- 55,62 ---- # Constants. PROGRAM=ltmain.sh PACKAGE=libtool ! VERSION=1.4.2 ! TIMESTAMP=" (1.922.2.54 2001/09/11 03:33:37)" default_mode= help="Try \`$progname --help' for more information." *************** *** 84,89 **** --- 84,92 ---- save_LANG="$LANG"; LANG=C; export LANG fi + # Make sure IFS has a sensible default + : ${IFS=" "} + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then echo "$modename: not configured to build any kind of library" 1>&2 echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 *************** *** 202,207 **** --- 205,215 ---- exit 1 fi + # If this variable is set in any of the actions, the command in it + # will be execed at the end. This prevents here-documents from being + # left over by shells. + exec_cmd= + if test -z "$show_help"; then # Infer the operation mode. *************** *** 329,335 **** -Wc,*) args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` lastarg= ! IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" --- 337,343 ---- -Wc,*) args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` lastarg= ! save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" *************** *** 459,465 **** pic_mode=default ;; esac ! if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then # non-PIC code in shared libraries is not supported pic_mode=default fi --- 467,473 ---- pic_mode=default ;; esac ! if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then # non-PIC code in shared libraries is not supported pic_mode=default fi *************** *** 615,620 **** --- 623,632 ---- # Now arrange that obj and lo_libobj become the same file $show "(cd $xdir && $LN_S $baseobj $libobj)" if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then + # Unlock the critical section if it was locked + if test "$need_locks" != no; then + $run $rm "$lockfile" + fi exit 0 else error=$? *************** *** 1031,1036 **** --- 1043,1059 ---- # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in + *-*-openbsd*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; esac fi deplibs="$deplibs $arg" *************** *** 1122,1128 **** -Wc,*) args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` arg= ! IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' for flag in $args; do IFS="$save_ifs" case $flag in --- 1145,1151 ---- -Wc,*) args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` arg= ! save_ifs="$IFS"; IFS=',' for flag in $args; do IFS="$save_ifs" case $flag in *************** *** 1140,1146 **** -Wl,*) args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` arg= ! IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' for flag in $args; do IFS="$save_ifs" case $flag in --- 1163,1169 ---- -Wl,*) args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` arg= ! save_ifs="$IFS"; IFS=',' for flag in $args; do IFS="$save_ifs" case $flag in *************** *** 1343,1349 **** ;; esac for pass in $passes; do ! if test "$linkmode" = prog; then # Determine which files to process case $pass in dlopen) --- 1366,1372 ---- ;; esac for pass in $passes; do ! if test $linkmode = prog; then # Determine which files to process case $pass in dlopen) *************** *** 1360,1370 **** found=no case $deplib in -l*) ! if test "$linkmode" = oldlib && test "$linkmode" = obj; then $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 continue fi ! if test "$pass" = conv; then deplibs="$deplib $deplibs" continue fi --- 1383,1393 ---- found=no case $deplib in -l*) ! if test $linkmode = oldlib && test $linkmode = obj; then $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 continue fi ! if test $pass = conv; then deplibs="$deplib $deplibs" continue fi *************** *** 1384,1390 **** finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" ! test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" fi continue fi --- 1407,1413 ---- finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" ! test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs" fi continue fi *************** *** 1393,1408 **** case $linkmode in lib) deplibs="$deplib $deplibs" ! test "$pass" = conv && continue newdependency_libs="$deplib $newdependency_libs" newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` ;; prog) ! if test "$pass" = conv; then deplibs="$deplib $deplibs" continue fi ! if test "$pass" = scan; then deplibs="$deplib $deplibs" newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` else --- 1416,1431 ---- case $linkmode in lib) deplibs="$deplib $deplibs" ! test $pass = conv && continue newdependency_libs="$deplib $newdependency_libs" newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` ;; prog) ! if test $pass = conv; then deplibs="$deplib $deplibs" continue fi ! if test $pass = scan; then deplibs="$deplib $deplibs" newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` else *************** *** 1417,1423 **** continue ;; # -L -R*) ! if test "$pass" = link; then dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` # Make sure the xrpath contains only unique directories. case "$xrpath " in --- 1440,1446 ---- continue ;; # -L -R*) ! if test $pass = link; then dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` # Make sure the xrpath contains only unique directories. case "$xrpath " in *************** *** 1430,1436 **** ;; *.la) lib="$deplib" ;; *.$libext) ! if test "$pass" = conv; then deplibs="$deplib $deplibs" continue fi --- 1453,1459 ---- ;; *.la) lib="$deplib" ;; *.$libext) ! if test $pass = conv; then deplibs="$deplib $deplibs" continue fi *************** *** 1451,1457 **** continue ;; prog) ! if test "$pass" != link; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" --- 1474,1480 ---- continue ;; prog) ! if test $pass != link; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" *************** *** 1462,1468 **** esac # linkmode ;; # *.$libext *.lo | *.$objext) ! if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then # If there is no dlopen support or we're linking statically, # we need to preload. newdlprefiles="$newdlprefiles $deplib" --- 1485,1491 ---- esac # linkmode ;; # *.$libext *.lo | *.$objext) ! if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then # If there is no dlopen support or we're linking statically, # we need to preload. newdlprefiles="$newdlprefiles $deplib" *************** *** 1512,1524 **** if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || ! { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then # Add dl[pre]opened files of deplib test -n "$dlopen" && dlfiles="$dlfiles $dlopen" test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" fi ! if test "$pass" = conv; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then --- 1535,1547 ---- if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || ! { test $linkmode = oldlib && test $linkmode = obj; }; then # Add dl[pre]opened files of deplib test -n "$dlopen" && dlfiles="$dlfiles $dlopen" test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" fi ! if test $pass = conv; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then *************** *** 1537,1543 **** esac tmp_libs="$tmp_libs $deplib" done ! elif test "$linkmode" != prog && test "$linkmode" != lib; then $echo "$modename: \`$lib' is not a convenience library" 1>&2 exit 1 fi --- 1560,1566 ---- esac tmp_libs="$tmp_libs $deplib" done ! elif test $linkmode != prog && test $linkmode != lib; then $echo "$modename: \`$lib' is not a convenience library" 1>&2 exit 1 fi *************** *** 1555,1561 **** fi # This library was specified with -dlopen. ! if test "$pass" = dlopen; then if test -z "$libdir"; then $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 exit 1 --- 1578,1584 ---- fi # This library was specified with -dlopen. ! if test $pass = dlopen; then if test -z "$libdir"; then $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 exit 1 *************** *** 1604,1610 **** name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` # This library was specified with -dlpreopen. ! if test "$pass" = dlpreopen; then if test -z "$libdir"; then $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 exit 1 --- 1627,1633 ---- name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` # This library was specified with -dlpreopen. ! if test $pass = dlpreopen; then if test -z "$libdir"; then $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 exit 1 *************** *** 1623,1629 **** if test -z "$libdir"; then # Link the convenience library ! if test "$linkmode" = lib; then deplibs="$dir/$old_library $deplibs" elif test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$dir/$old_library $compile_deplibs" --- 1646,1652 ---- if test -z "$libdir"; then # Link the convenience library ! if test $linkmode = lib; then deplibs="$dir/$old_library $deplibs" elif test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$dir/$old_library $compile_deplibs" *************** *** 1634,1640 **** continue fi ! if test "$linkmode" = prog && test "$pass" != link; then newlib_search_path="$newlib_search_path $ladir" deplibs="$lib $deplibs" --- 1657,1663 ---- continue fi ! if test $linkmode = prog && test $pass != link; then newlib_search_path="$newlib_search_path $ladir" deplibs="$lib $deplibs" *************** *** 1671,1677 **** # Link against this shared library if test "$linkmode,$pass" = "prog,link" || ! { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. --- 1694,1700 ---- # Link against this shared library if test "$linkmode,$pass" = "prog,link" || ! { test $linkmode = lib && test $hardcode_into_libs = yes; }; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. *************** *** 1693,1699 **** esac ;; esac ! if test "$linkmode" = prog; then # We need to hardcode the library path if test -n "$shlibpath_var"; then # Make sure the rpath contains only unique directories. --- 1716,1722 ---- esac ;; esac ! if test $linkmode = prog; then # We need to hardcode the library path if test -n "$shlibpath_var"; then # Make sure the rpath contains only unique directories. *************** *** 1750,1756 **** if test -f "$output_objdir/$soname-def"; then : else $show "extracting exported symbol list from \`$soname'" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' eval cmds=\"$extract_expsyms_cmds\" for cmd in $cmds; do IFS="$save_ifs" --- 1773,1779 ---- if test -f "$output_objdir/$soname-def"; then : else $show "extracting exported symbol list from \`$soname'" ! save_ifs="$IFS"; IFS='~' eval cmds=\"$extract_expsyms_cmds\" for cmd in $cmds; do IFS="$save_ifs" *************** *** 1763,1769 **** # Create $newlib if test -f "$output_objdir/$newlib"; then :; else $show "generating import library for \`$soname'" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' eval cmds=\"$old_archive_from_expsyms_cmds\" for cmd in $cmds; do IFS="$save_ifs" --- 1786,1792 ---- # Create $newlib if test -f "$output_objdir/$newlib"; then :; else $show "generating import library for \`$soname'" ! save_ifs="$IFS"; IFS='~' eval cmds=\"$old_archive_from_expsyms_cmds\" for cmd in $cmds; do IFS="$save_ifs" *************** *** 1777,1783 **** linklib=$newlib fi # test -n $old_archive_from_expsyms_cmds ! if test "$linkmode" = prog || test "$mode" != relink; then add_shlibpath= add_dir= add= --- 1800,1806 ---- linklib=$newlib fi # test -n $old_archive_from_expsyms_cmds ! if test $linkmode = prog || test "$mode" != relink; then add_shlibpath= add_dir= add= *************** *** 1826,1832 **** *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; esac fi ! if test "$linkmode" = prog; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else --- 1849,1855 ---- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; esac fi ! if test $linkmode = prog; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else *************** *** 1843,1849 **** fi fi ! if test "$linkmode" = prog || test "$mode" = relink; then add_shlibpath= add_dir= add= --- 1866,1872 ---- fi fi ! if test $linkmode = prog || test "$mode" = relink; then add_shlibpath= add_dir= add= *************** *** 1865,1871 **** add="-l$name" fi ! if test "$linkmode" = prog; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else --- 1888,1894 ---- add="-l$name" fi ! if test $linkmode = prog; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else *************** *** 1873,1879 **** test -n "$add" && deplibs="$add $deplibs" fi fi ! elif test "$linkmode" = prog; then if test "$alldeplibs" = yes && { test "$deplibs_check_method" = pass_all || { test "$build_libtool_libs" = yes && --- 1896,1902 ---- test -n "$add" && deplibs="$add $deplibs" fi fi ! elif test $linkmode = prog; then if test "$alldeplibs" = yes && { test "$deplibs_check_method" = pass_all || { test "$build_libtool_libs" = yes && *************** *** 1911,1927 **** echo "*** Therefore, libtool will create a static module, that should work " echo "*** as long as the dlopening application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then ! echo ! echo "*** However, this would only work if libtool was able to extract symbol" ! echo "*** lists from a program, using \`nm' or equivalent, but libtool could" ! echo "*** not find such a program. So, this module is probably useless." ! echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then ! build_libtool_libs=module ! build_old_libs=yes else ! build_libtool_libs=no fi fi else --- 1934,1950 ---- echo "*** Therefore, libtool will create a static module, that should work " echo "*** as long as the dlopening application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then ! echo ! echo "*** However, this would only work if libtool was able to extract symbol" ! echo "*** lists from a program, using \`nm' or equivalent, but libtool could" ! echo "*** not find such a program. So, this module is probably useless." ! echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then ! build_libtool_libs=module ! build_old_libs=yes else ! build_libtool_libs=no fi fi else *************** *** 1932,1940 **** fi fi # link shared/static library? ! if test "$linkmode" = lib; then if test -n "$dependency_libs" && ! { test "$hardcode_into_libs" != yes || test $build_old_libs = yes || test $link_static = yes; }; then # Extract -R from dependency_libs temp_deplibs= --- 1955,1963 ---- fi fi # link shared/static library? ! if test $linkmode = lib; then if test -n "$dependency_libs" && ! { test $hardcode_into_libs != yes || test $build_old_libs = yes || test $link_static = yes; }; then # Extract -R from dependency_libs temp_deplibs= *************** *** 1964,1970 **** tmp_libs="$tmp_libs $deplib" done ! if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do case $deplib in --- 1987,1993 ---- tmp_libs="$tmp_libs $deplib" done ! if test $link_all_deplibs != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do case $deplib in *************** *** 2007,2021 **** fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs ! if test "$pass" = dlpreopen; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi ! if test "$pass" != dlopen; then ! test "$pass" != scan && dependency_libs="$newdependency_libs" ! if test "$pass" != conv; then # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do --- 2030,2044 ---- fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs ! if test $pass = dlpreopen; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi ! if test $pass != dlopen; then ! test $pass != scan && dependency_libs="$newdependency_libs" ! if test $pass != conv; then # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do *************** *** 2073,2079 **** deplibs= fi done # for pass ! if test "$linkmode" = prog; then dlfiles="$newdlfiles" dlprefiles="$newdlprefiles" fi --- 2096,2102 ---- deplibs= fi done # for pass ! if test $linkmode = prog; then dlfiles="$newdlfiles" dlprefiles="$newdlprefiles" fi *************** *** 2175,2181 **** else # Parse the version information argument. ! IFS="${IFS= }"; save_ifs="$IFS"; IFS=':' set dummy $vinfo 0 0 0 IFS="$save_ifs" --- 2198,2204 ---- else # Parse the version information argument. ! save_ifs="$IFS"; IFS=':' set dummy $vinfo 0 0 0 IFS="$save_ifs" *************** *** 2312,2317 **** --- 2335,2350 ---- if test -z "$vinfo" && test -n "$release"; then major= verstring="0.0" + case $version_type in + darwin) + # we can't check for "0.0" in archive_cmds due to quoting + # problems, so we reset it completely + verstring="" + ;; + *) + verstring="0.0" + ;; + esac if test "$need_version" = no; then versuffix= else *************** *** 2408,2416 **** *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; *) # Add libc to deplibs on all other systems if necessary. ! if test "$build_libtool_need_lc" = "yes"; then deplibs="$deplibs -lc" fi ;; --- 2441,2452 ---- *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. + ;; *) # Add libc to deplibs on all other systems if necessary. ! if test $build_libtool_need_lc = "yes"; then deplibs="$deplibs -lc" fi ;; *************** *** 2683,2689 **** # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then ! if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= dep_rpath= --- 2719,2725 ---- # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then ! if test $hardcode_into_libs = yes; then # Hardcode the library paths hardcode_libdirs= dep_rpath= *************** *** 2784,2790 **** export_symbols="$output_objdir/$libname.exp" $run $rm $export_symbols eval cmds=\"$export_symbols_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 2820,2826 ---- export_symbols="$output_objdir/$libname.exp" $run $rm $export_symbols eval cmds=\"$export_symbols_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 2860,2866 **** else eval cmds=\"$archive_cmds\" fi ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 2896,2902 ---- else eval cmds=\"$archive_cmds\" fi ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 2988,2994 **** output="$obj" eval cmds=\"$reload_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 3024,3030 ---- output="$obj" eval cmds=\"$reload_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 3024,3030 **** reload_objs="$libobjs $reload_conv_objs" output="$libobj" eval cmds=\"$reload_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 3060,3066 ---- reload_objs="$libobjs $reload_conv_objs" output="$libobj" eval cmds=\"$reload_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 3082,3087 **** --- 3118,3128 ---- ;; esac + # AIX needs explicit runtime linking option + + compile_command="$compile_command $use_runtimelinking" + finalize_command="$finalize_command $use_runtimelinking" + compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" *************** *** 3287,3313 **** #undef lt_preloaded_symbols #if defined (__STDC__) && __STDC__ ! # define lt_ptr_t void * #else ! # define lt_ptr_t char * # define const #endif /* The mapping between symbol names and symbols. */ const struct { const char *name; ! lt_ptr_t address; } lt_preloaded_symbols[] = {\ " ! sed -n -e 's/^: \([^ ]*\) $/ {\"\1\", (lt_ptr_t) 0},/p' \ ! -e 's/^. \([^ ]*\) \([^ ]*\)$/ {"\2", (lt_ptr_t) \&\2},/p' \ ! < "$nlist" >> "$output_objdir/$dlsyms" $echo >> "$output_objdir/$dlsyms" "\ ! {0, (lt_ptr_t) 0} }; /* This works around a problem in FreeBSD linker */ --- 3328,3352 ---- #undef lt_preloaded_symbols #if defined (__STDC__) && __STDC__ ! # define lt_ptr void * #else ! # define lt_ptr char * # define const #endif /* The mapping between symbol names and symbols. */ const struct { const char *name; ! lt_ptr address; } lt_preloaded_symbols[] = {\ " ! eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" $echo >> "$output_objdir/$dlsyms" "\ ! {0, (lt_ptr) 0} }; /* This works around a problem in FreeBSD linker */ *************** *** 3618,3625 **** # relink executable if necessary if test -n \"\$relink_command\"; then ! if (eval \$relink_command); then : else $rm \"\$progdir/\$file\" exit 1 fi --- 3657,3665 ---- # relink executable if necessary if test -n \"\$relink_command\"; then ! if relink_command_output=\`eval \$relink_command 2>&1\`; then : else + $echo \"\$relink_command_output\" >&2 $rm \"\$progdir/\$file\" exit 1 fi *************** *** 3790,3796 **** eval cmds=\"$old_archive_cmds\" fi ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 3830,3836 ---- eval cmds=\"$old_archive_cmds\" fi ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 3879,3884 **** --- 3919,3925 ---- tdlname=$dlname case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + *aix*,*,*,*,*) tdlname=$realname\($dlname\) ;; esac $echo > $output "\ # $outputname - a libtool library file *************** *** 4123,4137 **** test "X$dir" = "X$file/" && dir= dir="$dir$objdir" ! if test -n "$relink_command"; then ! $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 ! fi ! fi # See the names of the shared library. set dummy $library_names --- 4164,4180 ---- test "X$dir" = "X$file/" && dir= dir="$dir$objdir" ! # BEGIN WORKAROUND DESTDIR ! # if test -n "$relink_command"; then ! # $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 ! # fi ! # fi ! # END WORKAROUND DESTDIR # See the names of the shared library. set dummy $library_names *************** *** 4141,4147 **** shift srcname="$realname" ! test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. $show "$install_prog $dir/$srcname $destdir/$realname" --- 4184,4192 ---- shift srcname="$realname" ! # BEGIN WORKAROUND DESTDIR ! # test -n "$relink_command" && srcname="$realname"T ! # END WORKAROUND DESTDIR # Install the shared library and build the symlinks. $show "$install_prog $dir/$srcname $destdir/$realname" *************** *** 4165,4171 **** # Do each command in the postinstall commands. lib="$destdir/$realname" eval cmds=\"$postinstall_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 4210,4216 ---- # Do each command in the postinstall commands. lib="$destdir/$realname" eval cmds=\"$postinstall_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 4352,4358 **** # Do each command in the postinstall commands. eval cmds=\"$old_postinstall_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 4397,4403 ---- # Do each command in the postinstall commands. eval cmds=\"$old_postinstall_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 4368,4378 **** if test -n "$current_libdirs"; then # Maybe just do a dry run. test -n "$run" && current_libdirs=" -n$current_libdirs" ! exec $SHELL $0 --finish$current_libdirs ! exit 1 fi - - exit 0 ;; # libtool finish mode --- 4413,4422 ---- if test -n "$current_libdirs"; then # Maybe just do a dry run. test -n "$run" && current_libdirs=" -n$current_libdirs" ! exec_cmd='$SHELL $0 --finish$current_libdirs' ! else ! exit 0 fi ;; # libtool finish mode *************** *** 4391,4397 **** if test -n "$finish_cmds"; then # Do each command in the finish commands. eval cmds=\"$finish_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 4435,4441 ---- if test -n "$finish_cmds"; then # Do each command in the finish commands. eval cmds=\"$finish_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 4575,4585 **** LANG="$save_LANG"; export LANG fi ! # Now actually exec the command. ! eval "exec \$cmd$args" ! ! $echo "$modename: cannot exec \$cmd$args" ! exit 1 else # Display what would be done. if test -n "$shlibpath_var"; then --- 4619,4626 ---- LANG="$save_LANG"; export LANG fi ! # Now prepare to actually exec the command. ! exec_cmd='"$cmd"$args' else # Display what would be done. if test -n "$shlibpath_var"; then *************** *** 4641,4654 **** # Don't error if the file doesn't exist and rm -f was used. if (test -L "$file") >/dev/null 2>&1 \ ! || (test -h "$file") >/dev/null 2>&1 \ || test -f "$file"; then ! : elif test -d "$file"; then ! exit_status=1 continue elif test "$rmforce" = yes; then ! continue fi rmfiles="$file" --- 4682,4695 ---- # Don't error if the file doesn't exist and rm -f was used. if (test -L "$file") >/dev/null 2>&1 \ ! || (test -h "$file") >/dev/null 2>&1 \ || test -f "$file"; then ! : elif test -d "$file"; then ! exit_status=1 continue elif test "$rmforce" = yes; then ! continue fi rmfiles="$file" *************** *** 4670,4676 **** if test -n "$library_names"; then # Do each command in the postuninstall commands. eval cmds=\"$postuninstall_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 4711,4717 ---- if test -n "$library_names"; then # Do each command in the postuninstall commands. eval cmds=\"$postuninstall_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 4685,4691 **** if test -n "$old_library"; then # Do each command in the old_postuninstall commands. eval cmds=\"$old_postuninstall_cmds\" ! IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" --- 4726,4732 ---- if test -n "$old_library"; then # Do each command in the old_postuninstall commands. eval cmds=\"$old_postuninstall_cmds\" ! save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" *************** *** 4744,4754 **** ;; esac ! $echo "$modename: invalid operation mode \`$mode'" 1>&2 ! $echo "$generic_help" 1>&2 ! exit 1 fi # test -z "$show_help" # We need to display help for each of the modes. case $mode in "") $echo \ --- 4785,4802 ---- ;; esac ! if test -z "$exec_cmd"; then ! $echo "$modename: invalid operation mode \`$mode'" 1>&2 ! $echo "$generic_help" 1>&2 ! exit 1 ! fi fi # test -z "$show_help" + if test -n "$exec_cmd"; then + eval exec $exec_cmd + exit 1 + fi + # We need to display help for each of the modes. case $mode in "") $echo \ diff -crN ./libgnomecanvas/missing /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/missing *** ./libgnomecanvas/missing Fri Aug 24 13:42:34 2001 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/missing Sat Aug 9 21:32:04 2003 *************** *** 1,7 **** #! /bin/sh # Common stub for a few missing GNU programs while installing. ! # Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc. ! # Franc,ois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by --- 1,7 ---- #! /bin/sh # Common stub for a few missing GNU programs while installing. ! # Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc. ! # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by *************** *** 18,37 **** # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. if test $# -eq 0; then echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi # In the cases where this matters, `missing' is being run in the # srcdir already. ! if test -f configure.in; then configure_ac=configure.ac else configure_ac=configure.in fi case "$1" in -h|--h|--he|--hel|--help) echo "\ --- 18,55 ---- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + if test $# -eq 0; then echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi + run=: + # In the cases where this matters, `missing' is being run in the # srcdir already. ! if test -f configure.ac; then configure_ac=configure.ac else configure_ac=configure.in fi case "$1" in + --run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + ;; + esac + + # If it does not exist, or fails to run (possibly an outdated version), + # try to emulate it. + case "$1" in -h|--h|--he|--hel|--help) echo "\ *************** *** 43,48 **** --- 61,67 ---- Options: -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: aclocal touch file \`aclocal.m4' *************** *** 51,63 **** automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing - GNU libit 0.0" ;; -*) --- 70,84 ---- automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing 0.3 - GNU automake" ;; -*) *************** *** 69,75 **** aclocal) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`acinclude.m4' or \`$configure_ac'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 --- 90,96 ---- aclocal) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 *************** *** 78,84 **** autoconf) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`$configure_ac'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure --- 99,105 ---- autoconf) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure *************** *** 87,96 **** autoheader) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`acconfig.h' or \`$configure_ac'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." ! files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac` test -z "$files" && files="config.h" touch_files= for f in $files; do --- 108,117 ---- autoheader) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." ! files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" touch_files= for f in $files; do *************** *** 106,112 **** automake) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | --- 127,133 ---- automake) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | *************** *** 167,173 **** --- 188,219 ---- fi ;; + help2man) + echo 1>&2 "\ + WARNING: \`$1' is missing on your system. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + makeinfo) + if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then + # We have makeinfo, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file *************** *** 183,188 **** --- 229,273 ---- touch $file ;; + tar) + shift + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar ${1+"$@"} && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar ${1+"$@"} && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" ${1+"$@"} && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" ${1+"$@"} && exit 0 + ;; + esac + fi + + echo 1>&2 "\ + WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ WARNING: \`$1' is needed, and you do not seem to have it handy on your diff -crN ./libgnomecanvas/stamp-h.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/stamp-h.in *** ./libgnomecanvas/stamp-h.in Thu Feb 27 23:22:27 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/stamp-h.in Sat Aug 9 21:32:05 2003 *************** *** 1 **** - timestamp --- 0 ---- diff -crN ./libgnomecanvas/tests/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/tests/Makefile.in *** ./libgnomecanvas/tests/Makefile.in Thu Feb 27 23:22:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomecanvas/tests/Makefile.in Sat Aug 9 21:32:08 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ! # 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. --- 1,7 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 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. *************** *** 10,15 **** --- 11,17 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + @SET_MAKE@ SHELL = @SHELL@ *************** *** 31,43 **** mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ --- 33,41 ---- *************** *** 46,56 **** AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : --- 44,54 ---- AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : *************** *** 59,64 **** --- 57,63 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ CANVAS_GLADE_CFLAGS = @CANVAS_GLADE_CFLAGS@ *************** *** 69,74 **** --- 68,74 ---- CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 81,90 **** GTKDOC = @GTKDOC@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ HTML_DIR = @HTML_DIR@ INSTOBJEXT = @INSTOBJEXT@ - INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ - INTLOBJS = @INTLOBJS@ LIBGNOMECANVAS_AGE = @LIBGNOMECANVAS_AGE@ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@ LIBGNOMECANVAS_CURRENT = @LIBGNOMECANVAS_CURRENT@ --- 81,89 ---- GTKDOC = @GTKDOC@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ LIBGNOMECANVAS_AGE = @LIBGNOMECANVAS_AGE@ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@ LIBGNOMECANVAS_CURRENT = @LIBGNOMECANVAS_CURRENT@ *************** *** 93,99 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 92,97 ---- *************** *** 103,108 **** --- 101,108 ---- PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ + PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ REBUILD = @REBUILD@ STRIP = @STRIP@ *************** *** 110,116 **** --- 110,121 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ + install_sh = @install_sh@ + + LDFLAGS = -export-dynamic check_PROGRAMS = \ test-libglade-canvas *************** *** 130,380 **** LDADD = $(CANVAS_GLADE_LIBS) - LDFLAGS = -export-dynamic - test_libglade_canvas_SOURCE = test-libglade-canvas.c EXTRA_DIST = test-libglade-canvas.glade mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! check_PROGRAMS = test-libglade-canvas$(EXEEXT) ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. ! LIBS = @LIBS@ test_libglade_canvas_SOURCES = test-libglade-canvas.c ! test_libglade_canvas_OBJECTS = test-libglade-canvas.$(OBJEXT) test_libglade_canvas_LDADD = $(LDADD) ! test_libglade_canvas_DEPENDENCIES = ! test_libglade_canvas_LDFLAGS = ! 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 $@ ! DIST_COMMON = Makefile.am Makefile.in ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = gtar ! GZIP_ENV = --best SOURCES = test-libglade-canvas.c - OBJECTS = test-libglade-canvas.$(OBJEXT) ! all: all-redirect .SUFFIXES: ! .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) --gnu --include-deps tests/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! mostlyclean-checkPROGRAMS: clean-checkPROGRAMS: -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) ! distclean-checkPROGRAMS: ! maintainer-clean-checkPROGRAMS: .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 *.o core *.core - -rm -f *.$(OBJEXT) - - clean-compile: - - distclean-compile: - -rm -f *.tab.c - - maintainer-clean-compile: - .c.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! .s.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! .S.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! mostlyclean-libtool: ! -rm -f *.lo ! ! clean-libtool: ! -rm -rf .libs _libs ! ! distclean-libtool: ! ! maintainer-clean-libtool: ! ! test-libglade-canvas$(EXEEXT): $(test_libglade_canvas_OBJECTS) $(test_libglade_canvas_DEPENDENCIES) ! @rm -f test-libglade-canvas$(EXEEXT) ! $(LINK) $(test_libglade_canvas_LDFLAGS) $(test_libglade_canvas_OBJECTS) $(test_libglade_canvas_LDADD) $(LIBS) tags: TAGS ! 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; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! 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)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ! ! mostlyclean-tags: ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! maintainer-clean-tags: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! subdir = tests distdir: $(DISTFILES) @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 - - check-TESTS: $(TESTS) - @failed=0; all=0; \ - srcdir=$(srcdir); export srcdir; \ - for tst in $(TESTS); do \ - if test -f $$tst; then dir=.; \ - else dir="$(srcdir)"; fi; \ - if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \ - all=`expr $$all + 1`; \ - echo "PASS: $$tst"; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ - fi; \ - done; \ - if test "$$failed" -eq 0; then \ - banner="All $$all tests passed"; \ - else \ - banner="$$failed of $$all tests failed"; \ - fi; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0 - info-am: - info: info-am - dvi-am: - dvi: dvi-am check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: ! install-exec: install-exec-am ! install-data-am: ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall: uninstall-am - all-am: Makefile - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-checkPROGRAMS mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-checkPROGRAMS clean-compile clean-libtool clean-tags \ ! clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-checkPROGRAMS distclean-compile \ ! distclean-libtool distclean-tags distclean-generic \ ! clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-checkPROGRAMS \ ! 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 ! .PHONY: mostlyclean-checkPROGRAMS distclean-checkPROGRAMS \ ! clean-checkPROGRAMS maintainer-clean-checkPROGRAMS mostlyclean-compile \ ! distclean-compile clean-compile maintainer-clean-compile \ ! mostlyclean-libtool distclean-libtool clean-libtool \ ! maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir check-TESTS info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck 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 # 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. --- 135,400 ---- LDADD = $(CANVAS_GLADE_LIBS) test_libglade_canvas_SOURCE = test-libglade-canvas.c EXTRA_DIST = test-libglade-canvas.glade + subdir = tests mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! check_PROGRAMS = test-libglade-canvas$(EXEEXT) test_libglade_canvas_SOURCES = test-libglade-canvas.c ! test_libglade_canvas_OBJECTS = test-libglade-canvas.$(OBJEXT) test_libglade_canvas_LDADD = $(LDADD) ! test_libglade_canvas_DEPENDENCIES = ! test_libglade_canvas_LDFLAGS = ! DEFS = @DEFS@ ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LIBS = @LIBS@ ! depcomp = ! 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 $@ ! DIST_SOURCES = test-libglade-canvas.c ! DIST_COMMON = Makefile.am Makefile.in SOURCES = test-libglade-canvas.c ! all: all-am ! .SUFFIXES: ! .SUFFIXES: .c .lo .o .obj ! mostlyclean-libtool: ! -rm -f *.lo + clean-libtool: + -rm -rf .libs _libs ! distclean-libtool: ! -rm -f libtool ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps tests/Makefile ! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && \ ! CONFIG_HEADERS= CONFIG_LINKS= \ ! CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status clean-checkPROGRAMS: -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) + test-libglade-canvas$(EXEEXT): $(test_libglade_canvas_OBJECTS) $(test_libglade_canvas_DEPENDENCIES) + @rm -f test-libglade-canvas$(EXEEXT) + $(LINK) $(test_libglade_canvas_LDFLAGS) $(test_libglade_canvas_OBJECTS) $(test_libglade_canvas_LDADD) $(LIBS) ! mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core ! distclean-compile: ! -rm -f *.tab.c .c.o: ! $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< .c.obj: $(COMPILE) -c `cygpath -w $<` .c.lo: ! $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ! uninstall-info-am: tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(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; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(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; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! check-TESTS: $(TESTS) ! @failed=0; all=0; xfail=0; xpass=0; \ ! srcdir=$(srcdir); export srcdir; \ ! list='$(TESTS)'; \ ! if test -n "$$list"; then \ ! for tst in $$list; do \ ! if test -f ./$$tst; then dir=./; \ ! elif test -f $$tst; then dir=; \ ! else dir="$(srcdir)/"; fi; \ ! if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ ! all=`expr $$all + 1`; \ ! case " $(XFAIL_TESTS) " in \ ! *" $$tst "*) \ ! xpass=`expr $$xpass + 1`; \ ! failed=`expr $$failed + 1`; \ ! echo "XPASS: $$tst"; \ ! ;; \ ! *) \ ! echo "PASS: $$tst"; \ ! ;; \ ! esac; \ ! elif test $$? -ne 77; then \ ! all=`expr $$all + 1`; \ ! case " $(XFAIL_TESTS) " in \ ! *" $$tst "*) \ ! xfail=`expr $$xfail + 1`; \ ! echo "XFAIL: $$tst"; \ ! ;; \ ! *) \ ! failed=`expr $$failed + 1`; \ ! echo "FAIL: $$tst"; \ ! ;; \ ! esac; \ ! fi; \ ! done; \ ! if test "$$failed" -eq 0; then \ ! if test "$$xfail" -eq 0; then \ ! banner="All $$all tests passed"; \ ! else \ ! banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ! fi; \ ! else \ ! if test "$$xpass" -eq 0; then \ ! banner="$$failed of $$all tests failed"; \ ! else \ ! banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ! fi; \ ! fi; \ ! dashes=`echo "$$banner" | sed s/./=/g`; \ ! echo "$$dashes"; \ ! echo "$$banner"; \ ! echo "$$dashes"; \ ! test "$$failed" -eq 0; \ ! fi ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am ! all-am: Makefile ! installdirs: install: install-am ! install-exec: install-exec-am ! 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-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) 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-checkPROGRAMS clean-generic clean-libtool mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: ! ! install-exec-am: ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool ! ! uninstall-am: uninstall-info-am + .PHONY: GTAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + tags uninstall uninstall-am uninstall-info-am # 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.