diff -crN ./libbonobo/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/Makefile.in *** ./libbonobo/Makefile.in Fri Mar 14 16:54:23 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/Makefile.in Sat Aug 9 21:12:55 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 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,72 **** --- 57,74 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ + AWK = @AWK@ BONOBO_ACTIVATION_IDL_DIR = @BONOBO_ACTIVATION_IDL_DIR@ + BONOBO_ACTIVATION_IDL_DIR_PC = @BONOBO_ACTIVATION_IDL_DIR_PC@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 76,81 **** --- 78,84 ---- GMSGFMT = @GMSGFMT@ GTKDOC = @GTKDOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 102,108 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 105,110 ---- *************** *** 120,210 **** VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ SUBDIRS = idl bonobo monikers samples tests po doc libincludedir = $(includedir)/libbonobo-2.0 ! libinclude_HEADERS = libbonobo.h ! EXTRA_DIST = intltool-extract.in intltool-merge.in intltool-update.in changes.txt ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h ! CONFIG_CLEAN_FILES = ! HEADERS = $(libinclude_HEADERS) ! ! DIST_COMMON = README ./stamp-h.in AUTHORS COPYING COPYING.LIB ChangeLog \ ! INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h 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) acconfig.h 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: ! install-libincludeHEADERS: $(libinclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libincludedir) @list='$(libinclude_HEADERS)'; for p in $$list; do \ ! if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ ! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libincludedir)/$$p"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libincludedir)/$$p; \ done uninstall-libincludeHEADERS: @$(NORMAL_UNINSTALL) ! list='$(libinclude_HEADERS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(libincludedir)/$$p; \ done # This directory's subdirectories are mostly independent; you can cd --- 122,236 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ + install_sh = @install_sh@ SUBDIRS = idl bonobo monikers samples tests po doc libincludedir = $(includedir)/libbonobo-2.0 ! libinclude_HEADERS = \ ! libbonobo.h ! EXTRA_DIST = \ ! intltool-extract.in \ ! intltool-merge.in \ ! intltool-update.in \ ! changes.txt + subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h ! CONFIG_CLEAN_FILES = ! depcomp = ! DIST_SOURCES = ! HEADERS = $(libinclude_HEADERS) ! ! ! 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 $(libinclude_HEADERS) ./stamp-h.in AUTHORS COPYING \ ! COPYING.LIB ChangeLog INSTALL Makefile.am Makefile.in NEWS TODO \ ! acconfig.h 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) $(top_srcdir)/acconfig.h ! @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: install-libincludeHEADERS: $(libinclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libincludedir) @list='$(libinclude_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)$(libincludedir)/$$f"; \ ! $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(libincludedir)/$$f; \ done uninstall-libincludeHEADERS: @$(NORMAL_UNINSTALL) ! @list='$(libinclude_HEADERS)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(libincludedir)/$$f"; \ ! rm -f $(DESTDIR)$(libincludedir)/$$f; \ done # This directory's subdirectories are mostly independent; you can cd *************** *** 213,224 **** # (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//`; \ --- 239,245 ---- # (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//`; \ *************** *** 241,251 **** 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"; \ --- 262,277 ---- 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"; \ *************** *** 264,347 **** 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 \ --- 290,355 ---- 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)/bonobo $(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 \ *************** *** 349,435 **** 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-libincludeHEADERS install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-recursive - uninstall-am: uninstall-libincludeHEADERS - uninstall: uninstall-recursive - all-am: Makefile $(HEADERS) config.h - all-redirect: all-recursive-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: installdirs-recursive - installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(libincludedir) - 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 \ ! uninstall-libincludeHEADERS install-libincludeHEADERS \ ! 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. --- 357,498 ---- 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 $(HEADERS) config.h ! installdirs: installdirs-recursive ! installdirs-am: ! $(mkinstalldirs) $(DESTDIR)$(libincludedir) ! 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-libincludeHEADERS ! ! 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-libincludeHEADERS ! ! 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-libincludeHEADERS 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-libincludeHEADERS \ + 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 ./libbonobo/aclocal.m4 /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/aclocal.m4 *** ./libbonobo/aclocal.m4 Fri Mar 14 16:53:53 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/aclocal.m4 Sat Aug 9 21:12:34 2003 *************** *** 1,123 **** ! dnl aclocal.m4 generated automatically by aclocal 1.4-p6 ! 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([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ! 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-${am__api_version}, $missing_dir) - AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) - AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir) - AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) - AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) - AC_REQUIRE([AC_PROG_MAKE_SET])]) - - # Copyright 2002 Free Software Foundation, Inc. ! # 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 ! # the Free Software Foundation; either version 2, or (at your option) ! # any later version. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! ! # AM_AUTOMAKE_VERSION(VERSION) ! # ---------------------------- ! # Automake X.Y traces this macro to ensure aclocal.m4 has been ! # generated from the m4 files accompanying Automake X.Y. ! AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"]) ! # AM_SET_CURRENT_AUTOMAKE_VERSION ! # ------------------------------- ! # Call AM_AUTOMAKE_VERSION so it can be traced. ! # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ! AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.4-p6])]) # # 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 *************** *** 127,133 **** alias in your environment]) fi ! test "[$]2" = conftestfile ) then # Ok. --- 204,210 ---- alias in your environment]) fi ! test "$[2]" = conftest.file ) then # Ok. *************** *** 136,159 **** 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 *************** *** 168,192 **** (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]) dnl AC_PROG_INTLTOOL([MINIMUM-VERSION]) --- 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 ] ) dnl AC_PROG_INTLTOOL([MINIMUM-VERSION]) *************** *** 316,331 **** ]) ! # isc-posix.m4 serial 2 (gettext-0.11.2) ! dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. ! dnl This file is free software, distributed under the terms of the GNU ! dnl General Public License. As a special exception to the GNU General ! dnl Public License, this file may be distributed as part of a program ! dnl that contains a configuration script generated by Autoconf, under ! dnl the same distribution terms as the rest of that program. ! ! # This file is not needed with autoconf-2.53 and newer. Remove it in 2005. ! # This test replaces the one in autoconf. # Currently this macro should have the same name as the autoconf macro # because gettext's gettext.m4 (distributed in the automake package) --- 707,713 ---- ]) ! #serial 1 # This test replaces the one in autoconf. # Currently this macro should have the same name as the autoconf macro # because gettext's gettext.m4 (distributed in the automake package) *************** *** 372,379 **** AC_REQUIRE([AC_PROG_LD])dnl AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl AC_REQUIRE([AC_PROG_NM])dnl - AC_REQUIRE([LT_AC_PROG_SED])dnl - AC_REQUIRE([AC_PROG_LN_S])dnl AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl AC_REQUIRE([AC_OBJEXT])dnl --- 754,759 ---- *************** *** 541,552 **** 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* | nonstopux*) symcode='[[BCDEGRST]]' ;; - osf*) - symcode='[[BCDEGQRST]]' - ;; solaris* | sysv5*) symcode='[[BDT]]' ;; --- 921,929 ---- 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]]' ;; *************** *** 643,649 **** save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" ! if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS="$save_LIBS" --- 1020,1026 ---- save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" ! if AC_TRY_EVAL(ac_link) && test -s conftest; then pipe_works=yes fi LIBS="$save_LIBS" *************** *** 1187,1193 **** # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; ! beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) --- 1564,1570 ---- # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; ! beos* | irix5* | irix6* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) *************** *** 1230,1236 **** lt_cv_prog_cc_pic='+Z' ;; ! irix5* | irix6* | nonstopux*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. --- 1607,1613 ---- lt_cv_prog_cc_pic='+Z' ;; ! irix5* | irix6*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. *************** *** 1274,1280 **** sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' ! lt_cv_prog_cc_wl='-Wl,' ;; uts4*) --- 1651,1661 ---- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) 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 ;; uts4*) *************** *** 1496,1501 **** --- 1877,1883 ---- 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 *************** *** 1639,1645 **** # 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`sed 1q $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; --- 2021,2027 ---- # 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; *************** *** 1648,1654 **** set dummy \$symbol; case \[$]# in 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - 4) echo " \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;; *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; esac; _lt_hint=`expr 1 + \$_lt_hint`; --- 2030,2035 ---- *************** *** 1700,1729 **** hardcode_shlibpath_var=no ;; - linux*) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - if test $supports_anon_versioning = yes; then - archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - else - $archive_expsym_cmds="$archive_cmds" - fi - else - ld_shlibs=no - fi - ;; - *) if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' --- 2081,2086 ---- *************** *** 1777,1801 **** aix_use_runtimelinking=no exp_sym_flag='-Bexport' no_entry_flag="" else ! aix_use_runtimelinking=no ! ! # 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 runtime linking. ! case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ! for ld_flag in $LDFLAGS; do ! case $ld_flag in ! *-brtl*) ! aix_use_runtimelinking=yes ! break ! ;; ! esac ! done ! esac ! exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi # When large executables or shared objects are built, AIX ld can --- 2134,2146 ---- 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 *************** *** 1830,1844 **** shared_flag='-shared' else # not using gcc ! if test "$host_cpu" = ia64; then ! shared_flag='${wl}-G' ! else ! if test "$aix_use_runtimelinking" = yes; then ! shared_flag='${wl}-G' ! else ! shared_flag='${wl}-bM:SRE' ! fi ! fi fi # It seems that -bexpall can do strange things, so it is better to --- 2175,2181 ---- 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 *************** *** 1848,1855 **** # 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}-blibpath:$libdir:/usr/lib:/lib' ! archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' --- 2185,2192 ---- # 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' *************** *** 1862,1868 **** 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 ;; --- 2199,2205 ---- 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 ;; *************** *** 1904,1912 **** 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. Also zsh mangles ! # `"' quotes if we put them in here... so don't! ! archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes --- 2241,2248 ---- 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 *************** *** 1958,1971 **** export_dynamic_flag_spec='${wl}-E' ;; ! irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='-rpath $libdir' fi hardcode_libdir_separator=: link_all_deplibs=yes ;; --- 2294,2306 ---- export_dynamic_flag_spec='${wl}-E' ;; ! irix5* | irix6*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' fi + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: link_all_deplibs=yes ;; *************** *** 1993,1999 **** 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 $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else --- 2328,2334 ---- 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 *************** *** 2003,2009 **** hardcode_libdir_flag_spec='-R$libdir' ;; *) ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac --- 2338,2344 ---- 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 *************** *** 2115,2137 **** ;; sysv4) ! case $host_vendor in ! sni) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=yes # is this really true??? ! ;; ! siemens) ! ## LD is ld it makes a PLAMLIB ! ## CC just makes a GrossModule. ! archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' ! reload_cmds='$CC -r -o $output$reload_objs' ! hardcode_direct=no ! ;; ! motorola) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=no #Motorola manual says yes, but my tests say they lie ! ;; ! esac runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; --- 2450,2462 ---- ;; 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' ! hardcode_direct=no #Motorola manual says yes, but my tests say they lie ! fi runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; *************** *** 2272,2280 **** aix4* | aix5*) version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes if test "$host_cpu" = ia64; then # AIX 5 supports IA64 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' --- 2597,2602 ---- *************** *** 2296,2319 **** 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 fi - hardcode_into_libs=yes ;; amigaos*) --- 2618,2629 ---- 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*) *************** *** 2361,2367 **** ;; 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" -e "s,=/,/,g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' --- 2671,2677 ---- ;; 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' *************** *** 2444,2460 **** postinstall_cmds='chmod 555 $lib' ;; ! irix5* | irix6* | nonstopux*) ! case $host_os in ! nonstopux*) version_type=nonstopux ;; ! *) version_type=irix ;; ! esac need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in ! irix5* | nonstopux*) libsuff= shlibsuff= ;; *) --- 2754,2767 ---- postinstall_cmds='chmod 555 $lib' ;; ! irix5* | irix6*) ! version_type=irix need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in ! irix5*) libsuff= shlibsuff= ;; *) *************** *** 2558,2569 **** osf3* | osf4* | osf5*) version_type=osf need_version=no ! soname_spec='${libname}${release}.so$major' ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - hardcode_into_libs=yes ;; sco3.2v5*) --- 2865,2875 ---- osf3* | osf4* | osf5*) version_type=osf need_version=no ! soname_spec='${libname}${release}.so' ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; sco3.2v5*) *************** *** 2606,2617 **** case $host_vendor in sni) shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no ;; motorola) need_lib_prefix=no --- 2912,2917 ---- *************** *** 2673,2679 **** ;; aix4*) ! if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi ;; --- 2973,2979 ---- ;; aix4*) ! if test "$host_cpu" != ia64 ; then test "$enable_shared" = yes && enable_static=no fi ;; *************** *** 2766,2775 **** # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. ! for var in echo old_CC old_CFLAGS SED \ 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 \ 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 \ --- 3066,3076 ---- # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. ! for var in echo old_CC old_CFLAGS \ 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 \ *************** *** 2828,2838 **** # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - # A sed that does not truncate output. - SED=$lt_SED - # Sed that helps us avoid accidentally triggering echo(1) options like -n. ! Xsed="${SED} -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. --- 3129,3136 ---- # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # Sed that helps us avoid accidentally triggering echo(1) options like -n. ! Xsed="sed -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. *************** *** 2954,2959 **** --- 3252,3260 ---- # 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 *************** *** 3593,3599 **** # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies # -- PORTME fill in with the dynamic library characteristics AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], ! [AC_CACHE_CHECK([how to recognise dependent libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= --- 3894,3900 ---- # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies # -- PORTME fill in with the dynamic library characteristics AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], ! [AC_CACHE_CHECK([how to recognise dependant libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= *************** *** 3668,3676 **** lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; ! irix5* | irix6* | nonstopux*) case $host_os in ! irix5* | nonstopux*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; --- 3969,3977 ---- lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; ! irix5* | irix6*) case $host_os in ! irix5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; *************** *** 3692,3698 **** # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM --- 3993,3999 ---- # 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 *************** *** 3763,3771 **** 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 ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; esac ;; esac --- 4064,4069 ---- *************** *** 3794,3800 **** # 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" --- 4092,4114 ---- # 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" *************** *** 3831,3842 **** ]) # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for ! # the libltdl convenience library and LTDLINCL to the include flags for # the libltdl header and adds --enable-ltdl-convenience to the ! # configure arguments. Note that LIBLTDL and LTDLINCL are not # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not # provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed ! # with '${top_builddir}/' and LTDLINCL will be prefixed with # '${top_srcdir}/' (note the single quotes!). If your package is not # flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. --- 4145,4156 ---- ]) # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for ! # the libltdl convenience library and INCLTDL to the include flags for # the libltdl header and adds --enable-ltdl-convenience to the ! # configure arguments. Note that LIBLTDL and INCLTDL are not # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not # provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed ! # with '${top_builddir}/' and INCLTDL will be prefixed with # '${top_srcdir}/' (note the single quotes!). If your package is not # flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. *************** *** 3848,3865 **** ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la ! LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ! # For backwards non-gettext consistent compatibility... ! INCLTDL="$LTDLINCL" ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for ! # the libltdl installable library and LTDLINCL to the include flags for # the libltdl header and adds --enable-ltdl-install to the configure ! # arguments. Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is # AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed # libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will ! # be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed # with '${top_srcdir}/' (note the single quotes!). If your package is # not flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. --- 4162,4177 ---- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la ! INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for ! # the libltdl installable library and INCLTDL to the include flags for # the libltdl header and adds --enable-ltdl-install to the configure ! # arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is # AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed # libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will ! # be prefixed with '${top_builddir}/' and INCLTDL will be prefixed # with '${top_srcdir}/' (note the single quotes!). If your package is # not flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. *************** *** 3877,3890 **** if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la ! LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" ! LTDLINCL= fi - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" ]) # old names --- 4189,4200 ---- if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la ! INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" ! INCLTDL= fi ]) # old names *************** *** 3899,3993 **** # This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL]) - # NOTE: This macro has been submitted for inclusion into # - # GNU Autoconf as AC_PROG_SED. When it is available in # - # a released version of Autoconf we should remove this # - # macro and use it instead. # - # LT_AC_PROG_SED - # -------------- - # Check for a fully-functional sed program, that truncates - # as few characters as possible. Prefer GNU sed if found. - AC_DEFUN([LT_AC_PROG_SED], - [AC_MSG_CHECKING([for a sed that does not truncate output]) - AC_CACHE_VAL(lt_cv_path_SED, - [# Loop through the user's path and test for sed and gsed. - # Then use that list of sed's as ones to test for truncation. - as_executable_p="test -f" - 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_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext" - fi - done - done - done - - # Create a temporary directory, and hook for its removal unless debugging. - $debug || - { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 - } - - # Create a (secure) tmp directory for tmp files. - : ${TMPDIR=/tmp} - { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" - } || - { - tmp=$TMPDIR/sed$$-$RANDOM - (umask 077 && mkdir $tmp) - } || - { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 - { (exit 1); exit 1; } - } - _max=0 - _count=0 - # Add /usr/xpg4/bin/sed as it is typically found on Solaris - # along with /bin/sed that truncates output. - for _sed in $_sed_list /usr/xpg4/bin/sed; do - test ! -f ${_sed} && break - cat /dev/null > "$tmp/sed.in" - _count=0 - echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in" - # Check for GNU sed and select it if it is found. - if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then - lt_cv_path_SED=${_sed} - break - fi - while true; do - cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" - mv "$tmp/sed.tmp" "$tmp/sed.in" - cp "$tmp/sed.in" "$tmp/sed.nl" - echo >>"$tmp/sed.nl" - ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break - cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break - # 40000 chars as input seems more than enough - test $_count -gt 10 && break - _count=`expr $_count + 1` - if test $_count -gt $_max; then - _max=$_count - lt_cv_path_SED=$_sed - fi - done - done - rm -rf "$tmp" - ]) - if test "X$SED" != "X"; then - lt_cv_path_SED=$SED - else - SED=$lt_cv_path_SED - fi - AC_MSG_RESULT([$SED]) - ]) - # Macro to add for using GNU gettext. # Ulrich Drepper , 1995, 1996 # --- 4209,4214 ---- *************** *** 4335,4341 **** fi AC_ARG_ENABLE(compile-warnings, ! [ --enable-compile-warnings=[no/minimum/yes/maximum/error] Turn on compiler warnings.],, [enable_compile_warnings="$default_compile_warnings"]) warnCFLAGS= if test "x$GCC" != xyes; then --- 4556,4562 ---- fi AC_ARG_ENABLE(compile-warnings, ! [ --enable-compile-warnings=[no/minimum/yes/maximum/error] Turn on compiler warnings.], [enable_compile_warnings="$enableval"],[enable_compile_warnings="$default_compile_warnings"]) warnCFLAGS= if test "x$GCC" != xyes; then diff -crN ./libbonobo/bonobo/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/bonobo/Makefile.in *** ./libbonobo/bonobo/Makefile.in Fri Mar 14 16:54:34 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/bonobo/Makefile.in Sat Aug 9 21:12:56 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 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,72 **** --- 57,74 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ + AWK = @AWK@ BONOBO_ACTIVATION_IDL_DIR = @BONOBO_ACTIVATION_IDL_DIR@ + BONOBO_ACTIVATION_IDL_DIR_PC = @BONOBO_ACTIVATION_IDL_DIR_PC@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 76,81 **** --- 78,84 ---- GMSGFMT = @GMSGFMT@ GTKDOC = @GTKDOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 101,107 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 104,109 ---- *************** *** 119,160 **** VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ ! INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(WARN_CFLAGS) $(LIBBONOBO_CFLAGS) -DBONOBO_LIBDIR=\""$(libdir)"\" -DBONOBO_DATADIR=\""$(datadir)"\" -DBONOBO_PIXMAPDIR=\""$(datadir)/pixmaps"\" -DBONOBO_BINDIR=\""$(bindir)"\" -DBONOBO_LOCALSTATEDIR=\""$(localstatedir)"\" -DBONOBO_LOCALEDIR=\""$(gnomelocaledir)"\" -DG_DISABLE_DEPRECATED -DG_LOG_DOMAIN=\"Bonobo\" -DVERSION=\"$(VERSION)\" ! LDFLAGS = @LT_VERSION_INFO@ ! ! CORBA_SOURCE = Bonobo.h Bonobo-common.c Bonobo-stubs.c Bonobo-skels.c ! ! ! idls = $(top_srcdir)/idl/Bonobo.idl $(top_srcdir)/idl/Bonobo_Canvas.idl $(top_srcdir)/idl/Bonobo_Context.idl $(top_srcdir)/idl/Bonobo_Control.idl $(top_srcdir)/idl/Bonobo_Embeddable.idl $(top_srcdir)/idl/Bonobo_Gdk.idl $(top_srcdir)/idl/Bonobo_ItemContainer.idl $(top_srcdir)/idl/Bonobo_Listener.idl $(top_srcdir)/idl/Bonobo_Moniker.idl $(top_srcdir)/idl/Bonobo_Persist.idl $(top_srcdir)/idl/Bonobo_Print.idl $(top_srcdir)/idl/Bonobo_Property.idl $(top_srcdir)/idl/Bonobo_Storage.idl $(top_srcdir)/idl/Bonobo_UI.idl $(top_srcdir)/idl/Bonobo_Zoomable.idl $(top_srcdir)/idl/Bonobo_Exception.idl $(top_srcdir)/idl/Bonobo_Clipboard.idl idl_flags = -I$(top_srcdir)/idl -I $(BONOBO_ACTIVATION_IDL_DIR) -D__Bonobo_COMPILATION lib_LTLIBRARIES = libbonobo-2.la ! libbonobo_2_la_LIBADD = $(LIBBONOBO_LIBS) libbonoboincludedir = $(includedir)/libbonobo-2.0/bonobo ! libbonoboinclude_HEADERS = Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h bonobo-persist-file.h bonobo-persist-stream.h bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h bonobo-property-bag-client.h bonobo-shlib-factory.h bonobo-storage.h bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h ! ! ! noinst_HEADERS = bonobo-moniker-context.h bonobo-running-context.h bonobo-shutdown.h bonobo-marshal.h ! libbonobo_src = bonobo-moniker-context.c bonobo-arg.c bonobo-context.c bonobo-event-source.c bonobo-exception.c bonobo-generic-factory.c bonobo-item-container.c bonobo-item-handler.c bonobo-listener.c bonobo-main.c bonobo-moniker.c bonobo-moniker-extender.c bonobo-moniker-simple.c bonobo-moniker-util.c bonobo-object.c bonobo-persist-file.c bonobo-persist-stream.c bonobo-persist.c bonobo-persist-client.c bonobo-property-bag.c bonobo-property-bag-client.c bonobo-shlib-factory.c bonobo-storage.c bonobo-stream-client.c bonobo-stream-memory.c bonobo-storage-memory.c bonobo-running-context.c bonobo-types.c bonobo-debug.c bonobo-debug.h ! libbonobo_2_la_SOURCES = $(libbonoboinclude_HEADERS) $(libbonobo_src) $(CORBA_SOURCE) ! marshal_sources = bonobo-marshal.c bonobo-marshal.h EXTRA_DIST = libbonobo-2.0.pc.in bonobo-marshal.list --- 121,272 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ + install_sh = @install_sh@ ! LDFLAGS = @LDFLAGS@ \ ! @LT_VERSION_INFO@ ! INCLUDES = \ ! -I$(top_srcdir) \ ! -I$(top_builddir) \ ! $(WARN_CFLAGS) \ ! $(LIBBONOBO_CFLAGS) \ ! -DBONOBO_LIBDIR=\""$(libdir)"\" \ ! -DBONOBO_DATADIR=\""$(datadir)"\" \ ! -DBONOBO_PIXMAPDIR=\""$(datadir)/pixmaps"\" \ ! -DBONOBO_BINDIR=\""$(bindir)"\" \ ! -DBONOBO_LOCALSTATEDIR=\""$(localstatedir)"\" \ ! -DBONOBO_LOCALEDIR=\""$(gnomelocaledir)"\" \ ! -DG_DISABLE_DEPRECATED \ ! -DG_LOG_DOMAIN=\"Bonobo\" \ ! -DVERSION=\"$(VERSION)\" ! ! ! CORBA_SOURCE = \ ! Bonobo.h \ ! Bonobo-common.c \ ! Bonobo-stubs.c \ ! Bonobo-skels.c ! ! ! idls = \ ! $(top_srcdir)/idl/Bonobo.idl \ ! $(top_srcdir)/idl/Bonobo_Canvas.idl \ ! $(top_srcdir)/idl/Bonobo_Context.idl \ ! $(top_srcdir)/idl/Bonobo_Control.idl \ ! $(top_srcdir)/idl/Bonobo_Embeddable.idl \ ! $(top_srcdir)/idl/Bonobo_Gdk.idl \ ! $(top_srcdir)/idl/Bonobo_ItemContainer.idl \ ! $(top_srcdir)/idl/Bonobo_Listener.idl \ ! $(top_srcdir)/idl/Bonobo_Moniker.idl \ ! $(top_srcdir)/idl/Bonobo_Persist.idl \ ! $(top_srcdir)/idl/Bonobo_Print.idl \ ! $(top_srcdir)/idl/Bonobo_Property.idl \ ! $(top_srcdir)/idl/Bonobo_Storage.idl \ ! $(top_srcdir)/idl/Bonobo_UI.idl \ ! $(top_srcdir)/idl/Bonobo_Zoomable.idl \ ! $(top_srcdir)/idl/Bonobo_Exception.idl \ ! $(top_srcdir)/idl/Bonobo_Clipboard.idl idl_flags = -I$(top_srcdir)/idl -I $(BONOBO_ACTIVATION_IDL_DIR) -D__Bonobo_COMPILATION lib_LTLIBRARIES = libbonobo-2.la ! libbonobo_2_la_LIBADD = \ ! $(LIBBONOBO_LIBS) libbonoboincludedir = $(includedir)/libbonobo-2.0/bonobo ! libbonoboinclude_HEADERS = \ ! Bonobo.h \ ! bonobo-arg.h \ ! bonobo-context.h \ ! bonobo-event-source.h \ ! bonobo-exception.h \ ! bonobo-generic-factory.h \ ! bonobo-item-container.h \ ! bonobo-item-handler.h \ ! bonobo-listener.h \ ! bonobo-main.h \ ! bonobo-macros.h \ ! bonobo-moniker-extender.h \ ! bonobo-moniker-simple.h \ ! bonobo-moniker-util.h \ ! bonobo-moniker.h \ ! bonobo-object.h \ ! bonobo-persist-file.h \ ! bonobo-persist-stream.h \ ! bonobo-persist.h \ ! bonobo-persist-client.h \ ! bonobo-property-bag.h \ ! bonobo-property-bag-client.h \ ! bonobo-shlib-factory.h \ ! bonobo-storage.h \ ! bonobo-stream.h \ ! bonobo-stream-client.h \ ! bonobo-stream-memory.h \ ! bonobo-storage-memory.h \ ! bonobo-xobject.h \ ! bonobo-i18n.h \ ! bonobo-types.h ! noinst_HEADERS = \ ! bonobo-moniker-context.h \ ! bonobo-running-context.h \ ! bonobo-shutdown.h \ ! bonobo-marshal.h ! libbonobo_src = \ ! bonobo-moniker-context.c \ ! bonobo-arg.c \ ! bonobo-context.c \ ! bonobo-event-source.c \ ! bonobo-exception.c \ ! bonobo-generic-factory.c \ ! bonobo-item-container.c \ ! bonobo-item-handler.c \ ! bonobo-listener.c \ ! bonobo-main.c \ ! bonobo-moniker.c \ ! bonobo-moniker-extender.c \ ! bonobo-moniker-simple.c \ ! bonobo-moniker-util.c \ ! bonobo-object.c \ ! bonobo-persist-file.c \ ! bonobo-persist-stream.c \ ! bonobo-persist.c \ ! bonobo-persist-client.c \ ! bonobo-property-bag.c \ ! bonobo-property-bag-client.c \ ! bonobo-shlib-factory.c \ ! bonobo-storage.c \ ! bonobo-stream-client.c \ ! bonobo-stream-memory.c \ ! bonobo-storage-memory.c \ ! bonobo-running-context.c \ ! bonobo-types.c \ ! bonobo-debug.c \ ! bonobo-debug.h ! ! ! libbonobo_2_la_SOURCES = \ ! $(libbonoboinclude_HEADERS) \ ! $(libbonobo_src) \ ! $(CORBA_SOURCE) ! marshal_sources = \ ! bonobo-marshal.c \ ! bonobo-marshal.h EXTRA_DIST = libbonobo-2.0.pc.in bonobo-marshal.list *************** *** 164,566 **** pkgconfig_DATA = libbonobo-2.0.pc DONT_DIST_SOURCE = $(CORBA_SOURCE) $(marshal_sources) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = libbonobo-2.0.pc ! LTLIBRARIES = $(lib_LTLIBRARIES) ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. LIBS = @LIBS@ ! libbonobo_2_la_LDFLAGS = ! libbonobo_2_la_DEPENDENCIES = ! libbonobo_2_la_OBJECTS = bonobo-moniker-context.lo bonobo-arg.lo \ ! bonobo-context.lo bonobo-event-source.lo bonobo-exception.lo \ ! bonobo-generic-factory.lo bonobo-item-container.lo \ ! bonobo-item-handler.lo bonobo-listener.lo bonobo-main.lo \ ! bonobo-moniker.lo bonobo-moniker-extender.lo bonobo-moniker-simple.lo \ ! bonobo-moniker-util.lo bonobo-object.lo bonobo-persist-file.lo \ ! bonobo-persist-stream.lo bonobo-persist.lo bonobo-persist-client.lo \ ! bonobo-property-bag.lo bonobo-property-bag-client.lo \ ! bonobo-shlib-factory.lo bonobo-storage.lo bonobo-stream-client.lo \ ! bonobo-stream-memory.lo bonobo-storage-memory.lo \ ! bonobo-running-context.lo bonobo-types.lo bonobo-debug.lo \ ! Bonobo-common.lo Bonobo-stubs.lo Bonobo-skels.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 = $(libbonoboinclude_HEADERS) $(noinst_HEADERS) ! DIST_COMMON = Makefile.am Makefile.in libbonobo-2.0.pc.in ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! ! TAR = gtar ! GZIP_ENV = --best SOURCES = $(libbonobo_2_la_SOURCES) - OBJECTS = $(libbonobo_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 bonobo/Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - libbonobo-2.0.pc: $(top_builddir)/config.status libbonobo-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: ! libbonobo-2.la: $(libbonobo_2_la_OBJECTS) $(libbonobo_2_la_DEPENDENCIES) ! $(LINK) -rpath $(libdir) $(libbonobo_2_la_LDFLAGS) $(libbonobo_2_la_OBJECTS) $(libbonobo_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-libbonoboincludeHEADERS: $(libbonoboinclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libbonoboincludedir) @list='$(libbonoboinclude_HEADERS)'; for p in $$list; do \ ! if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ ! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libbonoboincludedir)/$$p"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libbonoboincludedir)/$$p; \ done uninstall-libbonoboincludeHEADERS: @$(NORMAL_UNINSTALL) ! list='$(libbonoboinclude_HEADERS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(libbonoboincludedir)/$$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 = bonobo 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 ! bonobo-arg.lo bonobo-arg.o : bonobo-arg.c ../config.h bonobo-main.h \ ! Bonobo.h bonobo-exception.h bonobo-arg.h ! Bonobo-common.lo Bonobo-common.o : Bonobo-common.c Bonobo.h ! bonobo-context.lo bonobo-context.o : bonobo-context.c ../config.h \ ! bonobo-object.h Bonobo.h bonobo-macros.h bonobo-context.h \ ! bonobo-shutdown.h bonobo-running-context.h \ ! bonobo-moniker-context.h ! bonobo-debug.lo bonobo-debug.o : bonobo-debug.c bonobo-debug.h ! bonobo-event-source.lo bonobo-event-source.o : bonobo-event-source.c \ ! ../config.h bonobo-listener.h bonobo-arg.h Bonobo.h \ ! bonobo-object.h bonobo-macros.h bonobo-exception.h \ ! bonobo-event-source.h bonobo-running-context.h ! bonobo-exception.lo bonobo-exception.o : bonobo-exception.c ../config.h \ ! bonobo-i18n.h bonobo-object.h Bonobo.h bonobo-macros.h \ ! bonobo-shutdown.h bonobo-exception.h ! bonobo-generic-factory.lo bonobo-generic-factory.o : \ ! bonobo-generic-factory.c ../config.h Bonobo.h bonobo-main.h \ ! bonobo-types.h bonobo-object.h bonobo-macros.h bonobo-arg.h \ ! bonobo-marshal.h bonobo-exception.h bonobo-generic-factory.h \ ! bonobo-i18n.h bonobo-context.h bonobo-running-context.h ! bonobo-item-container.lo bonobo-item-container.o : \ ! bonobo-item-container.c ../config.h bonobo-exception.h Bonobo.h \ ! bonobo-main.h bonobo-object.h bonobo-macros.h \ ! bonobo-item-container.h bonobo-moniker.h bonobo-marshal.h \ ! bonobo-types.h bonobo-arg.h ! bonobo-item-handler.lo bonobo-item-handler.o : bonobo-item-handler.c \ ! ../config.h bonobo-main.h Bonobo.h bonobo-object.h \ ! bonobo-macros.h bonobo-exception.h bonobo-types.h bonobo-arg.h \ ! bonobo-marshal.h bonobo-item-handler.h ! bonobo-listener.lo bonobo-listener.o : bonobo-listener.c ../config.h \ ! bonobo-exception.h Bonobo.h bonobo-listener.h bonobo-arg.h \ ! bonobo-object.h bonobo-macros.h bonobo-marshal.h bonobo-types.h ! bonobo-main.lo bonobo-main.o : bonobo-main.c ../config.h \ ! bonobo-exception.h Bonobo.h bonobo-main.h bonobo-object.h \ ! bonobo-macros.h bonobo-context.h bonobo-shutdown.h ! bonobo-moniker-context.lo bonobo-moniker-context.o : \ ! bonobo-moniker-context.c ../config.h bonobo-exception.h \ ! Bonobo.h bonobo-moniker-util.h bonobo-moniker-extender.h \ ! bonobo-moniker.h bonobo-object.h bonobo-macros.h \ ! bonobo-moniker-context.h ! bonobo-moniker-extender.lo bonobo-moniker-extender.o : \ ! bonobo-moniker-extender.c ../config.h bonobo-exception.h \ ! Bonobo.h bonobo-moniker.h bonobo-object.h bonobo-macros.h \ ! bonobo-moniker-util.h bonobo-moniker-extender.h ! bonobo-moniker-simple.lo bonobo-moniker-simple.o : \ ! bonobo-moniker-simple.c ../config.h bonobo-moniker.h \ ! bonobo-object.h Bonobo.h bonobo-macros.h \ ! bonobo-moniker-simple.h bonobo-types.h bonobo-arg.h \ ! bonobo-marshal.h ! bonobo-moniker-util.lo bonobo-moniker-util.o : bonobo-moniker-util.c \ ! ../config.h bonobo-i18n.h bonobo-object.h Bonobo.h \ ! bonobo-macros.h bonobo-exception.h bonobo-moniker-util.h ! bonobo-moniker.lo bonobo-moniker.o : bonobo-moniker.c ../config.h \ ! bonobo-i18n.h bonobo-exception.h Bonobo.h bonobo-moniker.h \ ! bonobo-object.h bonobo-macros.h bonobo-moniker-util.h \ ! bonobo-moniker-extender.h ! bonobo-object.lo bonobo-object.o : bonobo-object.c ../config.h Bonobo.h \ ! bonobo-exception.h bonobo-main.h bonobo-object.h \ ! bonobo-macros.h bonobo-shlib-factory.h bonobo-generic-factory.h \ ! bonobo-i18n.h bonobo-running-context.h bonobo-marshal.h \ ! bonobo-types.h bonobo-arg.h bonobo-shutdown.h bonobo-debug.h ! bonobo-persist-client.lo bonobo-persist-client.o : \ ! bonobo-persist-client.c bonobo-persist-client.h bonobo-object.h \ ! Bonobo.h bonobo-macros.h bonobo-exception.h \ ! bonobo-stream-client.h bonobo-moniker-util.h ! bonobo-persist-file.lo bonobo-persist-file.o : bonobo-persist-file.c \ ! ../config.h bonobo-exception.h Bonobo.h bonobo-persist-file.h \ ! bonobo-persist.h bonobo-object.h bonobo-macros.h ! bonobo-persist-stream.lo bonobo-persist-stream.o : \ ! bonobo-persist-stream.c ../config.h bonobo-exception.h Bonobo.h \ ! bonobo-persist-stream.h bonobo-persist.h bonobo-object.h \ ! bonobo-macros.h ! bonobo-persist.lo bonobo-persist.o : bonobo-persist.c ../config.h \ ! bonobo-persist.h bonobo-object.h Bonobo.h bonobo-macros.h ! bonobo-property-bag-client.lo bonobo-property-bag-client.o : \ ! bonobo-property-bag-client.c ../config.h bonobo-arg.h Bonobo.h \ ! bonobo-shutdown.h bonobo-exception.h bonobo-moniker-util.h \ ! bonobo-property-bag-client.h bonobo-property-bag.h \ ! bonobo-object.h bonobo-macros.h bonobo-event-source.h \ ! bonobo-listener.h ! bonobo-property-bag.lo bonobo-property-bag.o : bonobo-property-bag.c \ ! ../config.h Bonobo.h bonobo-exception.h bonobo-property-bag.h \ ! bonobo-object.h bonobo-macros.h bonobo-arg.h \ ! bonobo-event-source.h bonobo-listener.h bonobo-marshal.h \ ! bonobo-types.h ! bonobo-running-context.lo bonobo-running-context.o : \ ! bonobo-running-context.c ../config.h bonobo-context.h \ ! bonobo-object.h Bonobo.h bonobo-macros.h bonobo-exception.h \ ! bonobo-event-source.h bonobo-listener.h bonobo-arg.h \ ! bonobo-moniker-util.h bonobo-running-context.h \ ! bonobo-shutdown.h bonobo-main.h bonobo-debug.h ! bonobo-shlib-factory.lo bonobo-shlib-factory.o : bonobo-shlib-factory.c \ ! ../config.h Bonobo.h bonobo-main.h bonobo-exception.h \ ! bonobo-shlib-factory.h bonobo-object.h bonobo-macros.h \ ! bonobo-generic-factory.h bonobo-i18n.h bonobo-running-context.h ! Bonobo-skels.lo Bonobo-skels.o : Bonobo-skels.c Bonobo.h ! bonobo-storage-memory.lo bonobo-storage-memory.o : \ ! bonobo-storage-memory.c ../config.h bonobo-storage-memory.h \ ! bonobo-storage.h bonobo-object.h Bonobo.h bonobo-macros.h \ ! bonobo-stream-memory.h bonobo-exception.h ! bonobo-storage.lo bonobo-storage.o : bonobo-storage.c ../config.h \ ! bonobo-storage.h bonobo-object.h Bonobo.h bonobo-macros.h \ ! bonobo-exception.h ! bonobo-stream-client.lo bonobo-stream-client.o : bonobo-stream-client.c \ ! ../config.h Bonobo.h bonobo-object.h bonobo-macros.h \ ! bonobo-exception.h bonobo-stream-client.h ! bonobo-stream-memory.lo bonobo-stream-memory.o : bonobo-stream-memory.c \ ! ../config.h bonobo-stream-memory.h bonobo-storage.h \ ! bonobo-object.h Bonobo.h bonobo-macros.h bonobo-exception.h ! Bonobo-stubs.lo Bonobo-stubs.o : Bonobo-stubs.c Bonobo.h ! bonobo-types.lo bonobo-types.o : bonobo-types.c ../config.h \ ! bonobo-types.h bonobo-object.h Bonobo.h bonobo-macros.h \ ! bonobo-arg.h bonobo-marshal.h bonobo-marshal.c ! ! 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-libbonoboincludeHEADERS ! 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-libbonoboincludeHEADERS 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)$(libbonoboincludedir) mostlyclean-generic: clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) 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-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-libbonoboincludeHEADERS install-libbonoboincludeHEADERS 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 $(CORBA_SOURCE): $(idls) $(ORBIT_IDL) --- 276,560 ---- pkgconfig_DATA = libbonobo-2.0.pc DONT_DIST_SOURCE = $(CORBA_SOURCE) $(marshal_sources) + subdir = bonobo mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = libbonobo-2.0.pc ! LTLIBRARIES = $(lib_LTLIBRARIES) ! ! libbonobo_2_la_LDFLAGS = ! libbonobo_2_la_DEPENDENCIES = ! am_libbonobo_2_la_OBJECTS = bonobo-moniker-context.lo bonobo-arg.lo \ ! bonobo-context.lo bonobo-event-source.lo bonobo-exception.lo \ ! bonobo-generic-factory.lo bonobo-item-container.lo \ ! bonobo-item-handler.lo bonobo-listener.lo bonobo-main.lo \ ! bonobo-moniker.lo bonobo-moniker-extender.lo \ ! bonobo-moniker-simple.lo bonobo-moniker-util.lo \ ! bonobo-object.lo bonobo-persist-file.lo \ ! bonobo-persist-stream.lo bonobo-persist.lo \ ! bonobo-persist-client.lo bonobo-property-bag.lo \ ! bonobo-property-bag-client.lo bonobo-shlib-factory.lo \ ! bonobo-storage.lo bonobo-stream-client.lo \ ! bonobo-stream-memory.lo bonobo-storage-memory.lo \ ! bonobo-running-context.lo bonobo-types.lo bonobo-debug.lo \ ! Bonobo-common.lo Bonobo-stubs.lo Bonobo-skels.lo ! libbonobo_2_la_OBJECTS = $(am_libbonobo_2_la_OBJECTS) ! 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 = $(libbonobo_2_la_SOURCES) ! DATA = $(pkgconfig_DATA) ! HEADERS = $(libbonoboinclude_HEADERS) $(noinst_HEADERS) ! DIST_COMMON = $(libbonoboinclude_HEADERS) $(noinst_HEADERS) Makefile.am \ ! Makefile.in libbonobo-2.0.pc.in SOURCES = $(libbonobo_2_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 bonobo/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 + libbonobo-2.0.pc: $(top_builddir)/config.status libbonobo-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) ! libbonobo-2.la: $(libbonobo_2_la_OBJECTS) $(libbonobo_2_la_DEPENDENCIES) ! $(LINK) -rpath $(libdir) $(libbonobo_2_la_LDFLAGS) $(libbonobo_2_la_OBJECTS) $(libbonobo_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-libbonoboincludeHEADERS: $(libbonoboinclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libbonoboincludedir) @list='$(libbonoboinclude_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)$(libbonoboincludedir)/$$f"; \ ! $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(libbonoboincludedir)/$$f; \ done uninstall-libbonoboincludeHEADERS: @$(NORMAL_UNINSTALL) ! @list='$(libbonoboinclude_HEADERS)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(libbonoboincludedir)/$$f"; \ ! rm -f $(DESTDIR)$(libbonoboincludedir)/$$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)$(libbonoboincludedir) 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: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) 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-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-libbonoboincludeHEADERS 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-libbonoboincludeHEADERS 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-exec install-exec-am install-info \ ! install-info-am install-libLTLIBRARIES \ ! install-libbonoboincludeHEADERS 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-libbonoboincludeHEADERS uninstall-pkgconfigDATA $(CORBA_SOURCE): $(idls) $(ORBIT_IDL) *************** *** 577,583 **** for file in $(DONT_DIST_SOURCE) ; do \ rm -f $(distdir)/$$file ; \ done - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- 571,576 ---- diff -crN ./libbonobo/config.guess /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/config.guess *** ./libbonobo/config.guess Thu Feb 20 12:48:58 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/config.guess Sat Aug 9 21:12:34 2003 *************** *** 1,9 **** #! /bin/sh # Attempt to guess a canonical system name. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002 Free Software Foundation, Inc. ! timestamp='2002-10-21' # 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 --- 1,9 ---- #! /bin/sh # Attempt to guess a canonical system name. ! # 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 *************** *** 24,32 **** # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Originally written by Per Bothner . ! # Please send patches to . Submit a context ! # diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and --- 24,31 ---- # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Written by Per Bothner . ! # Please send patches to . # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and *************** *** 88,127 **** exit 1 fi - trap 'exit 1' 1 2 15 ! # CC_FOR_BUILD -- compiler used by this script. Note that the use of a ! # compiler to aid in system detection is discouraged as it requires ! # temporary files to be created and, as you can see below, it is a ! # headache to deal with in a portable fashion. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. ! # This shell variable is my proudest work .. or something. --bje ! ! set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; ! (old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) ! || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; ! dummy=$tmpdir/dummy ; ! files="$dummy.c $dummy.o $dummy.rel $dummy" ; ! trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; ! case $CC_FOR_BUILD,$HOST_CC,$CC in ! ,,) echo "int x;" > $dummy.c ; ! for c in cc gcc c89 c99 ; do ! if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; ! rm -f $files ; 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 ; ! unset files' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) --- 87,116 ---- exit 1 fi ! dummy=dummy-$$ ! trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 + # CC_FOR_BUILD -- compiler used by this script. # 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) *************** *** 138,167 **** case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) ! # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. ! # ! # Note: NetBSD doesn't particularly care about the vendor ! # portion of the name. We always set it to "unknown". ! sysctl="sysctl -n hw.machine_arch" ! UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ ! /usr/sbin/$sysctl 2>/dev/null || echo unknown)` ! case "${UNAME_MACHINE_ARCH}" in ! armeb) machine=armeb-unknown ;; ! arm*) machine=arm-unknown ;; ! sh3el) machine=shl-unknown ;; ! sh3eb) machine=sh-unknown ;; ! *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. ! case "${UNAME_MACHINE_ARCH}" in ! arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null --- 127,155 ---- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) ! # Netbsd (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. ! # Determine the machine/vendor (is the vendor relevant). ! case "${UNAME_MACHINE}" in ! amiga) machine=m68k-unknown ;; ! arm32) machine=arm-unknown ;; ! atari*) machine=m68k-atari ;; ! sun3*) machine=m68k-sun ;; ! mac68k) machine=m68k-apple ;; ! macppc) machine=powerpc-apple ;; ! hp3[0-9][05]) machine=m68k-hp ;; ! ibmrt|romp-ibm) machine=romp-ibm ;; ! *) machine=${UNAME_MACHINE}-unknown ;; esac # The Operating System including object format, if it has switched # 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 *************** *** 184,228 **** # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` --- 172,177 ---- *************** *** 231,237 **** # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - eval $set_cc_for_build cat <$dummy.s .data \$Lformat: --- 180,185 ---- *************** *** 257,265 **** jsr \$26,exit .end main EOF ! $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null if test "$?" = 0 ; then ! case `$dummy` in 0-0) UNAME_MACHINE="alpha" ;; --- 205,214 ---- 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 0-0) UNAME_MACHINE="alpha" ;; *************** *** 281,292 **** 2-1307) UNAME_MACHINE="alphaev68" ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; esac fi ! rm -f $dummy.s $dummy && rmdir $tmpdir echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) --- 230,238 ---- 2-1307) UNAME_MACHINE="alphaev68" ;; esac fi ! rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) *************** *** 301,311 **** Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; ! *:[Mm]orph[Oo][Ss]:*:*) ! echo ${UNAME_MACHINE}-unknown-morphos exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition --- 247,275 ---- Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; ! arc64:OpenBSD:*:*) ! echo mips64el-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! arc:OpenBSD:*:*) ! echo mipsel-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! hkmips:OpenBSD:*:*) ! echo mips-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! pmax:OpenBSD:*:*) ! echo mipsel-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! sgi:OpenBSD:*:*) ! echo mips-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! wgrisc:OpenBSD:*:*) ! echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition *************** *** 327,336 **** NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; - esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; --- 291,296 ---- *************** *** 359,365 **** echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) ! UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) --- 319,325 ---- echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) ! UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) *************** *** 373,378 **** --- 333,344 ---- 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 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor *************** *** 399,404 **** --- 365,382 ---- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + sun3*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; *************** *** 437,457 **** exit (-1); } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c \ ! && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ! && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit 0 ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit 0 ;; - Night_Hawk:*:*:PowerMAX_OS) - echo powerpc-harris-powermax - exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; --- 415,429 ---- exit (-1); } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy \ ! && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ! && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; *************** *** 524,531 **** exit(0); } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 --- 496,503 ---- exit(0); } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 *************** *** 534,540 **** fi exit 0 ;; *:AIX:*:[45]) ! IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else --- 506,512 ---- fi exit 0 ;; *:AIX:*:[45]) ! IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else *************** *** 574,581 **** 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) ! if [ -x /usr/bin/getconf ]; then ! sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 --- 546,555 ---- 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) ! case "${HPUX_REV}" in ! 11.[0-9][0-9]) ! if [ -x /usr/bin/getconf ]; then ! sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 *************** *** 584,596 **** case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac ! fi ! if [ "${HP_ARCH}" = "" ]; then ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include --- 558,570 ---- case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; esac ;; esac ! fi ;; ! esac ! if [ "${HP_ARCH}" = "" ]; then ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include *************** *** 623,632 **** exit (0); } EOF ! (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ! if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi ! rm -f $dummy.c $dummy && rmdir $tmpdir ! fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; --- 597,606 ---- 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} exit 0 ;; *************** *** 661,668 **** exit (0); } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) --- 635,642 ---- exit (0); } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) *************** *** 690,695 **** --- 664,672 ---- parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; + hppa*:OpenBSD:*:*) + echo hppa-unknown-openbsd + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; *************** *** 708,713 **** --- 685,693 ---- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit 0 ;; + CRAY*X-MP:*:*:*) + echo xmp-cray-unicos + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *************** *** 729,740 **** --- 709,726 ---- CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; + CRAY-2:*:*:*) + echo cray2-cray-unicos + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; *************** *** 745,763 **** echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) ! # Determine whether the default compiler uses glibc. ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #include ! #if __GLIBC__ >= 2 ! LIBC=gnu ! #else ! LIBC= ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! rm -f $dummy.c && rmdir $tmpdir ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin --- 731,740 ---- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ! exit 0 ;; ! *:OpenBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin *************** *** 768,776 **** i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; - x86:Interix*:3*) - echo i386-pc-interix3 - exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we --- 745,750 ---- *************** *** 796,825 **** echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; ia64:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #undef CPU ! #undef mips ! #undef mipsel ! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mipsel ! #else ! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips ! #else ! CPU= ! #endif ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! rm -f $dummy.c && rmdir $tmpdir ! test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu --- 770,785 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; ia64:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux exit 0 ;; m68*:Linux:*:*) 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 *************** *** 868,875 **** # 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. ! # Set LC_ALL=C to ensure ld outputs messages in English. ! ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// --- 828,834 ---- # 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: *// *************** *** 881,887 **** ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ! exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit 0 ;; --- 840,846 ---- ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ! exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit 0 ;; *************** *** 893,921 **** esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #include ! #ifdef __ELF__ ! # ifdef __GLIBC__ ! # if __GLIBC__ >= 2 ! LIBC=gnu ! # else ! LIBC=gnulibc1 ! # endif ! # else ! LIBC=gnulibc1 ! # endif ! #else ! #ifdef __INTEL_COMPILER ! LIBC=gnu ! #else ! LIBC=gnuaout ! #endif ! #endif EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! rm -f $dummy.c && rmdir $tmpdir ! test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) --- 852,883 ---- esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build ! cat >$dummy.c < ! #ifdef __cplusplus ! #include /* for printf() prototype */ ! int main (int argc, char *argv[]) { ! #else ! int main (argc, argv) int argc; char *argv[]; { ! #endif ! #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; ! } 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 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) *************** *** 953,965 **** UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then ! UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` ! (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 ! (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 ! (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 ! (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else --- 915,927 ---- UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then ! UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` ! (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 ! (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 ! (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ && UNAME_MACHINE=i686 ! (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else *************** *** 992,1003 **** # "miniframe" echo m68010-convergent-sysv exit 0 ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` --- 954,962 ---- # "miniframe" echo m68010-convergent-sysv exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` *************** *** 1088,1096 **** SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} exit 0 ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit 0 ;; --- 1047,1052 ---- *************** *** 1101,1117 **** echo `uname -p`-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) ! UNAME_PROCESSOR=`uname -p` ! if test "$UNAME_PROCESSOR" = "x86"; then ! UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi ! echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; ! NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) --- 1057,1071 ---- echo `uname -p`-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) ! if test "${UNAME_MACHINE}" = "x86pc"; then UNAME_MACHINE=pc fi ! echo `uname -p`-${UNAME_MACHINE}-nto-qnx exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; ! NSR-[KW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) *************** *** 1283,1290 **** } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir # Apollos put the system type in the environment. --- 1237,1244 ---- } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy # Apollos put the system type in the environment. diff -crN ./libbonobo/config.sub /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/config.sub *** ./libbonobo/config.sub Thu Feb 20 12:48:58 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/config.sub Sat Aug 9 21:12:34 2003 *************** *** 1,9 **** #! /bin/sh # Configuration validation subroutine script. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002 Free Software Foundation, Inc. ! timestamp='2002-09-05' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software --- 1,9 ---- #! /bin/sh # Configuration validation subroutine script. ! # 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 *************** *** 29,36 **** # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Please send patches to . Submit a context ! # diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. --- 29,35 ---- # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. *************** *** 118,124 **** # 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* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*) 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/'` ;; *************** *** 227,268 **** 1750a | 580 \ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ! | clipper \ ! | d10v | d30v | dlx | dsp16xx \ ! | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ | m32r | m68000 | m68k | m88k | mcore \ ! | mips | mipsbe | mipseb | mipsel | mipsle \ ! | mips16 \ ! | mips64 | mips64el \ ! | mips64vr | mips64vrel \ ! | mips64orion | mips64orionel \ ! | mips64vr4100 | mips64vr4100el \ ! | mips64vr4300 | mips64vr4300el \ ! | mips64vr5000 | mips64vr5000el \ ! | mipsisa32 | mipsisa32el \ ! | mipsisa64 | mipsisa64el \ ! | mipsisa64sb1 | mipsisa64sb1el \ ! | mipsisa64sr71k | mipsisa64sr71kel \ ! | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | ns16k | ns32k \ ! | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ ! | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ ! | sh64 | sh64le \ ! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ ! | strongarm \ | tahoe | thumb | tic80 | tron \ ! | v850 | v850e \ | we32k \ ! | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; --- 226,257 ---- 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 ;; *************** *** 289,339 **** 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ! | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ! | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ! | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ! | avr-* \ | bs2000-* \ ! | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ ! | clipper-* | cydra-* \ ! | d10v-* | d30v-* | dlx-* \ | elxsi-* \ ! | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ | m32r-* \ ! | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ ! | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ! | mips16-* \ ! | mips64-* | mips64el-* \ ! | mips64vr-* | mips64vrel-* \ ! | mips64orion-* | mips64orionel-* \ ! | mips64vr4100-* | mips64vr4100el-* \ ! | mips64vr4300-* | mips64vr4300el-* \ ! | mips64vr5000-* | mips64vr5000el-* \ ! | mipsisa32-* | mipsisa32el-* \ ! | mipsisa64-* | mipsisa64el-* \ ! | mipsisa64sb1-* | mipsisa64sb1el-* \ ! | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ! | mipstx39 | mipstx39el \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ ! | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ ! | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ! | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ ! | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ ! | xtensa-* \ | ymp-* \ | z8k-*) ;; --- 278,315 ---- 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-*) ;; *************** *** 398,407 **** basic_machine=ns32k-sequent os=-dynix ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; convex-c1) basic_machine=c1-convex os=-bsd --- 374,379 ---- *************** *** 422,429 **** basic_machine=c38-convex os=-bsd ;; ! cray | j90) ! basic_machine=j90-cray os=-unicos ;; crds | unos) --- 394,409 ---- basic_machine=c38-convex os=-bsd ;; ! cray | ymp) ! basic_machine=ymp-cray ! os=-unicos ! ;; ! cray2) ! basic_machine=cray2-cray ! os=-unicos ! ;; ! [cjt]90) ! basic_machine=${basic_machine}-cray os=-unicos ;; crds | unos) *************** *** 438,451 **** decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola --- 418,423 ---- *************** *** 626,631 **** --- 598,611 ---- basic_machine=m68k-atari os=-mint ;; + mipsel*-linux*) + basic_machine=mipsel-unknown + os=-linux-gnu + ;; + mips*-linux*) + basic_machine=mips-unknown + os=-linux-gnu + ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; *************** *** 640,649 **** basic_machine=m68k-rom68k os=-coff ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; msdos) basic_machine=i386-pc os=-msdos --- 620,625 ---- *************** *** 723,732 **** basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) - basic_machine=or32-unknown - os=-coff - ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose --- 699,704 ---- *************** *** 749,767 **** pbb) basic_machine=m68k-tti ;; ! pc532 | pc532-*) basic_machine=ns32k-pc532 ;; ! pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; ! pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; pentiumii | pentium2) basic_machine=i686-pc ;; ! pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) --- 721,739 ---- pbb) basic_machine=m68k-tti ;; ! pc532 | pc532-*) basic_machine=ns32k-pc532 ;; ! pentium | p5 | k5 | k6 | nexgen) basic_machine=i586-pc ;; ! pentiumpro | p6 | 6x86 | athlon) basic_machine=i686-pc ;; pentiumii | pentium2) basic_machine=i686-pc ;; ! pentium-* | p5-* | k5-* | k6-* | nexgen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) *************** *** 776,797 **** power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown ! ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ! ;; 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/^[^-]*-//'` ;; --- 748,769 ---- power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown ! ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ! ;; 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/^[^-]*-//'` ;; *************** *** 812,833 **** rtpc | rtpc-*) basic_machine=romp-ibm ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; sa29200) basic_machine=a29k-amd os=-udi ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; sequent) basic_machine=i386-sequent ;; --- 784,793 ---- *************** *** 835,841 **** basic_machine=sh-hitachi os=-hms ;; ! sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; --- 795,801 ---- basic_machine=sh-hitachi os=-hms ;; ! sparclite-wrs) basic_machine=sparclite-wrs os=-vxworks ;; *************** *** 901,922 **** basic_machine=i386-sequent os=-dynix ;; - t3d) - basic_machine=alpha-cray - os=-unicos - ;; t3e) ! basic_machine=alphaev5-cray ! os=-unicos ! ;; ! t90) ! basic_machine=t90-cray os=-unicos ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff --- 861,870 ---- basic_machine=i386-sequent os=-dynix ;; t3e) ! basic_machine=t3e-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff *************** *** 927,936 **** tx39el) basic_machine=mipstx39el-unknown ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; tower | tower-32) basic_machine=m68k-ncr ;; --- 875,880 ---- *************** *** 955,962 **** os=-vms ;; vpp*|vx|vx-*) ! basic_machine=f301-fujitsu ! ;; vxworks960) basic_machine=i960-wrs os=-vxworks --- 899,906 ---- os=-vms ;; vpp*|vx|vx-*) ! basic_machine=f301-fujitsu ! ;; vxworks960) basic_machine=i960-wrs os=-vxworks *************** *** 981,993 **** basic_machine=i386-pc os=-windows32-msvcrt ;; ! xps | xps100) ! basic_machine=xps100-honeywell ! ;; ! ymp) ! basic_machine=ymp-cray os=-unicos ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim --- 925,937 ---- basic_machine=i386-pc os=-windows32-msvcrt ;; ! xmp) ! basic_machine=xmp-cray os=-unicos ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim *************** *** 1008,1013 **** --- 952,964 ---- op60c) basic_machine=hppa1.1-oki ;; + mips) + if [ x$os = x-linux-gnu ]; then + basic_machine=mips-unknown + else + basic_machine=mips-mips + fi + ;; romp) basic_machine=romp-ibm ;; *************** *** 1027,1042 **** we32k) basic_machine=we32k-att ;; ! sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; ! cydra) basic_machine=cydra-cydrome ;; orion) --- 978,990 ---- we32k) basic_machine=we32k-att ;; ! sh3 | sh4 | sh3eb | sh4eb) basic_machine=sh-unknown ;; sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; ! cydra) basic_machine=cydra-cydrome ;; orion) *************** *** 1051,1056 **** --- 999,1008 ---- pmac | pmac-mpw) basic_machine=powerpc-apple ;; + c4x*) + basic_machine=c4x-none + os=-coff + ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; *************** *** 1116,1123 **** | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ ! | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ ! | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) --- 1068,1074 ---- | -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*) *************** *** 1169,1188 **** -acis*) os=-aos ;; - -atheos*) - os=-atheos - ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; - -nova*) - os=-rtmk-nova - ;; -ns2 ) ! os=-nextstep2 ;; -nsk*) os=-nsk --- 1120,1133 ---- -acis*) os=-aos ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; -ns2 ) ! os=-nextstep2 ;; -nsk*) os=-nsk *************** *** 1221,1228 **** -xenix) os=-xenix ;; ! -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ! os=-mint ;; -none) ;; --- 1166,1173 ---- -xenix) os=-xenix ;; ! -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ! os=-mint ;; -none) ;; *************** *** 1255,1265 **** arm*-semi) os=-aout ;; - # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; ! pdp11-*) os=-none ;; *-dec | vax-*) --- 1200,1209 ---- arm*-semi) os=-aout ;; pdp10-*) os=-tops20 ;; ! pdp11-*) os=-none ;; *-dec | vax-*) *************** *** 1286,1294 **** mips*-*) os=-elf ;; - or32-*) - os=-coff - ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; --- 1230,1235 ---- *************** *** 1352,1370 **** *-next) os=-nextstep3 ;; ! *-gould) os=-sysv ;; ! *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; ! *-sgi) os=-irix ;; ! *-siemens) os=-sysv4 ;; *-masscomp) --- 1293,1311 ---- *-next) os=-nextstep3 ;; ! *-gould) os=-sysv ;; ! *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; ! *-sgi) os=-irix ;; ! *-siemens) os=-sysv4 ;; *-masscomp) *************** *** 1436,1442 **** -ptx*) vendor=sequent ;; ! -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) --- 1377,1383 ---- -ptx*) vendor=sequent ;; ! -vxsim* | -vxworks*) vendor=wrs ;; -aux*) diff -crN ./libbonobo/configure /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/configure *** ./libbonobo/configure Fri Mar 14 16:54:00 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/configure Sat Aug 9 21:13:03 2003 *************** *** 1,11 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.57. # # 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. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## --- 1,178 ---- #! /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. + + # 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 that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + + case X$ECHO in + X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` + ;; + esac + + echo=${ECHO-echo} + if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : + elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then + # Yippee, $echo works! + : + else + # Restart under the correct shell. + exec $SHELL "$0" --no-reexec ${1+"$@"} + fi + + if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null && + echo_test_string="`eval $cmd`" && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null + then + break + fi + done + fi + + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : + else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # 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' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$dir/echo" + break + fi + done + IFS="$save_ifs" + + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + echo='print -r' + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} + else + # Try using printf. + echo='printf %s\n' + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + echo="$CONFIG_SHELL $0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$CONFIG_SHELL $0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "$0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} + else + # Oops. We lost completely, so just stick with echo. + echo=echo + fi + fi + fi + fi + fi + fi + + # Copy echo and quote the copy suitably for passing to libtool from + # the Makefile, instead of quoting the original, which is used later. + ECHO=$echo + if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + 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. ## ## --------------------- ## *************** *** 14,26 **** if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset --- 181,191 ---- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi + # NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset *************** *** 28,69 **** as_unset=false fi ! ! # Work around bugs in pre-3.0 UWIN ksh. ! $as_unset ENV MAIL MAILPATH ! PS1='$ ' ! PS2='> ' ! PS4='+ ' ! ! # NLS nuisances. ! for as_var in \ ! LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ! LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ! LC_TELEPHONE LC_TIME ! do ! if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then ! eval $as_var=C; export $as_var ! else ! $as_unset $as_var ! fi ! done ! ! # Required to use basename. ! if expr a : '\(a\)' >/dev/null 2>&1; then ! as_expr=expr ! else ! as_expr=false ! fi ! ! if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ! as_basename=basename ! else ! as_basename=false ! fi # Name of the executable. ! as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ --- 193,226 ---- 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\(/\)$' \| \ *************** *** 74,80 **** /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' --- 231,236 ---- *************** *** 85,99 **** # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then ! echo "#! /bin/sh" >conf$$.sh ! echo "exit 0" >>conf$$.sh ! chmod +x conf$$.sh ! if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi ! rm -f conf$$.sh fi --- 241,255 ---- # 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 *************** *** 141,148 **** 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 - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } CONFIG_SHELL=$as_dir/$as_base export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" ${1+"$@"} --- 297,302 ---- *************** *** 215,226 **** fi rm -f conf$$ conf$$.exe conf$$.file - if mkdir -p . 2>/dev/null; then - as_mkdir_p=: - else - as_mkdir_p=false - fi - as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. --- 369,374 ---- *************** *** 237,402 **** IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH ! ! ! # 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 that we are running under the correct shell. ! SHELL=${CONFIG_SHELL-/bin/sh} ! ! case X$ECHO in ! X*--fallback-echo) ! # Remove one level of quotation (which was required for Make). ! ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` ! ;; ! esac ! ! echo=${ECHO-echo} ! if test "X$1" = X--no-reexec; then ! # Discard the --no-reexec flag, and continue. ! shift ! elif test "X$1" = X--fallback-echo; then ! # Avoid inline document here, it may be left over ! : ! elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then ! # Yippee, $echo works! ! : ! else ! # Restart under the correct shell. ! exec $SHELL "$0" --no-reexec ${1+"$@"} ! fi ! ! if test "X$1" = X--fallback-echo; then ! # used as fallback echo ! shift ! cat </dev/null && ! echo_test_string="`eval $cmd`" && ! (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null ! then ! break ! fi ! done ! fi ! ! if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ! echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ! test "X$echo_testing_string" = "X$echo_test_string"; then ! : ! else ! # The Solaris, AIX, and Digital Unix default echo programs unquote ! # backslashes. This makes it impossible to quote backslashes using ! # echo "$something" | sed 's/\\/\\\\/g' ! # ! # 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' && ! echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ! test "X$echo_testing_string" = "X$echo_test_string"; then ! echo="$dir/echo" ! break ! fi ! done ! IFS="$save_ifs" ! ! if test "X$echo" = Xecho; then ! # We didn't find a better echo, so look for alternatives. ! if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && ! echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && ! test "X$echo_testing_string" = "X$echo_test_string"; then ! # This shell has a builtin print -r that does the trick. ! echo='print -r' ! elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && ! test "X$CONFIG_SHELL" != X/bin/ksh; then ! # If we have ksh, try running configure again with it. ! ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ! export ORIGINAL_CONFIG_SHELL ! CONFIG_SHELL=/bin/ksh ! export CONFIG_SHELL ! exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} ! else ! # Try using printf. ! echo='printf %s\n' ! if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ! echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ! test "X$echo_testing_string" = "X$echo_test_string"; then ! # Cool, printf works ! : ! elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && ! test "X$echo_testing_string" = 'X\t' && ! echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && ! test "X$echo_testing_string" = "X$echo_test_string"; then ! CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ! export CONFIG_SHELL ! SHELL="$CONFIG_SHELL" ! export SHELL ! echo="$CONFIG_SHELL $0 --fallback-echo" ! elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && ! test "X$echo_testing_string" = 'X\t' && ! echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && ! test "X$echo_testing_string" = "X$echo_test_string"; then ! echo="$CONFIG_SHELL $0 --fallback-echo" ! else ! # maybe with a smaller string... ! prev=: ! ! for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do ! if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null ! then ! break ! fi ! prev="$cmd" ! done ! ! if test "$prev" != 'sed 50q "$0"'; then ! echo_test_string=`eval $prev` ! export echo_test_string ! exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} ! else ! # Oops. We lost completely, so just stick with echo. ! echo=echo ! fi ! fi ! fi ! fi ! fi ! fi ! ! # Copy echo and quote the copy suitably for passing to libtool from ! # the Makefile, instead of quoting the original, which is used later. ! ECHO=$echo ! if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then ! ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" ! fi ! # Name of the host. --- 385,391 ---- IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } # Name of the host. *************** *** 410,416 **** # Initializations. # ac_default_prefix=/usr/local - ac_config_libobj_dir=. cross_compiling=no subdirs= MFLAGS= --- 399,404 ---- *************** *** 467,474 **** # include #endif" - ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL YACC PATH_TO_XRDB GETTEXT_PACKAGE gnomelocaledir USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS WARN_CFLAGS PKG_CONFIG LIBBONOBO_CFLAGS LIBBONOBO_LIBS ORBIT_IDL GLIB_GENMARSHAL BONOBO_ACTIVATION_IDL_DIR HTML_DIR GTKDOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE LIBOBJS LTLIBOBJS' - ac_subst_files='' # Initialize some variables set by options. ac_init_help= --- 455,460 ---- *************** *** 892,900 **** { (exit 1); exit 1; }; } fi fi - (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 - { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias --- 878,883 ---- *************** *** 1007,1012 **** --- 990,997 ---- Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer --enable-shared=PKGS build shared libraries default=yes *************** *** 1073,1079 **** # 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` --- 1058,1064 ---- # 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` *************** *** 1113,1119 **** running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ --- 1098,1104 ---- 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 $@ *************** *** 1165,1218 **** # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. - # Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. - # Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= - ac_configure_args0= - ac_configure_args1= ac_sep= ! ac_must_keep_next=false ! for ac_pass in 1 2 do ! for ac_arg ! do ! case $ac_arg in ! -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; ! -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ! | -silent | --silent | --silen | --sile | --sil) ! continue ;; ! *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ! ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ! esac ! case $ac_pass in ! 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ! 2) ! ac_configure_args1="$ac_configure_args1 '$ac_arg'" ! if test $ac_must_keep_next = true; then ! ac_must_keep_next=false # Got value, back to normal. ! else ! case $ac_arg in ! *=* | --config-cache | -C | -disable-* | --disable-* \ ! | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ ! | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ ! | -with-* | --with-* | -without-* | --without-* | --x) ! case "$ac_configure_args0 " in ! "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; ! esac ! ;; ! -* ) ac_must_keep_next=true ;; ! esac ! fi ! ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" ! # Get rid of the leading space. ! ac_sep=" " ! ;; ! esac ! done done - $as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } - $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there --- 1150,1176 ---- # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. # Also quote any args containing shell meta-characters. ac_configure_args= ac_sep= ! for ac_arg 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 # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there *************** *** 1223,1229 **** # Save into config.log some information that might help in debugging. { echo - cat <<\_ASBOX ## ---------------- ## ## Cache variables. ## --- 1181,1186 ---- *************** *** 1246,1280 **** esac; } echo - - cat <<\_ASBOX - ## ----------------- ## - ## Output variables. ## - ## ----------------- ## - _ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX - ## ------------- ## - ## Output files. ## - ## ------------- ## - _ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - fi - if test -s confdefs.h; then cat <<\_ASBOX ## ----------- ## --- 1203,1208 ---- *************** *** 1282,1288 **** ## ----------- ## _ASBOX echo ! sed "/^$/d" confdefs.h | sort echo fi test "$ac_signal" != 0 && --- 1210,1216 ---- ## ----------- ## _ASBOX echo ! sed "/^$/d" confdefs.h echo fi test "$ac_signal" != 0 && *************** *** 1442,1452 **** - ac_config_headers="$ac_config_headers config.h" ! ac_config_commands="$ac_config_commands default-1" - am__api_version="1.4" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then --- 1370,1378 ---- ! ac_config_headers="$ac_config_headers config.h" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then *************** *** 1553,1572 **** 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 --- 1479,1499 ---- 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 *************** *** 1579,1621 **** { (exit 1); exit 1; }; } fi ! test "$2" = conftestfile ! ) ! 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 - rm -f conftest* - 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" - # Use a double $ so make ignores it. - test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" - # Double any \ or $. echo might interpret backslashes. - # By default was `s,x,x', remove it if useless. - cat <<\_ACEOF >conftest.sed - s/[\\$]/&&/g;s/;s,x,x,$// - _ACEOF - program_transform_name=`echo $program_transform_name | sed -f conftest.sed` - rm conftest.sed ! 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=` --- 1506,1602 ---- { (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" ! # Use a double $ so make ignores it. ! test "$program_suffix" != NONE && ! program_transform_name="s,\$,$program_suffix,;$program_transform_name" ! # Double any \ or $. echo might interpret backslashes. ! # By default was `s,x,x', remove it if useless. ! cat <<\_ACEOF >conftest.sed ! s/[\\$]/&&/g;s/;s,x,x,$// ! _ACEOF ! 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=` *************** *** 1636,1652 **** SET_MAKE="MAKE=${MAKE-make}" fi - PACKAGE=libbonobo ! VERSION=2.2.1 ! if test "`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 cat >>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" _ACEOF --- 1617,1667 ---- 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=libbonobo + VERSION=2.2.0 + cat >>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" _ACEOF *************** *** 1657,1739 **** _ACEOF ! missing_dir=`cd $ac_aux_dir && pwd` ! echo "$as_me:$LINENO: checking for working aclocal-${am__api_version}" >&5 ! echo $ECHO_N "checking for working aclocal-${am__api_version}... $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-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then ! ACLOCAL=aclocal-${am__api_version} ! echo "$as_me:$LINENO: result: found" >&5 ! echo "${ECHO_T}found" >&6 ! else ! ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" ! echo "$as_me:$LINENO: result: missing" >&5 ! echo "${ECHO_T}missing" >&6 ! fi ! echo "$as_me:$LINENO: 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:$LINENO: result: found" >&5 ! echo "${ECHO_T}found" >&6 ! else ! AUTOCONF="$missing_dir/missing autoconf" ! echo "$as_me:$LINENO: result: missing" >&5 ! echo "${ECHO_T}missing" >&6 ! fi - echo "$as_me:$LINENO: checking for working automake-${am__api_version}" >&5 - echo $ECHO_N "checking for working automake-${am__api_version}... $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-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-${am__api_version} - echo "$as_me:$LINENO: result: found" >&5 - echo "${ECHO_T}found" >&6 - else - AUTOMAKE="$missing_dir/missing automake-${am__api_version}" - echo "$as_me:$LINENO: result: missing" >&5 - echo "${ECHO_T}missing" >&6 - fi ! echo "$as_me:$LINENO: 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:$LINENO: result: found" >&5 ! echo "${ECHO_T}found" >&6 ! else ! AUTOHEADER="$missing_dir/missing autoheader" ! echo "$as_me:$LINENO: result: missing" >&5 ! echo "${ECHO_T}missing" >&6 ! fi - echo "$as_me:$LINENO: 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:$LINENO: result: found" >&5 - echo "${ECHO_T}found" >&6 - else - MAKEINFO="$missing_dir/missing makeinfo" - echo "$as_me:$LINENO: result: missing" >&5 - echo "${ECHO_T}missing" >&6 - fi echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 --- 1672,1714 ---- _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 *************** *** 1882,1896 **** # Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT. ! ac_config_commands="$ac_config_commands default-2" ! - ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" LT_VERSION_INFO='-version-info 0:0:1' ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --- 1857,1910 ---- # Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT. ! ac_config_commands="$ac_config_commands default-1" LT_VERSION_INFO='-version-info 0:0:1' + + ac_config_commands="$ac_config_commands default-2" + + 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' *************** *** 2095,2101 **** # 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 ! ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi --- 2109,2117 ---- # 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 fi fi *************** *** 2200,2209 **** fi ! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ! See \`config.log' for more details." >&5 ! echo "$as_me: error: no acceptable C compiler found in \$PATH ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. --- 2216,2223 ---- 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. *************** *** 2228,2239 **** cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () { --- 2242,2255 ---- 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 () { *************** *** 2243,2249 **** } _ACEOF ac_clean_files_save=$ac_clean_files ! ac_clean_files="$ac_clean_files a.out a.exe b.out" # 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. --- 2259,2265 ---- } _ACEOF ac_clean_files_save=$ac_clean_files ! ac_clean_files="$ac_clean_files a.out a.exe" # 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. *************** *** 2262,2300 **** # 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= ! # b.out is created by i960 compilers. ! for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out ! do ! test -f "$ac_file" || continue case $ac_file in ! *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ! ;; ! conftest.$ac_ext ) ! # This is the source file. ! ;; ! [ab].out ) ! # We found the default executable, but exeext='' is most ! # certainly right. ! break;; ! *.* ) ! ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ! # FIXME: I believe we export ac_cv_exeext for Libtool, ! # but it would be cool to find out if it's true. Does anybody ! # maintain Libtool? --akim. ! export ac_cv_exeext ! break;; ! * ) ! break;; esac done else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! { { echo "$as_me:$LINENO: error: C compiler cannot create executables ! See \`config.log' for more details." >&5 ! echo "$as_me: error: C compiler cannot create executables ! See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi --- 2278,2303 ---- # 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;; ! *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ! # FIXME: I believe we export ac_cv_exeext for Libtool --akim. ! export ac_cv_exeext ! break;; ! * ) break;; esac done 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 *************** *** 2321,2331 **** cross_compiling=yes else { { echo "$as_me:$LINENO: error: cannot run C compiled programs. ! If you meant to cross compile, use \`--host'. ! See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C compiled programs. ! If you meant to cross compile, use \`--host'. ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi --- 2324,2332 ---- 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;} { (exit 1); exit 1; }; } fi fi *************** *** 2333,2339 **** echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 ! rm -f a.out a.exe conftest$ac_cv_exeext b.out 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. --- 2334,2340 ---- 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. *************** *** 2353,2362 **** # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. ! for ac_file in conftest.exe conftest conftest.*; do ! test -f "$ac_file" || continue case $ac_file in ! *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; --- 2354,2362 ---- # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. ! for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do case $ac_file in ! *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; *************** *** 2364,2373 **** esac done else ! { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot compute suffix of executables: cannot compile and link ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi --- 2364,2371 ---- 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 *************** *** 2385,2396 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () { --- 2383,2396 ---- 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 () { *************** *** 2407,2425 **** (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in ! *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! { { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot compute suffix of object files: cannot compile ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi --- 2407,2422 ---- (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in ! *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done 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 *************** *** 2436,2447 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () { --- 2433,2446 ---- 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 () { *************** *** 2468,2475 **** ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 2467,2473 ---- ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 2489,2500 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () { --- 2487,2500 ---- 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 () { *************** *** 2518,2525 **** ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 2518,2524 ---- ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 2541,2642 **** CFLAGS= fi fi - echo "$as_me:$LINENO: 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 $LINENO "configure" - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end 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:$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_stdc=$ac_arg - break - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' 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:$LINENO: result: none needed" >&5 - echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 - echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; - esac - # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide --- 2540,2545 ---- *************** *** 2669,2681 **** do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include $ac_declaration int main () { --- 2572,2586 ---- 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 () { *************** *** 2699,2717 **** : else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_declaration int main () { --- 2604,2623 ---- : else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 continue 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 () { *************** *** 2735,2742 **** break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext done --- 2641,2647 ---- break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done *************** *** 2749,2756 **** else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c --- 2654,2660 ---- else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c *************** *** 2759,2764 **** --- 2663,2737 ---- 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 *************** *** 2770,2780 **** LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 2743,2749 ---- LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 2783,2788 **** --- 2752,2763 ---- /* 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 () { *************** *** 2806,2813 **** ac_cv_lib_cposix_strerror=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_cposix_strerror=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 2781,2787 ---- ac_cv_lib_cposix_strerror=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_cposix_strerror=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 3025,3031 **** # 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 ! ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi --- 2999,3007 ---- # 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 fi fi *************** *** 3130,3139 **** fi ! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ! See \`config.log' for more details." >&5 ! echo "$as_me: error: no acceptable C compiler found in \$PATH ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. --- 3106,3113 ---- 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. *************** *** 3163,3174 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () { --- 3137,3150 ---- 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 () { *************** *** 3195,3202 **** ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 3171,3177 ---- ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 3216,3227 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () { --- 3191,3204 ---- 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 () { *************** *** 3245,3252 **** ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 3222,3228 ---- ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 3268,3369 **** CFLAGS= fi fi - echo "$as_me:$LINENO: 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 $LINENO "configure" - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end 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:$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_stdc=$ac_arg - break - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' 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:$LINENO: result: none needed" >&5 - echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 - echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; - esac - # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide --- 3244,3249 ---- *************** *** 3396,3408 **** do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include $ac_declaration int main () { --- 3276,3290 ---- 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 () { *************** *** 3426,3444 **** : else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_declaration int main () { --- 3308,3327 ---- : else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 continue 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 () { *************** *** 3462,3469 **** break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext done --- 3345,3351 ---- break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done *************** *** 3475,3490 **** fi else ! echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 fi ! rm -f conftest.$ac_objext conftest.$ac_ext ! 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 ac_ext=c ac_cpp='$CPP $CPPFLAGS' --- 3357,3440 ---- fi else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! fi ! rm -f conftest.$ac_objext conftest.$ac_ext ! 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 ! ! 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' *************** *** 3509,3536 **** do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # 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" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif 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=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 --- 3459,3476 ---- do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. # 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 *************** *** 3547,3554 **** : else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Broken: fails on valid input. continue fi --- 3487,3493 ---- : else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi *************** *** 3558,3574 **** # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end 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=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 --- 3497,3509 ---- # 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 *************** *** 3586,3593 **** continue else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Passes both tests. ac_preproc_ok=: break --- 3521,3527 ---- continue else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break *************** *** 3616,3643 **** do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # 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" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif 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=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 --- 3550,3567 ---- do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. # 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 *************** *** 3654,3661 **** : else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Broken: fails on valid input. continue fi --- 3578,3584 ---- : else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi *************** *** 3665,3681 **** # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end 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=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 --- 3588,3600 ---- # 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 *************** *** 3693,3700 **** continue else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Passes both tests. ac_preproc_ok=: break --- 3612,3618 ---- continue else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break *************** *** 3707,3716 **** if $ac_preproc_ok; then : else ! { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check ! See \`config.log' for more details." >&5 ! echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi --- 3625,3632 ---- 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 *************** *** 3721,3741 **** ac_compiler_gnu=$ac_cv_c_compiler_gnu - echo "$as_me:$LINENO: checking for egrep" >&5 - echo $ECHO_N "checking for egrep... $ECHO_C" >&6 - if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi - fi - echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 - echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep - - 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 --- 3637,3642 ---- *************** *** 3743,3801 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include #include #include - int - main () - { - - ; - return 0; - } _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_header_stdc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! ac_cv_header_stdc=no fi ! rm -f conftest.$ac_objext conftest.$ac_ext 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" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! $EGREP "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no --- 3644,3691 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include #include #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 ! else ! ac_cpp_err= ! fi ! else ! ac_cpp_err=yes ! fi ! if test -z "$ac_cpp_err"; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! ac_cv_header_stdc=no fi ! rm -f conftest.err conftest.$ac_ext 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 _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no *************** *** 3808,3823 **** # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! $EGREP "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no --- 3698,3709 ---- # 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 _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no *************** *** 3833,3850 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else ! # define ISLOWER(c) \ ! (('a' <= (c) && (c) <= 'i') \ || ('j' <= (c) && (c) <= 'r') \ || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) --- 3719,3731 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else ! # define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ || ('j' <= (c) && (c) <= 'r') \ || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) *************** *** 3877,3888 **** else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ( exit $ac_status ) ac_cv_header_stdc=no fi ! rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi --- 3758,3768 ---- 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 *************** *** 4158,4164 **** # 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" --- 4038,4060 ---- # 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" *************** *** 4178,4268 **** echo "$as_me:$LINENO: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 - echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 - echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 - if test "${lt_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # Loop through the user's path and test for sed and gsed. - # Then use that list of sed's as ones to test for truncation. - as_executable_p="test -f" - 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_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext" - fi - done - done - done - - # Create a temporary directory, and hook for its removal unless debugging. - $debug || - { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 - } - - # Create a (secure) tmp directory for tmp files. - : ${TMPDIR=/tmp} - { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" - } || - { - tmp=$TMPDIR/sed$$-$RANDOM - (umask 077 && mkdir $tmp) - } || - { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 - { (exit 1); exit 1; } - } - _max=0 - _count=0 - # Add /usr/xpg4/bin/sed as it is typically found on Solaris - # along with /bin/sed that truncates output. - for _sed in $_sed_list /usr/xpg4/bin/sed; do - test ! -f ${_sed} && break - cat /dev/null > "$tmp/sed.in" - _count=0 - echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in" - # Check for GNU sed and select it if it is found. - if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then - lt_cv_path_SED=${_sed} - break - fi - while true; do - cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" - mv "$tmp/sed.tmp" "$tmp/sed.in" - cp "$tmp/sed.in" "$tmp/sed.nl" - echo >>"$tmp/sed.nl" - ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break - cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break - # 40000 chars as input seems more than enough - test $_count -gt 10 && break - _count=`expr $_count + 1` - if test $_count -gt $_max; then - _max=$_count - lt_cv_path_SED=$_sed - fi - done - done - rm -rf "$tmp" - - fi - - if test "X$SED" != "X"; then - lt_cv_path_SED=$SED - else - SED=$lt_cv_path_SED - fi - echo "$as_me:$LINENO: result: $SED" >&5 - echo "${ECHO_T}$SED" >&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 --- 4074,4079 ---- *************** *** 4274,4281 **** echo "${ECHO_T}no, using $LN_S" >&6 fi ! echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 ! echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else --- 4085,4092 ---- 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 else *************** *** 4352,4360 **** lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; ! irix5* | irix6* | nonstopux*) case $host_os in ! irix5* | nonstopux*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; --- 4163,4171 ---- lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; ! irix5* | irix6*) case $host_os in ! irix5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; *************** *** 4376,4382 **** # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM --- 4187,4193 ---- # 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 *************** *** 4447,4455 **** 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 ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; esac ;; esac --- 4258,4263 ---- *************** *** 4503,4514 **** 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* | nonstopux*) symcode='[BCDEGRST]' ;; - osf*) - symcode='[BCDEGQRST]' - ;; solaris* | sysv5*) symcode='[BDT]' ;; --- 4311,4319 ---- 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]' ;; *************** *** 4617,4623 **** (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS="$save_LIBS" --- 4422,4428 ---- (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 LIBS="$save_LIBS" *************** *** 4685,4695 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> --- 4490,4496 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include <$ac_header> *************** *** 4709,4716 **** eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext --- 4510,4516 ---- 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 *************** *** 4745,4755 **** echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF --- 4545,4551 ---- 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 *************** *** 4768,4775 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 4564,4570 ---- 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 *************** *** 4781,4797 **** echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end 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=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 --- 4576,4588 ---- 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 *************** *** 4808,4815 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 4599,4605 ---- 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 *************** *** 4822,4853 **** { 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;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&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;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --- 4612,4625 ---- { 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 *************** *** 4873,4879 **** - # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) --- 4645,4650 ---- *************** *** 5189,5195 **** case $host in *-*-irix6*) # Find out which ABI we are using. ! echo '#line 5192 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? --- 4960,4966 ---- case $host in *-*-irix6*) # Find out which ABI we are using. ! echo '#line 4963 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? *************** *** 5229,5240 **** cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () { --- 5000,5013 ---- 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 () { *************** *** 5258,5265 **** lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! lt_cv_cc_needs_belf=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 5031,5037 ---- lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 lt_cv_cc_needs_belf=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 5431,5437 **** # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; ! beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) --- 5203,5209 ---- # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; ! beos* | irix5* | irix6* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) *************** *** 5474,5480 **** lt_cv_prog_cc_pic='+Z' ;; ! irix5* | irix6* | nonstopux*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. --- 5246,5252 ---- lt_cv_prog_cc_pic='+Z' ;; ! irix5* | irix6*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. *************** *** 5518,5524 **** sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' ! lt_cv_prog_cc_wl='-Wl,' ;; uts4*) --- 5290,5300 ---- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) 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 ;; uts4*) *************** *** 5558,5569 **** CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () { --- 5334,5347 ---- 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 () { *************** *** 5602,5609 **** else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! lt_cv_prog_cc_pic_works=no fi --- 5380,5386 ---- else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 lt_cv_prog_cc_pic_works=no fi *************** *** 5646,5657 **** LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () { --- 5423,5436 ---- 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 () { *************** *** 5675,5682 **** lt_cv_prog_cc_static_works=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" --- 5454,5460 ---- lt_cv_prog_cc_static_works=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" *************** *** 5718,5724 **** save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no ! if { (eval echo configure:5721: \"$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 --- 5496,5502 ---- save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no ! if { (eval echo configure:5499: \"$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 *************** *** 5760,5771 **** ac_objext=lo cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () { --- 5538,5551 ---- 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 () { *************** *** 5796,5803 **** else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext ac_objext="$save_objext" --- 5576,5582 ---- else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext ac_objext="$save_objext" *************** *** 5845,5856 **** compiler_rtti_exceptions=no cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () { --- 5624,5637 ---- 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 () { *************** *** 5881,5888 **** else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" --- 5662,5668 ---- else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" *************** *** 5911,5916 **** --- 5691,5697 ---- 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 *************** *** 6054,6060 **** # 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`sed 1q $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; --- 5835,5841 ---- # 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; *************** *** 6063,6069 **** set dummy \$symbol; case \$# in 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - 4) echo " \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;; *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; esac; _lt_hint=`expr 1 + \$_lt_hint`; --- 5844,5849 ---- *************** *** 6115,6144 **** hardcode_shlibpath_var=no ;; - linux*) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - if test $supports_anon_versioning = yes; then - archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - else - $archive_expsym_cmds="$archive_cmds" - fi - else - ld_shlibs=no - fi - ;; - *) if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' --- 5895,5900 ---- *************** *** 6192,6216 **** aix_use_runtimelinking=no exp_sym_flag='-Bexport' no_entry_flag="" else ! aix_use_runtimelinking=no ! ! # 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 runtime linking. ! case $host_os in aix4.[23]|aix4.[23].*|aix5*) ! for ld_flag in $LDFLAGS; do ! case $ld_flag in ! *-brtl*) ! aix_use_runtimelinking=yes ! break ! ;; ! esac ! done ! esac ! exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi # When large executables or shared objects are built, AIX ld can --- 5948,5960 ---- 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 *************** *** 6245,6259 **** shared_flag='-shared' else # not using gcc ! if test "$host_cpu" = ia64; then ! shared_flag='${wl}-G' ! else ! if test "$aix_use_runtimelinking" = yes; then ! shared_flag='${wl}-G' ! else ! shared_flag='${wl}-bM:SRE' ! fi ! fi fi # It seems that -bexpall can do strange things, so it is better to --- 5989,5995 ---- 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 *************** *** 6263,6270 **** # 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}-blibpath:$libdir:/usr/lib:/lib' ! archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' --- 5999,6006 ---- # 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' *************** *** 6277,6283 **** 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 ;; --- 6013,6019 ---- 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 ;; *************** *** 6319,6327 **** 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. Also zsh mangles ! # `"' quotes if we put them in here... so don't! ! archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes --- 6055,6062 ---- 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 *************** *** 6373,6386 **** export_dynamic_flag_spec='${wl}-E' ;; ! irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='-rpath $libdir' fi hardcode_libdir_separator=: link_all_deplibs=yes ;; --- 6108,6120 ---- export_dynamic_flag_spec='${wl}-E' ;; ! irix5* | irix6*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' fi + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: link_all_deplibs=yes ;; *************** *** 6408,6414 **** 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 $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else --- 6142,6148 ---- 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 *************** *** 6418,6424 **** hardcode_libdir_flag_spec='-R$libdir' ;; *) ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac --- 6152,6158 ---- 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 *************** *** 6530,6552 **** ;; sysv4) ! case $host_vendor in ! sni) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=yes # is this really true??? ! ;; ! siemens) ! ## LD is ld it makes a PLAMLIB ! ## CC just makes a GrossModule. ! archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' ! reload_cmds='$CC -r -o $output$reload_objs' ! hardcode_direct=no ! ;; ! motorola) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=no #Motorola manual says yes, but my tests say they lie ! ;; ! esac runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; --- 6264,6276 ---- ;; 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' ! hardcode_direct=no #Motorola manual says yes, but my tests say they lie ! fi runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; *************** *** 6694,6702 **** aix4* | aix5*) version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes if test "$host_cpu" = ia64; then # AIX 5 supports IA64 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' --- 6418,6423 ---- *************** *** 6718,6741 **** 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 fi - hardcode_into_libs=yes ;; amigaos*) --- 6439,6450 ---- 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*) *************** *** 6783,6789 **** ;; 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" -e "s,=/,/,g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' --- 6492,6498 ---- ;; 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' *************** *** 6866,6882 **** postinstall_cmds='chmod 555 $lib' ;; ! irix5* | irix6* | nonstopux*) ! case $host_os in ! nonstopux*) version_type=nonstopux ;; ! *) version_type=irix ;; ! esac need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in ! irix5* | nonstopux*) libsuff= shlibsuff= ;; *) --- 6575,6588 ---- postinstall_cmds='chmod 555 $lib' ;; ! irix5* | irix6*) ! version_type=irix need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in ! irix5*) libsuff= shlibsuff= ;; *) *************** *** 6980,6991 **** osf3* | osf4* | osf5*) version_type=osf need_version=no ! soname_spec='${libname}${release}.so$major' ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - hardcode_into_libs=yes ;; sco3.2v5*) --- 6686,6696 ---- osf3* | osf4* | osf5*) version_type=osf need_version=no ! soname_spec='${libname}${release}.so' ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; sco3.2v5*) *************** *** 7028,7039 **** case $host_vendor in sni) shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no ;; motorola) need_lib_prefix=no --- 6733,6738 ---- *************** *** 7099,7105 **** ;; aix4*) ! if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi ;; --- 6798,6804 ---- ;; aix4*) ! if test "$host_cpu" != ia64 ; then test "$enable_shared" = yes && enable_static=no fi ;; *************** *** 7156,7199 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char shl_load (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* 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 (); /* 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 ! char (*f) () = shl_load; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != shl_load; ; return 0; } --- 6855,6891 ---- 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; } *************** *** 7213,7220 **** ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 6905,6911 ---- 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 *************** *** 7233,7243 **** LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 6924,6930 ---- LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 7246,7251 **** --- 6933,6944 ---- /* 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 () { *************** *** 7269,7276 **** ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 6962,6968 ---- 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 *************** *** 7288,7331 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char dlopen (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* 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 (); /* 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_dlopen) || defined (__stub___dlopen) choke me #else ! char (*f) () = dlopen; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != dlopen; ; return 0; } --- 6980,7016 ---- 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. */ ! #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 dlopen (); + 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_dlopen) || defined (__stub___dlopen) choke me #else ! f = dlopen; #endif ; return 0; } *************** *** 7345,7352 **** ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7030,7036 ---- ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 7365,7375 **** LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 7049,7055 ---- 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 *************** *** 7378,7383 **** --- 7058,7069 ---- /* 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 () { *************** *** 7401,7408 **** ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7087,7093 ---- 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 *************** *** 7422,7432 **** LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 7107,7113 ---- LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 7435,7440 **** --- 7116,7127 ---- /* 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 () { *************** *** 7458,7465 **** ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7145,7151 ---- ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 7479,7489 **** LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 7165,7171 ---- LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 7492,7497 **** --- 7174,7185 ---- /* 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 () { *************** *** 7515,7522 **** ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7203,7209 ---- 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 *************** *** 7574,7580 **** lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* 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 (); /* 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 ! char (*f) () = $ac_func; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != $ac_func; ; return 0; } --- 8183,8219 ---- 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; } *************** *** 8552,8559 **** eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 8233,8239 ---- 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 *************** *** 8578,8584 **** gnomelocaledir='${prefix}/${DATADIRNAME}/locale' ! ALL_LINGUAS="am ar az be bg ca cs da de el eo es fa fi fr gl he hu id it ja ko lv mk mn ms nl nn no pl pt pt_BR ro ru sk sl sq sv ta tr uk vi zh_CN zh_TW" for ac_header in locale.h --- 8258,8264 ---- gnomelocaledir='${prefix}/${DATADIRNAME}/locale' ! ALL_LINGUAS="am ar az be bg ca cs da de el es fa fi fr gl he hu it ja ko lv mk ms nl nn no pl pt pt_BR ru sk sl sq sv ta tr uk vi zh_CN zh_TW" for ac_header in locale.h *************** *** 8598,8608 **** echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF --- 8278,8284 ---- 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 *************** *** 8621,8628 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 8297,8303 ---- 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 *************** *** 8634,8650 **** echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end 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=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 --- 8309,8321 ---- 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 *************** *** 8661,8668 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 8332,8338 ---- 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 *************** *** 8675,8706 **** { 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;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&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;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --- 8345,8358 ---- { 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 *************** *** 8730,8741 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include int main () { --- 8382,8395 ---- 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 () { *************** *** 8759,8766 **** am_cv_val_LC_MESSAGES=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! am_cv_val_LC_MESSAGES=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 8413,8419 ---- 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 *************** *** 8798,8808 **** echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include _ACEOF --- 8451,8457 ---- 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 *************** *** 8821,8828 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 8470,8476 ---- 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 *************** *** 8834,8850 **** echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end 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=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 --- 8482,8494 ---- 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 *************** *** 8861,8868 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 8505,8511 ---- 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 *************** *** 8875,8906 **** { 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;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&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;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for libintl.h" >&5 echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 --- 8518,8531 ---- { 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 *************** *** 8927,8940 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include int main () { --- 8552,8567 ---- 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 () { *************** *** 8958,8965 **** gt_cv_func_dgettext_libc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! gt_cv_func_dgettext_libc=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 8585,8591 ---- gt_cv_func_dgettext_libc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 gt_cv_func_dgettext_libc=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 8980,9023 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* 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 (); /* 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 ! char (*f) () = $ac_func; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != $ac_func; ; return 0; } --- 8606,8642 ---- 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; } *************** *** 9037,9044 **** eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 8656,8662 ---- 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 *************** *** 9070,9080 **** LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 8688,8694 ---- LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 9083,9088 **** --- 8697,8708 ---- /* 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 () { *************** *** 9106,9113 **** ac_cv_lib_intl_bindtextdomain=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_intl_bindtextdomain=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 8726,8732 ---- ac_cv_lib_intl_bindtextdomain=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_intl_bindtextdomain=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 9125,9135 **** LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 8744,8750 ---- LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 9138,9143 **** --- 8753,8764 ---- /* 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 () { *************** *** 9161,9168 **** ac_cv_lib_intl_dgettext=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_intl_dgettext=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 8782,8788 ---- ac_cv_lib_intl_dgettext=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_intl_dgettext=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 9191,9201 **** LIBS="-lintl -liconv $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 8811,8817 ---- LIBS="-lintl -liconv $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 9204,9209 **** --- 8820,8831 ---- /* 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 () { *************** *** 9227,9234 **** ac_cv_lib_intl_dcgettext=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_intl_dcgettext=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 8849,8855 ---- ac_cv_lib_intl_dcgettext=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_intl_dcgettext=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 9265,9308 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* 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 (); /* 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 ! char (*f) () = $ac_func; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != $ac_func; ; return 0; } --- 8886,8922 ---- 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; } *************** *** 9322,9329 **** eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 8936,8942 ---- 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 *************** *** 9412,9455 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* 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 (); /* 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 ! char (*f) () = $ac_func; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != $ac_func; ; return 0; } --- 9025,9061 ---- 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; } *************** *** 9469,9476 **** eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 9075,9081 ---- 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 *************** *** 9563,9574 **** cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () { --- 9168,9181 ---- 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 () { *************** *** 9594,9601 **** DATADIRNAME=share else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! CATOBJEXT=.mo DATADIRNAME=lib fi --- 9201,9207 ---- DATADIRNAME=share else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 CATOBJEXT=.mo DATADIRNAME=lib fi *************** *** 9631,9637 **** # We need to process the po/ directory. POSUB=po ! ac_config_commands="$ac_config_commands default-3" for lang in $ALL_LINGUAS; do --- 9237,9243 ---- # We need to process the po/ directory. POSUB=po ! ac_config_commands="$ac_config_commands default-3" for lang in $ALL_LINGUAS; do *************** *** 9712,9718 **** # Check whether --enable-compile-warnings or --disable-compile-warnings was given. if test "${enable_compile_warnings+set}" = set; then enableval="$enable_compile_warnings" ! else enable_compile_warnings="$default_compile_warnings" fi; --- 9318,9324 ---- # Check whether --enable-compile-warnings or --disable-compile-warnings was given. if test "${enable_compile_warnings+set}" = set; then enableval="$enable_compile_warnings" ! enable_compile_warnings="$enableval" else enable_compile_warnings="$default_compile_warnings" fi; *************** *** 9745,9756 **** echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () { --- 9351,9364 ---- 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 () { *************** *** 9774,9781 **** has_option=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! has_option=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 9382,9388 ---- has_option=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 has_option=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 9840,9853 **** have_dladdr=false cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #define _GNU_SOURCE #include int main () { --- 9447,9462 ---- have_dladdr=false cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #define _GNU_SOURCE #include + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 9876,9883 **** have_dladdr=true else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext --- 9485,9491 ---- have_dladdr=true else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 10102,10107 **** --- 9710,9719 ---- # Activation idl files BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`" + if test "x$BONOBO_ACTIVATION_IDL_DIR_PC" = "x" ; then + BONOBO_ACTIVATION_IDL_DIR_PC=$BONOBO_ACTIVATION_IDL_DIR + fi + ################################################## *************** *** 10228,10234 **** fi ! ac_config_files="$ac_config_files Makefile po/Makefile.in idl/Makefile bonobo/Makefile bonobo/libbonobo-2.0.pc monikers/Makefile samples/Makefile samples/echo/Makefile tests/Makefile doc/Makefile doc/api/Makefile doc/api/figures/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure --- 9840,9846 ---- fi ! ac_config_files="$ac_config_files Makefile po/Makefile.in idl/Makefile bonobo/Makefile bonobo/libbonobo-2.0.pc monikers/Makefile samples/Makefile samples/echo/Makefile tests/Makefile doc/Makefile doc/api/Makefile doc/api/figures/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure *************** *** 10239,10245 **** # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # ! # `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. --- 9851,9857 ---- # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # ! # `ac_cv_env_foo' variables (set or unset) will be overriden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. *************** *** 10274,10280 **** t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache ! if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file --- 9886,9892 ---- t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache ! if cmp -s $cache_file confcache; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file *************** *** 10305,10325 **** DEFS=-DHAVE_CONFIG_H - ac_libobjs= - ac_ltlibobjs= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - - LTLIBOBJS=$ac_ltlibobjs - - mv -f po/POTFILES po/POTFILES.tmp --- 9917,9922 ---- *************** *** 10341,10352 **** # configure, is in config.log if it exists. debug=false - ac_cs_recheck=false - ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## --- 9938,9948 ---- # configure, is in config.log if it exists. debug=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF + ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## *************** *** 10355,10367 **** if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset --- 9951,9961 ---- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi + # NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset *************** *** 10369,10410 **** as_unset=false fi ! ! # Work around bugs in pre-3.0 UWIN ksh. ! $as_unset ENV MAIL MAILPATH ! PS1='$ ' ! PS2='> ' ! PS4='+ ' ! ! # NLS nuisances. ! for as_var in \ ! LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ! LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ! LC_TELEPHONE LC_TIME ! do ! if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then ! eval $as_var=C; export $as_var ! else ! $as_unset $as_var ! fi ! done ! ! # Required to use basename. ! if expr a : '\(a\)' >/dev/null 2>&1; then ! as_expr=expr ! else ! as_expr=false ! fi ! ! if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ! as_basename=basename ! else ! as_basename=false ! fi # Name of the executable. ! as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ --- 9963,9996 ---- 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\(/\)$' \| \ *************** *** 10415,10421 **** /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' --- 10001,10006 ---- *************** *** 10426,10440 **** # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then ! echo "#! /bin/sh" >conf$$.sh ! echo "exit 0" >>conf$$.sh ! chmod +x conf$$.sh ! if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi ! rm -f conf$$.sh fi --- 10011,10025 ---- # 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 *************** *** 10483,10490 **** 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 - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } CONFIG_SHELL=$as_dir/$as_base export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" ${1+"$@"} --- 10068,10073 ---- *************** *** 10558,10569 **** fi rm -f conf$$ conf$$.exe conf$$.file - if mkdir -p . 2>/dev/null; then - as_mkdir_p=: - else - as_mkdir_p=false - fi - as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. --- 10141,10146 ---- *************** *** 10580,10586 **** IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH exec 6>&1 --- 10157,10163 ---- IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } exec 6>&1 *************** *** 10597,10603 **** cat >&5 <<_CSEOF This file was extended by $as_me, which was ! generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS --- 10174,10180 ---- 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 *************** *** 10637,10643 **** -h, --help print this help, then exit -V, --version print version number, then exit - -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] --- 10214,10219 ---- *************** *** 10660,10666 **** cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 --- 10236,10242 ---- 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 *************** *** 10681,10705 **** --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ! ac_shift=: ! ;; ! -*) ! ac_option=$1 ! ac_optarg=$2 ! ac_shift=shift ;; *) # This is not an option, so the user has probably given explicit # arguments. - ac_option=$1 ac_need_defaults=false;; esac ! case $ac_option in # Handling of the options. _ACEOF ! cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ! ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) --- 10257,10281 ---- --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ! shift ! set dummy "$ac_option" "$ac_optarg" ${1+"$@"} ! shift ;; + -*);; *) # This is not an option, so the user has probably given explicit # arguments. ac_need_defaults=false;; esac ! 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) *************** *** 10714,10729 **** --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) ! $ac_shift ! CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) ! $ac_shift ! CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; # This is an error. -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --- 10290,10302 ---- --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) ! shift ! CONFIG_FILES="$CONFIG_FILES $1" ac_need_defaults=false;; --header | --heade | --head | --hea ) ! shift ! CONFIG_HEADERS="$CONFIG_HEADERS $1" ac_need_defaults=false;; # This is an error. -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 *************** *** 10738,10757 **** shift done - ac_configure_extra_args= - - if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" - fi - - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - fi - _ACEOF cat >>$CONFIG_STATUS <<_ACEOF --- 10311,10316 ---- *************** *** 10759,10766 **** # INIT-COMMANDS section. # - INTLTOOL_PERL=${INTLTOOL_PERL} _ACEOF --- 10318,10326 ---- # INIT-COMMANDS section. # INTLTOOL_PERL=${INTLTOOL_PERL} + AMDEP_TRUE="$AMDEP_TRUE" + ac_aux_dir="$ac_aux_dir" _ACEOF *************** *** 10804,10812 **** test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi - # Have a temporary directory for convenience. Make it in the build tree - # simply because there is no reason to put it here, and in addition, - # creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { --- 10364,10369 ---- *************** *** 10815,10831 **** } # Create a (secure) tmp directory for tmp files. ! { ! tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { ! tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { ! echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } --- 10372,10388 ---- } # Create a (secure) tmp directory for tmp files. ! : ${TMPDIR=/tmp} { ! tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { ! tmp=$TMPDIR/cs$$-$RANDOM (umask 077 && mkdir $tmp) } || { ! echo "$me: cannot create a temporary directory in $TMPDIR" >&2 { (exit 1); exit 1; } } *************** *** 10878,10889 **** --- 10435,10456 ---- 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 *************** *** 10910,10919 **** 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,@EGREP@,$EGREP,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t --- 10477,10486 ---- 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 s,@build_vendor@,$build_vendor,;t t *************** *** 10955,10966 **** s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@GLIB_GENMARSHAL@,$GLIB_GENMARSHAL,;t t s,@BONOBO_ACTIVATION_IDL_DIR@,$BONOBO_ACTIVATION_IDL_DIR,;t t s,@HTML_DIR@,$HTML_DIR,;t t s,@GTKDOC@,$GTKDOC,;t t s,@ENABLE_GTK_DOC_TRUE@,$ENABLE_GTK_DOC_TRUE,;t t s,@ENABLE_GTK_DOC_FALSE@,$ENABLE_GTK_DOC_FALSE,;t t - s,@LIBOBJS@,$LIBOBJS,;t t - s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF _ACEOF --- 10522,10532 ---- s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@GLIB_GENMARSHAL@,$GLIB_GENMARSHAL,;t t s,@BONOBO_ACTIVATION_IDL_DIR@,$BONOBO_ACTIVATION_IDL_DIR,;t t + s,@BONOBO_ACTIVATION_IDL_DIR_PC@,$BONOBO_ACTIVATION_IDL_DIR_PC,;t t s,@HTML_DIR@,$HTML_DIR,;t t s,@GTKDOC@,$GTKDOC,;t t s,@ENABLE_GTK_DOC_TRUE@,$ENABLE_GTK_DOC_TRUE,;t t s,@ENABLE_GTK_DOC_FALSE@,$ENABLE_GTK_DOC_FALSE,;t t CEOF _ACEOF *************** *** 11031,11060 **** /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! { if $as_mkdir_p; then ! mkdir -p "$ac_dir" ! else ! as_dir="$ac_dir" ! as_dirs= ! while test ! -d "$as_dir"; do ! as_dirs="$as_dir $as_dirs" ! as_dir=`(dirname "$as_dir") 2>/dev/null || ! $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X\(//\)[^/]' \| \ ! X"$as_dir" : 'X\(//\)$' \| \ ! X"$as_dir" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || ! echo X"$as_dir" | ! sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ! /^X\(\/\/\)[^/].*/{ s//\1/; q; } ! /^X\(\/\/\)$/{ s//\1/; q; } ! /^X\(\/\).*/{ s//\1/; q; } ! s/.*/./; q'` ! done ! test ! -n "$as_dirs" || mkdir $as_dirs ! fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 ! echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ! { (exit 1); exit 1; }; }; } ac_builddir=. --- 10597,10621 ---- /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! { case "$ac_dir" in ! [\\/]* | ?:[\\/]* ) as_incr_dir=;; ! *) as_incr_dir=.;; ! esac ! as_dummy="$ac_dir" ! for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do ! case $as_mkdir_dir in ! # Skip DOS drivespec ! ?:) 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=. *************** *** 11084,11090 **** # 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` --- 10645,10651 ---- # 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` *************** *** 11274,11280 **** # 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). echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS ! echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail --- 10835,10841 ---- # 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). echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS ! echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail *************** *** 11298,11304 **** mv conftest.tail conftest.defines done rm -f conftest.defines ! echo ' fi # grep' >>$CONFIG_STATUS echo >>$CONFIG_STATUS # Break up conftest.undefs because some shells have a limit on the size --- 10859,10865 ---- mv conftest.tail conftest.defines done rm -f conftest.defines ! echo ' fi # egrep' >>$CONFIG_STATUS echo >>$CONFIG_STATUS # Break up conftest.undefs because some shells have a limit on the size *************** *** 11338,11344 **** cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then ! if diff $ac_file $tmp/config.h >/dev/null 2>&1; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else --- 10899,10905 ---- 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 *************** *** 11354,11383 **** /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! { if $as_mkdir_p; then ! mkdir -p "$ac_dir" ! else ! as_dir="$ac_dir" ! as_dirs= ! while test ! -d "$as_dir"; do ! as_dirs="$as_dir $as_dirs" ! as_dir=`(dirname "$as_dir") 2>/dev/null || ! $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X\(//\)[^/]' \| \ ! X"$as_dir" : 'X\(//\)$' \| \ ! X"$as_dir" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || ! echo X"$as_dir" | ! sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ! /^X\(\/\/\)[^/].*/{ s//\1/; q; } ! /^X\(\/\/\)$/{ s//\1/; q; } ! /^X\(\/\).*/{ s//\1/; q; } ! s/.*/./; q'` ! done ! test ! -n "$as_dirs" || mkdir $as_dirs ! fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 ! echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ! { (exit 1); exit 1; }; }; } rm -f $ac_file mv $tmp/config.h $ac_file --- 10915,10939 ---- /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! { case "$ac_dir" in ! [\\/]* | ?:[\\/]* ) as_incr_dir=;; ! *) as_incr_dir=.;; ! esac ! as_dummy="$ac_dir" ! for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do ! case $as_mkdir_dir in ! # Skip DOS drivespec ! ?:) 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 *************** *** 11386,11391 **** --- 10942,10953 ---- 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 *************** *** 11436,11442 **** # 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` --- 10998,11004 ---- # 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` *************** *** 11444,11451 **** { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in ! default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;; ! default-2 ) sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-extract.in > intltool-extract.out if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then --- 11006,11012 ---- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in ! default-1 ) sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-extract.in > intltool-extract.out if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then *************** *** 11475,11480 **** --- 11036,11080 ---- chmod u+w intltool-update ;; + default-2 ) + 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-3 ) case "$CONFIG_FILES" in *po/Makefile.in*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; *************** *** 11500,11510 **** # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null ! $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. --- 11100,11107 ---- # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: exec 5>/dev/null ! $SHELL $CONFIG_STATUS || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. diff -crN ./libbonobo/doc/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/Makefile.in *** ./libbonobo/doc/Makefile.in Fri Mar 14 16:55:32 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/Makefile.in Sat Aug 9 21:12:56 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 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,72 **** --- 57,74 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ + AWK = @AWK@ BONOBO_ACTIVATION_IDL_DIR = @BONOBO_ACTIVATION_IDL_DIR@ + BONOBO_ACTIVATION_IDL_DIR_PC = @BONOBO_ACTIVATION_IDL_DIR_PC@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 76,81 **** --- 78,84 ---- GMSGFMT = @GMSGFMT@ GTKDOC = @GTKDOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 102,108 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 105,110 ---- *************** *** 120,150 **** VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ SUBDIRS = api EXTRA_DIST = NAMESPACE 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 doc/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. --- 122,169 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ + install_sh = @install_sh@ SUBDIRS = api EXTRA_DIST = NAMESPACE + subdir = doc 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 doc/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. *************** *** 152,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. ! ! @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//`; \ --- 171,177 ---- # (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//`; \ *************** *** 180,190 **** 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"; \ --- 194,209 ---- 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"; \ *************** *** 203,253 **** 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 = doc 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 \ --- 222,281 ---- 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 \ *************** *** 255,334 **** 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. --- 283,378 ---- 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 ./libbonobo/doc/api/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/Makefile.in *** ./libbonobo/doc/api/Makefile.in Fri Mar 14 16:55:36 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/Makefile.in Sat Aug 9 21:12:57 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 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,72 **** --- 57,74 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ + AWK = @AWK@ BONOBO_ACTIVATION_IDL_DIR = @BONOBO_ACTIVATION_IDL_DIR@ + BONOBO_ACTIVATION_IDL_DIR_PC = @BONOBO_ACTIVATION_IDL_DIR_PC@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 76,81 **** --- 78,84 ---- GMSGFMT = @GMSGFMT@ GTKDOC = @GTKDOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 102,108 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 105,110 ---- *************** *** 120,127 **** --- 122,132 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ + install_sh = @install_sh@ SUBDIRS = figures *************** *** 153,163 **** IGNORE_HFILES = # Images to copy into HTML directory. ! HTML_IMAGES = figures/persist.png figures/persist-file.png figures/persist-storage.png figures/persist-stream.png figures/stream.png figures/storage.png figures/unknown.png # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). ! content_files = faq.xml debugging.xml properties.xml refcounting.xml monikers-overview.xml # Other files to distribute. --- 158,171 ---- IGNORE_HFILES = # Images to copy into HTML directory. ! HTML_IMAGES = figures/persist.png figures/persist-file.png\ ! figures/persist-storage.png figures/persist-stream.png\ ! figures/stream.png figures/storage.png figures/unknown.png # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). ! content_files = faq.xml debugging.xml properties.xml refcounting.xml\ ! monikers-overview.xml # Other files to distribute. *************** *** 165,171 **** # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. ! GTKDOC_CFLAGS = @CFLAGS@ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(LIBBONOBO_CFLAGS) -I$(top_srcdir) -I$(top_builddir) GTKDOC_LIBS = $(top_builddir)/bonobo/libbonobo-2.la $(LIBBONOBO_LIBS) --- 173,185 ---- # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. ! GTKDOC_CFLAGS = \ ! @CFLAGS@ \ ! -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ ! -I$(top_srcdir) \ ! -I$(top_builddir) \ ! @CPPFLAGS@ \ ! $(LIBBONOBO_CFLAGS) GTKDOC_LIBS = $(top_builddir)/bonobo/libbonobo-2.la $(LIBBONOBO_LIBS) *************** *** 191,223 **** TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) ! EXTRA_DIST = $(content_files) $(extra_files) $(DOC_MAIN_SGML_FILE) $(DOC_MODULE).types $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt ! ! ! DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp ! ! ! SCANOBJ_FILES = $(DOC_MODULE).args $(DOC_MODULE).hierarchy $(DOC_MODULE).interfaces $(DOC_MODULE).prerequisites $(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 doc/api/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. --- 205,263 ---- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) ! EXTRA_DIST = \ ! $(content_files) \ ! $(extra_files) \ ! $(DOC_MAIN_SGML_FILE) \ ! $(DOC_MODULE).types \ ! $(DOC_MODULE)-sections.txt \ ! $(DOC_MODULE)-overrides.txt ! ! ! DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ ! $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp ! ! ! SCANOBJ_FILES = \ ! $(DOC_MODULE).args \ ! $(DOC_MODULE).hierarchy \ ! $(DOC_MODULE).interfaces \ ! $(DOC_MODULE).prerequisites \ ! $(DOC_MODULE).signals + subdir = doc/api 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 doc/api/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. *************** *** 225,236 **** # (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//`; \ --- 265,271 ---- # (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//`; \ *************** *** 253,263 **** 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"; \ --- 288,303 ---- 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"; \ *************** *** 276,326 **** 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 = doc/api 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 \ --- 316,375 ---- 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 \ *************** *** 328,408 **** 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 ! $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook ! 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-local 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-local - 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-local ! 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 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-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-local install-data-am install-data install-am \ ! install uninstall-am uninstall all-local all-redirect all-am all \ ! installdirs-am installdirs mostlyclean-generic distclean-generic \ ! clean-generic maintainer-clean-generic clean mostlyclean distclean \ ! maintainer-clean @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp --- 377,478 ---- 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 ! $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="${top_distdir}" distdir="$(distdir)" \ ! dist-hook check-am: all-am check: check-recursive ! all-am: Makefile all-local ! 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 clean-local 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-data-local ! ! 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 \ ! maintainer-clean-local ! ! 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 all-local check check-am \ ! clean clean-generic clean-libtool clean-local 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-local \ ! 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-local \ ! maintainer-clean-recursive mostlyclean mostlyclean-generic \ ! mostlyclean-libtool mostlyclean-recursive tags tags-recursive \ ! uninstall uninstall-am uninstall-info-am \ ! uninstall-info-recursive uninstall-recursive @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp *************** *** 479,486 **** echo '-- Installing '$$i ; \ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ fi) # --- 549,554 ---- *************** *** 500,506 **** -cp $(srcdir)/html/* $(distdir)/html .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: --- 568,573 ---- diff -crN ./libbonobo/doc/api/figures/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/figures/Makefile.in *** ./libbonobo/doc/api/figures/Makefile.in Fri Mar 14 16:55:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/figures/Makefile.in Sat Aug 9 21:12:57 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 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,72 **** --- 57,74 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ + AWK = @AWK@ BONOBO_ACTIVATION_IDL_DIR = @BONOBO_ACTIVATION_IDL_DIR@ + BONOBO_ACTIVATION_IDL_DIR_PC = @BONOBO_ACTIVATION_IDL_DIR_PC@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 76,81 **** --- 78,84 ---- GMSGFMT = @GMSGFMT@ GTKDOC = @GTKDOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 102,108 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 105,110 ---- *************** *** 120,129 **** VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ ! diagrams = persist.dia persist-file.dia persist-storage.dia persist-stream.dia storage.dia stream.dia unknown.dia diagrams_png = $(diagrams:.dia=.png) --- 122,135 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ + install_sh = @install_sh@ ! diagrams = persist.dia persist-file.dia persist-storage.dia \ ! persist-stream.dia storage.dia stream.dia unknown.dia diagrams_png = $(diagrams:.dia=.png) *************** *** 131,235 **** MAINTAINERCLEANFILES = $(diagrams_png) EXTRA_DIST = $(diagrams) $(diagrams_png) 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 doc/api/figures/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 = doc/api/figures 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 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: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) ! mostlyclean-am: mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: 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: 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-local all-redirect all-am all installdirs mostlyclean-generic \ ! distclean-generic clean-generic maintainer-clean-generic clean \ ! mostlyclean distclean maintainer-clean all-local: $(diagrams_png) --- 137,268 ---- MAINTAINERCLEANFILES = $(diagrams_png) EXTRA_DIST = $(diagrams) $(diagrams_png) + subdir = doc/api/figures 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 doc/api/figures/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 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." -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) ! clean: clean-am ! clean-am: clean-generic clean-libtool 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-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-generic mostlyclean-libtool ! ! uninstall-am: uninstall-info-am ! ! .PHONY: all all-am all-local check check-am clean clean-generic \ ! clean-libtool distclean distclean-generic distclean-libtool \ ! 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-generic \ ! mostlyclean-libtool uninstall uninstall-am uninstall-info-am all-local: $(diagrams_png) *************** *** 238,244 **** # NOTE: if you edit the dia files, save them UNcompressed! %.png: %.dia @dia $< -e $@ 2> /dev/null || true - # 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: --- 271,276 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-config-database.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-config-database.sgml *** ./libbonobo/doc/api/tmpl/bonobo-config-database.sgml Fri Mar 14 16:55:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-config-database.sgml Sat Aug 9 21:17:17 2003 *************** *** 9,345 **** - - - - - - - - - - - @db: - @key: - @opt_ev: - @Returns: - - - - - - - - @db: - @key: - @defval: - @def: - @Returns: - - - - - - - - @db: - @key: - @opt_ev: - @Returns: - - - - - - - - @db: - @key: - @defval: - @def: - @Returns: - - - - - - - - @db: - @key: - @opt_ev: - @Returns: - - - - - - - - @db: - @key: - @defval: - @def: - @Returns: - - - - - - - - @db: - @key: - @opt_ev: - @Returns: - - - - - - - - @db: - @key: - @defval: - @def: - @Returns: - - - - - - - - @db: - @key: - @opt_ev: - @Returns: - - - - - - - - @db: - @key: - @defval: - @def: - @Returns: - - - - - - - - @db: - @key: - @opt_ev: - @Returns: - - - - - - - - @db: - @key: - @defval: - @def: - @Returns: - - - - - - - - @db: - @key: - @opt_ev: - @Returns: - - - - - - - - @db: - @key: - @defval: - @def: - @Returns: ! ! ! ! ! ! ! @db: ! @key: ! @opt_ev: ! @Returns: ! ! ! ! ! ! ! ! @db: ! @key: ! @defval: ! @def: ! @Returns: ! ! ! ! ! ! ! ! @db: ! @key: ! @opt_ev: ! @Returns: ! ! ! ! ! ! ! ! @db: ! @key: ! @defval: ! @def: ! @Returns: ! ! ! ! ! ! ! ! @db: ! @key: ! @opt_tc: ! @opt_ev: ! @Returns: ! ! ! ! ! ! ! ! @db: ! @key: ! @value: ! @opt_ev: ! ! ! ! ! ! ! ! @db: ! @key: ! @value: ! @opt_ev: ! ! ! ! ! ! ! ! @db: ! @key: ! @value: ! @opt_ev: ! ! ! ! ! ! ! ! @db: ! @key: ! @value: ! @opt_ev: ! ! ! ! ! ! ! ! @db: ! @key: ! @value: ! @opt_ev: ! ! ! ! ! ! ! ! @db: ! @key: ! @value: ! @opt_ev: ! ! ! ! ! ! ! ! @db: ! @key: ! @value: ! @opt_ev: ! ! ! ! ! ! ! ! @db: ! @key: ! @value: ! @opt_ev: ! ! ! ! ! ! ! ! @db: ! @key: ! @value: ! @opt_ev: ! ! ! - @db: - @key: - @value: - @opt_ev: - --- 9,18 ---- ! diff -crN ./libbonobo/doc/api/tmpl/bonobo-context.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-context.sgml *** ./libbonobo/doc/api/tmpl/bonobo-context.sgml Fri Mar 14 16:55:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-context.sgml Sat Aug 9 21:17:17 2003 *************** *** 2,103 **** bonobo-context ! Extensible runtime service interface ! The bonobo-context code is designed to provide a way to ! expose CORBA contexts through a single C interface. This ! is so that language bindings can get away with wrapping ! a single function, and yet have access to the whole ! Bonobo service framework. Two examples of this are the ! MonikerContext and the RunningContext ( see ! Bonobo_Context.idl ). ! ! ! ! ! Getting and using the moniker context ! ! Bonobo_MonikerContext context; ! Bonobo_Unknown object; ! ! context = bonobo_context_get ("Activation", NULL); ! ! if (context == CORBA_OBJECT_NIL) ! g_error (_("Internal error, no activation context")); ! ! object = Bonobo_MonikerContext_getObject ( ! "file:/demo/a.jpeg", "Bonobo/Control", ev); ! ... ! ! ! ! ! ! The list of contexts is open and may be expanded in the future, ! currently there are the following: ! ! ! ! Activation - Bonobo/MonikerContext ! ! ! ! ! Running - Bonobo/RunningContext ! ! ! ! ! ! ! The running context is particularly useful for ensuring that ! server processes exit cleanly when all their objects and ! derived objects are dead. To do this we can simply do the ! following: ! ! ! ! How to get a factory to quit when it is idle ! ! static void ! last_unref_exit_cb (gpointer context, ! BonoboObject *factory) ! { ! bonobo_object_unref (factory); ! gtk_main_quit (); ! } ! ... ! int main (int argc, char **argv) ! { ! ... ! bonobo_running_context_ignore_object (BONOBO_OBJREF (object)); ! ! gtk_signal_connect (GTK_OBJECT (bonobo_context_running_get ()), ! "last_unref", last_unref_exit_cb, factory); ! ... ! bonobo_main (); ! } ! ! ! ! ! Since this is a commonly used thing there is a helper to make this ! easier: ! ! How to get a factory to quit when it is idle ! ! bonobo_running_context_auto_exit_unref (factory) ! ! --- 2,21 ---- bonobo-context ! ! + + diff -crN ./libbonobo/doc/api/tmpl/bonobo-event-source.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-event-source.sgml *** ./libbonobo/doc/api/tmpl/bonobo-event-source.sgml Fri Mar 14 16:55:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-event-source.sgml Sat Aug 9 21:17:16 2003 *************** *** 2,97 **** bonobo-event-source ! An Event Source where clients can connect to listen to events. ! An event source object is responsible for channeling the emission ! of signals on an object to the appropriate attached listeners. ! The API is extremely simple and allows implementations to notify ! their listeners of a new event occuring. ! ! ! ! To notify a listener, you need to construct a textual string, ! this is done by the bonobo_event functions ! ( see #BonoboListener ) ':' delimiting the fields. It is reccommended ! that the IDL module path of the interface be used as the first ! part of the string. This is because many interfaces can be aggregated ! together and need to share the same event namespace without conflicts. ! So for example the bonobo property bag notification code ! uses the IDL path "Bonobo/Property" the "change" kind and sets the ! sub-type to the property name: ! ! An example event source notification ! ! static void ! notify_listeners (BonoboPropertyBag *pb, ! BonoboProperty *prop, ! const BonoboArg *new_value, ! CORBA_Environment *opt_ev) ! { ! if (prop->flags & BONOBO_PROPERTY_NO_LISTENING) ! return; ! ! bonobo_event_source_notify_listeners_full (pb->es, ! "Bonobo/Property", ! "change", prop->name, ! new_value, opt_ev); ! } ! ! ! Of course, you need to notify the listener with a valid ! BonoboArg containing the event data, this could easily contain ! a structure. eg. ! ! Passing a structure in an event ! ! module GNOME { ! module Foo { ! struct BaaEvent { ! double a; ! string b; ! long c; ! }; ! }; ! }; ! ! ! static void ! fire_event (BonoboEventSource *on_source, ! double a_double, ! char *a_string, ! long a_float, ! CORBA_Environment *opt_ev) ! { ! CORBA_any any; ! GNOME_Foo_BaaEvent e; ! ! e.a = a_double; ! e.b = a_string; ! e.c = a_float; ! ! any->_type = TC_GNOME_Foo_BaaEvent; ! any->_data = &e; ! ! bonobo_event_source_notify_listeners_full ( ! on_source, "GNOME/Foo", "event", NULL, ! &any, opt_ev); ! } ! ! ! NB. it is reccommended that you make it clear that the event ! structure is intended for use with the #BonoboEventSource / ! #BonoboListener by naming it XYZEvent, ie. with the 'Event' ! suffix. ! #BonoboListener #BonoboArg --- 2,21 ---- bonobo-event-source ! ! + ! + *************** *** 134,141 **** @event_name: @opt_value: @opt_ev: - - @value: --- 58,63 ---- *************** *** 149,156 **** @subtype: @opt_value: @opt_ev: - - @value: --- 71,76 ---- *************** *** 161,168 **** @object: @listener: @opt_ev: - - @id: --- 81,86 ---- *************** *** 175,182 **** @opt_mask: @opt_ev: @user_data: - - @Returns: --- 93,98 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-exception.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-exception.sgml *** ./libbonobo/doc/api/tmpl/bonobo-exception.sgml Fri Mar 14 16:55:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-exception.sgml Sat Aug 9 21:17:17 2003 *************** *** 2,104 **** bonobo-exception - maps CORBA exceptions to user readable text, + helper macros - - - This module contains some useful helper functions - that can be used to set various exceptions inside your - CORBA methods. It also contains code to map between - complex CORBA_Environment exceptions and helpful - strings suitable for display to the user. - - Typically to test for exceptions the BONOBO_EX macro - is used thus: - - Bonobo exception trapping and reporting - - int - do_something (CORBA_Environment *ev) - { - ... - - retval = Foo_Baa_method (object, ev); - - if (BONOBO_EX (ev)) { - if (BONOBO_USER_EX (ev, ex_CosNaming_NamingContext_NotFound)) { - g_warning ("Not found"); - } else { - char *str; - - g_warning ("Exception '%s' occured", - (str = bonobo_exception_get_text (ev))); - g_free (str); - } - return -1; - } - ... - } - - ! This macro sets the stateless user exception with @repo_id on ! @opt_ev or warns if @opt_ev == NULL ! @opt_ev: an optional corba exception environment. ! @repo_id: repoid of the exception to set. ! this macro is used for bonobo preconditons on argument types, ! usualy inside skels if @expr is FALSE a warning is printed and ! @opt_ev is set to ex_Bonobo_BadArg. ! @expr: an expression that should be true ! @opt_ev: an optional corba exception environment. ! this macro is used for bonobo preconditons on argument types, ! usualy inside skels if @expr is FALSE a warning is printed and ! @opt_ev is set to ex_Bonobo_BadArg. ! @expr: an expression that should be true ! @val: a value to return on failure. ! @opt_ev: an optional corba exception environment. ! This macro returns TRUE if @ev flags an exception. ! @ev: the exception environment ! This macro returns TRUE if @ev contains a user exception ! of type @id. ! @ev: the exception environment ! @id: the repo_id of the exception --- 2,64 ---- bonobo-exception + + + ! ! @opt_ev: ! @repo_id: ! ! @expr: ! @opt_ev: ! ! @expr: ! @val: ! @opt_ev: ! ! @ev: ! ! @ev: ! @id: *************** *** 111,143 **** ! returns if there is an exception flagged in @ev. ! @ev: the exception environment ! returns @v if there is an exception flagged in @ev ! @ev: the exception environment ! @v: the value to return ! The prototype for user registerable exception decoders. ! @ev: the exception environment ! @user_data: user data to be passed to the function ! @Returns: a g_malloc'd copy of a translated user readable error string. @ev: --- 71,104 ---- ! ! @ev: ! ! @ev: ! @v: ! ! @ev: ! @user_data: ! @Returns: + @ev: *************** *** 155,160 **** --- 116,122 ---- + @repo_id: *************** *** 163,168 **** --- 125,131 ---- + @repo_id: diff -crN ./libbonobo/doc/api/tmpl/bonobo-generic-factory.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-generic-factory.sgml *** ./libbonobo/doc/api/tmpl/bonobo-generic-factory.sgml Fri Mar 14 16:55:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-generic-factory.sgml Sat Aug 9 21:17:16 2003 *************** *** 1,78 **** ! BonoboGenericFactory ! The basic, generic Bonobo object factory implementation - The vast majority of Bonobo objects are created by the - #BonoboGenericFactory implementation. This provides a - very simple C sugar wrapper of the GNOME::ObjectFactory - IDL interface, used by OAF to instantiate new objects. - - - Most applications when they start up will register their - Bonobo object factory with OAF, this can be done like this: - - How to register a factory with OAF - - BonoboGenericFactory *factory; - - factory = bonobo_generic_factory_new_multi ( - "OAFIID:GNOME_MyApp_myId", - my_factory_function, NULL); - bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory)); - - - This registers the factory with OAF, associated with your - factory's OAFIID ( as specified in the installed .oaf file ). - The running_context_auto_exit_unref function is used to ensure - that the program exits the gtk main loop when all of the factory's - ( or any derived ) objects are destroyed. - - - When an object that is created by your factory is demanded from - OAF the my_factory_function will be called: - - A simple factory - - static BonoboObject * - my_factory_fn (BonoboGenericFactory *this, - const char *object_id, - void *data) - { - BonoboObject *object = NULL; - - g_return_val_if_fail (object_id != NULL, NULL); - - if (!strcmp (object_id, "OAFIID:Bonobo_Sample_Clock")) - object = bonobo_clock_control_new (); - else - g_warning ("Unknown OAFIID '%s'", object_id); - - return object; - } - - - This will return the newly constructed object via OAF to - the Object requestor. - - The generic factory works in two modes, multi and plain, - it is recommended that the multi mode be used. Also, there - is a macro that can be used for simple components to remove - the burden of writing the main function and getting the - initialization correct, see #BONOBO_OAF_FACTORY_MULTI. - --- 1,21 ---- ! bonobo-generic-factory ! + *************** *** 118,129 **** @factory_cb: @user_data: @Returns: - - @oaf_iid: - @factory: - @component_id: - @data: - @goad_id: --- 61,66 ---- *************** *** 145,158 **** @act_iid: @factory_cb: @Returns: - - @oaf_iid: - @c_factory: - @corba_factory: - @user_data: - @component_id: - @data: - @goad_id: --- 82,87 ---- *************** *** 197,204 **** @version: @callback: @data: - - @fn: --- 126,131 ---- *************** *** 211,218 **** @version: @callback: @data: - - @fn: --- 138,143 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-i18n.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-i18n.sgml *** ./libbonobo/doc/api/tmpl/bonobo-i18n.sgml Fri Mar 14 16:55:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-i18n.sgml Sat Aug 9 21:17:17 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libbonobo/doc/api/tmpl/bonobo-item-container.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-item-container.sgml *** ./libbonobo/doc/api/tmpl/bonobo-item-container.sgml Fri Mar 14 16:55:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-item-container.sgml Sat Aug 9 21:17:16 2003 *************** *** 1,19 **** ! BonoboItemContainer ! this implements a simple container interface for compound document containers ! This implementation is mostly deprecated, see #BonoboItemHandler ! #BonoboItemHandler --- 1,21 ---- ! bonobo-item-container ! ! + ! + *************** *** 72,85 **** @name: - - - - - - @bonoboitemcontainer: the object which received the signal. - @arg1: - @arg2: - @arg3: - @Returns: - --- 74,76 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-item-handler.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-item-handler.sgml *** ./libbonobo/doc/api/tmpl/bonobo-item-handler.sgml Fri Mar 14 16:55:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-item-handler.sgml Sat Aug 9 21:17:16 2003 *************** *** 1,97 **** ! BonoboItemHandler ! Simple Moniker Arguments - ! Sometimes you want to pass "arguments" to a component. ! Consider the component with the following OAFIID: - OAFIID:GNOME_FileSelector - - You might want to be able to set configuration options from - its moniker name, without having to ever use the property bag - API. For example: - - OAFIID:GNOME_FileSelector!AcceptMimeTypes=image/* - - - Implementing it - - Create a BonoboItemHandler. This component will - let you do argument parsing of any kind. - - You have to provide two functions: enumObjects - (this can be empty) and getObject. - The getObject function will be called when the moniker - mechanism is trying to resolve a set of arguments to your - function. - Like this: - - - Bonobo_Unknown - getObject (BonoboItemHandler *h, const char *item_name, - gboolean only_if_exists, gpointer data, - CORBA_Environment *ev) - { - MyData *m = data; - - if (strcmp (item_name, "friendly") == 0){ - m->friendly = true; - } - - /* we just return ourselves */ - return bonobo_object_dup_ref (bonobo_object_corba_objref (h), NULL); - } - - - - So basically during the `getObject' operation you will be - given a chance to process the `item_name' string which is - basically like a command line argument (for the sake of - explaining this) and based on this information you can - customize your component. - - - - - Sample functions - - Sometimes you will want to specify a bunch of options to - configure your component, like this: - - OAFIID:MyComponent!visible=true;image=blah.png - - So we are separating the various options with semi-colons - here. To simplify your code, we have provided a couple of - functions that given the following string: - visible=true;image=blah.png - Will return a GList split with BonoboItemOptions: - - - GSList *l, *x; - - x = bonobo_item_option_parse ("visible=true;image=blah.png"); - - for (l = x; l != NULL; l++){ - BonoboItemOption *io = l->data; - - printf ("Key=%s, Value=%s\n", io->key, io->value); - } - bonobo_item_option_free (x); - - - ! A simplistic implementation exists in #BonoboItemContainer. --- 1,21 ---- ! bonobo-item-handler ! ! ! + *************** *** 147,155 **** @enum_objects: @get_object: @Returns: - - @user_data: - @corba_handler: --- 71,76 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-listener.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-listener.sgml *** ./libbonobo/doc/api/tmpl/bonobo-listener.sgml Fri Mar 14 16:55:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-listener.sgml Sat Aug 9 21:17:16 2003 *************** *** 2,81 **** bonobo-listener ! An Event Listener (an implementation of Bonobo::Listener) - The BonoboListener object is a CORBA server used to receive events - emitted by a remote Bonobo::EventSource server. The combination - EventSource/Listener is used to notify one or more client - applications of events that happen in a component. Think of the - EventSource/Listener as a notification/callback system that allows - multiple clients to be informed of events. - - - Once created, the BonoboListener object needs to be attached to a - remote IDL:Bonobo/EventSource:1.0 server. This is done by passing the - CORBA Object reference of the BonoboListener to the addListener - method in the IDL:Bonobo/EventSource:1.0. - - The BonoboListener object allows the user to specify a callback - function to be invoked when an event is emitted by the - IDL:Bonobo/EventSource:1.0 server. The BonoboListener object also - emits the "event_notify" Gtk+ signal, which allows you to connect - multiple code segments to the same event notification. - - Here is a sample client application that registers interest in - being notified of events from the fictional "Keyboard" event - source: - - - - BonoboListener *keyboard_listener; - - my_listener_function (BonoboListener *l, char *event_name, - CORBA_any value, CORBA_Environment *ev, - gpointer user_data) - { - printf ("Received event named: %s\n", event_name); - } - - connect_to_keyboard_source (Bonobo_EventSource *keyboard) - { - Bonobo_Unknown reference; - - /* - * First, create the listener Bonobo server. - */ - keyboard_listener = bonobo_listener_new (my_listener_function, NULL); - - /* - * Now, register our listener with the EventSource - */ - reference = bonobo_object_corba_objref (keyboard_listener); - Bonobo_EventSource_addListener (keyboard, reference); - } - - - - The CORBA::any value passed to the listener function is defined by - the contract between the EventSource's event you are using and you. - To manipulate the value, you can use the CORBA DynamicAny interface - to introspect the value and extract the information you need. - - - - - #BonoboEventSource #BonoboArg - --- 2,20 ---- bonobo-listener ! + *************** *** 104,118 **** ! The signature for the callback function invoked when an event is ! delivered to the BonoboListener object. ! @listener: a pointer to the BonoboListener. ! @event_name: the event name that was emitted. ! @any: The value (A CORBA Any) that was passed by the EventSource. ! @ev: Environment for returning CORBA errors. ! @user_data: the data pointer specified when you called bonobo_listener_new --- 43,56 ---- ! ! @listener: ! @event_name: ! @any: ! @ev: ! @user_data: *************** *** 123,130 **** @event_cb: @user_data: @Returns: - - @event_callback: --- 61,66 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-macros.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-macros.sgml *** ./libbonobo/doc/api/tmpl/bonobo-macros.sgml Fri Mar 14 16:55:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-macros.sgml Sat Aug 9 21:17:17 2003 *************** *** 9,19 **** --- 9,21 ---- + + *************** *** 23,419 **** @type_as_function: @corba_type: @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ parent_type: @parent_type_macro: @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ - register_type_macro: - @\ register_type_macro: - - @parent_type: - @register_type_macro: --- 25,34 ---- *************** *** 433,1449 **** @parent_class_cast: @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: @\ ! name: @\ ! name: @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @\ ! name: ! @args: ! @def_return: ! ! @name: ! ! ! ! ! ! ! ! @type: ! @type_as_function: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @parent_type_macro: ! ! @parent_type: ! ! ! ! ! ! ! ! @type: ! @type_as_function: ! @corba_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @\ ! parent_type: ! @parent_type_macro: ! ! @parent_type: ! ! ! ! ! ! ! ! @type: ! @type_as_function: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: ! @\ ! parent_type: ! @\ ! corba_type: @\ parent_type: @parent_type_macro: - - @corba_type: - @parent_type: --- 48,95 ---- @parent_class_cast: @\ ! name: ! @args: ! @def_return: ! ! ! ! ! ! ! ! @type: ! @type_as_function: @\ ! parent_type: ! @parent_type_macro: ! ! ! ! ! ! ! ! @type: ! @type_as_function: ! @corba_type: @\ ! parent_type: ! @parent_type_macro: ! ! ! ! ! ! ! ! @type: ! @type_as_function: @\ ! corba_type: @\ parent_type: @parent_type_macro: *************** *** 1455,1655 **** @type_as_function: @corba_type: @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ - parent_type: - @\ parent_type: @parent_type_macro: - - @parent_type: --- 101,107 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-main.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-main.sgml *** ./libbonobo/doc/api/tmpl/bonobo-main.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-main.sgml Sat Aug 9 21:17:17 2003 *************** *** 2,19 **** bonobo-main ! Bonobo initialization. ! Initialization functions for Bonobo applications. --- 2,21 ---- bonobo-main ! ! + + *************** *** 30,39 **** @argc: @argv: @Returns: - - @orb: - @poa: - @manager: --- 32,37 ---- *************** *** 88,94 **** ! Returns the CORBA_ORB object that is being used by Bonobo. @Returns: --- 86,92 ---- ! @Returns: *************** *** 96,102 **** ! Returns the POA object that is being used by Bonobo. @Returns: --- 94,100 ---- ! @Returns: *************** *** 104,110 **** ! Returns the POA Manager object that is being used by Bonobo. @Returns: --- 102,108 ---- ! @Returns: diff -crN ./libbonobo/doc/api/tmpl/bonobo-moniker-context.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-moniker-context.sgml *** ./libbonobo/doc/api/tmpl/bonobo-moniker-context.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-moniker-context.sgml Sat Aug 9 21:17:17 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libbonobo/doc/api/tmpl/bonobo-moniker-extender.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-moniker-extender.sgml *** ./libbonobo/doc/api/tmpl/bonobo-moniker-extender.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-moniker-extender.sgml Sat Aug 9 21:17:16 2003 *************** *** 1,101 **** ! BonoboMonikerExtender ! A way to extend arbitary monikers ! A moniker extender is used to extend the functionality of a moniker. ! There are two standard moniker extenders that cannot be system wide, ! since they use the oaf database to expand the scope of a moniker to ! arbitrarily many interfaces. These are invoked explicitely by monikers ! implementing the stream interface in the following way: ! ! Explicit Stream extender usage example ! ! Bonobo_Unknown ! example_moniker_resolve (BonoboMoniker *moniker, ! const Bonobo_ResolveOptions *options, ! const CORBA_char *requested_interface, ! CORBA_Environment *ev) ! { ! if (!strcmp (requested_interface, "IDL:Bonobo/Stream:1.0")) ! return handle_stream (moniker, options, ev); ! else ! return bonobo_moniker_use_extender ( ! "OAFIID:Bonobo_MonikerExtender_stream", ! moniker, options, requested_interface, ev); ! } ! ! ! The moniker extender essentialy resolves 'moniker' against stream ! and my some means ( not known when the moniker was written ) converts ! this to a new exotic interface - via. the PersistStream interface. ! ! ! ! All standard moniker extenders are registered by adding a fragment ! like this: ! ! Oaf information for an extender ! ! <oaf_attribute name="bonobo:moniker_extender" type="stringv"> ! <item value="file:"/> ! </oaf_attribute> ! ! ! to the .oaf file. This registers the extender with the system, such ! that when a moniker resolve fails an extender can be found for any ! of the monikers with prefix specified in the "bonobo:moniker_extender" ! stringv. ! ! ! ! Implementing your own extender is extremely simple, much like ! #BonoboMonikerSimple. ! ! Oaf information for an extender ! ! Bonobo_Unknown ! example_extender_resolve (BonoboMonikerExtender *extender, ! const Bonobo_Moniker m, ! const Bonobo_ResolveOptions *options, ! const CORBA_char *display_name, ! const CORBA_char *requested_interface, ! CORBA_Environment *ev) ! { ! ... resolve 'm' against an interface we know it supports ... ! ... then use that interface to provide requested_interface ... ! } ! ! ! It is registered again in much the same way in your factory: ! ! Creating a new simple moniker ! ! static BonoboObject * ! bonobo_std_moniker_factory (BonoboGenericFactory *this, ! const char *object_id, ! void *data) ! { ! g_return_val_if_fail (object_id != NULL, NULL); ! ! if (!strcmp (object_id, "OAFIID:Bonobo_MonikerExtender_file")) ! return BONOBO_OBJECT (bonobo_moniker_extender_new ( ! example_extender_resolve, NULL)); ! else ! return NULL; ! } ! ! --- 1,21 ---- ! bonobo-moniker-extender ! ! + + *************** *** 148,155 **** @interface: @opt_ev: @Returns: - - @ev: --- 68,73 ---- *************** *** 163,169 **** @requested_interface: @opt_ev: @Returns: - - @ev: --- 81,85 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-moniker-simple.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-moniker-simple.sgml *** ./libbonobo/doc/api/tmpl/bonobo-moniker-simple.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-moniker-simple.sgml Sat Aug 9 21:17:16 2003 *************** *** 1,84 **** ! BonoboMonikerSimple ! A super easy to use moniker implementation wrapper ! BonoboMonikerSimple makes writing monikers really extremely ! easy. To implement a moniker you only have to write 1 function. ! To register create the moniker object you have to use only 1 ! call. It can't get much simpler. If you want to use monikers ! instead of implementing them, you probably want to see ! #bonobo-moniker-util instead. ! ! ! ! Few people need to implement monikers, but if they do, this ! is how they should do it: ! ! A cut down file: moniker implementation ! ! Bonobo_Unknown ! bonobo_moniker_file_resolve (BonoboMoniker *moniker, ! const Bonobo_ResolveOptions *options, ! const CORBA_char *requested_interface, ! CORBA_Environment *ev) ! { ! const char *fname = bonobo_moniker_get_name (moniker); ! Bonobo_Unknown retval; ! ! g_warning ("Fname '%s'", fname); ! ! if (!strcmp (requested_interface, "IDL:Bonobo/Stream:1.0")) { ! BonoboStream *stream; ! ! stream = bonobo_stream_open ("fs", fname, ! Bonobo_Storage_READ, 0664); ! ! if (!stream) { ! g_warning ("Failed to open stream '%s'", fname); ! CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ! ex_Bonobo_Moniker_InterfaceNotFound, NULL); ! return CORBA_OBJECT_NIL; ! } ! ! return CORBA_Object_duplicate (BONOBO_OBJREF (stream), ev); ! } ! ! return CORBA_OBJECT_NIL; ! } ! ! ! After implementing the resolve function, you need to create the new moniker ! in your standard factory: ! ! Creating a new simple moniker ! ! static BonoboObject * ! bonobo_std_moniker_factory (BonoboGenericFactory *this, ! const char *object_id, ! void *data) ! { ! g_return_val_if_fail (object_id != NULL, NULL); ! ! if (!strcmp (object_id, "OAFIID:Bonobo_Moniker_File")) ! ! return BONOBO_OBJECT (bonobo_moniker_simple_new ( ! "file:", bonobo_moniker_file_resolve)); ! else ! return NULL; ! } ! ! ! #BonoboMoniker, #BonoboMonikerSimple, #bonobo-moniker-util, #BonoboMonikerExtender --- 1,21 ---- ! bonobo-moniker-simple ! ! + ! + *************** *** 147,154 **** @name: @resolve_closure: @Returns: - - @resolve_fn: --- 84,89 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-moniker-util.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-moniker-util.sgml *** ./libbonobo/doc/api/tmpl/bonobo-moniker-util.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-moniker-util.sgml Sat Aug 9 21:17:17 2003 *************** *** 2,73 **** bonobo-moniker-util ! Object activation and construction through monikers. - The moniker utility functions provide two sets of functions: - - - - Helper functions for constructing and resolving monikers, - and a simple get_object method that constructs and resolves - against an interface in a single pass. Also, asynchronous - versions of these methods are provided using the #BonoboAsync - code. - - - - - Helper functions for the implementation of new custom - monikers are also provided here, along with a lot of the - grunt code neccessary for moniker implementation, particularly - constructing the chained list of sub-monikers that comprises - a complex moniker. - - - - - - The most useful function to get a feel for what monikers can do - is the bonobo_get_object method. This is - used to create a moniker and resolve it against a given interface - like this: - - GetObject example - - GtkWidget * - moniker_resolve_demo (void) - { - Bonobo_Control control; - CORBA_Environment ev; - - CORBA_exception_init (&ev); - - control = bonobo_get_object ("file:/demo/a.jpeg", - "Bonobo/Control", NULL); - - if (control == CORBA_OBJECT_NIL) - g_error ("Failed to get object file:/demo/a.jpeg"); - - return bonobo_widget_new_control (control); - } - - - This also makes a control out of the widget. - - - It is worth noting that when resolving monikers a contracted - version of the interface name may be used, ommitting the 'IDL:' - prefix and / or the ':0' suffix. --- 2,21 ---- bonobo-moniker-util ! + + *************** *** 77,84 **** @interface_name: @opt_ev: @Returns: - - @ev: --- 25,30 ---- *************** *** 89,96 **** @name: @opt_ev: @Returns: - - @ev: --- 35,40 ---- *************** *** 101,108 **** @moniker: @opt_ev: @Returns: - - @ev: --- 45,50 ---- *************** *** 114,121 **** @interface_name: @opt_ev: @Returns: - - @ev: --- 56,61 ---- *************** *** 149,156 **** @ev: @cb: @user_data: - - @timeout_msec: --- 89,94 ---- *************** *** 162,169 **** @ev: @cb: @user_data: - - @timeout_msec: --- 100,105 ---- *************** *** 177,184 **** @ev: @cb: @user_data: - - @timeout_msec: --- 113,118 ---- *************** *** 191,198 **** @ev: @cb: @user_data: - - @timeout_msec: --- 125,130 ---- *************** *** 203,210 **** @moniker: @opt_ev: @Returns: - - @ev: --- 135,140 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-moniker.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-moniker.sgml *** ./libbonobo/doc/api/tmpl/bonobo-moniker.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-moniker.sgml Sat Aug 9 21:17:16 2003 *************** *** 1,35 **** ! BonoboMoniker ! The base implementation of our abstract object naming space - Monikers are used to name objects, they effectively implement - an object naming space. You can obtain monikers either because - you created the moniker manually, or from a stringified - representation of a moniker. - - - For more information see bonobo/doc/Monikers, relatively few - people want to implement monikers, mostly they just want to - use them. To do this you need the #bonobo-moniker-util API. - - To implement your own moniker, it is most likely that you want - to use #BonoboMonikerSimple, BonoboMoniker is a mostly abstract - base class that in some obscure cases might provide a more - powerful feature set. Most people use #BonoboMonikerSimple. - ! #bonobo-moniker-util #BonoboMonikerSimple --- 1,21 ---- ! bonobo-moniker ! ! + *************** *** 73,80 **** @moniker: @opt_ev: @Returns: - - @ev: --- 59,64 ---- *************** *** 85,92 **** @moniker: @parent: @opt_ev: - - @ev: --- 69,74 ---- *************** *** 123,130 **** @moniker: @unescaped_name: - - @num_chars: --- 105,110 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-object.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-object.sgml *** ./libbonobo/doc/api/tmpl/bonobo-object.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-object.sgml Sat Aug 9 21:17:16 2003 *************** *** 1,152 **** ! BonoboObject - Base object for wrapping Bonobo::Unknown derived objects. Implements - . - - - - BonoboObject provides an easy to use way of writing CORBA servers. It - drastically simplifies the issues of epv and vepv construction by - automating these, and automatically instantiates a CORBA_Object on - g_object_new. This removes clutter from construction time. For - libbonobo-2.0, it strongly deprecates #BonoboXObject. - - -
- The Bonobo::Unknown interface - - - - - -
- - - The Bonobo::Unknown interface (wrapped by - BonoboObject) is the foundation for the component system: it provides - life cycle management for objects as well as service discovery. - - - - The Bonobo interfaces are all based on the - Bonobo::Unknown interface. This - interface is very simple and provides two basic services: - object lifetime management and object - functionality-discovery. This interface only contains three - methods, here it is: - - - module Bonobo { - interface Unknown { - void void ref (); - void void unref (); - Object query_interface (in string repoid); - }; - }; - - - - - The ref() and unref() - methods are used to control the lifetime of an object. The - query_interface method is used to discover - optional functionality provided by the object implementation. - - - - The lifetime management is based on reference counting: when a - component is initially launched, it starts life with a reference - count of one. This reference is held by the component invoker. - Each time a reference is kept to this object (say, you store a - copy of the object in an array), the reference count is - incremented. Every time a reference goes out of scope, the - reference count needs to be decremented. When the reference - count reaches zero, the component knows that there are no - outstanding references to it, and it is safe to shutdown. At - this point, the component shuts down. - - - - It is possible to ask an object which implements the - Bonobo::Unknown interface if it supports - other CORBA interfaces. For example, it would be possible to - ask an object whether it supports the - "IDL:Bonobo/EmbeddablePrint:1.0" interface to find out if it is - possible to print its contents. If the return value from - invoking the query_interface method on the - interface is CORBA_OBJECT_NIL, then we know that the requested interface - is not supported. Otherwise, we can invoke - IDL:Bonobo/EmbeddablePrint:1.0 methods on the returned CORBA - Object. - - - - Clients of the query_interface method use - it to discover dynamically if a component supports a given - interface. Sometimes the client code would require a specific - interface to exist, but many times it is possible to operate in - a "downgraded" mode. You should design your code to be able to - cope with the lack of interfaces in objects. This will allow - your program to deal with more components, and this also allows - components to work in more situations. - - For example, a help browser can load an HTML renderer component and - ask this component which sort of features are supported by it: - - stop_animations (BrowserHTML html) - { - BrowserControl control - control = html->query_interface ("IDL:Browser/Control:1.0"); - if (control) - control->stop_animations (); - } - - - The return value of the query_interface invocation contains a - reference to a CORBA object that is derived from the - Bonobo::Unknown interface or - CORBA_OBJECT_NIL if the interface is not supported by the - object. And this interface would have been already - ref()ed before it was returned. It is up - to the caller to call unref() when they are - done using the interface. - - - - BonoboObject implements the Bonobo::Unknown interface and exports the - implementations of the methods in this class to simplify creating - new objects that inherit from Bonobo::Unknown. This base object - provides default implementations for the ref, unref and - query_interface methods. - - Other implementations reuse this implementation by listing on their - VEPV tables the bonobo_object_epv entry point vector. - - - The Bonobo::Unknown interface is inspired - by the Microsoft COM IUnknown interface - but it has been translated into the CORBA world. - - - #GObject - ! Returns the #GtkType for the BonoboObject object. --- 1,24 ---- ! bonobo-object + + ! *************** *** 170,177 **** ! Private information kept by the BonoboObject. This should not be ! used by BonoboObject users. --- 42,48 ---- ! *************** *** 261,268 **** @object: @opt_ev: @Returns: - - @ev: --- 132,137 ---- *************** *** 273,280 **** @object: @opt_ev: @Returns: - - @ev: --- 142,147 ---- *************** *** 284,291 **** @obj: @Returns: - - @object: --- 151,156 ---- *************** *** 294,301 **** @obj: - - @object: --- 159,164 ---- *************** *** 305,312 **** @obj: @Returns: - - @object: --- 168,173 ---- *************** *** 328,335 **** @line: @ref: @Returns: - - @object: --- 189,194 ---- *************** *** 352,360 **** ! Checks if the exception in @e needs to be signaled. If so, then ! the proper exception signal is generated on the BonoboObject object ! @o for the CORBA reference @c. @o: --- 211,217 ---- ! @o: *************** *** 411,419 **** @s: - @Returns: - - @servant: --- 268,273 ---- *************** *** 422,430 **** @o: - @Returns: - - @object: --- 276,281 ---- *************** *** 474,492 **** @prefix: - - - - - - @bonoboobject: the object which received the signal. - - - - - - - @bonoboobject: the object which received the signal. - @arg1: - @arg2: - --- 325,327 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-persist-client.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-persist-client.sgml *** ./libbonobo/doc/api/tmpl/bonobo-persist-client.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-persist-client.sgml Sat Aug 9 21:17:17 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libbonobo/doc/api/tmpl/bonobo-persist-file.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-persist-file.sgml *** ./libbonobo/doc/api/tmpl/bonobo-persist-file.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-persist-file.sgml Sat Aug 9 21:17:16 2003 *************** *** 1,144 **** ! BonoboPersistFile ! Interface for anything that can save / load itself from a file. ! The PersistFile interface is a useful interface for Bonoboizing ! legacy applications, however, for new / correct applications it ! is far preferable to implement the #BonoboPersistStream interface, ! since this will not only result in a nice clean to your application ! architecture, but also allow the transparent use of local, remote, ! and synthetic streams. ! ! ! ! This interface works by connecting callbacks to the methods, in ! a pretty deprecated fashion, it is probably better nowadays to ! simply sub-class the BonoboXObject and override the epv methods. ! Either way, after all the caveats here is an example use: ! ! Persist file implementation ! ! static gint ! load_from_file (BonoboPersistFile *pf, ! const CORBA_char *filename, ! CORBA_Environment *ev, ! void *closure) ! { ! EogImageData *image_data = closure; ! ! g_warning ("Load from '%s'", filename); ! ! return 0; /* Return 0 on success */ ! } ! ! static gint ! save_to_file (BonoboPersistFile *pf, ! const CORBA_char *filename, ! CORBA_Environment *ev, ! void *closure) ! { ! EogImageData *image_data = closure; ! ! g_warning ("Save to '%s'", filename); ! ! return 0; /* Return 0 on success */ ! } ! ! ! Having implemented the callbacks we then have to register them ! and aggregate the interface to our object: ! ! Aggregating a new PersistFile ! ! EogImageData * ! eog_image_data_construct (EogImageData *image_data) ! { ! BonoboObject *retval; ! BonoboPersistFile *file; ! ! file = bonobo_persist_file_new ( ! load_from_file, save_to_file, image_data); ! ! if (file == NULL) { ! bonobo_object_unref (BONOBO_OBJECT (image_data)); ! return NULL; ! } ! ! bonobo_object_add_interface (BONOBO_OBJECT (image_data), ! BONOBO_OBJECT (file)); ! ! return image_data; ! } ! ! ! Note again, that you should be writing a BonoboPersistStream ! interface, however if you have already done this you might like ! to just have hooks through so that old apps can use the PersistFile ! interface: ! ! Chaining to a #PersistStream implementation ! ! static gint ! load_from_file (BonoboPersistFile *pf, ! const CORBA_char *filename, ! CORBA_Environment *ev, ! void *closure) ! { ! Bonobo_PersistStream ps = closure; ! BonoboStream *stream; ! ! stream = bonobo_stream_open ( ! BONOBO_IO_DRIVER_FS, ! filename, Bonobo_STORAGE_READ, ! 0); ! ! if (!stream) ! return 0; ! ! .. extract content type from file ... ! ! Bonobo_PersistStream_load (ps, type, ev); ! ! return 0; /* Return 0 on success */ ! } ! ! static gint ! save_to_file (BonoboPersistFile *pf, ! const CORBA_char *filename, ! CORBA_Environment *ev, ! void *closure) ! { ! Bonobo_PersistStream ps = closure; ! BonoboStream *stream; ! ! stream = bonobo_stream_open ( ! BONOBO_IO_DRIVER_FS, ! filename, Bonobo_STORAGE_WRITE | Bonobo_STORAGE_CREATE, ! S_IRUSR | S_IWUSR | S_IRGRP); ! ! if (!stream) ! return 0; ! ! .. work out content type we want to save ... ! ! Bonobo_PersistStream_save (ps, type, ev); ! ! return 0; /* Return 0 on success */ ! } ! ! ! The mime type data can be extracted from gnome-vfs or gnome-mime. ! #BonoboPersistStream, #BonoboPersist --- 1,21 ---- ! bonobo-persist-file ! ! + ! + *************** *** 168,175 **** @ev: @closure: @Returns: - - @filename: --- 45,50 ---- *************** *** 201,208 **** @iid: @closure: @Returns: - - @ps: - @corba_ps: --- 76,80 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-persist-stream.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-persist-stream.sgml *** ./libbonobo/doc/api/tmpl/bonobo-persist-stream.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-persist-stream.sgml Sat Aug 9 21:17:16 2003 *************** *** 1,97 **** ! BonoboPersistStream ! Interface for anything that can save / load itself from a Bonobo stream. ! The PersistStream interface is the interface to use for all new ! components that are able to load and save themselves to a stream. ! It should be associated with any #BonoboEmbeddable for use by the ! container in creating a compound document. ! ! ! ! This interface works by connecting callbacks to the methods, in ! a somewhat deprecated fashion, it is probably better nowadays to ! simply sub-class the BonoboXObject and override the epv methods. ! Either way, after all the caveats here is an example use: ! ! ! ! ! Implementing the PersistStream callbacks ! ! static void ! load_from_stream (BonoboPersistStream *ps, ! const Bonobo_Stream stream, ! Bonobo_Persist_ContentType type, ! void *closure, ! CORBA_Environment *ev) ! { ! EogImageData *image_data = closure; ! ! g_warning ("Load content from stream of type '%s'", type); ! } ! ! static gint ! save_to_stream (BonoboPersistStream *ps, ! const Bonobo_Stream stream, ! Bonobo_Persist_ContentType type, ! void *closure, ! CORBA_Environment *ev) ! { ! EogImageData *image_data = closure; ! ! g_warning ("Save content to stream with type '%s'", type); ! } ! ! static Bonobo_Persist_ContentTypeList * ! get_supported_types (BonoboPersistStream *ps, ! void *closure, ! CORBA_Environment *ev) ! { ! return bonobo_persist_generate_content_types ( ! 2, "text/plain", "text/html"); ! } ! ! ! Having implemented the callbacks we then have to register them ! and aggregate the interface to our object: ! ! Aggregating a new PersistStream ! ! EogImageData * ! eog_image_data_construct (EogImageData *image_data) ! { ! BonoboObject *retval; ! BonoboPersistStream *ps; ! ! ps = bonobo_persist_stream_new ( ! load_from_stream, save_to_stream, ! get_supported_types, NULL, ! image_data); ! ! if (ps == NULL) { ! bonobo_object_unref (BONOBO_OBJECT (image_data)); ! return NULL; ! } ! ! bonobo_object_add_interface (BONOBO_OBJECT (image_data), ! BONOBO_OBJECT (ps)); ! ! return image_data; ! } ! ! --- 1,21 ---- ! bonobo-persist-stream ! ! + + *************** *** 151,158 **** @iid: @closure: @Returns: - - @max_fn: --- 75,80 ---- *************** *** 167,174 **** @iid: @closure: @Returns: - - @max_fn: - @corba_ps: --- 89,93 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-persist.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-persist.sgml *** ./libbonobo/doc/api/tmpl/bonobo-persist.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-persist.sgml Sat Aug 9 21:17:16 2003 *************** *** 1,21 **** ! BonoboPersist ! Interface for anything that can save / load itself. ! BonoboPersist is an abstract base class that is useless by itself. ! It implements some methods to handle content type querying for ! use by the derived #BonoboPersistStream interface. ! #BonoboPersistStream, #BonoboPersistFile --- 1,21 ---- ! bonobo-persist ! ! + ! + *************** *** 59,66 **** @persist: @iid: @Returns: - - @corba_persist: --- 59,64 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-property-bag-client.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-property-bag-client.sgml *** ./libbonobo/doc/api/tmpl/bonobo-property-bag-client.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-property-bag-client.sgml Sat Aug 9 21:17:18 2003 *************** *** 2,31 **** bonobo-property-bag-client ! simplified property bag client wrapper code - This code is designed to make the property bag interface slightly - easier to use, by allowing optional CORBA environments, sensible - return values on exceptions, and accessors for specific types of - CORBA_Any. eg. bonobo_property_bag_client_get_value_glong. - - - With the property bag interface, as in all current remote Bonobo - method invocations, translation issues are very dodgy. Assuming - that the server process was activated in the correct locale, all - should be well, however there is no guarantee that ( in a rapidly - changing locale environment ) the string will be correctly translated. - It is difficult to know how to solve this problem. ! #BonoboPropertyBag, #BonoboProperty, #BonoboPropertyControl --- 2,21 ---- bonobo-property-bag-client ! + ! + *************** *** 579,590 **** - @Returns: - - @pb: - @ev: - @first_arg: - @var_args: --- 569,574 ---- *************** *** 592,603 **** - @Returns: - - @pb: - @ev: - @first_arg: - @var_args: --- 576,581 ---- *************** *** 605,615 **** - @Returns: - - @pb: - @propname: - @ev: --- 583,588 ---- *************** *** 617,627 **** - @Returns: - - @pb: - @propname: - @ev: --- 590,595 ---- *************** *** 629,639 **** - @Returns: - - @pb: - @propname: - @ev: --- 597,602 ---- *************** *** 641,651 **** - @Returns: - - @pb: - @propname: - @ev: --- 604,609 ---- *************** *** 653,663 **** - @Returns: - - @pb: - @propname: - @ev: --- 611,616 ---- *************** *** 665,675 **** - @Returns: - - @pb: - @propname: - @ev: --- 618,623 ---- *************** *** 677,687 **** - @Returns: - - @pb: - @propname: - @ev: --- 625,630 ---- *************** *** 692,700 **** @pb: @name: @ev: - @Returns: - - @propname: --- 635,640 ---- *************** *** 702,712 **** - @Returns: - - @pb: - @propname: - @ev: --- 642,647 ---- *************** *** 714,724 **** - @Returns: - - @pb: - @propname: - @ev: --- 649,654 ---- *************** *** 726,736 **** - @Returns: - - @pb: - @propname: - @ev: --- 656,661 ---- *************** *** 738,748 **** - @Returns: - - @pb: - @propname: - @ev: --- 663,668 ---- *************** *** 750,760 **** - @Returns: - - @pb: - @propname: - @ev: --- 670,675 ---- *************** *** 762,772 **** - @Returns: - - @pb: - @propname: - @ev: --- 677,682 ---- *************** *** 777,785 **** @pb: @name: @ev: - @Returns: - - @propname: --- 687,692 ---- *************** *** 787,797 **** - - @pb: - @propname: - @value: - @ev: --- 694,699 ---- *************** *** 799,809 **** - - @pb: - @propname: - @value: - @ev: --- 701,706 ---- *************** *** 811,821 **** - - @pb: - @propname: - @value: - @ev: --- 708,713 ---- *************** *** 823,833 **** - - @pb: - @propname: - @value: - @ev: --- 715,720 ---- *************** *** 835,845 **** - - @pb: - @propname: - @value: - @ev: --- 722,727 ---- *************** *** 847,857 **** - - @pb: - @propname: - @value: - @ev: --- 729,734 ---- *************** *** 859,869 **** - - @pb: - @propname: - @value: - @ev: --- 736,741 ---- *************** *** 871,881 **** - @Returns: - - @pb: - @propname: - @ev: --- 743,748 ---- *************** *** 883,892 **** - @Returns: - - @pb: - @propname: - @ev: --- 750,754 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-property-bag.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-property-bag.sgml *** ./libbonobo/doc/api/tmpl/bonobo-property-bag.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-property-bag.sgml Sat Aug 9 21:17:17 2003 *************** *** 1,149 **** ! BonoboPropertyBag ! Implements a generic property storage interface ! The PropertyBag is used for many things, particularly for ! the customization of controls. The important thing to ! remember about the BonoboPropertyBag implementation is that ! no live data is stored in the bag. ie. the Model for the ! properties is your code. ! ! ! ! Consequently when someone requests a properties value, ! or sets a property the callbacks you supply at bag ! construction time are called, and the code therein must ! supply the property. Similarly, when a property changes ! value inside your object you need to notify the property ! bag's listeners that it has changed with a call to ! bonobo_property_bag_notify_listeners. ! ! ! ! Here is a simple example use of the property bag: ! ! PropertyBag Callbacks ! ! enum { ! PROP_RUNNING, ! PROP_COLOUR ! } MyArgs; ! ! static void ! get_prop (BonoboPropertyBag *bag, ! BonoboArg *arg, ! guint arg_id, ! CORBA_Environment *ev, ! gpointer user_data) ! { ! GtkObject *clock = user_data; ! ! switch (arg_id) { ! ! case PROP_RUNNING: ! BONOBO_ARG_SET_BOOLEAN (arg, clock->is_running); ! break; ! ! case PROP_COLOUR: ! BONOBO_ARG_SET_STRING (arg, clock->color); ! break; ! ! default: ! bonobo_exception_set (ev, ex_Bonobo_PropertyBag_NotFound); ! break; ! } ! } ! ! static void ! set_prop (BonoboPropertyBag *bag, ! const BonoboArg *arg, ! guint arg_id, ! CORBA_Environment *ev, ! gpointer user_data) ! { ! GtkClock *clock = user_data; ! ! switch (arg_id) { ! ! case PROP_RUNNING: { ! guint i = BONOBO_ARG_GET_BOOLEAN (arg); ! ! if (i) ! gtk_clock_start (clock); ! else ! gtk_clock_stop (clock); ! break; ! } ! ! case PROP_COLOUR: ! gtk_clock_set_color (clock, BONOBO_ARG_GET_STRING (arg)); ! ! default: ! bonobo_exception_set (ev, ex_Bonobo_PropertyBag_NotFound); ! break; ! } ! } ! ! ! ! ! Then to instantiate the property bag interface and associate it with ! a control perhaps we do: ! ! Adding a PropertyBag to a control ! ! BonoboPropertyBag *pb; ! ! pb = bonobo_property_bag_new (get_prop, set_prop, clock); ! bonobo_control_set_properties (control, pb); ! ! bonobo_property_bag_add (pb, "running", PROP_RUNNING, ! BONOBO_ARG_BOOLEAN, NULL, ! _("Whether or not the clock is running"), ! 0); ! ! bonobo_property_bag_add (pb, "colour", PROP_COLOUR, ! BONOBO_ARG_STRING, NULL, ! _("The colour of the clock face"), ! 0); ! ! bonobo_object_unref (BONOBO_OBJECT (pb)); ! ! ! And finally we need to notify listeners of changes in various properties ! so we could perhaps do: ! ! Notifying proterty bag listeners ! ! static void ! signal_handler (GtkClock *clock, BonoboPropertyBag *pb) ! { ! BonoboArg *arg = bonobo_arg_new (TC_string); ! ! BONOBO_ARG_SET_STRING (arg, gtk_clock_get_color (clock)); ! ! bonobo_property_bag_notify_listeners ( ! pb, "colour", arg, NULL); ! ! bonobo_arg_release (arg); ! } ! ... ! gtk_signal_connect (GTK_OBJECT (clock), "color_changed", ! GTK_SIGNAL_FUNC (signal_handler), pb); ! ! ! See also #BonoboArg. --- 1,21 ---- ! bonobo-property-bag ! ! + + *************** *** 253,261 **** @set_prop_cb: @user_data: @Returns: - - @get_prop: - @set_prop: --- 125,130 ---- *************** *** 277,284 **** @set_prop: @event_source: @Returns: - - @user_data: --- 146,151 ---- *************** *** 291,298 **** @set_prop: @event_source: @Returns: - - @user_data: --- 158,163 ---- *************** *** 307,314 **** @default_value: @doctitle: @flags: - - @docstring: --- 172,177 ---- *************** *** 326,333 **** @flags: @get_prop: @set_prop: - - @user_data: --- 189,194 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-running-context.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-running-context.sgml *** ./libbonobo/doc/api/tmpl/bonobo-running-context.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-running-context.sgml Sat Aug 9 21:17:18 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libbonobo/doc/api/tmpl/bonobo-shlib-factory.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-shlib-factory.sgml *** ./libbonobo/doc/api/tmpl/bonobo-shlib-factory.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-shlib-factory.sgml Sat Aug 9 21:17:17 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libbonobo/doc/api/tmpl/bonobo-shutdown.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-shutdown.sgml *** ./libbonobo/doc/api/tmpl/bonobo-shutdown.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-shutdown.sgml Sat Aug 9 21:17:18 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libbonobo/doc/api/tmpl/bonobo-storage-memory.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-storage-memory.sgml *** ./libbonobo/doc/api/tmpl/bonobo-storage-memory.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-storage-memory.sgml Sat Aug 9 21:17:17 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libbonobo/doc/api/tmpl/bonobo-storage.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-storage.sgml *** ./libbonobo/doc/api/tmpl/bonobo-storage.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-storage.sgml Sat Aug 9 21:17:18 2003 *************** *** 2,63 **** bonobo-storage - Abstract implementation of the Bonobo::Storage interface - - - The BonoboStorage C interface is extremely simple, this is since - the CORBA client interface is where the action occurs. It is - anticipated that relatively few people need to implement the - Bonobo/Storage IDL interface. - - The common entry point for BonoboStorage is that of opening a - storage using the bonobo_storage_open function, perhaps by a - container to use to persist a compound document: - - An example storage use case - - void - container_save (SampleApp *app, - const char *filename, - CORBA_Environment *ev) - { - BonoboStorage *storage; - Bonobo_Storage corba_storage; - GList *components; - int i; - - storage = bonobo_storage_open (STORAGE_TYPE, filename, - Bonobo_Storage_READ | - Bonobo_Storage_WRITE | - Bonobo_Storage_CREATE, - 0664); - g_return_if_fail (storage); - - corba_storage = BONOBO_OBJREF (storage); - - ... - Serialize components to streams created in the storage - ... - - Bonobo_Storage_commit (corba_storage, ev); - - CORBA_exception_free (ev); - - bonobo_object_unref (BONOBO_OBJECT (storage)); - } - - ! #BonoboPersist #BonoboPersistStream --- 2,21 ---- bonobo-storage + + ! + diff -crN ./libbonobo/doc/api/tmpl/bonobo-stream-client.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-stream-client.sgml *** ./libbonobo/doc/api/tmpl/bonobo-stream-client.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-stream-client.sgml Sat Aug 9 21:17:18 2003 *************** *** 2,36 **** bonobo-stream-client ! Simplified client wrapper functions for the Stream interface - These interfaces are designed to make the stream interface - slightly easier to use from client code. This is done 2 ways, - first by make the exception environments optiional, and secondly - by providing slightly nicer semantics. - - - - Writing some simple data to a stream - - bonobo_stream_client_printf (stream, TRUE, ev, "Hello World: %d", 5); - - - It is well worth using the bonobo_stream_client_write function - for any potentialy large writes, since this blocks the data into - sensible chunks. This is important, otherwise a single transfer is - attempted that will cause hassles in the CORBA stubs. [ NB. ORBit - tries to alloca a huge chunk of memory and SEGVs ]. ! #BonoboStream --- 2,21 ---- bonobo-stream-client ! + ! + diff -crN ./libbonobo/doc/api/tmpl/bonobo-stream-memory.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-stream-memory.sgml *** ./libbonobo/doc/api/tmpl/bonobo-stream-memory.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-stream-memory.sgml Sat Aug 9 21:17:17 2003 *************** *** 1,51 **** ! BonoboStreamMem - In-memory implementation of Bonobo::Stream interface. - The BonoboStreamMem is an implementation of the - IDL:Bonobo/Stream:1.0 interface. This implementation allows an - in-memory buffer to be exposed as a IDL:Bonobo/Stream:1.0 to - clients. - - - - Here is a sample way of exposing a C string as an - IDL:Bonobo/Stream:1.0: - - - Sample BonoboStreamMem usage ! ! BonoboStream *make_bonobo_stream_on_string (char *string) ! { ! return bonobo_stream_mem_create (string, strlen (string), TRUE, FALSE); ! } ! ! - This example will make the string argument be exposed as a CORBA - stream. ! ! ! #BonoboStream ! An abstract class to implement ! IDL:Bonobo/Streams. ! ! ! IDL:Bonobo/Stream:1.0 ! The CORBA interface implemented . ! ! --- 1,21 ---- ! bonobo-stream-memory ! ! + *************** *** 82,89 **** @read_only: @resizable: @Returns: - - @corba_stream: --- 52,57 ---- diff -crN ./libbonobo/doc/api/tmpl/bonobo-stream.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-stream.sgml *** ./libbonobo/doc/api/tmpl/bonobo-stream.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-stream.sgml Sat Aug 9 21:17:18 2003 *************** *** 1,33 **** ! BonoboStream ! Abstract object for file (stream) access. - This is an abstract class for the various Stream implementations in - Bonobo. There are at least: file based streams, memory based - streams and structured storage streams. The BonoboStream abstract - class can be used to implement new servers that implement the - IDL:Bonobo/Stream:1.0 interface. - - - If you are writing a component, this is one interface that your - component should not really support. You probably want to implement - the a #BonoboPersist interface such as #BonoboPersistStream. This - allows a component to serialize itself and de-persist itself using - a stream supplied by a container. - - If you are implementing a stream you probably want to see some - of the helpful wrappers first. - ! #bonobo-stream-client, BonoboPersistStream, #BonoboPersist, #BonoboStreamFile, #BonoboStreamMem --- 1,18 ---- ! bonobo-stream ! ! + diff -crN ./libbonobo/doc/api/tmpl/bonobo-types.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-types.sgml *** ./libbonobo/doc/api/tmpl/bonobo-types.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-types.sgml Sat Aug 9 21:17:18 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./libbonobo/doc/api/tmpl/bonobo-xobject.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-xobject.sgml *** ./libbonobo/doc/api/tmpl/bonobo-xobject.sgml Fri Mar 14 16:55:40 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/doc/api/tmpl/bonobo-xobject.sgml Sat Aug 9 21:17:17 2003 *************** *** 1,129 **** ! BonoboXObject ! a simplified CORBA server object wrapper ! BonoboXObject provides an easy to use way of writing CORBA servers. However, ! for libbonobo-2.0, all its functionality has been merged with ! #BonoboObject, which is the one that should be used for writing ! Bonobo/CORBA servers. ! ! ! ! The CORBA methods are associated with a GObject class in the same ! way that standard GObject methods and signals are. We insert the ! CORBA generated Entry Point Vector (epv) struct as the first ! element of the derived class eg. ! ! Setting up the GObjectClass data ! ! typedef struct { ! BonoboXObject base; ! ! BonoboControlPrivate *priv; ! } BonoboControl; ! ! typedef struct { ! BonoboXObjectClass parent_class; ! ! POA_Bonobo_Control__epv epv; ! ! /* Signals. */ ! void (*set_frame) (BonoboControl *control); ! void (*activate) (BonoboControl *control, gboolean state); ! } BonoboControlClass; ! ! ! ! ! ! Then we set up the type using the bonobo_x_type_unique ! function instead of gtk_type_unique ( but otherwise in the standard GObject ! fashion ). ! ! Registering the type with bonobo ! ! GType ! bonobo_control_get_type (void) ! { ! GType ptype; ! static GType type = 0; ! ! if (type == 0) { ! static GTypeInfo info = { ! "BonoboControl", ! NULL, NULL, ! sizeof (BonoboControlClass), ! (GClassInitFunc)bonobo_control_class_init, ! NULL, NULL, ! sizeof (BonoboControl), 0, ! (GObjectInitFunc)bonobo_control_init, ! NULL ! }; ! ptype = (parent); ! type = bonobo_x_type_unique (ptype, ! POA_Bonobo_Control__init, NULL, ! G_STRUCT_OFFSET (BonoboControlClass, epv), ! &info, "BonoboControl"); ! } ! return type; ! } ! ! ! Alternatively one can use the simpler BONOBO_X_TYPE_FUNC_FULL ! macros to achieve the same thing thus: ! ! Registering the type more simply ! ! BONOBO_X_TYPE_FUNC_FULL (BonoboControl, Bonobo_Control, ! PARENT_TYPE, bonobo_control); ! ! ! ! The POA_Bonobo_Control__init function is used to construct the CORBA object ! and the G_STRUCT_OFFSET tells Bonobo where your epv structure is ! in the Class data, so it can build your epv for you. ! The fini_fn function is not used in ORBit, so it is faster to use NULL here. ! ! ! After registering the type in the class initialization function, we ! must fill out the epv with our entry points, similar to the way we ! hook up virtual class functions. It may also be necessary to override ! the parent's epv's; this can be done by accessing the epv pointer for ! the parent class. ! ! Setting up the class' methods ! ! static void ! bonobo_control_class_init (BonoboControlClass *klass) ! { ! GObjectClass *object_class = (GObjectClass *)klass; ! POA_Bonobo_Control__epv *epv = &klass->epv; ! ! bonobo_control_parent_class = g_type_class_peek (PARENT_TYPE); ! ! ... ! ! object_class->finalize = bonobo_control_finalize; ! ! epv->activate = impl_Bonobo_Control_activate; ! epv->setSize = impl_Bonobo_Control_setSize; ! ... ! epv->realize = impl_Bonobo_Control_realize; ! epv->unrealize = impl_Bonobo_Control_unrealize; ! } ! ! ! #BonoboObject --- 1,21 ---- ! bonobo-xobject ! ! + ! + *************** *** 173,181 **** - @Returns: - - @p: --- 65,70 ---- *************** *** 183,191 **** - - @servant: - @ev: --- 72,77 ---- *************** *** 193,205 **** - @Returns: - - @parent_type: - @init_fn: - @fini_fn: - @epv_struct_offset: - @info: --- 79,84 ---- *************** *** 207,218 **** - @Returns: - - @type: - @init_fn: - @fini_fn: - @epv_struct_offset: --- 86,91 ---- diff -crN ./libbonobo/idl/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/idl/Makefile.in *** ./libbonobo/idl/Makefile.in Fri Mar 14 16:54:28 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/idl/Makefile.in Sat Aug 9 21:12:57 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 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,72 **** --- 57,74 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ + AWK = @AWK@ BONOBO_ACTIVATION_IDL_DIR = @BONOBO_ACTIVATION_IDL_DIR@ + BONOBO_ACTIVATION_IDL_DIR_PC = @BONOBO_ACTIVATION_IDL_DIR_PC@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 76,81 **** --- 78,84 ---- GMSGFMT = @GMSGFMT@ GTKDOC = @GTKDOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 102,108 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 105,110 ---- *************** *** 120,133 **** VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ NULL = idldir = $(datadir)/idl/bonobo-2.0 ! idl_DATA = Bonobo.idl Bonobo_Canvas.idl Bonobo_Context.idl Bonobo_Control.idl Bonobo_Embeddable.idl Bonobo_Gdk.idl Bonobo_ItemContainer.idl Bonobo_Listener.idl Bonobo_Moniker.idl Bonobo_Persist.idl Bonobo_Print.idl Bonobo_Property.idl Bonobo_Storage.idl Bonobo_UI.idl Bonobo_Zoomable.idl Bonobo_Exception.idl Bonobo_Clipboard.idl $(NULL) EXTRA_DIST = $(idl_DATA) --- 122,156 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ + install_sh = @install_sh@ NULL = idldir = $(datadir)/idl/bonobo-2.0 ! idl_DATA = \ ! Bonobo.idl \ ! Bonobo_Canvas.idl \ ! Bonobo_Context.idl \ ! Bonobo_Control.idl \ ! Bonobo_Embeddable.idl \ ! Bonobo_Gdk.idl \ ! Bonobo_ItemContainer.idl \ ! Bonobo_Listener.idl \ ! Bonobo_Moniker.idl \ ! Bonobo_Persist.idl \ ! Bonobo_Print.idl \ ! Bonobo_Property.idl \ ! Bonobo_Storage.idl \ ! Bonobo_UI.idl \ ! Bonobo_Zoomable.idl \ ! Bonobo_Exception.idl \ ! Bonobo_Clipboard.idl \ ! $(NULL) EXTRA_DIST = $(idl_DATA) *************** *** 135,412 **** orbittypelib_LTLIBRARIES = Bonobo_module.la orbittypelibdir = $(libdir)/orbit-2.0 ! IMODULE_SOURCE = Bonobo.h Bonobo-common.c Bonobo-imodule.c ! idl_flags = -I$(top_srcdir)/idl -I $(BONOBO_ACTIVATION_IDL_DIR) -D__Bonobo_COMPILATION -D__Bonobo_Unknown_COMPILATION -D__Bonobo_GenericFactory_COMPILATION -D__Bonobo_Activation_types_COMPILATION ! INCLUDES = -I. $(LIBBONOBO_CFLAGS) ! Bonobo_module_la_SOURCES = Bonobo-imodule.c ! Bonobo_module_la_LIBADD = $(LIBBONOBO_LIBS) ! Bonobo_module_la_LDFLAGS = -export-dynamic -module -avoid-version DONT_DIST_SOURCE = $(IMODULE_SOURCE) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(orbittypelib_LTLIBRARIES) ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. LIBS = @LIBS@ ! Bonobo_module_la_DEPENDENCIES = ! Bonobo_module_la_OBJECTS = Bonobo-imodule.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 = $(idl_DATA) ! ! DIST_COMMON = Makefile.am Makefile.in ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = gtar ! GZIP_ENV = --best SOURCES = $(Bonobo_module_la_SOURCES) - OBJECTS = $(Bonobo_module_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 idl/Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! mostlyclean-orbittypelibLTLIBRARIES: ! ! clean-orbittypelibLTLIBRARIES: ! -test -z "$(orbittypelib_LTLIBRARIES)" || rm -f $(orbittypelib_LTLIBRARIES) ! distclean-orbittypelibLTLIBRARIES: ! maintainer-clean-orbittypelibLTLIBRARIES: install-orbittypelibLTLIBRARIES: $(orbittypelib_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(orbittypelibdir) @list='$(orbittypelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(orbittypelibdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(orbittypelibdir)/$$p; \ else :; fi; \ done uninstall-orbittypelibLTLIBRARIES: @$(NORMAL_UNINSTALL) ! list='$(orbittypelib_LTLIBRARIES)'; for p in $$list; do \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(orbittypelibdir)/$$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: ! Bonobo_module.la: $(Bonobo_module_la_OBJECTS) $(Bonobo_module_la_DEPENDENCIES) ! $(LINK) -rpath $(orbittypelibdir) $(Bonobo_module_la_LDFLAGS) $(Bonobo_module_la_OBJECTS) $(Bonobo_module_la_LIBADD) $(LIBS) install-idlDATA: $(idl_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(idldir) @list='$(idl_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(idldir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(idldir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(idldir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(idldir)/$$p; \ ! fi; fi; \ done uninstall-idlDATA: @$(NORMAL_UNINSTALL) ! list='$(idl_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(idldir)/$$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 = idl 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 ! Bonobo-imodule.lo Bonobo-imodule.o : Bonobo-imodule.c Bonobo-common.c \ ! Bonobo.h ! ! 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-orbittypelibLTLIBRARIES install-idlDATA ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall-orbittypelibLTLIBRARIES uninstall-idlDATA uninstall: uninstall-am - all-am: Makefile $(LTLIBRARIES) $(DATA) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(orbittypelibdir) $(DESTDIR)$(idldir) 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-orbittypelibLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-orbittypelibLTLIBRARIES clean-compile clean-libtool \ ! clean-tags clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-orbittypelibLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-generic \ ! clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-orbittypelibLTLIBRARIES \ ! 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-orbittypelibLTLIBRARIES \ ! distclean-orbittypelibLTLIBRARIES clean-orbittypelibLTLIBRARIES \ ! maintainer-clean-orbittypelibLTLIBRARIES \ ! uninstall-orbittypelibLTLIBRARIES install-orbittypelibLTLIBRARIES \ ! mostlyclean-compile distclean-compile clean-compile \ ! maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool uninstall-idlDATA \ ! install-idlDATA 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 $(IMODULE_SOURCE): $(idl_DATA) $(ORBIT_IDL) --- 158,438 ---- orbittypelib_LTLIBRARIES = Bonobo_module.la orbittypelibdir = $(libdir)/orbit-2.0 ! IMODULE_SOURCE = \ ! Bonobo.h \ ! Bonobo-common.c \ ! Bonobo-imodule.c ! idl_flags = \ ! -I$(top_srcdir)/idl \ ! -I $(BONOBO_ACTIVATION_IDL_DIR) \ ! -D__Bonobo_COMPILATION \ ! -D__Bonobo_Unknown_COMPILATION \ ! -D__Bonobo_GenericFactory_COMPILATION \ ! -D__Bonobo_Activation_types_COMPILATION ! INCLUDES = \ ! -I. \ ! $(LIBBONOBO_CFLAGS) ! Bonobo_module_la_SOURCES = \ ! Bonobo-imodule.c ! Bonobo_module_la_LIBADD = \ ! $(LIBBONOBO_LIBS) ! Bonobo_module_la_LDFLAGS = \ ! -export-dynamic -module -avoid-version DONT_DIST_SOURCE = $(IMODULE_SOURCE) + subdir = idl mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(orbittypelib_LTLIBRARIES) ! ! Bonobo_module_la_DEPENDENCIES = ! am_Bonobo_module_la_OBJECTS = Bonobo-imodule.lo ! Bonobo_module_la_OBJECTS = $(am_Bonobo_module_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 = $(Bonobo_module_la_SOURCES) ! DATA = $(idl_DATA) ! DIST_COMMON = Makefile.am Makefile.in SOURCES = $(Bonobo_module_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 idl/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-orbittypelibLTLIBRARIES: $(orbittypelib_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(orbittypelibdir) @list='$(orbittypelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(orbittypelibdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(orbittypelibdir)/$$p; \ else :; fi; \ done uninstall-orbittypelibLTLIBRARIES: @$(NORMAL_UNINSTALL) ! @list='$(orbittypelib_LTLIBRARIES)'; for p in $$list; do \ ! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(orbittypelibdir)/$$p"; \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(orbittypelibdir)/$$p; \ done ! clean-orbittypelibLTLIBRARIES: ! -test -z "$(orbittypelib_LTLIBRARIES)" || rm -f $(orbittypelib_LTLIBRARIES) ! Bonobo_module.la: $(Bonobo_module_la_OBJECTS) $(Bonobo_module_la_DEPENDENCIES) ! $(LINK) -rpath $(orbittypelibdir) $(Bonobo_module_la_LDFLAGS) $(Bonobo_module_la_OBJECTS) $(Bonobo_module_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-idlDATA: $(idl_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(idldir) @list='$(idl_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)$(idldir)/$$f"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(idldir)/$$f; \ done uninstall-idlDATA: @$(NORMAL_UNINSTALL) ! @list='$(idl_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(idldir)/$$f"; \ ! rm -f $(DESTDIR)$(idldir)/$$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) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(orbittypelibdir) $(DESTDIR)$(idldir) 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-orbittypelibLTLIBRARIES \ ! 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-idlDATA install-orbittypelibLTLIBRARIES ! ! 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-idlDATA uninstall-info-am \ ! uninstall-orbittypelibLTLIBRARIES ! ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-orbittypelibLTLIBRARIES 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-idlDATA install-info install-info-am \ ! install-man install-orbittypelibLTLIBRARIES install-strip \ ! installcheck installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool tags uninstall \ ! uninstall-am uninstall-idlDATA uninstall-info-am \ ! uninstall-orbittypelibLTLIBRARIES $(IMODULE_SOURCE): $(idl_DATA) $(ORBIT_IDL) *************** *** 416,422 **** for file in $(DONT_DIST_SOURCE) ; do \ rm -f $(distdir)/$$file ; \ done - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- 442,447 ---- diff -crN ./libbonobo/install-sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/install-sh *** ./libbonobo/install-sh Thu Sep 5 08:46:15 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/install-sh Sat Aug 9 21:12:54 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 ./libbonobo/intltool-extract.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/intltool-extract.in *** ./libbonobo/intltool-extract.in Thu Feb 27 17:03:08 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/intltool-extract.in Sat Aug 9 21:12:35 2003 *************** *** 242,248 **** sub type_xml { ### For generic translatable XML files ### ! while ($input =~ /\s_$w+\s*=\s*\"([^"]+)\"/sg) { # " $messages{entity_decode_minimal($1)} = []; } --- 242,248 ---- sub type_xml { ### For generic translatable XML files ### ! while ($input =~ /\s_$w+=\"([^"]+)\"/sg) { # " $messages{entity_decode_minimal($1)} = []; } diff -crN ./libbonobo/intltool-merge.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/intltool-merge.in *** ./libbonobo/intltool-merge.in Thu Feb 27 17:03:08 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/intltool-merge.in Sat Aug 9 21:12:35 2003 *************** *** 3,9 **** # # The Intltool Message Merger # ! # Copyright (C) 2000, 2003 Free Software Foundation. # Copyright (C) 2000, 2001 Eazel, Inc # # Intltool is free software; you can redistribute it and/or --- 3,9 ---- # # The Intltool Message Merger # ! # Copyright (C) 2000, 2002 Free Software Foundation. # Copyright (C) 2000, 2001 Eazel, Inc # # Intltool is free software; you can redistribute it and/or *************** *** 226,232 **** sub get_local_charset { my ($encoding) = @_; ! my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/opt/kgnome2.2/lib/charset.alias"; # seek character encoding aliases in charset.alias (glib) --- 226,232 ---- sub get_local_charset { my ($encoding) = @_; ! my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/opt/freeware/lib/charset.alias"; # seek character encoding aliases in charset.alias (glib) *************** *** 364,371 **** } else { - print "WARNING: $po_file is not in UTF-8 but $encoding, converting...\n"; - my $iconv = $ENV{"INTLTOOL_ICONV"} || "iconv"; open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|"; } --- 364,369 ---- *************** *** 458,468 **** return $_; } - - # entity_encode: (string) - # - # Encode the given string to XML format (encode '<' etc). It also - # encodes high bit if not in UTF-8 mode. sub entity_encode { --- 456,461 ---- *************** *** 476,482 **** } else { - # with UTF-8 we only encode minimalistic return join ('', map (&entity_encode_int_minimalist, @list_of_chars)); } } --- 469,474 ---- diff -crN ./libbonobo/intltool-update.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/intltool-update.in *** ./libbonobo/intltool-update.in Thu Feb 27 17:03:09 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/intltool-update.in Sat Aug 9 21:12:35 2003 *************** *** 51,58 **** my $GETTEXT_PACKAGE = ""; my @languages; - my $conf_file; # remove later - my %varhash = (); my %po_files_by_lang = (); # Regular expressions to categorize file types. --- 51,56 ---- *************** *** 103,151 **** + ($HEADERS_ARG > 0) + ($MAINTAIN_ARG > 0) + ($REPORT_ARG > 0); - &print_help if $arg_count > 1; # --version and --help don't require a module name my $MODULE = $GETTEXT_PACKAGE || &find_package_name; ! if ($DIST_ARG) ! { ! if ($ARGV[0] =~ /^[a-z]/) ! { &update_po_file ($ARGV[0]); &print_status ($ARGV[0]); ! } ! else ! { &print_help; } ! } ! elsif ($POT_ARG) ! { &generate_headers; &generate_po_template; ! } ! elsif ($HEADERS_ARG) ! { &generate_headers; ! } ! elsif ($MAINTAIN_ARG) ! { &find_leftout_files; ! } ! elsif ($REPORT_ARG) ! { &print_report; ! } ! else ! { ! if ($ARGV[0] =~ /^[a-z]/) ! { &main ($ARGV[0]); ! } ! else ! { &print_help; } } --- 101,131 ---- + ($HEADERS_ARG > 0) + ($MAINTAIN_ARG > 0) + ($REPORT_ARG > 0); &print_help if $arg_count > 1; # --version and --help don't require a module name my $MODULE = $GETTEXT_PACKAGE || &find_package_name; ! if ($DIST_ARG) { ! if ($ARGV[0] =~ /^[a-z]/){ &update_po_file ($ARGV[0]); &print_status ($ARGV[0]); ! } else { &print_help; } ! } elsif ($POT_ARG) { &generate_headers; &generate_po_template; ! } elsif ($HEADERS_ARG) { &generate_headers; ! } elsif ($MAINTAIN_ARG) { &find_leftout_files; ! } elsif ($REPORT_ARG) { &print_report; ! } else { ! if ($ARGV[0] =~ /^[a-z]/) { &main ($ARGV[0]); ! } else { &print_help; } } *************** *** 187,193 **** sub main { my ($lang) = @_; ! ## Report error if the language file supplied ## to the command line is non-existent &print_error_not_existing("$lang.po") if ! -s "$lang.po"; --- 167,173 ---- sub main { my ($lang) = @_; ! ## Report error if the language file supplied ## to the command line is non-existent &print_error_not_existing("$lang.po") if ! -s "$lang.po"; *************** *** 212,249 **** "(?:desktop(?:\.in)+|theme(?:\.in)+|caves(?:\.in)+|directory(?:\.in)+|". "soundlist(?:\.in)+)"; ! if ($type =~ /\[type: gettext\/([^\]].*)]/) ! { $gettext_type=$1; } ! elsif ($type =~ /schemas(\.in)+$/) ! { $gettext_type="schemas"; } ! elsif ($type =~ /$xml_regex$/) ! { ! $gettext_type="xml"; ! } ! elsif ($type =~ /glade2?(\.in)*$/) ! { ! $gettext_type="glade"; } ! elsif ($type =~ /$ini_regex$/) ! { ! $gettext_type="ini"; } ! elsif ($type =~ /scm(\.in)*$/) ! { ! $gettext_type="scheme"; } ! elsif ($type =~ /keys(\.in)+$/) ! { ! $gettext_type="keys"; } ! else ! { ! $gettext_type=""; } return "gettext\/$gettext_type"; } --- 192,219 ---- "(?:desktop(?:\.in)+|theme(?:\.in)+|caves(?:\.in)+|directory(?:\.in)+|". "soundlist(?:\.in)+)"; ! if ($type =~ /\[type: gettext\/([^\]].*)]/) { $gettext_type=$1; } ! elsif ($type =~ /schemas(\.in)+$/) { $gettext_type="schemas"; } ! elsif ($type =~ /$xml_regex$/) { ! $gettext_type="xml"; } ! elsif ($type =~ /glade2?(\.in)*$/) { ! $gettext_type="glade"; } ! elsif ($type =~ /$ini_regex$/) { ! $gettext_type="ini"; } ! elsif ($type =~ /scm(\.in)*$/) { ! $gettext_type="scheme"; } ! elsif ($type =~ /keys(\.in)+$/) { ! $gettext_type="keys"; } + else { $gettext_type=""; } return "gettext\/$gettext_type"; } *************** *** 287,302 **** ## Check if we should ignore some found files, when ## comparing with POTFILES.in ! foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") ! { ! if (-s $ignore) ! { open FILE, $ignore; ! ! while () ! { ! if (/^[^#]/) ! { push @buf_potfiles_ignore, $_; } } --- 257,267 ---- ## Check if we should ignore some found files, when ## comparing with POTFILES.in ! foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") { ! if (-s $ignore) { open FILE, $ignore; ! while () { ! if (/^[^#]/){ push @buf_potfiles_ignore, $_; } } *************** *** 306,404 **** } foreach my $file (@buf_i18n_plain) ! { my $in_comment = 0; my $in_macro = 0; open FILE, "<$file"; while () ! { # Handle continued multi-line comment. if ($in_comment) ! { next unless s-.*\*/--; $in_comment = 0; ! } ! # Handle continued macro. if ($in_macro) ! { $in_macro = 0 unless /\\$/; next; ! } ! # Handle start of macro (or any preprocessor directive). if (/^\s*\#/) ! { $in_macro = 1 if /^([^\\]|\\.)*\\$/; next; ! } ! # Handle comments and quoted text. while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy ! { my $match = $1; if ($match eq "/*") ! { if (!s-/\*.*?\*/--) ! { s-/\*.*--; $in_comment = 1; ! } ! } elsif ($match eq "//") ! { s-//.*--; ! } else # ' or " ! { if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-) ! { warn "mismatched quotes at line $. in $file\n"; s-$match.*--; ! } ! } ! } ! if (/_\(QUOTEDTEXT/) ! { ## Remove the first 3 chars and add newline push @buf_allfiles, unpack("x3 A*", $file) . "\n"; last; ! } ! } close FILE; ! } ! ! foreach my $file (@buf_i18n_xml) ! { open FILE, "<$file"; ! ! while () ! { ! if (/\s_(.*)=\"/ || /translatable=\"yes\"/) ! { push @buf_allfiles, unpack("x3 A*", $file) . "\n"; last; } } } ! foreach my $file (@buf_i18n_ini) ! { open FILE, "<$file"; ! while () ! { ! if (/_(.*)=/) ! { push @buf_allfiles, unpack("x3 A*", $file) . "\n"; last; } } } ! foreach my $file (@buf_i18n_xml_unmarked) ! { push @buf_allfiles, unpack("x3 A*", $file) . "\n"; } --- 271,362 ---- } foreach my $file (@buf_i18n_plain) ! { my $in_comment = 0; my $in_macro = 0; open FILE, "<$file"; while () ! { # Handle continued multi-line comment. if ($in_comment) ! { next unless s-.*\*/--; $in_comment = 0; ! } ! # Handle continued macro. if ($in_macro) ! { $in_macro = 0 unless /\\$/; next; ! } ! # Handle start of macro (or any preprocessor directive). if (/^\s*\#/) ! { $in_macro = 1 if /^([^\\]|\\.)*\\$/; next; ! } ! # Handle comments and quoted text. while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy ! { my $match = $1; if ($match eq "/*") ! { if (!s-/\*.*?\*/--) ! { s-/\*.*--; $in_comment = 1; ! } ! } elsif ($match eq "//") ! { s-//.*--; ! } else # ' or " ! { if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-) ! { warn "mismatched quotes at line $. in $file\n"; s-$match.*--; ! } ! } ! } ! ! if (/_\(QUOTEDTEXT/) ! { ## Remove the first 3 chars and add newline push @buf_allfiles, unpack("x3 A*", $file) . "\n"; last; ! } ! } close FILE; ! } ! ! foreach my $file (@buf_i18n_xml) { open FILE, "<$file"; ! while () { ! if (/\s_(.*)=\"/ || /translatable=\"yes\"/){ push @buf_allfiles, unpack("x3 A*", $file) . "\n"; last; } } } ! foreach my $file (@buf_i18n_ini){ open FILE, "<$file"; ! while () { ! if (/_(.*)=/){ push @buf_allfiles, unpack("x3 A*", $file) . "\n"; last; } } } ! foreach my $file (@buf_i18n_xml_unmarked){ push @buf_allfiles, unpack("x3 A*", $file) . "\n"; } *************** *** 407,431 **** @buf_potfiles_sorted = sort (@buf_potfiles); my %in2; ! foreach (@buf_potfiles_sorted) ! { $in2{$_} = 1; } my @result; ! foreach (@buf_allfiles_sorted) ! { ! if (!exists($in2{$_})) ! { push @result, $_ } } ## Save file with information about the files missing ## if any, and give information about this procedure. ! if (@result) ! { print "\n" if $VERBOSE; open OUT, ">missing"; print OUT @result; --- 365,385 ---- @buf_potfiles_sorted = sort (@buf_potfiles); my %in2; ! foreach (@buf_potfiles_sorted) { $in2{$_} = 1; } my @result; ! foreach (@buf_allfiles_sorted){ ! if (!exists($in2{$_})){ push @result, $_ } } ## Save file with information about the files missing ## if any, and give information about this procedure. ! if (@result) { print "\n" if $VERBOSE; open OUT, ">missing"; print OUT @result; *************** *** 468,476 **** else { open FILE, ") ! { chomp; ## Find xml files in POTFILES.in and generate the --- 422,428 ---- else { open FILE, ") { chomp; ## Find xml files in POTFILES.in and generate the *************** *** 478,498 **** my $gettext_type= &determine_type ($1); ! if (/\.($xml_extension|$ini_extension)$/ || /^\[/) ! { $_ =~ s/^\[[^\[].*]\s*//; ! my $filename = "../$_"; ! ! if ($VERBOSE) ! { ! system ($EXTRACT, "--update", ! "--type=$gettext_type", $filename); ! } ! else ! { ! system ($EXTRACT, "--update", "--type=$gettext_type", ! "--quiet", $filename); } } } --- 430,443 ---- my $gettext_type= &determine_type ($1); ! if (/\.($xml_extension|$ini_extension)$/ || /^\[/){ $_ =~ s/^\[[^\[].*]\s*//; + my $filename = "../$_"; ! if ($VERBOSE){ ! system($EXTRACT, "--update", "--type=$gettext_type", $filename); ! } else { ! system($EXTRACT, "--update", "--type=$gettext_type", "--quiet", $filename); } } } *************** *** 510,530 **** open INFILE, "POTFILES.in"; ! ! while () ! { chomp; ! if (/\.($xml_extension|$ini_extension)$/ || /^\[/) ! { s/^\[.*]\s*//; ! print OUTFILE "$_.h\n"; ! } ! else ! { print OUTFILE "$_\n"; } } - close OUTFILE; close INFILE; --- 455,469 ---- open INFILE, "POTFILES.in"; ! while () { chomp; ! if (/\.($xml_extension|$ini_extension)$/ || /^\[/) { s/^\[.*]\s*//; ! print OUTFILE "$_.h\n"; ! } else { print OUTFILE "$_\n"; } } close OUTFILE; close INFILE; *************** *** 551,566 **** close FILE; print "done\n" if $VERBOSE; ! if (!-e "$MODULE.po") ! { print "WARNING: It seems that none of the files in POTFILES.in ". "contain marked strings\n"; exit (1); } system ("rm", "-f", "$MODULE.pot"); ! move ("$MODULE.po", "$MODULE.pot") or ! die "$PROGRAM: couldn't move $MODULE.po to $MODULE.pot.\n"; print "Wrote $MODULE.pot\n" if $VERBOSE; } --- 490,503 ---- close FILE; print "done\n" if $VERBOSE; ! if (!-e "$MODULE.po") { print "WARNING: It seems that none of the files in POTFILES.in ". "contain marked strings\n"; exit (1); } system ("rm", "-f", "$MODULE.pot"); ! move ("$MODULE.po", "$MODULE.pot") or die "$PROGRAM: couldn't move $MODULE.po to $MODULE.pot.\n"; print "Wrote $MODULE.pot\n" if $VERBOSE; } *************** *** 575,582 **** # Perform merge, remove backup file and the "messages" trash file # generated by gettext ! system ("msgmerge", "-o", "$lang.po", "$lang.po.old", "$MODULE.pot"); ! unlink "$lang.po.old"; unlink "messages"; } --- 512,518 ---- # Perform merge, remove backup file and the "messages" trash file # generated by gettext ! system ("msgmerge", "$lang.po.old", "$MODULE.pot", "-o", "$lang.po"); unlink "$lang.po.old"; unlink "messages"; } *************** *** 597,604 **** @languages = map (&po_file2lang, @po_files); ! foreach my $lang (@languages) ! { $po_files_by_lang{$lang} = shift (@po_files); } } --- 533,539 ---- @languages = map (&po_file2lang, @po_files); ! foreach my $lang (@languages) { $po_files_by_lang{$lang} = shift (@po_files); } } *************** *** 624,748 **** &generate_po_template; &gather_po_files; ! foreach my $lang (@languages) ! { print "$lang: "; &update_po_file ($lang); } print "\n\n * Current translation support in $MODULE \n\n"; ! foreach my $lang (@languages) ! { print "$lang: "; system ("msgfmt", "--statistics", "$lang.po"); } } ! sub substitute_var ! { ! my ($str) = @_; ! ! # cache each variable. varhash is global to we can add ! # variables elsewhere. ! while () ! { ! if (/^(\w+)=(\S+)/) ! { ! $varhash{$1} = $2; ! } ! } ! ! if ($str =~ /^(.*)\${?([A-Z]+)}?(.*)$/) ! { ! my $rest = $3; ! my $untouched = $1; ! my $sub = $varhash{$2}; ! ! return substitute_var ("$untouched$sub$rest"); ! } ! return $str; ! } ! ! sub open_CONF_handle { my $base_dirname = getcwd(); $base_dirname =~ s@.*/@@; my ($conf_in, $src_dir); ! if ($base_dirname =~ /^po(-.+)?$/) ! { ! if (-f "../configure.in") ! { $conf_in = "../configure.in"; ! } ! elsif (-f "../configure.ac") ! { $conf_in = "../configure.ac"; ! } ! else ! { my $makefile_source; - local (*IN); open IN, ") ! { ! if (/^top_srcdir[ \t]*=/) ! { ! $src_dir = $_; $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/; ! chomp $src_dir; $conf_in = "$src_dir" . "/configure.in" . "\n"; - last; } } ! ! $conf_file || die "Cannot find top_srcdir in Makefile."; } ! ! $conf_file = $conf_in; ! open (CONF, "<$conf_in") || die "can't open $conf_in: $!"; ! } ! else ! { ! print "$PROGRAM: Unable to proceed.\n" . ! "Make sure to run this script inside the po directory.\n"; ! exit; ! } ! } ! sub find_package_name ! { ! &open_CONF_handle; ! ! my $conf_source; { ! local (*IN); ! open (IN, "<$conf_file") || die "can't open $conf_file: $!"; ! seek (IN, 0, 0); ! local $/; # slurp mode ! $conf_source = ; ! } ! ! my $name = ""; ! ! $name = $1 if $conf_source =~ /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m; ! ! if ($conf_source =~ /^AC_INIT\([\s\[]*([^,\)\s\]]+)\]?\s*,/m) ! { ! $name = $1; ! $varhash{"AC_PACKAGE_NAME"} = $1; } - - $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\s\]]+)/m; - - $name = "\$AC_PACKAGE_NAME" if "$name" eq "AC_PACKAGE_NAME"; - - $name = substitute_var ($name); ! return $name if $name; } --- 559,642 ---- &generate_po_template; &gather_po_files; ! foreach my $lang (@languages) { print "$lang: "; &update_po_file ($lang); } print "\n\n * Current translation support in $MODULE \n\n"; ! foreach my $lang (@languages){ print "$lang: "; system ("msgfmt", "--statistics", "$lang.po"); } } ! sub find_package_name { my $base_dirname = getcwd(); $base_dirname =~ s@.*/@@; my ($conf_in, $src_dir); ! if ($base_dirname =~ /^po(-.+)?$/) { ! if (-f "../configure.in") { $conf_in = "../configure.in"; ! } elsif (-f "../configure.ac") { $conf_in = "../configure.ac"; ! } else { my $makefile_source; local (*IN); open IN, ") { ! if (/^top_srcdir[ \t]*=/) { ! $src_dir = $_; ! # print "${src_dir}\n"; ! $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/; ! # print "${src_dir}\n"; chomp $src_dir; $conf_in = "$src_dir" . "/configure.in" . "\n"; last; } } ! $conf_in || die "Cannot find top_srcdir in Makefile." ! } ! ! my %varhash = (); ! my $conf_source; { ! local (*IN); ! open (IN, "<$conf_in") || die "can't open $conf_in: $!"; ! while () { ! if (/^(\w+)=(\S+)/) { $varhash{$1} = $2 }; ! } ! seek (IN, 0, 0); ! local $/; # slurp mode ! $conf_source = ; ! } ! ! my $name = ""; ! $name = $1 if $conf_source =~ /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m; ! if ($conf_source =~ /^AC_INIT\([\s\[]*([^,\)\s\]]+)\]?\s*,/m) { ! $name = $1; ! $varhash{"AC_PACKAGE_NAME"} = $1; } ! $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\s\]]+)/m; ! $name = "\$AC_PACKAGE_NAME" if "$name" eq "AC_PACKAGE_NAME"; ! ! my $oldname = ""; ! while (($name =~ /[\$](\S+)/) && ("$oldname" ne "$name")) { ! $oldname = $name; ! if (exists $varhash{$1}) { ! $name =~ s/[\$](\S+)/$varhash{$1}/; ! } ! } ! return $name if $name; } ! print "$PROGRAM: Unable to determine package name.\n" . ! "Make sure to run this script inside the po directory.\n"; ! exit; } diff -crN ./libbonobo/ltmain.sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/ltmain.sh *** ./libbonobo/ltmain.sh Thu Feb 20 12:48:58 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/ltmain.sh Sat Aug 9 21:12:35 2003 *************** *** 49,62 **** fi # The name of this program. ! progname=`$echo "$0" | ${SED} 's%^.*/%%'` modename="$progname" # Constants. PROGRAM=ltmain.sh PACKAGE=libtool ! VERSION=1.4.3 ! TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)" default_mode= help="Try \`$progname --help' for more information." --- 49,62 ---- fi # The name of this program. ! progname=`$echo "$0" | sed 's%^.*/%%'` modename="$progname" # 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." *************** *** 67,85 **** # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. ! Xsed="${SED}"' -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' ! # test EBCDIC or ASCII ! case `echo A|od -x` in ! *[Cc]1*) # EBCDIC based system ! SP2NL="tr '\100' '\n'" ! NL2SP="tr '\r\n' '\100\100'" ! ;; ! *) # Assume ASCII based system ! SP2NL="tr '\040' '\012'" ! NL2SP="tr '\015\012' '\040\040'" ! ;; ! esac # NLS nuisances. # Only set LANG and LC_ALL to C if already set. --- 67,76 ---- # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. ! Xsed='sed -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' ! SP2NL='tr \040 \012' ! NL2SP='tr \015\012 \040\040' # NLS nuisances. # Only set LANG and LC_ALL to C if already set. *************** *** 153,159 **** ;; --config) ! ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 exit 0 ;; --- 144,150 ---- ;; --config) ! sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 exit 0 ;; *************** *** 186,193 **** --mode) prevopt="--mode" prev=mode ;; --mode=*) mode="$optarg" ;; - --preserve-dup-deps) duplicate_deps="yes" ;; - --quiet | --silent) show=: ;; --- 177,182 ---- *************** *** 226,232 **** # Infer the operation mode. if test -z "$mode"; then case $nonopt in ! *cc | *++ | gcc* | *-gcc* | xlc*) mode=link for arg do --- 215,221 ---- # Infer the operation mode. if test -z "$mode"; then case $nonopt in ! *cc | *++ | gcc* | *-gcc*) mode=link for arg do *************** *** 478,484 **** 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 *************** *** 768,774 **** linker_flags= dllsearchpath= lib_search_path=`pwd` - inst_prefix_dir= avoid_version=no dlfiles= --- 757,762 ---- *************** *** 899,909 **** prev= continue ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; release) release="-$arg" prev= --- 887,892 ---- *************** *** 1005,1020 **** continue ;; - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* # so, if we see these flags be careful not to treat them like -L -L[A-Z][A-Z]*:*) case $with_gcc/$host in ! no/*-*-irix* | no/*-*-nonstopux*) compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" ;; --- 988,998 ---- continue ;; # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* # so, if we see these flags be careful not to treat them like -L -L[A-Z][A-Z]*:*) case $with_gcc/$host in ! no/*-*-irix*) compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" ;; *************** *** 1065,1078 **** # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; ! *-*-openbsd* | *-*-freebsd*) # 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* | *-*-freebsd*) # Do not include libc_r directly, use -pthread flag. continue ;; --- 1043,1056 ---- # 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 ;; *************** *** 1352,1362 **** # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do ! if test "X$duplicate_deps" = "Xyes" ; then ! case "$libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac ! fi libs="$libs $deplib" done deplibs= --- 1330,1338 ---- # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do ! case "$libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac libs="$libs $deplib" done deplibs= *************** *** 1485,1496 **** lib) if test "$deplibs_check_method" != pass_all; then echo ! echo "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have" ! echo "*** because the file extensions .$libext of this argument makes me believe" ! echo "*** that it is just a static archive that I should not used here." else echo echo "*** Warning: Linking the shared library $output against the" --- 1461,1470 ---- lib) if test "$deplibs_check_method" != pass_all; then echo ! echo "*** Warning: This library needs some functionality provided by $deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." else echo echo "*** Warning: Linking the shared library $output against the" *************** *** 1534,1540 **** fi # Check to see that this really is a libtool archive. ! if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 --- 1508,1514 ---- fi # Check to see that this really is a libtool archive. ! if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 *************** *** 1581,1591 **** tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" ! if test "X$duplicate_deps" = "Xyes" ; then ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac ! fi tmp_libs="$tmp_libs $deplib" done elif test $linkmode != prog && test $linkmode != lib; then --- 1555,1563 ---- tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac tmp_libs="$tmp_libs $deplib" done elif test $linkmode != prog && test $linkmode != lib; then *************** *** 1708,1718 **** # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi ! if test "X$duplicate_deps" = "Xyes" ; then ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac ! fi tmp_libs="$tmp_libs $deplib" done # for deplib continue --- 1680,1688 ---- # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac tmp_libs="$tmp_libs $deplib" done # for deplib continue *************** *** 1796,1803 **** # Make a new name for the extract_expsyms_cmds to use soroot="$soname" ! soname=`echo $soroot | ${SED} -e 's/^.*\///'` ! newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : --- 1766,1773 ---- # Make a new name for the extract_expsyms_cmds to use soroot="$soname" ! soname=`echo $soroot | sed -e 's/^.*\///'` ! newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a" # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : *************** *** 1904,1919 **** if test "$hardcode_direct" = yes; then add="$libdir/$linklib" elif test "$hardcode_minus_L" = yes; then ! # Try looking first in the location we're being installed to. ! add_dir= ! if test -n "$inst_prefix_dir"; then ! case "$libdir" in ! [\\/]*) ! add_dir="-L$inst_prefix_dir$libdir" ! ;; ! esac ! fi ! add_dir="$add_dir -L$libdir" add="-l$name" elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in --- 1874,1880 ---- if test "$hardcode_direct" = yes; then add="$libdir/$linklib" elif test "$hardcode_minus_L" = yes; then ! add_dir="-L$libdir" add="-l$name" elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *************** *** 1923,1938 **** add="-l$name" else # We cannot seem to hardcode it, guess we'll fake it. ! # Try looking first in the location we're being installed to. ! add_dir= ! if test -n "$inst_prefix_dir"; then ! case "$libdir" in ! [\\/]*) ! add_dir="-L$inst_prefix_dir$libdir" ! ;; ! esac ! fi ! add_dir="$add_dir -L$libdir" add="-l$name" fi --- 1884,1890 ---- add="-l$name" else # We cannot seem to hardcode it, guess we'll fake it. ! add_dir="-L$libdir" add="-l$name" fi *************** *** 1974,1987 **** # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo ! echo "*** Warning: This system can not link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then ! echo "*** But as you try to build a module library, libtool will still create " ! echo "*** a static module, that should work as long as the dlopening application" ! echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" --- 1926,1938 ---- # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo ! echo "*** Warning: This library needs some functionality provided by $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then ! 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" *************** *** 2030,2040 **** tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" ! if test "X$duplicate_deps" = "Xyes" ; then ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac ! fi tmp_libs="$tmp_libs $deplib" done --- 1981,1989 ---- tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac tmp_libs="$tmp_libs $deplib" done *************** *** 2060,2066 **** if grep "^installed=no" $deplib > /dev/null; then path="-L$absdir/$objdir" else ! eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 --- 2009,2015 ---- if grep "^installed=no" $deplib > /dev/null; then path="-L$absdir/$objdir" else ! eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 *************** *** 2324,2344 **** versuffix=".$current"; ;; ! irix | nonstopux) major=`expr $current - $age + 1` ! ! case $version_type in ! nonstopux) verstring_prefix=nonstopux ;; ! *) verstring_prefix=sgi ;; ! esac ! verstring="$verstring_prefix$major.$revision" # Add in all the interfaces that we are compatible with. loop=$revision while test $loop != 0; do iface=`expr $revision - $loop` loop=`expr $loop - 1` ! verstring="$verstring_prefix$major.$iface:$verstring" done # Before this point, $major must not contain `.'. --- 2273,2288 ---- versuffix=".$current"; ;; ! irix) major=`expr $current - $age + 1` ! verstring="sgi$major.$revision" # Add in all the interfaces that we are compatible with. loop=$revision while test $loop != 0; do iface=`expr $revision - $loop` loop=`expr $loop - 1` ! verstring="sgi$major.$iface:$verstring" done # Before this point, $major must not contain `.'. *************** *** 2352,2358 **** ;; osf) ! major=.`expr $current - $age` versuffix=".$current.$age.$revision" verstring="$current.$age.$revision" --- 2296,2302 ---- ;; osf) ! major=`expr $current - $age` versuffix=".$current.$age.$revision" verstring="$current.$age.$revision" *************** *** 2444,2452 **** # Eliminate all temporary directories. for path in $notinst_path; do ! lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'` ! deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'` ! dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` done if test -n "$xrpath"; then --- 2388,2396 ---- # Eliminate all temporary directories. for path in $notinst_path; do ! lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'` ! deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'` ! dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'` done if test -n "$xrpath"; then *************** *** 2497,2503 **** *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; ! *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. ;; *) --- 2441,2447 ---- *-*-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. ;; *) *************** *** 2558,2577 **** else droppeddeps=yes echo ! echo "*** Warning: dynamic linker does not accept needed library $i." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which I believe you do not have" ! echo "*** because a test_compile did reveal that the linker did not use it for" ! echo "*** its dynamic dependency list that programs get resolved with at runtime." fi else newdeplibs="$newdeplibs $i" fi done else ! # Error occured in the first compile. Let's try to salvage ! # the situation: Compile a separate program for each library. for i in $deplibs; do name="`expr $i : '-l\(.*\)'`" # If $name is empty we are operating on a -L argument. --- 2502,2519 ---- else droppeddeps=yes echo ! echo "*** Warning: This library needs some functionality provided by $i." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." fi else newdeplibs="$newdeplibs $i" fi done else ! # Error occured in the first compile. Let's try to salvage the situation: ! # Compile a seperate program for each library. for i in $deplibs; do name="`expr $i : '-l\(.*\)'`" # If $name is empty we are operating on a -L argument. *************** *** 2590,2601 **** else droppeddeps=yes echo ! echo "*** Warning: dynamic linker does not accept needed library $i." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have" ! echo "*** because a test_compile did reveal that the linker did not use this one" ! echo "*** as a dynamic dependency that programs can get resolved with at runtime." fi else droppeddeps=yes --- 2532,2541 ---- else droppeddeps=yes echo ! echo "*** Warning: This library needs some functionality provided by $i." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." fi else droppeddeps=yes *************** *** 2634,2647 **** # but so what? potlib="$potent_lib" while test -h "$potlib" 2>/dev/null; do ! potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ ! | ${SED} 10q \ | egrep "$file_magic_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" --- 2574,2587 ---- # but so what? potlib="$potent_lib" while test -h "$potlib" 2>/dev/null; do ! potliblink=`ls -ld $potlib | sed 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ ! | sed 10q \ | egrep "$file_magic_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" *************** *** 2652,2668 **** if test -n "$a_deplib" ; then droppeddeps=yes echo ! echo "*** Warning: linker path does not have real file for library $a_deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have" ! echo "*** because I did check the linker path looking for a file starting" ! if test -z "$potlib" ; then ! echo "*** with $libname but no candidates were found. (...for file magic test)" ! else ! echo "*** with $libname and none of the candidates passed a file format test" ! echo "*** using a file magic. Last file checked: $potlib" ! fi fi else # Add a -L argument. --- 2592,2601 ---- if test -n "$a_deplib" ; then droppeddeps=yes echo ! echo "*** Warning: This library needs some functionality provided by $a_deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." fi else # Add a -L argument. *************** *** 2681,2689 **** for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check below in file_magic test if eval echo \"$potent_lib\" 2>/dev/null \ ! | ${SED} 10q \ | egrep "$match_pattern_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" --- 2614,2621 ---- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do if eval echo \"$potent_lib\" 2>/dev/null \ ! | sed 10q \ | egrep "$match_pattern_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" *************** *** 2694,2710 **** if test -n "$a_deplib" ; then droppeddeps=yes echo ! echo "*** Warning: linker path does not have real file for library $a_deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have" ! echo "*** because I did check the linker path looking for a file starting" ! if test -z "$potlib" ; then ! echo "*** with $libname but no candidates were found. (...for regex pattern test)" ! else ! echo "*** with $libname and none of the candidates passed a file format test" ! echo "*** using a regex pattern. Last file checked: $potlib" ! fi fi else # Add a -L argument. --- 2626,2635 ---- if test -n "$a_deplib" ; then droppeddeps=yes echo ! echo "*** Warning: This library needs some functionality provided by $a_deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." fi else # Add a -L argument. *************** *** 2969,2986 **** if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then eval cmds=\"$archive_expsym_cmds\" else - save_deplibs="$deplibs" - for conv in $convenience; do - tmp_deplibs= - for test_deplib in $deplibs; do - if test "$test_deplib" != "$conv"; then - tmp_deplibs="$tmp_deplibs $test_deplib" - fi - done - deplibs="$tmp_deplibs" - done eval cmds=\"$archive_cmds\" - deplibs="$save_deplibs" fi save_ifs="$IFS"; IFS='~' for cmd in $cmds; do --- 2894,2900 ---- *************** *** 3179,3185 **** prog) case $host in ! *cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; esac if test -n "$vinfo"; then $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 --- 3093,3099 ---- prog) case $host in ! *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;; esac if test -n "$vinfo"; then $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 *************** *** 3201,3216 **** # On Rhapsody replace the C library is the System framework compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - case $host in - *darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" - ;; - esac ;; esac compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" --- 3115,3128 ---- # On Rhapsody replace the C library is the System framework compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` ;; 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" *************** *** 3374,3382 **** if test -z "$export_symbols"; then export_symbols="$output_objdir/$output.exp" $run $rm $export_symbols ! $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' else ! $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' fi --- 3286,3294 ---- if test -z "$export_symbols"; then export_symbols="$output_objdir/$output.exp" $run $rm $export_symbols ! $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' else ! $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' fi *************** *** 3384,3390 **** for arg in $dlprefiles; do $show "extracting global C symbols from \`$arg'" ! name=`echo "$arg" | ${SED} -e 's%^.*/%%'` $run eval 'echo ": $name " >> "$nlist"' $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" done --- 3296,3302 ---- for arg in $dlprefiles; do $show "extracting global C symbols from \`$arg'" ! name=`echo "$arg" | sed -e 's%^.*/%%'` $run eval 'echo ": $name " >> "$nlist"' $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" done *************** *** 3399,3411 **** fi # Try sorting and uniquifying the output. ! if grep -v "^: " < "$nlist" | ! if sort -k 3 /dev/null 2>&1; then ! sort -k 3 ! else ! sort +2 ! fi | ! uniq > "$nlist"S; then : else grep -v "^: " < "$nlist" > "$nlist"S --- 3311,3317 ---- fi # Try sorting and uniquifying the output. ! if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then : else grep -v "^: " < "$nlist" > "$nlist"S *************** *** 3627,3633 **** relink_command="$var=\"$var_value\"; export $var; $relink_command" fi done ! relink_command="(cd `pwd`; $relink_command)" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` fi --- 3533,3539 ---- relink_command="$var=\"$var_value\"; export $var; $relink_command" fi done ! relink_command="cd `pwd`; $relink_command" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` fi *************** *** 3647,3653 **** # win32 will think the script is a binary if it has # a .exe suffix, so we strip it off here. case $output in ! *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;; esac # test for cygwin because mv fails w/o .exe extensions case $host in --- 3553,3559 ---- # win32 will think the script is a binary if it has # a .exe suffix, so we strip it off here. case $output in ! *.exe) output=`echo $output|sed 's,.exe$,,'` ;; esac # test for cygwin because mv fails w/o .exe extensions case $host in *************** *** 3671,3677 **** # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. ! Xsed="${SED}"' -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # The HP-UX ksh and POSIX shell print the target directory to stdout --- 3577,3583 ---- # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. ! Xsed='sed -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # The HP-UX ksh and POSIX shell print the target directory to stdout *************** *** 3709,3715 **** test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. ! file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` while test -n \"\$file\"; do destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` --- 3615,3621 ---- test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. ! file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\` while test -n \"\$file\"; do destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` *************** *** 3722,3728 **** fi file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` ! file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` done # Try to get the absolute directory name. --- 3628,3634 ---- fi file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` ! file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\` done # Try to get the absolute directory name. *************** *** 3736,3742 **** progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || \\ ! { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" --- 3642,3648 ---- progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || \\ ! { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" *************** *** 3782,3788 **** $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" # Some systems cannot cope with colon-terminated $shlibpath_var ! # The second colon is a workaround for a bug in BeOS R4 ${SED} $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` export $shlibpath_var --- 3688,3694 ---- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" # Some systems cannot cope with colon-terminated $shlibpath_var ! # The second colon is a workaround for a bug in BeOS R4 sed $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` export $shlibpath_var *************** *** 3957,3963 **** fi done # Quote the link command for shipping. ! relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` # Only create the output if not a dry run. --- 3863,3869 ---- fi done # Quote the link command for shipping. ! relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` # Only create the output if not a dry run. *************** *** 3974,3980 **** case $deplib in *.la) name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 --- 3880,3886 ---- case $deplib in *.la) name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 *************** *** 3988,3994 **** newdlfiles= for lib in $dlfiles; do name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 --- 3894,3900 ---- newdlfiles= for lib in $dlfiles; do name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 *************** *** 3999,4005 **** newdlprefiles= for lib in $dlprefiles; do name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 --- 3905,3911 ---- newdlprefiles= for lib in $dlprefiles; do name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 *************** *** 4013,4018 **** --- 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 *************** *** 4223,4229 **** *.la) # Check to see that this really is a libtool archive. ! if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 --- 4130,4136 ---- *.la) # Check to see that this really is a libtool archive. ! if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 *************** *** 4257,4289 **** test "X$dir" = "X$file/" && dir= dir="$dir$objdir" ! if test -n "$relink_command"; then ! # Determine the prefix the user has applied to our future dir. ! inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` ! ! # Don't allow the user to place us outside of our expected ! # location b/c this prevents finding dependent libraries that ! # are installed to the same prefix. ! if test "$inst_prefix_dir" = "$destdir"; then ! $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 ! exit 1 ! fi ! ! if test -n "$inst_prefix_dir"; then ! # Stick the inst_prefix_dir data into the link command. ! relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` ! else ! relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` ! fi ! ! $echo "$modename: warning: relinking \`$file'" 1>&2 ! $show "$relink_command" ! if $run eval "$relink_command"; then : ! else ! $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 ! exit 1 ! 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 *************** *** 4293,4299 **** 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" *************** *** 4390,4416 **** fi # Do a test to see if this is really a libtool program. ! case $host in ! *cygwin*|*mingw*) ! wrapper=`echo $file | ${SED} -e 's,.exe$,,'` ! ;; ! *) ! wrapper=$file ! ;; ! esac ! if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then notinst_deplibs= relink_command= # If there is no directory component, then add one. case $file in ! */* | *\\*) . $wrapper ;; ! *) . ./$wrapper ;; esac # Check the variables that should have been set. if test -z "$notinst_deplibs"; then ! $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 exit 1 fi --- 4283,4301 ---- fi # Do a test to see if this is really a libtool program. ! if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then notinst_deplibs= relink_command= # If there is no directory component, then add one. case $file in ! */* | *\\*) . $file ;; ! *) . ./$file ;; esac # Check the variables that should have been set. if test -z "$notinst_deplibs"; then ! $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 exit 1 fi *************** *** 4435,4442 **** relink_command= # If there is no directory component, then add one. case $file in ! */* | *\\*) . $wrapper ;; ! *) . ./$wrapper ;; esac outputname= --- 4320,4327 ---- relink_command= # If there is no directory component, then add one. case $file in ! */* | *\\*) . $file ;; ! *) . ./$file ;; esac outputname= *************** *** 4444,4454 **** if test "$finalize" = yes && test -z "$run"; then tmpdir="/tmp" test -n "$TMPDIR" && tmpdir="$TMPDIR" ! tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` ! if test $? = 0 ; then : ! else ! tmpdir="$tmpdir/libtool-$$" ! fi if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : else $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 --- 4329,4335 ---- if test "$finalize" = yes && test -z "$run"; then tmpdir="/tmp" test -n "$TMPDIR" && tmpdir="$TMPDIR" ! tmpdir="$tmpdir/libtool-$$" if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : else $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 *************** *** 4488,4494 **** destfile=$destfile.exe ;; *:*.exe) ! destfile=`echo $destfile | ${SED} -e 's,.exe$,,'` ;; esac ;; --- 4369,4375 ---- destfile=$destfile.exe ;; *:*.exe) ! destfile=`echo $destfile | sed -e 's,.exe$,,'` ;; esac ;; *************** *** 4636,4642 **** case $file in *.la) # Check to see that this really is a libtool archive. ! if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 --- 4517,4523 ---- case $file in *.la) # Check to see that this really is a libtool archive. ! if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 *************** *** 4707,4713 **** -*) ;; *) # Do a test to see if this is really a libtool program. ! if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then # If there is no directory component, then add one. case $file in */* | *\\*) . $file ;; --- 4588,4594 ---- -*) ;; *) # Do a test to see if this is really a libtool program. ! if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then # If there is no directory component, then add one. case $file in */* | *\\*) . $file ;; *************** *** 4739,4745 **** fi # Now prepare to actually exec the command. ! exec_cmd="\$cmd$args" else # Display what would be done. if test -n "$shlibpath_var"; then --- 4620,4626 ---- fi # Now prepare to actually exec the command. ! exec_cmd='"$cmd"$args' else # Display what would be done. if test -n "$shlibpath_var"; then *************** *** 4816,4822 **** case $name in *.la) # Possibly a libtool archive, so verify it. ! if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then . $dir/$name # Delete the libtool libraries and symlinks. --- 4697,4703 ---- case $name in *.la) # Possibly a libtool archive, so verify it. ! if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then . $dir/$name # Delete the libtool libraries and symlinks. *************** *** 4871,4877 **** *) # Do a test to see if this is a libtool program. if test $mode = clean && ! (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then relink_command= . $dir/$file --- 4752,4758 ---- *) # Do a test to see if this is a libtool program. if test $mode = clean && ! (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then relink_command= . $dir/$file diff -crN ./libbonobo/missing /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/missing *** ./libbonobo/missing Thu Sep 5 08:46:15 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/missing Sat Aug 9 21:12:54 2003 *************** *** 1,7 **** #! /bin/sh # Common stub for a few missing GNU programs while installing. ! # Copyright (C) 1996, 1997, 2001, 2002 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" ;; -*) *************** *** 66,75 **** exit 1 ;; ! 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 --- 87,96 ---- exit 1 ;; ! 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 *************** *** 103,112 **** touch $touch_files ;; ! 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 | --- 124,133 ---- touch $touch_files ;; ! 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 ./libbonobo/monikers/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/monikers/Makefile.in *** ./libbonobo/monikers/Makefile.in Fri Mar 14 16:54:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/monikers/Makefile.in Sat Aug 9 21:12:58 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 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,72 **** --- 57,74 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ + AWK = @AWK@ BONOBO_ACTIVATION_IDL_DIR = @BONOBO_ACTIVATION_IDL_DIR@ + BONOBO_ACTIVATION_IDL_DIR_PC = @BONOBO_ACTIVATION_IDL_DIR_PC@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 76,81 **** --- 78,84 ---- GMSGFMT = @GMSGFMT@ GTKDOC = @GTKDOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 102,108 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 105,110 ---- *************** *** 120,129 **** VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ ! INCLUDES = -I$(top_srcdir) $(WARN_CFLAGS) $(LIBBONOBO_CFLAGS) -DPLUGIN_DIR=\""$(PLUGIN_DIR)"\" -DBONOBO_LIBDIR=\""$(libdir)"\" -DBONOBO_DATADIR=\""$(datadir)"\" -DBONOBO_PIXMAPDIR=\""$(datadir)/pixmaps"\" -DBONOBO_BINDIR=\""$(bindir)"\" -DBONOBO_LOCALSTATEDIR=\""$(localstatedir)"\" -DBONOBO_LOCALEDIR=\""$(gnomelocaledir)"\" -DG_LOG_DOMAIN=\"Bonobo\" -DVERSION=\"$(VERSION)\" CLEANFILES = Bonobo_Moniker_std.server Bonobo_Moniker_std.server.in --- 122,146 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ + install_sh = @install_sh@ ! INCLUDES = \ ! -I$(top_srcdir) \ ! $(WARN_CFLAGS) \ ! $(LIBBONOBO_CFLAGS) \ ! -DPLUGIN_DIR=\""$(PLUGIN_DIR)"\" \ ! -DBONOBO_LIBDIR=\""$(libdir)"\" \ ! -DBONOBO_DATADIR=\""$(datadir)"\" \ ! -DBONOBO_PIXMAPDIR=\""$(datadir)/pixmaps"\" \ ! -DBONOBO_BINDIR=\""$(bindir)"\" \ ! -DBONOBO_LOCALSTATEDIR=\""$(localstatedir)"\" \ ! -DBONOBO_LOCALEDIR=\""$(gnomelocaledir)"\" \ ! -DG_LOG_DOMAIN=\"Bonobo\" \ ! -DVERSION=\"$(VERSION)\" CLEANFILES = Bonobo_Moniker_std.server Bonobo_Moniker_std.server.in *************** *** 134,472 **** monikerdir = $(libdir)/bonobo/monikers moniker_LTLIBRARIES = libmoniker_std_2.la ! libmoniker_std_2_la_SOURCES = bonobo-moniker-extender-stream.c bonobo-moniker-item.c bonobo-moniker-new.c bonobo-moniker-ior.c bonobo-moniker-oaf.c bonobo-moniker-cache.c bonobo-stream-cache.h bonobo-stream-cache.c bonobo-moniker-query.c bonobo-moniker-query.h bonobo-moniker-std.h bonobo-moniker-std.c libmoniker_std_2_la_LDFLAGS = -module -avoid-version ! libmoniker_std_2_la_LIBADD = $(top_builddir)/bonobo/libbonobo-2.la EXTRA_DIST = Bonobo_Moniker_std.server.in.in mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(moniker_LTLIBRARIES) ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. LIBS = @LIBS@ ! libmoniker_std_2_la_DEPENDENCIES = \ ! $(top_builddir)/bonobo/libbonobo-2.la ! libmoniker_std_2_la_OBJECTS = bonobo-moniker-extender-stream.lo \ ! bonobo-moniker-item.lo bonobo-moniker-new.lo bonobo-moniker-ior.lo \ ! bonobo-moniker-oaf.lo bonobo-moniker-cache.lo bonobo-stream-cache.lo \ ! bonobo-moniker-query.lo bonobo-moniker-std.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 = $(server_DATA) ! ! DIST_COMMON = Makefile.am Makefile.in ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! ! TAR = gtar ! GZIP_ENV = --best SOURCES = $(libmoniker_std_2_la_SOURCES) - OBJECTS = $(libmoniker_std_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 monikers/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! mostlyclean-monikerLTLIBRARIES: ! ! clean-monikerLTLIBRARIES: ! -test -z "$(moniker_LTLIBRARIES)" || rm -f $(moniker_LTLIBRARIES) ! ! distclean-monikerLTLIBRARIES: ! maintainer-clean-monikerLTLIBRARIES: install-monikerLTLIBRARIES: $(moniker_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(monikerdir) @list='$(moniker_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(monikerdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(monikerdir)/$$p; \ else :; fi; \ done uninstall-monikerLTLIBRARIES: @$(NORMAL_UNINSTALL) ! list='$(moniker_LTLIBRARIES)'; for p in $$list; do \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(monikerdir)/$$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: ! libmoniker_std_2.la: $(libmoniker_std_2_la_OBJECTS) $(libmoniker_std_2_la_DEPENDENCIES) ! $(LINK) -rpath $(monikerdir) $(libmoniker_std_2_la_LDFLAGS) $(libmoniker_std_2_la_OBJECTS) $(libmoniker_std_2_la_LIBADD) $(LIBS) install-serverDATA: $(server_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(serverdir) @list='$(server_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(serverdir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(serverdir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(serverdir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(serverdir)/$$p; \ ! fi; fi; \ done uninstall-serverDATA: @$(NORMAL_UNINSTALL) ! list='$(server_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(serverdir)/$$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 = monikers 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 - bonobo-moniker-cache.lo bonobo-moniker-cache.o : bonobo-moniker-cache.c \ - ../config.h ../bonobo/bonobo-exception.h ../bonobo/Bonobo.h \ - bonobo-moniker-std.h ../bonobo/bonobo-moniker-simple.h \ - ../bonobo/bonobo-types.h ../bonobo/bonobo-object.h \ - ../bonobo/bonobo-macros.h ../bonobo/bonobo-arg.h \ - ../bonobo/bonobo-moniker.h ../bonobo/bonobo-moniker-extender.h \ - bonobo-stream-cache.h ../bonobo/bonobo-stream.h \ - ../bonobo/bonobo-storage.h - bonobo-moniker-extender-stream.lo bonobo-moniker-extender-stream.o : \ - bonobo-moniker-extender-stream.c ../config.h \ - ../bonobo/bonobo-storage.h ../bonobo/bonobo-object.h \ - ../bonobo/Bonobo.h ../bonobo/bonobo-macros.h \ - ../bonobo/bonobo-exception.h ../bonobo/bonobo-moniker.h \ - ../bonobo/bonobo-moniker-extender.h \ - ../bonobo/bonobo-moniker-util.h bonobo-moniker-std.h \ - ../bonobo/bonobo-moniker-simple.h ../bonobo/bonobo-types.h \ - ../bonobo/bonobo-arg.h - bonobo-moniker-ior.lo bonobo-moniker-ior.o : bonobo-moniker-ior.c \ - ../config.h ../bonobo/bonobo-main.h ../bonobo/Bonobo.h \ - ../bonobo/bonobo-exception.h ../bonobo/bonobo-moniker-util.h \ - bonobo-moniker-std.h ../bonobo/bonobo-moniker-simple.h \ - ../bonobo/bonobo-types.h ../bonobo/bonobo-object.h \ - ../bonobo/bonobo-macros.h ../bonobo/bonobo-arg.h \ - ../bonobo/bonobo-moniker.h ../bonobo/bonobo-moniker-extender.h - bonobo-moniker-item.lo bonobo-moniker-item.o : bonobo-moniker-item.c \ - ../config.h ../bonobo/bonobo-exception.h ../bonobo/Bonobo.h \ - ../bonobo/bonobo-moniker-util.h bonobo-moniker-std.h \ - ../bonobo/bonobo-moniker-simple.h ../bonobo/bonobo-types.h \ - ../bonobo/bonobo-object.h ../bonobo/bonobo-macros.h \ - ../bonobo/bonobo-arg.h ../bonobo/bonobo-moniker.h \ - ../bonobo/bonobo-moniker-extender.h - bonobo-moniker-new.lo bonobo-moniker-new.o : bonobo-moniker-new.c \ - ../config.h ../bonobo/bonobo-moniker-util.h ../bonobo/Bonobo.h \ - bonobo-moniker-std.h ../bonobo/bonobo-moniker-simple.h \ - ../bonobo/bonobo-types.h ../bonobo/bonobo-object.h \ - ../bonobo/bonobo-macros.h ../bonobo/bonobo-arg.h \ - ../bonobo/bonobo-moniker.h ../bonobo/bonobo-moniker-extender.h - bonobo-moniker-oaf.lo bonobo-moniker-oaf.o : bonobo-moniker-oaf.c \ - ../config.h ../bonobo/bonobo-i18n.h \ - ../bonobo/bonobo-exception.h ../bonobo/Bonobo.h \ - ../bonobo/bonobo-moniker-util.h bonobo-moniker-std.h \ - ../bonobo/bonobo-moniker-simple.h ../bonobo/bonobo-types.h \ - ../bonobo/bonobo-object.h ../bonobo/bonobo-macros.h \ - ../bonobo/bonobo-arg.h ../bonobo/bonobo-moniker.h \ - ../bonobo/bonobo-moniker-extender.h - bonobo-moniker-query.lo bonobo-moniker-query.o : bonobo-moniker-query.c \ - ../config.h ../bonobo/bonobo-moniker.h \ - ../bonobo/bonobo-object.h ../bonobo/Bonobo.h \ - ../bonobo/bonobo-macros.h ../bonobo/bonobo-moniker-util.h \ - bonobo-moniker-std.h ../bonobo/bonobo-moniker-simple.h \ - ../bonobo/bonobo-types.h ../bonobo/bonobo-arg.h \ - ../bonobo/bonobo-moniker-extender.h - bonobo-moniker-std.lo bonobo-moniker-std.o : bonobo-moniker-std.c \ - ../config.h ../bonobo/bonobo-shlib-factory.h ../bonobo/Bonobo.h \ - ../bonobo/bonobo-object.h ../bonobo/bonobo-macros.h \ - ../bonobo/bonobo-generic-factory.h ../bonobo/bonobo-i18n.h \ - ../bonobo/bonobo-exception.h bonobo-moniker-std.h \ - ../bonobo/bonobo-moniker-simple.h ../bonobo/bonobo-types.h \ - ../bonobo/bonobo-arg.h ../bonobo/bonobo-moniker.h \ - ../bonobo/bonobo-moniker-extender.h - bonobo-stream-cache.lo bonobo-stream-cache.o : bonobo-stream-cache.c \ - ../config.h ../bonobo/bonobo-exception.h ../bonobo/Bonobo.h \ - ../bonobo/bonobo-stream-client.h bonobo-stream-cache.h \ - ../bonobo/bonobo-stream.h ../bonobo/bonobo-storage.h \ - ../bonobo/bonobo-object.h ../bonobo/bonobo-macros.h - - 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-monikerLTLIBRARIES install-serverDATA ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall-monikerLTLIBRARIES uninstall-serverDATA uninstall: uninstall-am - all-am: Makefile $(LTLIBRARIES) $(DATA) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(monikerdir) $(DESTDIR)$(serverdir) mostlyclean-generic: clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) 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-monikerLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-monikerLTLIBRARIES clean-compile clean-libtool \ ! clean-tags clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-monikerLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-generic \ ! clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-monikerLTLIBRARIES \ ! 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-monikerLTLIBRARIES distclean-monikerLTLIBRARIES \ ! clean-monikerLTLIBRARIES maintainer-clean-monikerLTLIBRARIES \ ! uninstall-monikerLTLIBRARIES install-monikerLTLIBRARIES \ ! mostlyclean-compile distclean-compile clean-compile \ ! maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool uninstall-serverDATA \ ! install-serverDATA 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 Bonobo_Moniker_std.server.in: Bonobo_Moniker_std.server.in.in sed -e "s|\@MONIKER_LIBDIR\@|$(monikerdir)|" $< > $@ @INTLTOOL_SERVER_RULE@ - # 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: --- 151,427 ---- monikerdir = $(libdir)/bonobo/monikers moniker_LTLIBRARIES = libmoniker_std_2.la ! libmoniker_std_2_la_SOURCES = \ ! bonobo-moniker-extender-stream.c \ ! bonobo-moniker-item.c \ ! bonobo-moniker-new.c \ ! bonobo-moniker-ior.c \ ! bonobo-moniker-oaf.c \ ! bonobo-moniker-cache.c \ ! bonobo-stream-cache.h \ ! bonobo-stream-cache.c \ ! bonobo-moniker-query.c \ ! bonobo-moniker-query.h \ ! bonobo-moniker-std.h \ ! bonobo-moniker-std.c libmoniker_std_2_la_LDFLAGS = -module -avoid-version ! libmoniker_std_2_la_LIBADD = $(top_builddir)/bonobo/libbonobo-2.la \ ! $(LIBBONOBO_LIBS) ! EXTRA_DIST = Bonobo_Moniker_std.server.in.in + subdir = monikers mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(moniker_LTLIBRARIES) ! ! libmoniker_std_2_la_DEPENDENCIES = $(top_builddir)/bonobo/libbonobo-2.la ! am_libmoniker_std_2_la_OBJECTS = bonobo-moniker-extender-stream.lo \ ! bonobo-moniker-item.lo bonobo-moniker-new.lo \ ! bonobo-moniker-ior.lo bonobo-moniker-oaf.lo \ ! bonobo-moniker-cache.lo bonobo-stream-cache.lo \ ! bonobo-moniker-query.lo bonobo-moniker-std.lo ! libmoniker_std_2_la_OBJECTS = $(am_libmoniker_std_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 = $(libmoniker_std_2_la_SOURCES) ! DATA = $(server_DATA) ! DIST_COMMON = Makefile.am Makefile.in SOURCES = $(libmoniker_std_2_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 monikers/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-monikerLTLIBRARIES: $(moniker_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(monikerdir) @list='$(moniker_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(monikerdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(monikerdir)/$$p; \ else :; fi; \ done uninstall-monikerLTLIBRARIES: @$(NORMAL_UNINSTALL) ! @list='$(moniker_LTLIBRARIES)'; for p in $$list; do \ ! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(monikerdir)/$$p"; \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(monikerdir)/$$p; \ done ! clean-monikerLTLIBRARIES: ! -test -z "$(moniker_LTLIBRARIES)" || rm -f $(moniker_LTLIBRARIES) ! libmoniker_std_2.la: $(libmoniker_std_2_la_OBJECTS) $(libmoniker_std_2_la_DEPENDENCIES) ! $(LINK) -rpath $(monikerdir) $(libmoniker_std_2_la_LDFLAGS) $(libmoniker_std_2_la_OBJECTS) $(libmoniker_std_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-serverDATA: $(server_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(serverdir) @list='$(server_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)$(serverdir)/$$f"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(serverdir)/$$f; \ done uninstall-serverDATA: @$(NORMAL_UNINSTALL) ! @list='$(server_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(serverdir)/$$f"; \ ! rm -f $(DESTDIR)$(serverdir)/$$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 check-am: all-am check: check-am ! all-am: Makefile $(LTLIBRARIES) $(DATA) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(monikerdir) $(DESTDIR)$(serverdir) 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: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) 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-monikerLTLIBRARIES \ ! 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-monikerLTLIBRARIES install-serverDATA ! ! 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 uninstall-monikerLTLIBRARIES \ ! uninstall-serverDATA ! ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-monikerLTLIBRARIES 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-monikerLTLIBRARIES install-serverDATA 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-monikerLTLIBRARIES \ ! uninstall-serverDATA Bonobo_Moniker_std.server.in: Bonobo_Moniker_std.server.in.in sed -e "s|\@MONIKER_LIBDIR\@|$(monikerdir)|" $< > $@ @INTLTOOL_SERVER_RULE@ # 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: diff -crN ./libbonobo/samples/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/samples/Makefile.in *** ./libbonobo/samples/Makefile.in Fri Mar 14 16:54:42 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/samples/Makefile.in Sat Aug 9 21:12:58 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 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,72 **** --- 57,74 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ + AWK = @AWK@ BONOBO_ACTIVATION_IDL_DIR = @BONOBO_ACTIVATION_IDL_DIR@ + BONOBO_ACTIVATION_IDL_DIR_PC = @BONOBO_ACTIVATION_IDL_DIR_PC@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 76,81 **** --- 78,84 ---- GMSGFMT = @GMSGFMT@ GTKDOC = @GTKDOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 102,108 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 105,110 ---- *************** *** 120,148 **** VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ SUBDIRS = echo 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 samples/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. --- 122,167 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ + install_sh = @install_sh@ SUBDIRS = echo + subdir = samples 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 samples/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. *************** *** 150,161 **** # (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//`; \ --- 169,175 ---- # (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//`; \ *************** *** 178,188 **** 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"; \ --- 192,207 ---- 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"; \ *************** *** 201,251 **** 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 = samples 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 \ --- 220,279 ---- 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 \ *************** *** 253,332 **** 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. --- 281,376 ---- 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 ./libbonobo/samples/echo/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/samples/echo/Makefile.in *** ./libbonobo/samples/echo/Makefile.in Fri Mar 14 16:54:48 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/samples/echo/Makefile.in Sat Aug 9 21:12:59 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 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,20 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. # # Makefile for the sample Echo server/client Bonobo components. # - SHELL = @SHELL@ srcdir = @srcdir@ --- 11,22 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + @SET_MAKE@ + # # Makefile for the sample Echo server/client Bonobo components. # SHELL = @SHELL@ srcdir = @srcdir@ *************** *** 35,47 **** mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ --- 37,45 ---- *************** *** 50,60 **** 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 = : --- 48,58 ---- 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 = : *************** *** 63,76 **** --- 61,78 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ + AWK = @AWK@ BONOBO_ACTIVATION_IDL_DIR = @BONOBO_ACTIVATION_IDL_DIR@ + BONOBO_ACTIVATION_IDL_DIR_PC = @BONOBO_ACTIVATION_IDL_DIR_PC@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 80,85 **** --- 82,88 ---- GMSGFMT = @GMSGFMT@ GTKDOC = @GTKDOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 106,112 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 109,114 ---- *************** *** 124,131 **** --- 126,136 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ + install_sh = @install_sh@ server_dot_in = Bonobo_Sample_Echo.server.in *************** *** 135,151 **** bin_PROGRAMS = echo-client-2 noinst_LIBRARIES = libEcho.a ! bonobo_echo_2_SOURCES = main.c echo.c echo.h ! bonobo_echo_2_LDADD = $(top_builddir)/bonobo/libbonobo-2.la $(LIBBONOBO_LIBS) libEcho.a $(INTLLIBS) echo_client_2_SOURCES = echo-client.c ! echo_client_2_LDADD = $(top_builddir)/bonobo/libbonobo-2.la $(LIBBONOBO_LIBS) libEcho.a $(INTLLIBS) ! ECHO_CORBA_GENERATED = Bonobo_Sample_Echo-common.c Bonobo_Sample_Echo-skels.c Bonobo_Sample_Echo-stubs.c Bonobo_Sample_Echo.h libEcho_a_SOURCES = $(ECHO_CORBA_GENERATED) --- 140,171 ---- bin_PROGRAMS = echo-client-2 noinst_LIBRARIES = libEcho.a ! bonobo_echo_2_SOURCES = \ ! main.c \ ! echo.c \ ! echo.h ! bonobo_echo_2_LDADD = \ ! $(top_builddir)/bonobo/libbonobo-2.la \ ! $(LIBBONOBO_LIBS) \ ! libEcho.a \ ! $(INTLLIBS) echo_client_2_SOURCES = echo-client.c ! echo_client_2_LDADD = \ ! $(top_builddir)/bonobo/libbonobo-2.la \ ! $(LIBBONOBO_LIBS) \ ! libEcho.a \ ! $(INTLLIBS) ! ECHO_CORBA_GENERATED = \ ! Bonobo_Sample_Echo-common.c \ ! Bonobo_Sample_Echo-skels.c \ ! Bonobo_Sample_Echo-stubs.c \ ! Bonobo_Sample_Echo.h libEcho_a_SOURCES = $(ECHO_CORBA_GENERATED) *************** *** 159,261 **** EXTRA_DIST = $(server_DATA) $(idl_DATA) $(server_dot_in).in ! INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN=\"Echo\" -I$(top_srcdir) $(LIBBONOBO_CFLAGS) CLEANFILES = $(server_dot_in) $(server_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../../config.h ! CONFIG_CLEAN_FILES = ! LIBRARIES = $(noinst_LIBRARIES) ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I../.. LIBS = @LIBS@ ! libEcho_a_LIBADD = ! libEcho_a_OBJECTS = Bonobo_Sample_Echo-common.$(OBJEXT) \ ! Bonobo_Sample_Echo-skels.$(OBJEXT) Bonobo_Sample_Echo-stubs.$(OBJEXT) ! AR = ar ! bin_PROGRAMS = echo-client-2$(EXEEXT) ! samples_PROGRAMS = bonobo-echo-2$(EXEEXT) ! PROGRAMS = $(bin_PROGRAMS) $(samples_PROGRAMS) ! ! echo_client_2_OBJECTS = echo-client.$(OBJEXT) ! echo_client_2_DEPENDENCIES = $(top_builddir)/bonobo/libbonobo-2.la \ ! libEcho.a ! echo_client_2_LDFLAGS = ! bonobo_echo_2_OBJECTS = main.$(OBJEXT) echo.$(OBJEXT) ! bonobo_echo_2_DEPENDENCIES = $(top_builddir)/bonobo/libbonobo-2.la \ ! libEcho.a ! bonobo_echo_2_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 $@ ! DATA = $(idl_DATA) $(server_DATA) ! ! DIST_COMMON = README ChangeLog Makefile.am Makefile.in ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - TAR = gtar - GZIP_ENV = --best - SOURCES = $(libEcho_a_SOURCES) $(echo_client_2_SOURCES) $(bonobo_echo_2_SOURCES) - OBJECTS = $(libEcho_a_OBJECTS) $(echo_client_2_OBJECTS) $(bonobo_echo_2_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 samples/echo/Makefile ! ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! ! ! mostlyclean-noinstLIBRARIES: ! ! clean-noinstLIBRARIES: ! -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) ! ! distclean-noinstLIBRARIES: ! ! maintainer-clean-noinstLIBRARIES: ! ! .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 --- 179,243 ---- EXTRA_DIST = $(server_DATA) $(idl_DATA) $(server_dot_in).in ! INCLUDES = \ ! -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ ! -DG_LOG_DOMAIN=\"Echo\" \ ! -I$(top_srcdir) \ ! $(LIBBONOBO_CFLAGS) CLEANFILES = $(server_dot_in) $(server_DATA) + subdir = samples/echo mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! LIBRARIES = $(noinst_LIBRARIES) ! ! libEcho_a_AR = $(AR) cru ! libEcho_a_LIBADD = ! am_libEcho_a_OBJECTS = Bonobo_Sample_Echo-common.$(OBJEXT) \ ! Bonobo_Sample_Echo-skels.$(OBJEXT) \ ! Bonobo_Sample_Echo-stubs.$(OBJEXT) ! libEcho_a_OBJECTS = $(am_libEcho_a_OBJECTS) ! bin_PROGRAMS = echo-client-2$(EXEEXT) ! samples_PROGRAMS = bonobo-echo-2$(EXEEXT) ! PROGRAMS = $(bin_PROGRAMS) $(samples_PROGRAMS) ! ! am_bonobo_echo_2_OBJECTS = main.$(OBJEXT) echo.$(OBJEXT) ! bonobo_echo_2_OBJECTS = $(am_bonobo_echo_2_OBJECTS) ! bonobo_echo_2_DEPENDENCIES = $(top_builddir)/bonobo/libbonobo-2.la \ ! libEcho.a ! bonobo_echo_2_LDFLAGS = ! am_echo_client_2_OBJECTS = echo-client.$(OBJEXT) ! echo_client_2_OBJECTS = $(am_echo_client_2_OBJECTS) ! echo_client_2_DEPENDENCIES = $(top_builddir)/bonobo/libbonobo-2.la \ ! libEcho.a ! echo_client_2_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 = $(libEcho_a_SOURCES) $(bonobo_echo_2_SOURCES) \ ! $(echo_client_2_SOURCES) ! DATA = $(idl_DATA) $(server_DATA) + DIST_COMMON = README ChangeLog Makefile.am Makefile.in + SOURCES = $(libEcho_a_SOURCES) $(bonobo_echo_2_SOURCES) $(echo_client_2_SOURCES) ! all: all-am .SUFFIXES: ! .SUFFIXES: .c .lo .o .obj mostlyclean-libtool: -rm -f *.lo *************** *** 264,577 **** -rm -rf .libs _libs distclean-libtool: ! maintainer-clean-libtool: ! libEcho.a: $(libEcho_a_OBJECTS) $(libEcho_a_DEPENDENCIES) -rm -f libEcho.a ! $(AR) cru libEcho.a $(libEcho_a_OBJECTS) $(libEcho_a_LIBADD) $(RANLIB) libEcho.a - - mostlyclean-binPROGRAMS: - - clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) - - distclean-binPROGRAMS: - - maintainer-clean-binPROGRAMS: - install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! if test -f $$p; then \ ! echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ! $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) ! list='$(bin_PROGRAMS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done ! mostlyclean-samplesPROGRAMS: ! ! clean-samplesPROGRAMS: ! -test -z "$(samples_PROGRAMS)" || rm -f $(samples_PROGRAMS) ! ! distclean-samplesPROGRAMS: ! ! maintainer-clean-samplesPROGRAMS: ! install-samplesPROGRAMS: $(samples_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(samplesdir) @list='$(samples_PROGRAMS)'; for p in $$list; do \ ! if test -f $$p; then \ ! echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(samplesdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ! $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(samplesdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-samplesPROGRAMS: @$(NORMAL_UNINSTALL) ! list='$(samples_PROGRAMS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(samplesdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done ! echo-client-2$(EXEEXT): $(echo_client_2_OBJECTS) $(echo_client_2_DEPENDENCIES) @rm -f echo-client-2$(EXEEXT) $(LINK) $(echo_client_2_LDFLAGS) $(echo_client_2_OBJECTS) $(echo_client_2_LDADD) $(LIBS) ! bonobo-echo-2$(EXEEXT): $(bonobo_echo_2_OBJECTS) $(bonobo_echo_2_DEPENDENCIES) ! @rm -f bonobo-echo-2$(EXEEXT) ! $(LINK) $(bonobo_echo_2_LDFLAGS) $(bonobo_echo_2_OBJECTS) $(bonobo_echo_2_LDADD) $(LIBS) install-idlDATA: $(idl_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(idldir) @list='$(idl_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(idldir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(idldir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(idldir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(idldir)/$$p; \ ! fi; fi; \ done uninstall-idlDATA: @$(NORMAL_UNINSTALL) ! list='$(idl_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(idldir)/$$p; \ done - install-serverDATA: $(server_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(serverdir) @list='$(server_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(serverdir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(serverdir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(serverdir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(serverdir)/$$p; \ ! fi; fi; \ done uninstall-serverDATA: @$(NORMAL_UNINSTALL) ! list='$(server_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(serverdir)/$$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 = samples/echo 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 - Bonobo_Sample_Echo-common.o: Bonobo_Sample_Echo-common.c \ - Bonobo_Sample_Echo.h ../../bonobo/Bonobo.h - Bonobo_Sample_Echo-skels.o: Bonobo_Sample_Echo-skels.c \ - Bonobo_Sample_Echo.h ../../bonobo/Bonobo.h - Bonobo_Sample_Echo-stubs.o: Bonobo_Sample_Echo-stubs.c \ - Bonobo_Sample_Echo.h ../../bonobo/Bonobo.h - echo-client.o: echo-client.c ../../config.h ../../libbonobo.h \ - ../../bonobo/bonobo-macros.h ../../bonobo/bonobo-types.h \ - ../../bonobo/bonobo-object.h ../../bonobo/Bonobo.h \ - ../../bonobo/bonobo-arg.h ../../bonobo/bonobo-moniker.h \ - ../../bonobo/bonobo-moniker-simple.h \ - ../../bonobo/bonobo-context.h ../../bonobo/bonobo-exception.h \ - ../../bonobo/bonobo-item-container.h \ - ../../bonobo/bonobo-moniker-util.h \ - ../../bonobo/bonobo-property-bag.h \ - ../../bonobo/bonobo-event-source.h \ - ../../bonobo/bonobo-listener.h \ - ../../bonobo/bonobo-property-bag-client.h \ - ../../bonobo/bonobo-generic-factory.h \ - ../../bonobo/bonobo-i18n.h ../../bonobo/bonobo-main.h \ - ../../bonobo/bonobo-stream.h ../../bonobo/bonobo-storage.h \ - ../../bonobo/bonobo-stream-memory.h \ - ../../bonobo/bonobo-stream-client.h \ - ../../bonobo/bonobo-persist.h \ - ../../bonobo/bonobo-persist-file.h \ - ../../bonobo/bonobo-persist-stream.h \ - ../../bonobo/bonobo-storage-memory.h Bonobo_Sample_Echo.h - echo.o: echo.c ../../config.h ../../libbonobo.h \ - ../../bonobo/bonobo-macros.h ../../bonobo/bonobo-types.h \ - ../../bonobo/bonobo-object.h ../../bonobo/Bonobo.h \ - ../../bonobo/bonobo-arg.h ../../bonobo/bonobo-moniker.h \ - ../../bonobo/bonobo-moniker-simple.h \ - ../../bonobo/bonobo-context.h ../../bonobo/bonobo-exception.h \ - ../../bonobo/bonobo-item-container.h \ - ../../bonobo/bonobo-moniker-util.h \ - ../../bonobo/bonobo-property-bag.h \ - ../../bonobo/bonobo-event-source.h \ - ../../bonobo/bonobo-listener.h \ - ../../bonobo/bonobo-property-bag-client.h \ - ../../bonobo/bonobo-generic-factory.h \ - ../../bonobo/bonobo-i18n.h ../../bonobo/bonobo-main.h \ - ../../bonobo/bonobo-stream.h ../../bonobo/bonobo-storage.h \ - ../../bonobo/bonobo-stream-memory.h \ - ../../bonobo/bonobo-stream-client.h \ - ../../bonobo/bonobo-persist.h \ - ../../bonobo/bonobo-persist-file.h \ - ../../bonobo/bonobo-persist-stream.h \ - ../../bonobo/bonobo-storage-memory.h Bonobo_Sample_Echo.h \ - echo.h - main.o: main.c ../../config.h ../../libbonobo.h \ - ../../bonobo/bonobo-macros.h ../../bonobo/bonobo-types.h \ - ../../bonobo/bonobo-object.h ../../bonobo/Bonobo.h \ - ../../bonobo/bonobo-arg.h ../../bonobo/bonobo-moniker.h \ - ../../bonobo/bonobo-moniker-simple.h \ - ../../bonobo/bonobo-context.h ../../bonobo/bonobo-exception.h \ - ../../bonobo/bonobo-item-container.h \ - ../../bonobo/bonobo-moniker-util.h \ - ../../bonobo/bonobo-property-bag.h \ - ../../bonobo/bonobo-event-source.h \ - ../../bonobo/bonobo-listener.h \ - ../../bonobo/bonobo-property-bag-client.h \ - ../../bonobo/bonobo-generic-factory.h \ - ../../bonobo/bonobo-i18n.h ../../bonobo/bonobo-main.h \ - ../../bonobo/bonobo-stream.h ../../bonobo/bonobo-storage.h \ - ../../bonobo/bonobo-stream-memory.h \ - ../../bonobo/bonobo-stream-client.h \ - ../../bonobo/bonobo-persist.h \ - ../../bonobo/bonobo-persist-file.h \ - ../../bonobo/bonobo-persist-stream.h \ - ../../bonobo/bonobo-storage-memory.h Bonobo_Sample_Echo.h \ - echo.h - - 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-binPROGRAMS ! install-exec: install-exec-am ! install-data-am: install-samplesPROGRAMS install-idlDATA \ ! install-serverDATA ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall-binPROGRAMS uninstall-samplesPROGRAMS \ ! uninstall-idlDATA uninstall-serverDATA uninstall: uninstall-am - all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(samplesdir) \ - $(DESTDIR)$(idldir) $(DESTDIR)$(serverdir) mostlyclean-generic: clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) 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-noinstLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-binPROGRAMS \ ! mostlyclean-samplesPROGRAMS mostlyclean-tags \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-noinstLIBRARIES clean-compile clean-libtool \ ! clean-binPROGRAMS clean-samplesPROGRAMS clean-tags \ ! clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-noinstLIBRARIES distclean-compile \ ! distclean-libtool distclean-binPROGRAMS \ ! distclean-samplesPROGRAMS distclean-tags \ ! distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ ! maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-binPROGRAMS \ ! maintainer-clean-samplesPROGRAMS 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-noinstLIBRARIES distclean-noinstLIBRARIES \ ! clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ ! mostlyclean-compile distclean-compile clean-compile \ ! maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool mostlyclean-binPROGRAMS \ ! distclean-binPROGRAMS clean-binPROGRAMS maintainer-clean-binPROGRAMS \ ! uninstall-binPROGRAMS install-binPROGRAMS mostlyclean-samplesPROGRAMS \ ! distclean-samplesPROGRAMS clean-samplesPROGRAMS \ ! maintainer-clean-samplesPROGRAMS uninstall-samplesPROGRAMS \ ! install-samplesPROGRAMS uninstall-idlDATA install-idlDATA \ ! uninstall-serverDATA install-serverDATA 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 $(server_dot_in): $(server_dot_in).in --- 246,512 ---- -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 samples/echo/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 ! AR = ar ! clean-noinstLIBRARIES: ! -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) ! libEcho.a: $(libEcho_a_OBJECTS) $(libEcho_a_DEPENDENCIES) -rm -f libEcho.a ! $(libEcho_a_AR) libEcho.a $(libEcho_a_OBJECTS) $(libEcho_a_LIBADD) $(RANLIB) libEcho.a install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ! if test -f $$p \ ! || test -f $$p1 \ ! ; then \ ! f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) ! @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ ! rm -f $(DESTDIR)$(bindir)/$$f; \ done ! clean-binPROGRAMS: ! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) install-samplesPROGRAMS: $(samples_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(samplesdir) @list='$(samples_PROGRAMS)'; for p in $$list; do \ ! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ! if test -f $$p \ ! || test -f $$p1 \ ! ; then \ ! f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(samplesdir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(samplesdir)/$$f; \ else :; fi; \ done uninstall-samplesPROGRAMS: @$(NORMAL_UNINSTALL) ! @list='$(samples_PROGRAMS)'; for p in $$list; do \ ! f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " rm -f $(DESTDIR)$(samplesdir)/$$f"; \ ! rm -f $(DESTDIR)$(samplesdir)/$$f; \ done ! clean-samplesPROGRAMS: ! -test -z "$(samples_PROGRAMS)" || rm -f $(samples_PROGRAMS) ! bonobo-echo-2$(EXEEXT): $(bonobo_echo_2_OBJECTS) $(bonobo_echo_2_DEPENDENCIES) ! @rm -f bonobo-echo-2$(EXEEXT) ! $(LINK) $(bonobo_echo_2_LDFLAGS) $(bonobo_echo_2_OBJECTS) $(bonobo_echo_2_LDADD) $(LIBS) ! echo-client-2$(EXEEXT): $(echo_client_2_OBJECTS) $(echo_client_2_DEPENDENCIES) @rm -f echo-client-2$(EXEEXT) $(LINK) $(echo_client_2_LDFLAGS) $(echo_client_2_OBJECTS) $(echo_client_2_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: install-idlDATA: $(idl_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(idldir) @list='$(idl_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)$(idldir)/$$f"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(idldir)/$$f; \ done uninstall-idlDATA: @$(NORMAL_UNINSTALL) ! @list='$(idl_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(idldir)/$$f"; \ ! rm -f $(DESTDIR)$(idldir)/$$f; \ done install-serverDATA: $(server_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(serverdir) @list='$(server_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)$(serverdir)/$$f"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(serverdir)/$$f; \ done uninstall-serverDATA: @$(NORMAL_UNINSTALL) ! @list='$(server_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(serverdir)/$$f"; \ ! rm -f $(DESTDIR)$(serverdir)/$$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 check-am: all-am check: check-am ! all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(samplesdir) $(DESTDIR)$(idldir) $(DESTDIR)$(serverdir) 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: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) 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-binPROGRAMS clean-generic clean-libtool \ ! clean-noinstLIBRARIES clean-samplesPROGRAMS 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-idlDATA install-samplesPROGRAMS \ ! install-serverDATA ! ! install-exec-am: install-binPROGRAMS ! ! 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-binPROGRAMS uninstall-idlDATA uninstall-info-am \ ! uninstall-samplesPROGRAMS uninstall-serverDATA ! ! .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ ! clean-generic clean-libtool clean-noinstLIBRARIES \ ! clean-samplesPROGRAMS distclean distclean-compile \ ! distclean-generic distclean-libtool distclean-tags distdir dvi \ ! dvi-am info info-am install install-am install-binPROGRAMS \ ! install-data install-data-am install-exec install-exec-am \ ! install-idlDATA install-info install-info-am install-man \ ! install-samplesPROGRAMS install-serverDATA install-strip \ ! installcheck installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool tags uninstall \ ! uninstall-am uninstall-binPROGRAMS uninstall-idlDATA \ ! uninstall-info-am uninstall-samplesPROGRAMS \ ! uninstall-serverDATA $(server_dot_in): $(server_dot_in).in *************** *** 581,587 **** $(ORBIT_IDL) -I$(top_srcdir)/idl -I $(BONOBO_ACTIVATION_IDL_DIR) $(srcdir)/Bonobo_Sample_Echo.idl @INTLTOOL_SERVER_RULE@ - # 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: --- 516,521 ---- diff -crN ./libbonobo/stamp-h.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/stamp-h.in *** ./libbonobo/stamp-h.in Fri Mar 14 16:54:22 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/stamp-h.in Sat Aug 9 21:12:55 2003 *************** *** 1 **** - timestamp --- 0 ---- diff -crN ./libbonobo/tests/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/tests/Makefile.in *** ./libbonobo/tests/Makefile.in Fri Mar 14 16:54:52 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonobo/tests/Makefile.in Sat Aug 9 21:13:00 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 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,72 **** --- 57,74 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ + AWK = @AWK@ BONOBO_ACTIVATION_IDL_DIR = @BONOBO_ACTIVATION_IDL_DIR@ + BONOBO_ACTIVATION_IDL_DIR_PC = @BONOBO_ACTIVATION_IDL_DIR_PC@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ *************** *** 76,81 **** --- 78,84 ---- GMSGFMT = @GMSGFMT@ GTKDOC = @GTKDOC@ HTML_DIR = @HTML_DIR@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 102,108 **** LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 105,110 ---- *************** *** 120,140 **** VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ ! noinst_PROGRAMS = test-moniker test-properties-server test-properties-client test-event-source test-object test-stream-mem test-storage-mem ! ! ! INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir) $(WARN_CFLAGS) $(LIBBONOBO_CFLAGS) LDADD = $(top_builddir)/bonobo/libbonobo-2.la $(LIBBONOBO_LIBS) ! test_properties_server_SOURCES = test-properties-server.c ! test_properties_client_SOURCES = test-properties-client.c test_moniker_SOURCES = test-moniker.c --- 122,158 ---- VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ YACC = @YACC@ + am__include = @am__include@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ + install_sh = @install_sh@ ! noinst_PROGRAMS = \ ! test-moniker \ ! test-properties-server \ ! test-properties-client \ ! test-event-source \ ! test-object \ ! test-stream-mem \ ! test-storage-mem ! ! ! INCLUDES = \ ! -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ ! -I$(top_srcdir) \ ! $(WARN_CFLAGS) \ ! $(LIBBONOBO_CFLAGS) LDADD = $(top_builddir)/bonobo/libbonobo-2.la $(LIBBONOBO_LIBS) ! test_properties_server_SOURCES = \ ! test-properties-server.c ! test_properties_client_SOURCES = \ ! test-properties-client.c test_moniker_SOURCES = test-moniker.c *************** *** 147,266 **** test_storage_mem_SOURCES = test-storage-mem.c ! TESTS_ENVIRONMENT = LD_LIBRARY_PATH="$(top_builddir)/bonobo/.libs:$$LD_LIBRARY_PATH" BONOBO_PLUGIN_PATH="$(top_builddir)/storage-modules/.libs:$$BONOBO_PLUGIN_PATH" ! TESTS = test-moniker test-event-source test-object test-stream-mem $(srcdir)/test-properties.sh test-storage-mem EXTRA_DIST = test-properties.sh mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! noinst_PROGRAMS = test-moniker$(EXEEXT) test-properties-server$(EXEEXT) \ ! test-properties-client$(EXEEXT) test-event-source$(EXEEXT) \ ! test-object$(EXEEXT) test-stream-mem$(EXEEXT) test-storage-mem$(EXEEXT) ! PROGRAMS = $(noinst_PROGRAMS) ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. ! LIBS = @LIBS@ ! test_moniker_OBJECTS = test-moniker.$(OBJEXT) ! test_moniker_LDADD = $(LDADD) ! test_moniker_DEPENDENCIES = $(top_builddir)/bonobo/libbonobo-2.la ! test_moniker_LDFLAGS = ! test_properties_server_OBJECTS = test-properties-server.$(OBJEXT) ! test_properties_server_LDADD = $(LDADD) ! test_properties_server_DEPENDENCIES = \ ! $(top_builddir)/bonobo/libbonobo-2.la ! test_properties_server_LDFLAGS = ! test_properties_client_OBJECTS = test-properties-client.$(OBJEXT) ! test_properties_client_LDADD = $(LDADD) ! test_properties_client_DEPENDENCIES = \ ! $(top_builddir)/bonobo/libbonobo-2.la ! test_properties_client_LDFLAGS = ! test_event_source_OBJECTS = test-event-source.$(OBJEXT) test_event_source_LDADD = $(LDADD) ! test_event_source_DEPENDENCIES = $(top_builddir)/bonobo/libbonobo-2.la ! test_event_source_LDFLAGS = ! test_object_OBJECTS = test-object.$(OBJEXT) test_object_LDADD = $(LDADD) ! test_object_DEPENDENCIES = $(top_builddir)/bonobo/libbonobo-2.la ! test_object_LDFLAGS = ! test_stream_mem_OBJECTS = test-stream-mem.$(OBJEXT) ! test_stream_mem_LDADD = $(LDADD) ! test_stream_mem_DEPENDENCIES = $(top_builddir)/bonobo/libbonobo-2.la ! test_stream_mem_LDFLAGS = ! test_storage_mem_OBJECTS = test-storage-mem.$(OBJEXT) test_storage_mem_LDADD = $(LDADD) ! test_storage_mem_DEPENDENCIES = $(top_builddir)/bonobo/libbonobo-2.la ! test_storage_mem_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 = README Makefile.am Makefile.in ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = gtar ! GZIP_ENV = --best ! SOURCES = $(test_moniker_SOURCES) $(test_properties_server_SOURCES) $(test_properties_client_SOURCES) $(test_event_source_SOURCES) $(test_object_SOURCES) $(test_stream_mem_SOURCES) $(test_storage_mem_SOURCES) ! OBJECTS = $(test_moniker_OBJECTS) $(test_properties_server_OBJECTS) $(test_properties_client_OBJECTS) $(test_event_source_OBJECTS) $(test_object_OBJECTS) $(test_stream_mem_OBJECTS) $(test_storage_mem_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 tests/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 --- 165,251 ---- test_storage_mem_SOURCES = test-storage-mem.c ! TESTS_ENVIRONMENT = \ ! LD_LIBRARY_PATH="$(top_builddir)/bonobo/.libs:$$LD_LIBRARY_PATH" \ ! BONOBO_PLUGIN_PATH="$(top_builddir)/storage-modules/.libs:$$BONOBO_PLUGIN_PATH" ! TESTS = test-moniker test-event-source test-object \ ! test-stream-mem $(srcdir)/test-properties.sh test-storage-mem EXTRA_DIST = test-properties.sh + subdir = tests mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! noinst_PROGRAMS = test-moniker$(EXEEXT) test-properties-server$(EXEEXT) \ ! test-properties-client$(EXEEXT) test-event-source$(EXEEXT) \ ! test-object$(EXEEXT) test-stream-mem$(EXEEXT) \ ! test-storage-mem$(EXEEXT) ! PROGRAMS = $(noinst_PROGRAMS) ! am_test_event_source_OBJECTS = test-event-source.$(OBJEXT) ! test_event_source_OBJECTS = $(am_test_event_source_OBJECTS) test_event_source_LDADD = $(LDADD) ! test_event_source_DEPENDENCIES = $(top_builddir)/bonobo/libbonobo-2.la ! test_event_source_LDFLAGS = ! am_test_moniker_OBJECTS = test-moniker.$(OBJEXT) ! test_moniker_OBJECTS = $(am_test_moniker_OBJECTS) ! test_moniker_LDADD = $(LDADD) ! test_moniker_DEPENDENCIES = $(top_builddir)/bonobo/libbonobo-2.la ! test_moniker_LDFLAGS = ! am_test_object_OBJECTS = test-object.$(OBJEXT) ! test_object_OBJECTS = $(am_test_object_OBJECTS) test_object_LDADD = $(LDADD) ! test_object_DEPENDENCIES = $(top_builddir)/bonobo/libbonobo-2.la ! test_object_LDFLAGS = ! am_test_properties_client_OBJECTS = test-properties-client.$(OBJEXT) ! test_properties_client_OBJECTS = $(am_test_properties_client_OBJECTS) ! test_properties_client_LDADD = $(LDADD) ! test_properties_client_DEPENDENCIES = \ ! $(top_builddir)/bonobo/libbonobo-2.la ! test_properties_client_LDFLAGS = ! am_test_properties_server_OBJECTS = test-properties-server.$(OBJEXT) ! test_properties_server_OBJECTS = $(am_test_properties_server_OBJECTS) ! test_properties_server_LDADD = $(LDADD) ! test_properties_server_DEPENDENCIES = \ ! $(top_builddir)/bonobo/libbonobo-2.la ! test_properties_server_LDFLAGS = ! am_test_storage_mem_OBJECTS = test-storage-mem.$(OBJEXT) ! test_storage_mem_OBJECTS = $(am_test_storage_mem_OBJECTS) test_storage_mem_LDADD = $(LDADD) ! test_storage_mem_DEPENDENCIES = $(top_builddir)/bonobo/libbonobo-2.la ! test_storage_mem_LDFLAGS = ! am_test_stream_mem_OBJECTS = test-stream-mem.$(OBJEXT) ! test_stream_mem_OBJECTS = $(am_test_stream_mem_OBJECTS) ! test_stream_mem_LDADD = $(LDADD) ! test_stream_mem_DEPENDENCIES = $(top_builddir)/bonobo/libbonobo-2.la ! test_stream_mem_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 = $(test_event_source_SOURCES) $(test_moniker_SOURCES) \ ! $(test_object_SOURCES) $(test_properties_client_SOURCES) \ ! $(test_properties_server_SOURCES) $(test_storage_mem_SOURCES) \ ! $(test_stream_mem_SOURCES) ! DIST_COMMON = README Makefile.am Makefile.in ! SOURCES = $(test_event_source_SOURCES) $(test_moniker_SOURCES) $(test_object_SOURCES) $(test_properties_client_SOURCES) $(test_properties_server_SOURCES) $(test_storage_mem_SOURCES) $(test_stream_mem_SOURCES) ! all: all-am .SUFFIXES: ! .SUFFIXES: .c .lo .o .obj mostlyclean-libtool: -rm -f *.lo *************** *** 269,541 **** -rm -rf .libs _libs distclean-libtool: ! maintainer-clean-libtool: ! ! test-moniker$(EXEEXT): $(test_moniker_OBJECTS) $(test_moniker_DEPENDENCIES) @rm -f test-moniker$(EXEEXT) $(LINK) $(test_moniker_LDFLAGS) $(test_moniker_OBJECTS) $(test_moniker_LDADD) $(LIBS) ! ! test-properties-server$(EXEEXT): $(test_properties_server_OBJECTS) $(test_properties_server_DEPENDENCIES) @rm -f test-properties-server$(EXEEXT) $(LINK) $(test_properties_server_LDFLAGS) $(test_properties_server_OBJECTS) $(test_properties_server_LDADD) $(LIBS) ! test-properties-client$(EXEEXT): $(test_properties_client_OBJECTS) $(test_properties_client_DEPENDENCIES) ! @rm -f test-properties-client$(EXEEXT) ! $(LINK) $(test_properties_client_LDFLAGS) $(test_properties_client_OBJECTS) $(test_properties_client_LDADD) $(LIBS) ! test-event-source$(EXEEXT): $(test_event_source_OBJECTS) $(test_event_source_DEPENDENCIES) ! @rm -f test-event-source$(EXEEXT) ! $(LINK) $(test_event_source_LDFLAGS) $(test_event_source_OBJECTS) $(test_event_source_LDADD) $(LIBS) ! test-object$(EXEEXT): $(test_object_OBJECTS) $(test_object_DEPENDENCIES) ! @rm -f test-object$(EXEEXT) ! $(LINK) $(test_object_LDFLAGS) $(test_object_OBJECTS) $(test_object_LDADD) $(LIBS) ! test-stream-mem$(EXEEXT): $(test_stream_mem_OBJECTS) $(test_stream_mem_DEPENDENCIES) ! @rm -f test-stream-mem$(EXEEXT) ! $(LINK) $(test_stream_mem_LDFLAGS) $(test_stream_mem_OBJECTS) $(test_stream_mem_LDADD) $(LIBS) ! test-storage-mem$(EXEEXT): $(test_storage_mem_OBJECTS) $(test_storage_mem_DEPENDENCIES) ! @rm -f test-storage-mem$(EXEEXT) ! $(LINK) $(test_storage_mem_LDFLAGS) $(test_storage_mem_OBJECTS) $(test_storage_mem_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 - test-event-source.o: test-event-source.c ../config.h ../libbonobo.h \ - ../bonobo/bonobo-macros.h ../bonobo/bonobo-types.h \ - ../bonobo/bonobo-object.h ../bonobo/Bonobo.h \ - ../bonobo/bonobo-arg.h ../bonobo/bonobo-moniker.h \ - ../bonobo/bonobo-moniker-simple.h ../bonobo/bonobo-context.h \ - ../bonobo/bonobo-exception.h ../bonobo/bonobo-item-container.h \ - ../bonobo/bonobo-moniker-util.h ../bonobo/bonobo-property-bag.h \ - ../bonobo/bonobo-event-source.h ../bonobo/bonobo-listener.h \ - ../bonobo/bonobo-property-bag-client.h \ - ../bonobo/bonobo-generic-factory.h ../bonobo/bonobo-i18n.h \ - ../bonobo/bonobo-main.h ../bonobo/bonobo-stream.h \ - ../bonobo/bonobo-storage.h ../bonobo/bonobo-stream-memory.h \ - ../bonobo/bonobo-stream-client.h ../bonobo/bonobo-persist.h \ - ../bonobo/bonobo-persist-file.h \ - ../bonobo/bonobo-persist-stream.h \ - ../bonobo/bonobo-storage-memory.h - test-moniker.o: test-moniker.c ../config.h ../libbonobo.h \ - ../bonobo/bonobo-macros.h ../bonobo/bonobo-types.h \ - ../bonobo/bonobo-object.h ../bonobo/Bonobo.h \ - ../bonobo/bonobo-arg.h ../bonobo/bonobo-moniker.h \ - ../bonobo/bonobo-moniker-simple.h ../bonobo/bonobo-context.h \ - ../bonobo/bonobo-exception.h ../bonobo/bonobo-item-container.h \ - ../bonobo/bonobo-moniker-util.h ../bonobo/bonobo-property-bag.h \ - ../bonobo/bonobo-event-source.h ../bonobo/bonobo-listener.h \ - ../bonobo/bonobo-property-bag-client.h \ - ../bonobo/bonobo-generic-factory.h ../bonobo/bonobo-i18n.h \ - ../bonobo/bonobo-main.h ../bonobo/bonobo-stream.h \ - ../bonobo/bonobo-storage.h ../bonobo/bonobo-stream-memory.h \ - ../bonobo/bonobo-stream-client.h ../bonobo/bonobo-persist.h \ - ../bonobo/bonobo-persist-file.h \ - ../bonobo/bonobo-persist-stream.h \ - ../bonobo/bonobo-storage-memory.h - test-object.o: test-object.c ../config.h ../libbonobo.h \ - ../bonobo/bonobo-macros.h ../bonobo/bonobo-types.h \ - ../bonobo/bonobo-object.h ../bonobo/Bonobo.h \ - ../bonobo/bonobo-arg.h ../bonobo/bonobo-moniker.h \ - ../bonobo/bonobo-moniker-simple.h ../bonobo/bonobo-context.h \ - ../bonobo/bonobo-exception.h ../bonobo/bonobo-item-container.h \ - ../bonobo/bonobo-moniker-util.h ../bonobo/bonobo-property-bag.h \ - ../bonobo/bonobo-event-source.h ../bonobo/bonobo-listener.h \ - ../bonobo/bonobo-property-bag-client.h \ - ../bonobo/bonobo-generic-factory.h ../bonobo/bonobo-i18n.h \ - ../bonobo/bonobo-main.h ../bonobo/bonobo-stream.h \ - ../bonobo/bonobo-storage.h ../bonobo/bonobo-stream-memory.h \ - ../bonobo/bonobo-stream-client.h ../bonobo/bonobo-persist.h \ - ../bonobo/bonobo-persist-file.h \ - ../bonobo/bonobo-persist-stream.h \ - ../bonobo/bonobo-storage-memory.h - test-properties-client.o: test-properties-client.c ../config.h \ - ../libbonobo.h ../bonobo/bonobo-macros.h \ - ../bonobo/bonobo-types.h ../bonobo/bonobo-object.h \ - ../bonobo/Bonobo.h ../bonobo/bonobo-arg.h \ - ../bonobo/bonobo-moniker.h ../bonobo/bonobo-moniker-simple.h \ - ../bonobo/bonobo-context.h ../bonobo/bonobo-exception.h \ - ../bonobo/bonobo-item-container.h \ - ../bonobo/bonobo-moniker-util.h ../bonobo/bonobo-property-bag.h \ - ../bonobo/bonobo-event-source.h ../bonobo/bonobo-listener.h \ - ../bonobo/bonobo-property-bag-client.h \ - ../bonobo/bonobo-generic-factory.h ../bonobo/bonobo-i18n.h \ - ../bonobo/bonobo-main.h ../bonobo/bonobo-stream.h \ - ../bonobo/bonobo-storage.h ../bonobo/bonobo-stream-memory.h \ - ../bonobo/bonobo-stream-client.h ../bonobo/bonobo-persist.h \ - ../bonobo/bonobo-persist-file.h \ - ../bonobo/bonobo-persist-stream.h \ - ../bonobo/bonobo-storage-memory.h - test-properties-server.o: test-properties-server.c ../config.h \ - ../libbonobo.h ../bonobo/bonobo-macros.h \ - ../bonobo/bonobo-types.h ../bonobo/bonobo-object.h \ - ../bonobo/Bonobo.h ../bonobo/bonobo-arg.h \ - ../bonobo/bonobo-moniker.h ../bonobo/bonobo-moniker-simple.h \ - ../bonobo/bonobo-context.h ../bonobo/bonobo-exception.h \ - ../bonobo/bonobo-item-container.h \ - ../bonobo/bonobo-moniker-util.h ../bonobo/bonobo-property-bag.h \ - ../bonobo/bonobo-event-source.h ../bonobo/bonobo-listener.h \ - ../bonobo/bonobo-property-bag-client.h \ - ../bonobo/bonobo-generic-factory.h ../bonobo/bonobo-i18n.h \ - ../bonobo/bonobo-main.h ../bonobo/bonobo-stream.h \ - ../bonobo/bonobo-storage.h ../bonobo/bonobo-stream-memory.h \ - ../bonobo/bonobo-stream-client.h ../bonobo/bonobo-persist.h \ - ../bonobo/bonobo-persist-file.h \ - ../bonobo/bonobo-persist-stream.h \ - ../bonobo/bonobo-storage-memory.h - test-storage-mem.o: test-storage-mem.c ../bonobo/bonobo-storage-memory.h \ - ../bonobo/bonobo-storage.h ../bonobo/bonobo-object.h \ - ../bonobo/Bonobo.h ../bonobo/bonobo-macros.h \ - ../bonobo/bonobo-main.h ../bonobo/bonobo-exception.h - test-stream-mem.o: test-stream-mem.c ../bonobo/bonobo-stream-client.h \ - ../bonobo/Bonobo.h ../bonobo/bonobo-stream-memory.h \ - ../bonobo/bonobo-storage.h ../bonobo/bonobo-object.h \ - ../bonobo/bonobo-macros.h ../bonobo/bonobo-exception.h \ - ../bonobo/bonobo-main.h - - 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-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 $(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 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. --- 254,495 ---- -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-noinstPROGRAMS: ! -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) ! test-event-source$(EXEEXT): $(test_event_source_OBJECTS) $(test_event_source_DEPENDENCIES) ! @rm -f test-event-source$(EXEEXT) ! $(LINK) $(test_event_source_LDFLAGS) $(test_event_source_OBJECTS) $(test_event_source_LDADD) $(LIBS) ! test-moniker$(EXEEXT): $(test_moniker_OBJECTS) $(test_moniker_DEPENDENCIES) @rm -f test-moniker$(EXEEXT) $(LINK) $(test_moniker_LDFLAGS) $(test_moniker_OBJECTS) $(test_moniker_LDADD) $(LIBS) ! test-object$(EXEEXT): $(test_object_OBJECTS) $(test_object_DEPENDENCIES) ! @rm -f test-object$(EXEEXT) ! $(LINK) $(test_object_LDFLAGS) $(test_object_OBJECTS) $(test_object_LDADD) $(LIBS) ! test-properties-client$(EXEEXT): $(test_properties_client_OBJECTS) $(test_properties_client_DEPENDENCIES) ! @rm -f test-properties-client$(EXEEXT) ! $(LINK) $(test_properties_client_LDFLAGS) $(test_properties_client_OBJECTS) $(test_properties_client_LDADD) $(LIBS) ! test-properties-server$(EXEEXT): $(test_properties_server_OBJECTS) $(test_properties_server_DEPENDENCIES) @rm -f test-properties-server$(EXEEXT) $(LINK) $(test_properties_server_LDFLAGS) $(test_properties_server_OBJECTS) $(test_properties_server_LDADD) $(LIBS) + test-storage-mem$(EXEEXT): $(test_storage_mem_OBJECTS) $(test_storage_mem_DEPENDENCIES) + @rm -f test-storage-mem$(EXEEXT) + $(LINK) $(test_storage_mem_LDFLAGS) $(test_storage_mem_OBJECTS) $(test_storage_mem_LDADD) $(LIBS) + test-stream-mem$(EXEEXT): $(test_stream_mem_OBJECTS) $(test_stream_mem_DEPENDENCIES) + @rm -f test-stream-mem$(EXEEXT) + $(LINK) $(test_stream_mem_LDFLAGS) $(test_stream_mem_OBJECTS) $(test_stream_mem_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-TESTS 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-TESTS 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.