diff -crN ./scrollkeeper/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/Makefile.in *** ./scrollkeeper/Makefile.in Thu Jan 23 07:11:56 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/Makefile.in Tue Jan 6 22:54:18 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 15,92 **** @SET_MAKE@ # copyright (C) 2000 Sun Microsystems, Inc. - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 15,80 ---- @SET_MAKE@ # copyright (C) 2000 Sun Microsystems, Inc. srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 102,145 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ SUBDIRS = libuuid libs buildtools config cl extract scripts man intl po doc --- 90,181 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ SUBDIRS = libuuid libs buildtools config cl extract scripts man intl po doc *************** *** 153,166 **** mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = intl/Makefile scrollkeeper.spec DIST_SOURCES = DATA = $(scrollkeeperdoc_DATA) ! 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 ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \ Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 \ config.guess config.h.in config.sub configure configure.in \ --- 189,205 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = intl/Makefile scrollkeeper.spec + depcomp = + am__depfiles_maybe = DIST_SOURCES = DATA = $(scrollkeeperdoc_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-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 ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \ Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 \ config.guess config.h.in config.sub configure configure.in \ *************** *** 176,182 **** configure.lineno $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) --- 215,221 ---- configure.lineno $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) *************** *** 291,300 **** --- 330,346 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 325,337 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__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 = . --- 371,398 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = . *************** *** 343,355 **** && rm -fr $(distdir); }; } GZIP_ENV = --best distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) $(mkinstalldirs) $(distdir)/. $(distdir)/config $(distdir)/intl $(distdir)/libs $(distdir)/po $(distdir)/scripts ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 404,423 ---- && rm -fr $(distdir); }; } GZIP_ENV = --best + distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) $(mkinstalldirs) $(distdir)/. $(distdir)/config $(distdir)/intl $(distdir)/libs $(distdir)/po $(distdir)/scripts ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 383,389 **** fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="${top_distdir}" distdir="$(distdir)" \ dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ --- 451,457 ---- fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ *************** *** 409,416 **** mkdir $(distdir)/=inst chmod a-w $(distdir) dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ && cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix=$$dc_install_base \ --with-included-gettext \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ --- 477,485 ---- mkdir $(distdir)/=inst chmod a-w $(distdir) dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix="$$dc_install_base" \ --with-included-gettext \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ *************** *** 419,441 **** && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ! && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ ! || { echo "ERROR: files left after uninstall:" ; \ ! find $$dc_install_base -type f -print ; \ ! exit 1; } >&2 ) \ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && rm -f $(distdir).tar.gz \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' distcleancheck: distclean if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ! || { echo "ERROR: files left after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am --- 488,526 ---- && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ! && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ ! distuninstallcheck \ ! && chmod -R a-w "$$dc_install_base" \ ! && ({ \ ! (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ ! distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ ! } || { rm -rf "$$dc_destdir"; exit 1; }) \ ! && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && rm -f $(distdir).tar.gz \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' + distuninstallcheck: + cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 distcleancheck: distclean if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ! || { echo "ERROR: files left in build directory after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am *************** *** 507,522 **** mostlyclean-am: mostlyclean-generic mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-local \ uninstall-scrollkeeperdocDATA 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 \ ! dist-gzip distcheck distclean distclean-generic distclean-hdr \ ! distclean-libtool distclean-recursive distclean-tags \ ! distcleancheck 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 \ --- 592,616 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-info-am uninstall-local \ uninstall-scrollkeeperdocDATA uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive ctags \ ! ctags-recursive dist dist-all dist-gzip distcheck distclean \ ! distclean-generic distclean-hdr distclean-libtool \ ! distclean-recursive distclean-tags distcleancheck distdir \ ! distuninstallcheck 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 \ *************** *** 525,531 **** 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-local uninstall-recursive \ uninstall-scrollkeeperdocDATA --- 619,626 ---- installcheck-am installdirs installdirs-am \ installdirs-recursive maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ! mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ! pdf-recursive ps ps-am ps-recursive tags tags-recursive \ uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-local uninstall-recursive \ uninstall-scrollkeeperdocDATA diff -crN ./scrollkeeper/aclocal.m4 /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/aclocal.m4 *** ./scrollkeeper/aclocal.m4 Thu Jan 23 07:11:24 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/aclocal.m4 Tue Jan 6 22:53:19 2004 *************** *** 1,6 **** ! # aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- ! # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,6 ---- ! # generated automatically by aclocal 1.7.1 -*- Autoconf -*- ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 11,26 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! # 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) --- 11,17 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! #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) *************** *** 61,120 **** # serial 6 ! # 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 "/". ! ! # _AM_DIRNAME(PATH) ! # ----------------- ! # Like AS_DIRNAME, only do it during macro expansion ! AC_DEFUN([_AM_DIRNAME], ! [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, ! m4_if(regexp([$1], [^//\([^/]\|$\)]), -1, ! m4_if(regexp([$1], [^/.*]), -1, ! [.], ! patsubst([$1], [^\(/\).*], [\1])), ! patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), ! patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl ! ])# _AM_DIRNAME ! ! ! # The stamp files are numbered to have different names. ! # We could number them on a directory basis, but that's additional ! # complications, let's have a unique counter. ! m4_define([_AM_STAMP_Count], [0]) ! ! ! # _AM_STAMP(HEADER) ! # ----------------- ! # The name of the stamp file for HEADER. ! AC_DEFUN([_AM_STAMP], ! [m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl ! AS_ESCAPE(_AM_DIRNAME(patsubst([$1], ! [:.*])))/stamp-h[]_AM_STAMP_Count]) ! ! ! # _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS) ! # ------------------------------------------------------------ ! # We used to try to get a real timestamp in stamp-h. But the fear is that ! # that will cause unnecessary cvs conflicts. ! AC_DEFUN([_AM_CONFIG_HEADER], ! [# Add the stamp file to the list of files AC keeps track of, ! # along with our hook. ! AC_CONFIG_HEADERS([$1], ! [# update the timestamp ! echo 'timestamp for $1' >"_AM_STAMP([$1])" ! $2], ! [$3]) ! ])# _AM_CONFIG_HEADER ! ! ! # AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS) ! # -------------------------------------------------------------- ! AC_DEFUN([AM_CONFIG_HEADER], ! [AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) ! ])# AM_CONFIG_HEADER # Do all the work for Automake. -*- Autoconf -*- --- 52,59 ---- # serial 6 ! # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ! AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) # Do all the work for Automake. -*- Autoconf -*- *************** *** 148,154 **** # CC etc. in the Makefile, will ask for an AC_PROG_CC use... ! AC_PREREQ([2.52]) # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. --- 87,93 ---- # CC etc. in the Makefile, will ask for an AC_PROG_CC use... ! AC_PREREQ([2.54]) # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. *************** *** 174,179 **** --- 113,128 ---- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi + # test whether we have cygpath + if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi + fi + AC_SUBST([CYGPATH_W]) + # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], *************** *** 205,221 **** AC_REQUIRE([AC_PROG_MAKE_SET])dnl _AM_IF_OPTION([no-dependencies],, ! [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 ]) ]) # Copyright 2002 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify --- 154,182 ---- AC_REQUIRE([AC_PROG_MAKE_SET])dnl _AM_IF_OPTION([no-dependencies],, ! [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 ]) ]) + + # 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. The stamp files are numbered to have different names. + + # Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the + # loop where config.status creates the headers, so we can generate + # our stamp files there. + AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], + [_am_stamp_count=`expr ${_am_stamp_count-0} + 1` + echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + # Copyright 2002 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify *************** *** 236,249 **** # ---------------------------- # 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.6"]) # 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.6.3])]) # Helper functions for option handling. -*- Autoconf -*- --- 197,210 ---- # ---------------------------- # 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.7"]) # 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.7.1])]) # Helper functions for option handling. -*- Autoconf -*- *************** *** 623,629 **** 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 --- 584,590 ---- if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ ! $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/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 *************** *** 638,643 **** --- 599,607 ---- fi ]) AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) + AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) *************** *** 757,763 **** [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) ! # Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- # 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 --- 721,729 ---- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) ! # Check to see how 'make' treats includes. -*- Autoconf -*- ! ! # Copyright (C) 2001, 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 *************** *** 797,803 **** # 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 --- 763,769 ---- # 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 | grep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU *************** *** 857,863 **** fi AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ! AC_MSG_ERROR([conditional \"$1\" was never defined. Usually this means the macro was only invoked conditionally.]) fi])]) --- 823,829 ---- fi AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ! AC_MSG_ERROR([conditional "$1" was never defined. Usually this means the macro was only invoked conditionally.]) fi])]) *************** *** 2013,2018 **** --- 1979,1985 ---- 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 *************** *** 2269,2291 **** 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 ! if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ! aix_use_runtimelinking=yes ! break ! fi ! done ! esac ! exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi # When large executables or shared objects are built, AIX ld can --- 2236,2248 ---- 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 *************** *** 2320,2334 **** 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 --- 2277,2283 ---- 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 *************** *** 2338,2345 **** # 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' --- 2287,2294 ---- # 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' *************** *** 2352,2358 **** 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 ;; --- 2301,2307 ---- 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 ;; *************** *** 2771,2792 **** 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 ;; --- 2720,2730 ---- 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 ;; *************** *** 3137,3143 **** ;; aix4*) ! if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi ;; --- 3075,3081 ---- ;; aix4*) ! if test "$host_cpu" != ia64 ; then test "$enable_shared" = yes && enable_static=no fi ;; *************** *** 3234,3239 **** --- 3172,3178 ---- 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 \ *************** *** 3415,3420 **** --- 3354,3362 ---- # 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 *************** *** 4153,4159 **** # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM --- 4095,4101 ---- # 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 *************** *** 4252,4258 **** # 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" --- 4194,4216 ---- # 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" *************** *** 4354,4359 **** --- 4312,4318 ---- ifelse([AC_DISABLE_FAST_INSTALL]) + dnl AC_PROG_INTLTOOL([MINIMUM-VERSION]) # serial 1 AC_PROG_INTLTOOL AC_DEFUN(AC_PROG_INTLTOOL, *************** *** 4376,4406 **** fi fi ! INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -k -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -p' ! INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -s -u -c $(top_builddir)/po/.intltool-merge-cache' AC_SUBST(INTLTOOL_DESKTOP_RULE) AC_SUBST(INTLTOOL_DIRECTORY_RULE) AC_SUBST(INTLTOOL_KEYS_RULE) AC_SUBST(INTLTOOL_OAF_RULE) AC_SUBST(INTLTOOL_PONG_RULE) AC_SUBST(INTLTOOL_SERVER_RULE) AC_SUBST(INTLTOOL_SHEET_RULE) AC_SUBST(INTLTOOL_SOUNDLIST_RULE) AC_SUBST(INTLTOOL_UI_RULE) AC_SUBST(INTLTOOL_XML_RULE) AC_SUBST(INTLTOOL_CAVES_RULE) AC_SUBST(INTLTOOL_SCHEMAS_RULE) # Use the tools built into the package, not the ones that are installed. --- 4335,4371 ---- fi fi ! INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -k -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -p' ! INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -s -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' AC_SUBST(INTLTOOL_DESKTOP_RULE) AC_SUBST(INTLTOOL_DIRECTORY_RULE) AC_SUBST(INTLTOOL_KEYS_RULE) + AC_SUBST(INTLTOOL_PROP_RULE) AC_SUBST(INTLTOOL_OAF_RULE) AC_SUBST(INTLTOOL_PONG_RULE) AC_SUBST(INTLTOOL_SERVER_RULE) AC_SUBST(INTLTOOL_SHEET_RULE) AC_SUBST(INTLTOOL_SOUNDLIST_RULE) AC_SUBST(INTLTOOL_UI_RULE) + AC_SUBST(INTLTOOL_XAM_RULE) AC_SUBST(INTLTOOL_XML_RULE) AC_SUBST(INTLTOOL_CAVES_RULE) AC_SUBST(INTLTOOL_SCHEMAS_RULE) + AC_SUBST(INTLTOOL_THEME_RULE) # Use the tools built into the package, not the ones that are installed. *************** *** 4426,4432 **** AC_DIVERT_PUSH(AC_DIVERSION_ICMDS) changequote(,) mv -f po/POTFILES po/POTFILES.tmp ! sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp changequote([,]) AC_DIVERT_POP() --- 4391,4397 ---- AC_DIVERT_PUSH(AC_DIVERSION_ICMDS) changequote(,) mv -f po/POTFILES po/POTFILES.tmp ! sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp changequote([,]) AC_DIVERT_POP() *************** *** 4435,4441 **** AC_CONFIG_COMMANDS_PRE([ changequote(,) mv -f po/POTFILES po/POTFILES.tmp ! sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp changequote([,]) ]) --- 4400,4406 ---- AC_CONFIG_COMMANDS_PRE([ changequote(,) mv -f po/POTFILES po/POTFILES.tmp ! sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp changequote([,]) ]) *************** *** 4477,4521 **** ]) ! # gettext.m4 serial 16 (gettext-0.11.4) ! 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. ! dnl ! dnl This file can can be used in projects which are not available under ! dnl the GNU General Public License or the GNU Library General Public ! dnl License but which still want to provide support for the GNU gettext ! dnl functionality. ! dnl Please note that the actual code of the GNU gettext library is covered ! dnl by the GNU Library General Public License, and the rest of the GNU ! dnl gettext package package is covered by the GNU General Public License. ! dnl They are *not* in the public domain. ! ! dnl Authors: ! dnl Ulrich Drepper , 1995-2000. ! dnl Bruno Haible , 2000-2002. ! ! dnl Macro to add for using GNU gettext. ! ! dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). ! dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The ! dnl default (if it is not specified or empty) is 'no-libtool'. ! dnl INTLSYMBOL should be 'external' for packages with no intl directory, ! dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. ! dnl If INTLSYMBOL is 'use-libtool', then a libtool library dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, dnl depending on --{enable,disable}-{shared,static} and on the presence of ! dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library dnl $(top_builddir)/intl/libintl.a will be created. dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext dnl implementations (in libc or libintl) without the ngettext() function ! dnl will be ignored. If NEEDSYMBOL is specified and is ! dnl 'need-formatstring-macros', then GNU gettext implementations that don't ! dnl support the ISO C 99 formatstring macros will be ignored. ! dnl INTLDIR is used to find the intl libraries. If empty, dnl the value `$(top_builddir)/intl/' is used. dnl dnl The result of the configuration is one of three cases: --- 4442,4471 ---- ]) ! # Macro to add for using GNU gettext. ! # Ulrich Drepper , 1995. ! # ! # This file can be copied and used freely without restrictions. It can ! # be used in projects which are not available under the GNU General Public ! # License or the GNU Library General Public License but which still want ! # to provide support for the GNU gettext functionality. ! # Please note that the actual code of the GNU gettext library is covered ! # by the GNU Library General Public License, and the rest of the GNU ! # gettext package package is covered by the GNU General Public License. ! # They are *not* in the public domain. ! ! # serial 10 ! ! dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]). ! dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, dnl depending on --{enable,disable}-{shared,static} and on the presence of ! dnl AM-DISABLE-SHARED). Otherwise, a static library dnl $(top_builddir)/intl/libintl.a will be created. dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext dnl implementations (in libc or libintl) without the ngettext() function ! dnl will be ignored. ! dnl LIBDIR is used to find the intl libraries. If empty, dnl the value `$(top_builddir)/intl/' is used. dnl dnl The result of the configuration is one of three cases: *************** *** 4529,4596 **** dnl 3) No internationalization, always use English msgid. dnl Catalog format: none dnl Catalog extension: none - dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. dnl The use of .gmo is historical (it was needed to avoid overwriting the dnl GNU format catalogs when building on a platform with an X/Open gettext), dnl but we keep it in order not to force irrelevant filename changes on the dnl maintainers. dnl ! AC_DEFUN([AM_GNU_GETTEXT], ! [ ! dnl Argument checking. ! ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , ! [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT ! ])])])])]) ! ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , ! [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ! ])])])]) ! define(gt_included_intl, ifelse([$1], [external], [no], [yes])) ! define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) ! ! AC_REQUIRE([AM_PO_SUBDIRS])dnl ! ifelse(gt_included_intl, yes, [ ! AC_REQUIRE([AM_INTL_SUBDIR])dnl ! ]) ! ! dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. ! AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) ! AC_REQUIRE([AC_LIB_RPATH]) ! ! dnl Sometimes libintl requires libiconv, so first search for libiconv. ! dnl Ideally we would do this search only after the ! dnl if test "$USE_NLS" = "yes"; then ! dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then ! dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT ! dnl the configure script would need to contain the same shell code ! dnl again, outside any 'if'. There are two solutions: ! dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. ! dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. ! dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not ! dnl documented, we avoid it. ! ifelse(gt_included_intl, yes, , [ ! AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ! ]) - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) - - ifelse(gt_included_intl, yes, [ BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no ! ]) ! LIBINTL= ! LTLIBINTL= ! POSUB= ! ! dnl If we use NLS figure out what method ! if test "$USE_NLS" = "yes"; then ! gt_use_preinstalled_gnugettext=no ! ifelse(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH(included-gettext, [ --with-included-gettext use the GNU gettext library included here], --- 4479,4507 ---- dnl 3) No internationalization, always use English msgid. dnl Catalog format: none dnl Catalog extension: none dnl The use of .gmo is historical (it was needed to avoid overwriting the dnl GNU format catalogs when building on a platform with an X/Open gettext), dnl but we keep it in order not to force irrelevant filename changes on the dnl maintainers. dnl ! AC_DEFUN([AM_WITH_NLS], ! [AC_MSG_CHECKING([whether NLS is requested]) ! dnl Default is enabled NLS ! AC_ARG_ENABLE(nls, ! [ --disable-nls do not use Native Language Support], ! USE_NLS=$enableval, USE_NLS=yes) ! AC_MSG_RESULT($USE_NLS) ! AC_SUBST(USE_NLS) BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no ! INTLLIBS= ! ! dnl If we use NLS figure out what method ! if test "$USE_NLS" = "yes"; then ! AC_DEFINE(ENABLE_NLS, 1, ! [Define to 1 if translation of program messages to the user's native language ! is requested.]) AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH(included-gettext, [ --with-included-gettext use the GNU gettext library included here], *************** *** 4600,4776 **** nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - ]) dnl User does not insist on using GNU NLS library. Figure out what dnl to use. If GNU gettext is available we use this. Else we have dnl to fall back to GNU NLS library. dnl Add a version number to the cache macros. ! define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) ! define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) ! define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) ! ! AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, ! [AC_TRY_LINK([#include ! ]ifelse([$2], [need-formatstring-macros], ! [#ifndef __GNU_GETTEXT_SUPPORTED_REVISION ! #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) ! #endif ! changequote(,)dnl ! typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; ! changequote([,])dnl ! ], [])[extern int _nl_msg_cat_cntr; ! extern int *_nl_domain_bindings;], ! [bindtextdomain ("", ""); ! return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], ! gt_cv_func_gnugettext_libc=yes, ! gt_cv_func_gnugettext_libc=no)]) ! ! if test "$gt_cv_func_gnugettext_libc" != "yes"; then ! dnl Sometimes libintl requires libiconv, so first search for libiconv. ! ifelse(gt_included_intl, yes, , [ ! AM_ICONV_LINK ! ]) ! dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL ! dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) ! dnl because that would add "-liconv" to LIBINTL and LTLIBINTL ! dnl even if libiconv doesn't exist. ! AC_LIB_LINKFLAGS_BODY([intl]) ! AC_CACHE_CHECK([for GNU gettext in libintl], ! gt_cv_func_gnugettext_libintl, ! [gt_save_CPPFLAGS="$CPPFLAGS" ! CPPFLAGS="$CPPFLAGS $INCINTL" ! gt_save_LIBS="$LIBS" ! LIBS="$LIBS $LIBINTL" ! dnl Now see whether libintl exists and does not depend on libiconv. ! AC_TRY_LINK([#include ! ]ifelse([$2], [need-formatstring-macros], ! [#ifndef __GNU_GETTEXT_SUPPORTED_REVISION ! #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) ! #endif ! changequote(,)dnl ! typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; ! changequote([,])dnl ! ], [])[extern int _nl_msg_cat_cntr; ! extern ! #ifdef __cplusplus ! "C" ! #endif ! const char *_nl_expand_alias ();], ! [bindtextdomain ("", ""); ! return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], ! gt_cv_func_gnugettext_libintl=yes, ! gt_cv_func_gnugettext_libintl=no) ! dnl Now see whether libintl exists and depends on libiconv. ! if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then ! LIBS="$LIBS $LIBICONV" ! AC_TRY_LINK([#include ! ]ifelse([$2], [need-formatstring-macros], ! [#ifndef __GNU_GETTEXT_SUPPORTED_REVISION ! #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) ! #endif ! changequote(,)dnl ! typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; ! changequote([,])dnl ! ], [])[extern int _nl_msg_cat_cntr; ! extern ! #ifdef __cplusplus ! "C" ! #endif ! const char *_nl_expand_alias ();], ! [bindtextdomain ("", ""); ! return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], ! [LIBINTL="$LIBINTL $LIBICONV" ! LTLIBINTL="$LTLIBINTL $LTLIBICONV" ! gt_cv_func_gnugettext_libintl=yes ! ]) ! fi ! CPPFLAGS="$gt_save_CPPFLAGS" ! LIBS="$gt_save_LIBS"]) ! fi ! dnl If an already present or preinstalled GNU gettext() is found, ! dnl use it. But if this macro is used in GNU gettext, and GNU ! dnl gettext is already preinstalled in libintl, we update this ! dnl libintl. (Cf. the install rule in intl/Makefile.in.) ! if test "$gt_cv_func_gnugettext_libc" = "yes" \ ! || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ ! && test "$PACKAGE" != gettext; }; then ! gt_use_preinstalled_gnugettext=yes ! else ! dnl Reset the values set by searching for libintl. ! LIBINTL= ! LTLIBINTL= ! INCINTL= ! fi ! ifelse(gt_included_intl, yes, [ ! if test "$gt_use_preinstalled_gnugettext" != "yes"; then ! dnl GNU gettext is not found in the C library. ! dnl Fall back on included GNU gettext library. ! nls_cv_use_gnu_gettext=yes fi fi if test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions used to generate GNU NLS library. INTLOBJS="\$(GETTOBJS)" ! BUILD_INCLUDED_LIBINTL=yes ! USE_INCLUDED_LIBINTL=yes ! LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" ! LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" ! LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` ! fi ! ! if test "$gt_use_preinstalled_gnugettext" = "yes" \ ! || test "$nls_cv_use_gnu_gettext" = "yes"; then ! dnl Mark actions to use GNU gettext tools. CATOBJEXT=.gmo fi - ]) ! if test "$gt_use_preinstalled_gnugettext" = "yes" \ ! || test "$nls_cv_use_gnu_gettext" = "yes"; then ! AC_DEFINE(ENABLE_NLS, 1, ! [Define to 1 if translation of program messages to the user's native language ! is requested.]) ! else ! USE_NLS=no ! fi ! fi ! ! if test "$USE_NLS" = "yes"; then ! if test "$gt_use_preinstalled_gnugettext" = "yes"; then ! if test "$gt_cv_func_gnugettext_libintl" = "yes"; then ! AC_MSG_CHECKING([how to link with libintl]) ! AC_MSG_RESULT([$LIBINTL]) ! AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) fi ! dnl For backward compatibility. Some packages may be using this. ! AC_DEFINE(HAVE_GETTEXT, 1, ! [Define if the GNU gettext() function is already present or preinstalled.]) ! AC_DEFINE(HAVE_DCGETTEXT, 1, ! [Define if the GNU dcgettext() function is already present or preinstalled.]) fi - dnl We need to process the po/ directory. - POSUB=po - fi - ifelse(gt_included_intl, yes, [ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL dnl to 'yes' because some of the testsuite requires it. if test "$PACKAGE" = gettext; then BUILD_INCLUDED_LIBINTL=yes fi dnl Make all variables we use known to autoconf. AC_SUBST(BUILD_INCLUDED_LIBINTL) AC_SUBST(USE_INCLUDED_LIBINTL) AC_SUBST(CATOBJEXT) AC_SUBST(INTLOBJS) dnl For backward compatibility. Some configure.ins may be using this. nls_cv_header_intl= --- 4511,4724 ---- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then dnl User does not insist on using GNU NLS library. Figure out what dnl to use. If GNU gettext is available we use this. Else we have dnl to fall back to GNU NLS library. + CATOBJEXT=NONE dnl Add a version number to the cache macros. ! define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc]) ! define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl]) ! AC_CHECK_HEADER(libintl.h, ! [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, ! [AC_TRY_LINK([#include ! extern int _nl_msg_cat_cntr;], ! [bindtextdomain ("", ""); ! return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr], ! gt_cv_func_gnugettext_libc=yes, ! gt_cv_func_gnugettext_libc=no)]) ! ! if test "$gt_cv_func_gnugettext_libc" != "yes"; then ! AC_CACHE_CHECK([for GNU gettext in libintl], ! gt_cv_func_gnugettext_libintl, ! [gt_save_LIBS="$LIBS" ! LIBS="$LIBS -lintl $LIBICONV" ! AC_TRY_LINK([#include ! extern int _nl_msg_cat_cntr;], ! [bindtextdomain ("", ""); ! return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr], ! gt_cv_func_gnugettext_libintl=yes, ! gt_cv_func_gnugettext_libintl=no) ! LIBS="$gt_save_LIBS"]) ! fi ! ! dnl If an already present or preinstalled GNU gettext() is found, ! dnl use it. But if this macro is used in GNU gettext, and GNU ! dnl gettext is already preinstalled in libintl, we update this ! dnl libintl. (Cf. the install rule in intl/Makefile.in.) ! if test "$gt_cv_func_gnugettext_libc" = "yes" \ ! || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ ! && test "$PACKAGE" != gettext; }; then ! AC_DEFINE(HAVE_GETTEXT, 1, ! [Define if the GNU gettext() function is already present or preinstalled.]) ! ! if test "$gt_cv_func_gnugettext_libintl" = "yes"; then ! dnl If iconv() is in a separate libiconv library, then anyone ! dnl linking with libintl{.a,.so} also needs to link with ! dnl libiconv. ! INTLLIBS="-lintl $LIBICONV" ! fi ! ! gt_save_LIBS="$LIBS" ! LIBS="$LIBS $INTLLIBS" ! AC_CHECK_FUNCS(dcgettext) ! LIBS="$gt_save_LIBS" ! ! dnl Search for GNU msgfmt in the PATH. ! AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ! [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :) ! AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ! ! dnl Search for GNU xgettext in the PATH. ! AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ! [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :) ! ! CATOBJEXT=.gmo ! fi ! ]) ! if test "$CATOBJEXT" = "NONE"; then ! dnl GNU gettext is not found in the C library. ! dnl Fall back on GNU gettext library. ! nls_cv_use_gnu_gettext=yes fi fi if test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions used to generate GNU NLS library. INTLOBJS="\$(GETTOBJS)" ! AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ! [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :) ! AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ! AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ! [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :) ! AC_SUBST(MSGFMT) ! BUILD_INCLUDED_LIBINTL=yes ! USE_INCLUDED_LIBINTL=yes CATOBJEXT=.gmo + INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi ! dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. ! dnl Test whether we really found GNU msgfmt. ! if test "$GMSGFMT" != ":"; then ! dnl If it is no GNU msgfmt we define it as : so that the ! dnl Makefiles still can work. ! if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then ! : ; ! else ! AC_MSG_RESULT( ! [found msgfmt program is not GNU msgfmt; ignore it]) ! GMSGFMT=":" ! fi ! fi ! dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. ! dnl Test whether we really found GNU xgettext. ! if test "$XGETTEXT" != ":"; then ! dnl If it is no GNU xgettext we define it as : so that the ! dnl Makefiles still can work. ! if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then ! : ; ! else ! AC_MSG_RESULT( ! [found xgettext program is not GNU xgettext; ignore it]) ! XGETTEXT=":" ! fi fi ! dnl We need to process the po/ directory. ! POSUB=po fi + AC_OUTPUT_COMMANDS( + [for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + fi + ;; + esac + done]) dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL dnl to 'yes' because some of the testsuite requires it. if test "$PACKAGE" = gettext; then BUILD_INCLUDED_LIBINTL=yes fi + dnl intl/plural.c is generated from intl/plural.y. It requires bison, + dnl because plural.y uses bison specific features. It requires at least + dnl bison-1.26 because earlier versions generate a plural.c that doesn't + dnl compile. + dnl bison is only needed for the maintainer (who touches plural.y). But in + dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put + dnl the rule in general Makefile. Now, some people carelessly touch the + dnl files or have a broken "make" program, hence the plural.c rule will + dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not + dnl present or too old. + AC_CHECK_PROGS([INTLBISON], [bison]) + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else + dnl Found it, now check the version. + AC_MSG_CHECKING([version of bison]) + changequote(<<,>>)dnl + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) + changequote([,])dnl + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + esac + AC_MSG_RESULT([$ac_prog_version]) + fi + if test $ac_verc_fail = yes; then + INTLBISON=: + fi + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + dnl Make all variables we use known to autoconf. AC_SUBST(BUILD_INCLUDED_LIBINTL) AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATALOGS) AC_SUBST(CATOBJEXT) + AC_SUBST(GMOFILES) + AC_SUBST(INTLLIBS) AC_SUBST(INTLOBJS) + AC_SUBST(POFILES) + AC_SUBST(POSUB) dnl For backward compatibility. Some configure.ins may be using this. nls_cv_header_intl= *************** *** 4787,5997 **** dnl For backward compatibility. Some Makefiles may be using this. GENCAT=gencat AC_SUBST(GENCAT) - - dnl Enable libtool support if the surrounding package wishes it. - INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) ]) ! dnl For backward compatibility. Some Makefiles may be using this. ! INTLLIBS="$LIBINTL" ! AC_SUBST(INTLLIBS) ! ! dnl Make all documented variables known to autoconf. ! AC_SUBST(LIBINTL) ! AC_SUBST(LTLIBINTL) ! AC_SUBST(POSUB) ! ]) ! ! ! dnl Checks for all prerequisites of the po subdirectory, ! dnl except for USE_NLS. ! AC_DEFUN([AM_PO_SUBDIRS], ! [ ! AC_REQUIRE([AC_PROG_MAKE_SET])dnl ! AC_REQUIRE([AC_PROG_INSTALL])dnl ! AC_REQUIRE([AM_MKINSTALLDIRS])dnl ! ! dnl Perform the following tests also if --disable-nls has been given, ! dnl because they are needed for "make dist" to work. ! ! dnl Search for GNU msgfmt in the PATH. ! dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. ! dnl The second test excludes FreeBSD msgfmt. ! AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ! [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && ! (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], ! :) ! AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ! ! dnl Search for GNU xgettext 0.11 or newer in the PATH. ! dnl The first test excludes Solaris xgettext and early GNU xgettext versions. ! dnl The second test excludes FreeBSD xgettext. ! AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ! [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && ! (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], ! :) ! dnl Remove leftover from FreeBSD xgettext call. ! rm -f messages.po ! ! dnl Search for GNU msgmerge 0.11 or newer in the PATH. ! AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, ! [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) ! ! dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. ! dnl Test whether we really found GNU msgfmt. ! if test "$GMSGFMT" != ":"; then ! dnl If it is no GNU msgfmt we define it as : so that the ! dnl Makefiles still can work. ! if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && ! (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then ! : ; ! else ! GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` ! AC_MSG_RESULT( ! [found $GMSGFMT program is not GNU msgfmt; ignore it]) ! GMSGFMT=":" ! fi ! fi ! ! dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. ! dnl Test whether we really found GNU xgettext. ! if test "$XGETTEXT" != ":"; then ! dnl If it is no GNU xgettext we define it as : so that the ! dnl Makefiles still can work. ! if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && ! (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then ! : ; ! else ! AC_MSG_RESULT( ! [found xgettext program is not GNU xgettext; ignore it]) ! XGETTEXT=":" ! fi ! dnl Remove leftover from FreeBSD xgettext call. ! rm -f messages.po ! fi ! ! AC_OUTPUT_COMMANDS([ ! for ac_file in $CONFIG_FILES; do ! # Support "outfile[:infile[:infile...]]" ! case "$ac_file" in ! *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; ! esac ! # PO directories have a Makefile.in generated from Makefile.in.in. ! case "$ac_file" in */Makefile.in) ! # Adjust a relative srcdir. ! ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` ! ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" ! ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` ! # In autoconf-2.13 it is called $ac_given_srcdir. ! # In autoconf-2.50 it is called $srcdir. ! test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" ! case "$ac_given_srcdir" in ! .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; ! /*) top_srcdir="$ac_given_srcdir" ;; ! *) top_srcdir="$ac_dots$ac_given_srcdir" ;; ! esac ! if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then ! rm -f "$ac_dir/POTFILES" ! test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" ! cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" ! # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend ! # on $ac_dir but don't depend on user-specified configuration ! # parameters. ! if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then ! # The LINGUAS file contains the set of available languages. ! if test -n "$ALL_LINGUAS"; then ! test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" ! fi ! ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` ! # Hide the ALL_LINGUAS assigment from automake. ! eval 'ALL_LINGUAS''=$ALL_LINGUAS_' ! fi ! case "$ac_given_srcdir" in ! .) srcdirpre= ;; ! *) srcdirpre='$(srcdir)/' ;; ! esac ! POFILES= ! GMOFILES= ! UPDATEPOFILES= ! DUMMYPOFILES= ! for lang in $ALL_LINGUAS; do ! POFILES="$POFILES $srcdirpre$lang.po" ! GMOFILES="$GMOFILES $srcdirpre$lang.gmo" ! UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" ! DUMMYPOFILES="$DUMMYPOFILES $lang.nop" ! done ! # CATALOGS depends on both $ac_dir and the user's LINGUAS ! # environment variable. ! INST_LINGUAS= ! if test -n "$ALL_LINGUAS"; then ! for presentlang in $ALL_LINGUAS; do ! useit=no ! if test "%UNSET%" != "$LINGUAS"; then ! desiredlanguages="$LINGUAS" ! else ! desiredlanguages="$ALL_LINGUAS" ! fi ! for desiredlang in $desiredlanguages; do ! # Use the presentlang catalog if desiredlang is ! # a. equal to presentlang, or ! # b. a variant of presentlang (because in this case, ! # presentlang can be used as a fallback for messages ! # which are not translated in the desiredlang catalog). ! case "$desiredlang" in ! "$presentlang"*) useit=yes;; ! esac ! done ! if test $useit = yes; then ! INST_LINGUAS="$INST_LINGUAS $presentlang" ! fi ! done ! fi ! CATALOGS= ! if test -n "$INST_LINGUAS"; then ! for lang in $INST_LINGUAS; do ! CATALOGS="$CATALOGS $lang.gmo" ! done ! fi ! test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" ! sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" ! for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do ! if test -f "$f"; then ! case "$f" in ! *.orig | *.bak | *~) ;; ! *) cat "$f" >> "$ac_dir/Makefile" ;; ! esac ! fi ! done ! fi ! ;; ! esac ! done], ! [# Capture the value of obsolete $ALL_LINGUAS because we need it to compute ! # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it ! # from automake. ! eval 'ALL_LINGUAS''="$ALL_LINGUAS"' ! # Capture the value of LINGUAS because we need it to compute CATALOGS. ! LINGUAS="${LINGUAS-%UNSET%}" ! ]) ! ]) ! ! ! dnl Checks for all prerequisites of the intl subdirectory, ! dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, ! dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. ! AC_DEFUN([AM_INTL_SUBDIR], ! [ ! AC_REQUIRE([AC_PROG_INSTALL])dnl ! AC_REQUIRE([AM_MKINSTALLDIRS])dnl ! AC_REQUIRE([AC_PROG_CC])dnl ! AC_REQUIRE([AC_CANONICAL_HOST])dnl ! AC_REQUIRE([AC_PROG_RANLIB])dnl ! AC_REQUIRE([AC_ISC_POSIX])dnl ! AC_REQUIRE([AC_HEADER_STDC])dnl ! AC_REQUIRE([AC_C_CONST])dnl ! AC_REQUIRE([AC_C_INLINE])dnl ! AC_REQUIRE([AC_TYPE_OFF_T])dnl ! AC_REQUIRE([AC_TYPE_SIZE_T])dnl ! AC_REQUIRE([AC_FUNC_ALLOCA])dnl ! AC_REQUIRE([AC_FUNC_MMAP])dnl ! AC_REQUIRE([jm_GLIBC21])dnl ! AC_REQUIRE([gt_INTDIV0])dnl ! AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl ! AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl ! AC_REQUIRE([gt_INTTYPES_PRI])dnl ! AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h]) ! AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ ! geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ ! strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) ! ! AM_ICONV ! AM_LANGINFO_CODESET ! if test $ac_cv_header_locale_h = yes; then ! AM_LC_MESSAGES ! fi ! ! dnl intl/plural.c is generated from intl/plural.y. It requires bison, ! dnl because plural.y uses bison specific features. It requires at least ! dnl bison-1.26 because earlier versions generate a plural.c that doesn't ! dnl compile. ! dnl bison is only needed for the maintainer (who touches plural.y). But in ! dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put ! dnl the rule in general Makefile. Now, some people carelessly touch the ! dnl files or have a broken "make" program, hence the plural.c rule will ! dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not ! dnl present or too old. ! AC_CHECK_PROGS([INTLBISON], [bison]) ! if test -z "$INTLBISON"; then ! ac_verc_fail=yes ! else ! dnl Found it, now check the version. ! AC_MSG_CHECKING([version of bison]) ! changequote(<<,>>)dnl ! ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` ! case $ac_prog_version in ! '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; ! 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) ! changequote([,])dnl ! ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; ! *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; ! esac ! AC_MSG_RESULT([$ac_prog_version]) ! fi ! if test $ac_verc_fail = yes; then ! INTLBISON=: ! fi ! ]) ! ! ! AC_DEFUN([AM_MKINSTALLDIRS], ! [ ! dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ! dnl find the mkinstalldirs script in another subdir but $(top_srcdir). ! dnl Try to locate is. ! MKINSTALLDIRS= ! if test -n "$ac_aux_dir"; then ! MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ! fi ! if test -z "$MKINSTALLDIRS"; then ! MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ! fi ! AC_SUBST(MKINSTALLDIRS) ! ]) ! ! ! dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) ! AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) ! ! # lib-prefix.m4 serial 1 (gettext-0.11) ! dnl Copyright (C) 2001-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. ! ! dnl From Bruno Haible. ! ! dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed ! dnl to access previously installed libraries. The basic assumption is that ! dnl a user will want packages to use other packages he previously installed ! dnl with the same --prefix option. ! dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate ! dnl libraries, but is otherwise very convenient. ! AC_DEFUN([AC_LIB_PREFIX], ! [ ! AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) ! AC_REQUIRE([AC_PROG_CC]) ! AC_REQUIRE([AC_CANONICAL_HOST]) ! AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) ! dnl By default, look in $includedir and $libdir. ! use_additional=yes ! AC_LIB_WITH_FINAL_PREFIX([ ! eval additional_includedir=\"$includedir\" ! eval additional_libdir=\"$libdir\" ! ]) ! AC_ARG_WITH([lib-prefix], ! [ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib ! --without-lib-prefix don't search for libraries in includedir and libdir], ! [ ! if test "X$withval" = "Xno"; then ! use_additional=no ! else ! if test "X$withval" = "X"; then ! AC_LIB_WITH_FINAL_PREFIX([ ! eval additional_includedir=\"$includedir\" ! eval additional_libdir=\"$libdir\" ! ]) ! else ! additional_includedir="$withval/include" ! additional_libdir="$withval/lib" ! fi ! fi ! ]) ! if test $use_additional = yes; then ! dnl Potentially add $additional_includedir to $CPPFLAGS. ! dnl But don't add it ! dnl 1. if it's the standard /usr/include, ! dnl 2. if it's already present in $CPPFLAGS, ! dnl 3. if it's /usr/local/include and we are using GCC on Linux, ! dnl 4. if it doesn't exist as a directory. ! if test "X$additional_includedir" != "X/usr/include"; then ! haveit= ! for x in $CPPFLAGS; do ! AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ! if test "X$x" = "X-I$additional_includedir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! if test "X$additional_includedir" = "X/usr/local/include"; then ! if test -n "$GCC"; then ! case $host_os in ! linux*) haveit=yes;; ! esac ! fi ! fi ! if test -z "$haveit"; then ! if test -d "$additional_includedir"; then ! dnl Really add $additional_includedir to $CPPFLAGS. ! CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" ! fi ! fi ! fi ! fi ! dnl Potentially add $additional_libdir to $LDFLAGS. ! dnl But don't add it ! dnl 1. if it's the standard /usr/lib, ! dnl 2. if it's already present in $LDFLAGS, ! dnl 3. if it's /usr/local/lib and we are using GCC on Linux, ! dnl 4. if it doesn't exist as a directory. ! if test "X$additional_libdir" != "X/usr/lib"; then ! haveit= ! for x in $LDFLAGS; do ! AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ! if test "X$x" = "X-L$additional_libdir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! if test "X$additional_libdir" = "X/usr/local/lib"; then ! if test -n "$GCC"; then ! case $host_os in ! linux*) haveit=yes;; ! esac ! fi ! fi ! if test -z "$haveit"; then ! if test -d "$additional_libdir"; then ! dnl Really add $additional_libdir to $LDFLAGS. ! LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" ! fi ! fi ! fi ! fi ! fi ! ]) ! ! dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, ! dnl acl_final_exec_prefix, containing the values to which $prefix and ! dnl $exec_prefix will expand at the end of the configure script. ! AC_DEFUN([AC_LIB_PREPARE_PREFIX], ! [ ! dnl Unfortunately, prefix and exec_prefix get only finally determined ! dnl at the end of configure. ! if test "X$prefix" = "XNONE"; then ! acl_final_prefix="$ac_default_prefix" ! else ! acl_final_prefix="$prefix" ! fi ! if test "X$exec_prefix" = "XNONE"; then ! acl_final_exec_prefix='${prefix}' ! else ! acl_final_exec_prefix="$exec_prefix" ! fi ! acl_save_prefix="$prefix" ! prefix="$acl_final_prefix" ! eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" ! prefix="$acl_save_prefix" ! ]) ! ! dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the ! dnl variables prefix and exec_prefix bound to the values they will have ! dnl at the end of the configure script. ! AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], ! [ ! acl_save_prefix="$prefix" ! prefix="$acl_final_prefix" ! acl_save_exec_prefix="$exec_prefix" ! exec_prefix="$acl_final_exec_prefix" ! $1 ! exec_prefix="$acl_save_exec_prefix" ! prefix="$acl_save_prefix" ! ]) ! ! # lib-link.m4 serial 3 (gettext-0.11.3) ! dnl Copyright (C) 2001-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. ! ! dnl From Bruno Haible. ! ! dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and ! dnl the libraries corresponding to explicit and implicit dependencies. ! dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and ! dnl augments the CPPFLAGS variable. ! AC_DEFUN([AC_LIB_LINKFLAGS], ! [ ! AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) ! AC_REQUIRE([AC_LIB_RPATH]) ! define([Name],[translit([$1],[./-], [___])]) ! define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], ! [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) ! AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ ! AC_LIB_LINKFLAGS_BODY([$1], [$2]) ! ac_cv_lib[]Name[]_libs="$LIB[]NAME" ! ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" ! ac_cv_lib[]Name[]_cppflags="$INC[]NAME" ! ]) ! LIB[]NAME="$ac_cv_lib[]Name[]_libs" ! LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" ! INC[]NAME="$ac_cv_lib[]Name[]_cppflags" ! AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) ! AC_SUBST([LIB]NAME) ! AC_SUBST([LTLIB]NAME) ! dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the ! dnl results of this search when this library appears as a dependency. ! HAVE_LIB[]NAME=yes ! undefine([Name]) ! undefine([NAME]) ! ]) ! ! dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) ! dnl searches for libname and the libraries corresponding to explicit and ! dnl implicit dependencies, together with the specified include files and ! dnl the ability to compile and link the specified testcode. If found, it ! dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and ! dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and ! dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs ! dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. ! AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], ! [ ! AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) ! AC_REQUIRE([AC_LIB_RPATH]) ! define([Name],[translit([$1],[./-], [___])]) ! define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], ! [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) ! ! dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME ! dnl accordingly. ! AC_LIB_LINKFLAGS_BODY([$1], [$2]) ! ! dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, ! dnl because if the user has installed lib[]Name and not disabled its use ! dnl via --without-lib[]Name-prefix, he wants to use it. ! ac_save_CPPFLAGS="$CPPFLAGS" ! AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) ! ! AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ ! ac_save_LIBS="$LIBS" ! LIBS="$LIBS $LIB[]NAME" ! AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) ! LIBS="$ac_save_LIBS" ! ]) ! if test "$ac_cv_lib[]Name" = yes; then ! HAVE_LIB[]NAME=yes ! AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) ! AC_MSG_CHECKING([how to link with lib[]$1]) ! AC_MSG_RESULT([$LIB[]NAME]) ! else ! HAVE_LIB[]NAME=no ! dnl If $LIB[]NAME didn't lead to a usable library, we don't need ! dnl $INC[]NAME either. ! CPPFLAGS="$ac_save_CPPFLAGS" ! LIB[]NAME= ! LTLIB[]NAME= ! fi ! AC_SUBST([HAVE_LIB]NAME) ! AC_SUBST([LIB]NAME) ! AC_SUBST([LTLIB]NAME) ! undefine([Name]) ! undefine([NAME]) ! ]) ! ! dnl Determine the platform dependent parameters needed to use rpath: ! dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, ! dnl hardcode_direct, hardcode_minus_L, ! dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec. ! AC_DEFUN([AC_LIB_RPATH], ! [ ! AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS ! AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld ! AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host ! AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir ! AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ ! CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ ! ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh ! . ./conftest.sh ! rm -f ./conftest.sh ! acl_cv_rpath=done ! ]) ! wl="$acl_cv_wl" ! libext="$acl_cv_libext" ! shlibext="$acl_cv_shlibext" ! hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" ! hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" ! hardcode_direct="$acl_cv_hardcode_direct" ! hardcode_minus_L="$acl_cv_hardcode_minus_L" ! sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec" ! sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec" ! dnl Determine whether the user wants rpath handling at all. ! AC_ARG_ENABLE(rpath, ! [ --disable-rpath do not hardcode runtime library paths], ! :, enable_rpath=yes) ! ]) ! ! dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and ! dnl the libraries corresponding to explicit and implicit dependencies. ! dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. ! AC_DEFUN([AC_LIB_LINKFLAGS_BODY], ! [ ! define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], ! [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) ! dnl By default, look in $includedir and $libdir. ! use_additional=yes ! AC_LIB_WITH_FINAL_PREFIX([ ! eval additional_includedir=\"$includedir\" ! eval additional_libdir=\"$libdir\" ! ]) ! AC_ARG_WITH([lib$1-prefix], ! [ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib ! --without-lib$1-prefix don't search for lib$1 in includedir and libdir], ! [ ! if test "X$withval" = "Xno"; then ! use_additional=no ! else ! if test "X$withval" = "X"; then ! AC_LIB_WITH_FINAL_PREFIX([ ! eval additional_includedir=\"$includedir\" ! eval additional_libdir=\"$libdir\" ! ]) ! else ! additional_includedir="$withval/include" ! additional_libdir="$withval/lib" ! fi ! fi ! ]) ! dnl Search the library and its dependencies in $additional_libdir and ! dnl $LDFLAGS. Using breadth-first-seach. ! LIB[]NAME= ! LTLIB[]NAME= ! INC[]NAME= ! rpathdirs= ! ltrpathdirs= ! names_already_handled= ! names_next_round='$1 $2' ! while test -n "$names_next_round"; do ! names_this_round="$names_next_round" ! names_next_round= ! for name in $names_this_round; do ! already_handled= ! for n in $names_already_handled; do ! if test "$n" = "$name"; then ! already_handled=yes ! break ! fi ! done ! if test -z "$already_handled"; then ! names_already_handled="$names_already_handled $name" ! dnl See if it was already located by an earlier AC_LIB_LINKFLAGS ! dnl or AC_LIB_HAVE_LINKFLAGS call. ! uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` ! eval value=\"\$HAVE_LIB$uppername\" ! if test -n "$value"; then ! if test "$value" = yes; then ! eval value=\"\$LIB$uppername\" ! test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" ! eval value=\"\$LTLIB$uppername\" ! test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" ! else ! dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined ! dnl that this library doesn't exist. So just drop it. ! : ! fi ! else ! dnl Search the library lib$name in $additional_libdir and $LDFLAGS ! dnl and the already constructed $LIBNAME/$LTLIBNAME. ! found_dir= ! found_la= ! found_so= ! found_a= ! if test $use_additional = yes; then ! if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then ! found_dir="$additional_libdir" ! found_so="$additional_libdir/lib$name.$shlibext" ! if test -f "$additional_libdir/lib$name.la"; then ! found_la="$additional_libdir/lib$name.la" ! fi ! else ! if test -f "$additional_libdir/lib$name.$libext"; then ! found_dir="$additional_libdir" ! found_a="$additional_libdir/lib$name.$libext" ! if test -f "$additional_libdir/lib$name.la"; then ! found_la="$additional_libdir/lib$name.la" ! fi ! fi ! fi ! fi ! if test "X$found_dir" = "X"; then ! for x in $LDFLAGS $LTLIB[]NAME; do ! AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ! case "$x" in ! -L*) ! dir=`echo "X$x" | sed -e 's/^X-L//'` ! if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then ! found_dir="$dir" ! found_so="$dir/lib$name.$shlibext" ! if test -f "$dir/lib$name.la"; then ! found_la="$dir/lib$name.la" ! fi ! else ! if test -f "$dir/lib$name.$libext"; then ! found_dir="$dir" ! found_a="$dir/lib$name.$libext" ! if test -f "$dir/lib$name.la"; then ! found_la="$dir/lib$name.la" ! fi ! fi ! fi ! ;; ! esac ! if test "X$found_dir" != "X"; then ! break ! fi ! done ! fi ! if test "X$found_dir" != "X"; then ! dnl Found the library. ! LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" ! if test "X$found_so" != "X"; then ! dnl Linking with a shared library. We attempt to hardcode its ! dnl directory into the executable's runpath, unless it's the ! dnl standard /usr/lib. ! if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then ! dnl No hardcoding is needed. ! LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" ! else ! dnl Use an explicit option to hardcode DIR into the resulting ! dnl binary. ! dnl Potentially add DIR to ltrpathdirs. ! dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. ! haveit= ! for x in $ltrpathdirs; do ! if test "X$x" = "X$found_dir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! ltrpathdirs="$ltrpathdirs $found_dir" ! fi ! dnl The hardcoding into $LIBNAME is system dependent. ! if test "$hardcode_direct" = yes; then ! dnl Using DIR/libNAME.so during linking hardcodes DIR into the ! dnl resulting binary. ! LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" ! else ! if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then ! dnl Use an explicit option to hardcode DIR into the resulting ! dnl binary. ! LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" ! dnl Potentially add DIR to rpathdirs. ! dnl The rpathdirs will be appended to $LIBNAME at the end. ! haveit= ! for x in $rpathdirs; do ! if test "X$x" = "X$found_dir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! rpathdirs="$rpathdirs $found_dir" ! fi ! else ! dnl Rely on "-L$found_dir". ! dnl But don't add it if it's already contained in the LDFLAGS ! dnl or the already constructed $LIBNAME ! haveit= ! for x in $LDFLAGS $LIB[]NAME; do ! AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ! if test "X$x" = "X-L$found_dir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" ! fi ! if test "$hardcode_minus_L" != no; then ! dnl FIXME: Not sure whether we should use ! dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" ! dnl here. ! LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" ! else ! dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH ! dnl here, because this doesn't fit in flags passed to the ! dnl compiler. So give up. No hardcoding. This affects only ! dnl very old systems. ! dnl FIXME: Not sure whether we should use ! dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" ! dnl here. ! LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" ! fi ! fi ! fi ! fi ! else ! if test "X$found_a" != "X"; then ! dnl Linking with a static library. ! LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" ! else ! dnl We shouldn't come here, but anyway it's good to have a ! dnl fallback. ! LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" ! fi ! fi ! dnl Assume the include files are nearby. ! additional_includedir= ! case "$found_dir" in ! */lib | */lib/) ! basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` ! additional_includedir="$basedir/include" ! ;; ! esac ! if test "X$additional_includedir" != "X"; then ! dnl Potentially add $additional_includedir to $INCNAME. ! dnl But don't add it ! dnl 1. if it's the standard /usr/include, ! dnl 2. if it's /usr/local/include and we are using GCC on Linux, ! dnl 3. if it's already present in $CPPFLAGS or the already ! dnl constructed $INCNAME, ! dnl 4. if it doesn't exist as a directory. ! if test "X$additional_includedir" != "X/usr/include"; then ! haveit= ! if test "X$additional_includedir" = "X/usr/local/include"; then ! if test -n "$GCC"; then ! case $host_os in ! linux*) haveit=yes;; ! esac ! fi ! fi ! if test -z "$haveit"; then ! for x in $CPPFLAGS $INC[]NAME; do ! AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ! if test "X$x" = "X-I$additional_includedir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! if test -d "$additional_includedir"; then ! dnl Really add $additional_includedir to $INCNAME. ! INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" ! fi ! fi ! fi ! fi ! fi ! dnl Look for dependencies. ! if test -n "$found_la"; then ! dnl Read the .la file. It defines the variables ! dnl dlname, library_names, old_library, dependency_libs, current, ! dnl age, revision, installed, dlopen, dlpreopen, libdir. ! save_libdir="$libdir" ! case "$found_la" in ! */* | *\\*) . "$found_la" ;; ! *) . "./$found_la" ;; ! esac ! libdir="$save_libdir" ! dnl We use only dependency_libs. ! for dep in $dependency_libs; do ! case "$dep" in ! -L*) ! additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` ! dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. ! dnl But don't add it ! dnl 1. if it's the standard /usr/lib, ! dnl 2. if it's /usr/local/lib and we are using GCC on Linux, ! dnl 3. if it's already present in $LDFLAGS or the already ! dnl constructed $LIBNAME, ! dnl 4. if it doesn't exist as a directory. ! if test "X$additional_libdir" != "X/usr/lib"; then ! haveit= ! if test "X$additional_libdir" = "X/usr/local/lib"; then ! if test -n "$GCC"; then ! case $host_os in ! linux*) haveit=yes;; ! esac ! fi ! fi ! if test -z "$haveit"; then ! haveit= ! for x in $LDFLAGS $LIB[]NAME; do ! AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ! if test "X$x" = "X-L$additional_libdir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! if test -d "$additional_libdir"; then ! dnl Really add $additional_libdir to $LIBNAME. ! LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" ! fi ! fi ! haveit= ! for x in $LDFLAGS $LTLIB[]NAME; do ! AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ! if test "X$x" = "X-L$additional_libdir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! if test -d "$additional_libdir"; then ! dnl Really add $additional_libdir to $LTLIBNAME. ! LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" ! fi ! fi ! fi ! fi ! ;; ! -R*) ! dir=`echo "X$dep" | sed -e 's/^X-R//'` ! if test "$enable_rpath" != no; then ! dnl Potentially add DIR to rpathdirs. ! dnl The rpathdirs will be appended to $LIBNAME at the end. ! haveit= ! for x in $rpathdirs; do ! if test "X$x" = "X$dir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! rpathdirs="$rpathdirs $dir" ! fi ! dnl Potentially add DIR to ltrpathdirs. ! dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. ! haveit= ! for x in $ltrpathdirs; do ! if test "X$x" = "X$dir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! ltrpathdirs="$ltrpathdirs $dir" ! fi ! fi ! ;; ! -l*) ! dnl Handle this in the next round. ! names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ! ;; ! *.la) ! dnl Handle this in the next round. Throw away the .la's ! dnl directory; it is already contained in a preceding -L ! dnl option. ! names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` ! ;; ! *) ! dnl Most likely an immediate library name. ! LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" ! LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" ! ;; ! esac ! done ! fi ! else ! dnl Didn't find the library; assume it is in the system directories ! dnl known to the linker and runtime loader. (All the system ! dnl directories known to the linker should also be known to the ! dnl runtime loader, otherwise the system is severely misconfigured.) ! LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" ! LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" ! fi ! fi ! fi ! done ! done ! if test "X$rpathdirs" != "X"; then ! if test -n "$hardcode_libdir_separator"; then ! dnl Weird platform: only the last -rpath option counts, the user must ! dnl pass all path elements in one option. We can arrange that for a ! dnl single library, but not when more than one $LIBNAMEs are used. ! alldirs= ! for found_dir in $rpathdirs; do ! alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" ! done ! dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. ! acl_save_libdir="$libdir" ! libdir="$alldirs" ! eval flag=\"$hardcode_libdir_flag_spec\" ! libdir="$acl_save_libdir" ! LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" ! else ! dnl The -rpath options are cumulative. ! for found_dir in $rpathdirs; do ! acl_save_libdir="$libdir" ! libdir="$found_dir" ! eval flag=\"$hardcode_libdir_flag_spec\" ! libdir="$acl_save_libdir" ! LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" ! done ! fi ! fi ! if test "X$ltrpathdirs" != "X"; then ! dnl When using libtool, the option that works for both libraries and ! dnl executables is -R. The -R options are cumulative. ! for found_dir in $ltrpathdirs; do ! LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" ! done ! fi ! ]) ! ! dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, ! dnl unless already present in VAR. ! dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes ! dnl contains two or three consecutive elements that belong together. ! AC_DEFUN([AC_LIB_APPENDTOVAR], ! [ ! for element in [$2]; do ! haveit= ! for x in $[$1]; do ! AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) ! if test "X$x" = "X$element"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! [$1]="${[$1]}${[$1]:+ }$element" ! fi ! done ! ]) ! ! # lib-ld.m4 serial 1 (gettext-0.11) ! dnl Copyright (C) 1996-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. ! ! dnl Subroutines of libtool.m4, ! dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision ! dnl with libtool.m4. ! ! dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. ! AC_DEFUN([AC_LIB_PROG_LD_GNU], ! [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, ! [# I'd rather use --version here, but apparently some GNU ld's only accept -v. ! if $LD -v 2>&1 &5; then ! acl_cv_prog_gnu_ld=yes ! else ! acl_cv_prog_gnu_ld=no ! fi]) ! with_gnu_ld=$acl_cv_prog_gnu_ld ! ]) ! ! dnl From libtool-1.4. Sets the variable LD. ! AC_DEFUN([AC_LIB_PROG_LD], ! [AC_ARG_WITH(gnu-ld, ! [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], ! test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) ! AC_REQUIRE([AC_PROG_CC])dnl ! AC_REQUIRE([AC_CANONICAL_HOST])dnl ! ac_prog=ld ! if test "$GCC" = yes; then ! # Check if gcc -print-prog-name=ld gives a path. ! AC_MSG_CHECKING([for ld used by GCC]) ! case $host in ! *-*-mingw*) ! # gcc leaves a trailing carriage return which upsets mingw ! ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ! *) ! ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ! esac ! case $ac_prog in ! # Accept absolute paths. ! [[\\/]* | [A-Za-z]:[\\/]*)] ! [re_direlt='/[^/][^/]*/\.\./'] ! # Canonicalize the path of ld ! ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` ! while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ! ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` ! done ! test -z "$LD" && LD="$ac_prog" ! ;; ! "") ! # If it fails, then pretend we aren't using GCC. ! ac_prog=ld ! ;; ! *) ! # If it is relative, then search for the first ld in PATH. ! with_gnu_ld=unknown ! ;; ! esac ! elif test "$with_gnu_ld" = yes; then ! AC_MSG_CHECKING([for GNU ld]) ! else ! AC_MSG_CHECKING([for non-GNU ld]) ! fi ! AC_CACHE_VAL(acl_cv_path_LD, ! [if test -z "$LD"; then ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ! acl_cv_path_LD="$ac_dir/$ac_prog" ! # Check to see if the program is GNU ld. I'd rather use --version, ! # but apparently some GNU ld's only accept -v. ! # Break only if it was the GNU/non-GNU ld that we prefer. ! if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then ! test "$with_gnu_ld" != no && break ! else ! test "$with_gnu_ld" != yes && break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! else ! acl_cv_path_LD="$LD" # Let the user override the test with a path. ! fi]) ! LD="$acl_cv_path_LD" ! if test -n "$LD"; then ! AC_MSG_RESULT($LD) ! else ! AC_MSG_RESULT(no) ! fi ! test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) ! AC_LIB_PROG_LD_GNU ! ]) ! ! # iconv.m4 serial AM4 (gettext-0.11.3) ! dnl Copyright (C) 2000-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. ! ! dnl From Bruno Haible. ! ! AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], ! [ ! dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. ! AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) ! AC_REQUIRE([AC_LIB_RPATH]) ! ! dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV ! dnl accordingly. ! AC_LIB_LINKFLAGS_BODY([iconv]) ! ]) ! ! AC_DEFUN([AM_ICONV_LINK], ! [ ! dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and ! dnl those with the standalone portable GNU libiconv installed). ! dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV ! dnl accordingly. ! AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ! ! dnl Add $INCICONV to CPPFLAGS before performing the following checks, ! dnl because if the user has installed libiconv and not disabled its use ! dnl via --without-libiconv-prefix, he wants to use it. The first ! dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. ! am_save_CPPFLAGS="$CPPFLAGS" ! AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) ! AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ ! am_cv_func_iconv="no, consider installing GNU libiconv" ! am_cv_lib_iconv=no ! AC_TRY_LINK([#include ! #include ], ! [iconv_t cd = iconv_open("",""); ! iconv(cd,NULL,NULL,NULL,NULL); ! iconv_close(cd);], ! am_cv_func_iconv=yes) ! if test "$am_cv_func_iconv" != yes; then ! am_save_LIBS="$LIBS" ! LIBS="$LIBS $LIBICONV" ! AC_TRY_LINK([#include ! #include ], ! [iconv_t cd = iconv_open("",""); ! iconv(cd,NULL,NULL,NULL,NULL); ! iconv_close(cd);], ! am_cv_lib_iconv=yes ! am_cv_func_iconv=yes) ! LIBS="$am_save_LIBS" ! fi ]) - if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) - fi - if test "$am_cv_lib_iconv" = yes; then - AC_MSG_CHECKING([how to link with libiconv]) - AC_MSG_RESULT([$LIBICONV]) - else - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV - dnl either. - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) - ]) - - AC_DEFUN([AM_ICONV], - [ - AM_ICONV_LINK - if test "$am_cv_func_iconv" = yes; then - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_TRY_COMPILE([ - #include - #include - extern - #ifdef __cplusplus - "C" - #endif - #if defined(__STDC__) || defined(__cplusplus) - size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); - #else - size_t iconv(); - #endif - ], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, - [Define as const if the declaration of iconv() needs const.]) - fi - ]) - - # progtest.m4 serial 2 (gettext-0.10.40) - dnl Copyright (C) 1996-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. - dnl - dnl This file can can be used in projects which are not available under - dnl the GNU General Public License or the GNU Library General Public - dnl License but which still want to provide support for the GNU gettext - dnl functionality. - dnl Please note that the actual code of the GNU gettext library is covered - dnl by the GNU Library General Public License, and the rest of the GNU - dnl gettext package package is covered by the GNU General Public License. - dnl They are *not* in the public domain. - - dnl Authors: - dnl Ulrich Drepper , 1996. # Search path for a program which passes the given test. dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) --- 4735,4831 ---- dnl For backward compatibility. Some Makefiles may be using this. GENCAT=gencat AC_SUBST(GENCAT) ]) ! dnl Usage: Just like AM_WITH_NLS, which see. ! AC_DEFUN([AM_GNU_GETTEXT], ! [AC_REQUIRE([AC_PROG_MAKE_SET])dnl ! AC_REQUIRE([AC_PROG_CC])dnl ! AC_REQUIRE([AC_CANONICAL_HOST])dnl ! AC_REQUIRE([AC_PROG_RANLIB])dnl ! AC_REQUIRE([AC_ISC_POSIX])dnl ! AC_REQUIRE([AC_HEADER_STDC])dnl ! AC_REQUIRE([AC_C_CONST])dnl ! AC_REQUIRE([AC_C_INLINE])dnl ! AC_REQUIRE([AC_TYPE_OFF_T])dnl ! AC_REQUIRE([AC_TYPE_SIZE_T])dnl ! AC_REQUIRE([AC_FUNC_ALLOCA])dnl ! AC_REQUIRE([AC_FUNC_MMAP])dnl ! AC_REQUIRE([jm_GLIBC21])dnl ! AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h]) ! AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \ ! getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ ! strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) ! ! AM_ICONV ! AM_LANGINFO_CODESET ! AM_LC_MESSAGES ! AM_WITH_NLS([$1],[$2],[$3]) ! ! if test "x$CATOBJEXT" != "x"; then ! if test "x$ALL_LINGUAS" = "x"; then ! LINGUAS= ! else ! AC_MSG_CHECKING(for catalogs to be installed) ! NEW_LINGUAS= ! for presentlang in $ALL_LINGUAS; do ! useit=no ! for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do ! # Use the presentlang catalog if desiredlang is ! # a. equal to presentlang, or ! # b. a variant of presentlang (because in this case, ! # presentlang can be used as a fallback for messages ! # which are not translated in the desiredlang catalog). ! case "$desiredlang" in ! "$presentlang"*) useit=yes;; ! esac ! done ! if test $useit = yes; then ! NEW_LINGUAS="$NEW_LINGUAS $presentlang" ! fi ! done ! LINGUAS=$NEW_LINGUAS ! AC_MSG_RESULT($LINGUAS) ! fi ! ! dnl Construct list of names of catalog files to be constructed. ! if test -n "$LINGUAS"; then ! for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ! fi ! fi ! dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ! dnl find the mkinstalldirs script in another subdir but $(top_srcdir). ! dnl Try to locate is. ! MKINSTALLDIRS= ! if test -n "$ac_aux_dir"; then ! MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ! fi ! if test -z "$MKINSTALLDIRS"; then ! MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ! fi ! AC_SUBST(MKINSTALLDIRS) ! dnl Enable libtool support if the surrounding package wishes it. ! INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], []) ! AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) ]) # Search path for a program which passes the given test. + # Ulrich Drepper , 1996. + # + # This file can be copied and used freely without restrictions. It can + # be used in projects which are not available under the GNU General Public + # License or the GNU Library General Public License but which still want + # to provide support for the GNU gettext functionality. + # Please note that the actual code of the GNU gettext library is covered + # by the GNU Library General Public License, and the rest of the GNU + # gettext package package is covered by the GNU General Public License. + # They are *not* in the public domain. + + # serial 2 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) *************** *** 6031,6043 **** AC_SUBST($1)dnl ]) ! # glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) ! dnl Copyright (C) 2000-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. # Test for the GNU C Library, version 2.1 or newer. # From Bruno Haible. --- 4865,4871 ---- AC_SUBST($1)dnl ]) ! #serial 2 # Test for the GNU C Library, version 2.1 or newer. # From Bruno Haible. *************** *** 6064,6322 **** ] ) ! # intdiv0.m4 serial 1 (gettext-0.11.3) ! dnl Copyright (C) 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. dnl From Bruno Haible. ! AC_DEFUN([gt_INTDIV0], [ ! AC_REQUIRE([AC_PROG_CC])dnl ! AC_REQUIRE([AC_CANONICAL_HOST])dnl ! AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], ! gt_cv_int_divbyzero_sigfpe, ! [ ! AC_TRY_RUN([ ! #include ! #include ! static void #ifdef __cplusplus ! sigfpe_handler (int sig) ! #else ! sigfpe_handler (sig) int sig; ! #endif ! { ! /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ ! exit (sig != SIGFPE); ! } ! ! int x = 1; ! int y = 0; ! int z; ! int nan; ! ! int main () ! { ! signal (SIGFPE, sigfpe_handler); ! /* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ ! #if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) ! signal (SIGTRAP, sigfpe_handler); ! #endif ! /* Linux/SPARC yields signal SIGILL. */ ! #if defined (__sparc__) && defined (__linux__) ! signal (SIGILL, sigfpe_handler); #endif ! ! z = x / y; ! nan = y / y; ! exit (1); ! } ! ], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, ! [ ! # Guess based on the CPU. ! case "$host_cpu" in ! alpha* | i[34567]86 | m68k | s390*) ! gt_cv_int_divbyzero_sigfpe="guessing yes";; ! *) ! gt_cv_int_divbyzero_sigfpe="guessing no";; ! esac ! ]) ! ]) ! case "$gt_cv_int_divbyzero_sigfpe" in ! *yes) value=1;; ! *) value=0;; ! esac ! AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, ! [Define if integer division by zero raises signal SIGFPE.]) ! ]) ! ! # uintmax_t.m4 serial 6 (gettext-0.11) ! dnl Copyright (C) 1997-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. ! ! dnl From Paul Eggert. ! ! AC_PREREQ(2.13) ! ! # Define uintmax_t to `unsigned long' or `unsigned long long' ! # if does not exist. ! ! AC_DEFUN([jm_AC_TYPE_UINTMAX_T], ! [ ! AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) ! AC_REQUIRE([jm_AC_HEADER_STDINT_H]) ! if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then ! AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) ! test $ac_cv_type_unsigned_long_long = yes \ ! && ac_type='unsigned long long' \ ! || ac_type='unsigned long' ! AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, ! [Define to unsigned long or unsigned long long ! if and don't define.]) ! fi ! ]) ! ! # inttypes_h.m4 serial 4 (gettext-0.11.4) ! dnl Copyright (C) 1997-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. ! ! dnl From Paul Eggert. ! ! # Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, ! # doesn't clash with , and declares uintmax_t. ! ! AC_DEFUN([jm_AC_HEADER_INTTYPES_H], ! [ ! AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, ! [AC_TRY_COMPILE( ! [#include ! #include ], ! [uintmax_t i = (uintmax_t) -1;], ! jm_ac_cv_header_inttypes_h=yes, ! jm_ac_cv_header_inttypes_h=no)]) ! if test $jm_ac_cv_header_inttypes_h = yes; then ! AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, ! [Define if exists, doesn't clash with , ! and declares uintmax_t. ]) ! fi ! ]) ! ! # stdint_h.m4 serial 2 (gettext-0.11.4) ! dnl Copyright (C) 1997-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. ! ! dnl From Paul Eggert. ! ! # Define HAVE_STDINT_H_WITH_UINTMAX if exists, ! # doesn't clash with , and declares uintmax_t. ! ! AC_DEFUN([jm_AC_HEADER_STDINT_H], ! [ ! AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, ! [AC_TRY_COMPILE( ! [#include ! #include ], ! [uintmax_t i = (uintmax_t) -1;], ! jm_ac_cv_header_stdint_h=yes, ! jm_ac_cv_header_stdint_h=no)]) ! if test $jm_ac_cv_header_stdint_h = yes; then ! AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, ! [Define if exists, doesn't clash with , ! and declares uintmax_t. ]) ! fi ! ]) ! ! # ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40) ! dnl Copyright (C) 1999-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. ! ! dnl From Paul Eggert. ! ! AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], ! [ ! AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, ! [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;], ! [unsigned long long ullmax = (unsigned long long) -1; ! return ull << i | ull >> i | ullmax / ull | ullmax % ull;], ! ac_cv_type_unsigned_long_long=yes, ! ac_cv_type_unsigned_long_long=no)]) ! if test $ac_cv_type_unsigned_long_long = yes; then ! AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, ! [Define if you have the unsigned long long type.]) ! fi ! ]) ! ! # inttypes.m4 serial 1 (gettext-0.11.4) ! dnl Copyright (C) 1997-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. ! ! dnl From Paul Eggert. ! ! # Define HAVE_INTTYPES_H if exists and doesn't clash with ! # . ! ! AC_DEFUN([gt_HEADER_INTTYPES_H], ! [ ! AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, ! [ ! AC_TRY_COMPILE( ! [#include ! #include ], ! [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) ! ]) ! if test $gt_cv_header_inttypes_h = yes; then ! AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, ! [Define if exists and doesn't clash with .]) ! fi ! ]) ! ! # inttypes-pri.m4 serial 1 (gettext-0.11.4) ! dnl Copyright (C) 1997-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. ! ! dnl From Bruno Haible. ! ! # Define PRI_MACROS_BROKEN if exists and defines the PRI* ! # macros to non-string values. This is the case on AIX 4.3.3. ! ! AC_DEFUN([gt_INTTYPES_PRI], ! [ ! AC_REQUIRE([gt_HEADER_INTTYPES_H]) ! if test $gt_cv_header_inttypes_h = yes; then ! AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], ! gt_cv_inttypes_pri_broken, ! [ ! AC_TRY_COMPILE([#include ! #ifdef PRId32 ! char *p = PRId32; #endif ! ], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) ! ]) fi ! if test "$gt_cv_inttypes_pri_broken" = yes; then ! AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, ! [Define if exists and defines unusable PRI* macros.]) fi ]) ! # codeset.m4 serial AM1 (gettext-0.10.40) ! dnl Copyright (C) 2000-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. dnl From Bruno Haible. --- 4892,4968 ---- ] ) ! #serial AM2 dnl From Bruno Haible. ! AC_DEFUN([AM_ICONV], [ ! dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and ! dnl those with the standalone portable GNU libiconv installed). ! AC_ARG_WITH([libiconv-prefix], ! [ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [ ! for dir in `echo "$withval" | tr : ' '`; do ! if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi ! if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi ! done ! ]) ! AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ ! am_cv_func_iconv="no, consider installing GNU libiconv" ! am_cv_lib_iconv=no ! AC_TRY_LINK([#include ! #include ], ! [iconv_t cd = iconv_open("",""); ! iconv(cd,NULL,NULL,NULL,NULL); ! iconv_close(cd);], ! am_cv_func_iconv=yes) ! if test "$am_cv_func_iconv" != yes; then ! am_save_LIBS="$LIBS" ! LIBS="$LIBS -liconv" ! AC_TRY_LINK([#include ! #include ], ! [iconv_t cd = iconv_open("",""); ! iconv(cd,NULL,NULL,NULL,NULL); ! iconv_close(cd);], ! am_cv_lib_iconv=yes ! am_cv_func_iconv=yes) ! LIBS="$am_save_LIBS" ! fi ! ]) ! if test "$am_cv_func_iconv" = yes; then ! AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) ! AC_MSG_CHECKING([for iconv declaration]) ! AC_CACHE_VAL(am_cv_proto_iconv, [ ! AC_TRY_COMPILE([ ! #include ! #include ! extern #ifdef __cplusplus ! "C" #endif ! #if defined(__STDC__) || defined(__cplusplus) ! size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); ! #else ! size_t iconv(); #endif ! ], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") ! am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) ! am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` ! AC_MSG_RESULT([$]{ac_t:- ! }[$]am_cv_proto_iconv) ! AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, ! [Define as const if the declaration of iconv() needs const.]) fi ! LIBICONV= ! if test "$am_cv_lib_iconv" = yes; then ! LIBICONV="-liconv" fi + AC_SUBST(LIBICONV) ]) ! #serial AM1 dnl From Bruno Haible. *************** *** 6334,6369 **** fi ]) - # lcmessage.m4 serial 3 (gettext-0.11.3) - 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. - dnl - dnl This file can can be used in projects which are not available under - dnl the GNU General Public License or the GNU Library General Public - dnl License but which still want to provide support for the GNU gettext - dnl functionality. - dnl Please note that the actual code of the GNU gettext library is covered - dnl by the GNU Library General Public License, and the rest of the GNU - dnl gettext package package is covered by the GNU General Public License. - dnl They are *not* in the public domain. - - dnl Authors: - dnl Ulrich Drepper , 1995. - # Check whether LC_MESSAGES is available in . AC_DEFUN([AM_LC_MESSAGES], ! [ ! AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ! [AC_TRY_LINK([#include ], [return LC_MESSAGES], am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ! if test $am_cv_val_LC_MESSAGES = yes; then ! AC_DEFINE(HAVE_LC_MESSAGES, 1, ! [Define if your file defines LC_MESSAGES.]) ! fi ! ]) --- 4980,5007 ---- fi ]) # Check whether LC_MESSAGES is available in . + # Ulrich Drepper , 1995. + # + # This file can be copied and used freely without restrictions. It can + # be used in projects which are not available under the GNU General Public + # License or the GNU Library General Public License but which still want + # to provide support for the GNU gettext functionality. + # Please note that the actual code of the GNU gettext library is covered + # by the GNU Library General Public License, and the rest of the GNU + # gettext package package is covered by the GNU General Public License. + # They are *not* in the public domain. + + # serial 2 AC_DEFUN([AM_LC_MESSAGES], ! [if test $ac_cv_header_locale_h = yes; then ! AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ! [AC_TRY_LINK([#include ], [return LC_MESSAGES], am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ! if test $am_cv_val_LC_MESSAGES = yes; then ! AC_DEFINE(HAVE_LC_MESSAGES, 1, ! [Define if your file defines LC_MESSAGES.]) ! fi ! fi]) diff -crN ./scrollkeeper/buildtools/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/buildtools/Makefile.in *** ./scrollkeeper/buildtools/Makefile.in Thu Jan 23 07:11:57 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/buildtools/Makefile.in Tue Jan 6 22:54:19 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 15,92 **** @SET_MAKE@ # copyright (C) 2001 Sun Microsystems, Inc. - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 15,80 ---- @SET_MAKE@ # copyright (C) 2001 Sun Microsystems, Inc. srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 102,145 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ INCLUDES = \ -I$(top_srcdir)/libs \ --- 90,181 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ INCLUDES = \ -I$(top_srcdir)/libs \ *************** *** 149,157 **** --- 185,195 ---- LDADD = \ $(XML_LIBS) \ $(XSLT_LIBS) \ + $(INTLLIBS) \ $(top_builddir)/libs/libscrollkeeper.la + # ?? : Changed by BV : Added $(INTLLIBS) noinst_PROGRAMS = \ scrollkeeper-tree-separate *************** *** 174,187 **** $(top_builddir)/libs/libscrollkeeper.la scrollkeeper_tree_separate_LDFLAGS = - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/separate.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 212,220 ---- $(top_builddir)/libs/libscrollkeeper.la scrollkeeper_tree_separate_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 189,195 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(scrollkeeper_tree_separate_SOURCES) DIST_COMMON = Makefile.am Makefile.in SOURCES = $(scrollkeeper_tree_separate_SOURCES) --- 222,227 ---- *************** *** 200,206 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu buildtools/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 232,238 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps buildtools/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 220,248 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/separate.Po@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 252,265 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 257,262 **** --- 274,282 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 282,301 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__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) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 302,342 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 352,359 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 393,400 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 382,399 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstPROGRAMS distclean distclean-compile \ ! distclean-depend 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. --- 423,448 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstPROGRAMS ctags 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 pdf \ ! pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./scrollkeeper/cl/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/cl/Makefile.in *** ./scrollkeeper/cl/Makefile.in Thu Jan 23 07:11:57 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/cl/Makefile.in Tue Jan 6 22:54:20 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 15,92 **** @SET_MAKE@ # copyright (C) 2000 Sun Microsystems, Inc. - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 15,80 ---- @SET_MAKE@ # copyright (C) 2000 Sun Microsystems, Inc. srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 102,145 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ SUBDIRS = templates src --- 90,181 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ SUBDIRS = templates src *************** *** 148,159 **** mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = 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 --- 184,198 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-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 *************** *** 161,167 **** .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu cl/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 200,206 ---- .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps cl/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 229,238 **** --- 268,284 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 263,282 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__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) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 309,349 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 374,396 **** mostlyclean-am: mostlyclean-generic mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-local 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-local uninstall-recursive --- 441,473 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-info-am uninstall-local uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive ctags \ ! ctags-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 pdf pdf-am \ ! pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ! uninstall uninstall-am uninstall-info-am \ uninstall-info-recursive uninstall-local uninstall-recursive diff -crN ./scrollkeeper/cl/src/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/cl/src/Makefile.in *** ./scrollkeeper/cl/src/Makefile.in Thu Jan 23 07:11:58 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/cl/src/Makefile.in Tue Jan 6 22:54:20 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 15,92 **** @SET_MAKE@ # Process this file with automake to produce Makefile.in. - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 15,80 ---- @SET_MAKE@ # Process this file with automake to produce Makefile.in. srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 102,145 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ INCLUDES = \ -I$(top_srcdir)/libs \ --- 90,181 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ INCLUDES = \ -I$(top_srcdir)/libs \ *************** *** 150,158 **** --- 186,196 ---- LDADD = \ $(XML_LIBS) \ $(XSLT_LIBS) \ + $(INTLLIBS) \ $(top_builddir)/libs/libscrollkeeper.la + # ?? : Changed by BV : Added $(INTLLIBS) bin_PROGRAMS = scrollkeeper-preinstall scrollkeeper-update scrollkeeper-install scrollkeeper-uninstall scrollkeeper-get-cl scrollkeeper_preinstall_SOURCES = \ *************** *** 214,230 **** $(top_builddir)/libs/libscrollkeeper.la scrollkeeper_update_LDFLAGS = - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/get-cl.Po ./$(DEPDIR)/preinstall.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/scrollkeeper-install.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/scrollkeeper-uninstall.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/update.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 252,260 ---- $(top_builddir)/libs/libscrollkeeper.la scrollkeeper_update_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 232,238 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(scrollkeeper_get_cl_SOURCES) \ $(scrollkeeper_install_SOURCES) \ $(scrollkeeper_preinstall_SOURCES) \ --- 262,267 ---- *************** *** 247,253 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu cl/src/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) --- 276,282 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps cl/src/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) *************** *** 261,267 **** ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ done --- 290,296 ---- ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ else :; fi; \ done *************** *** 301,333 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get-cl.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preinstall.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrollkeeper-install.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrollkeeper-uninstall.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/update.Po@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 330,343 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 342,347 **** --- 352,360 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 367,386 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__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) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 380,420 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 437,444 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 471,478 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 467,485 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-binPROGRAMS uninstall-info-am ! .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ ! clean-generic clean-libtool distclean distclean-compile \ ! distclean-depend 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-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-binPROGRAMS 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. --- 501,527 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-binPROGRAMS uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ ! clean-generic clean-libtool ctags 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-info install-info-am install-man install-strip \ ! installcheck installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ! tags uninstall uninstall-am uninstall-binPROGRAMS \ ! uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./scrollkeeper/cl/templates/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/cl/templates/Makefile.in *** ./scrollkeeper/cl/templates/Makefile.in Thu Jan 23 07:11:58 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/cl/templates/Makefile.in Tue Jan 6 22:54:21 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 15,92 **** @SET_MAKE@ # copyright (C) 2000 Sun Microsystems, Inc. - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 15,80 ---- @SET_MAKE@ # copyright (C) 2000 Sun Microsystems, Inc. srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 102,154 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ EXTRA_DIST = scrollkeeper_cl.xml.in LIB_PATH = $(top_builddir)/libs/.libs ! TRANSLATED_LOCALES = C be ca cs da de el es fr hu it ja ko nb nl no pl pt_BR ro ru sk sl sv tr uk vi zh_CN zh_TW subdir = cl/templates mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = DIST_COMMON = Makefile.am Makefile.in all: all-am --- 90,192 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ EXTRA_DIST = scrollkeeper_cl.xml.in LIB_PATH = $(top_builddir)/libs/.libs ! TRANSLATED_LOCALES = C be ca cs da de el es fr hu it ja ko nl no pl pt_BR ro ru sk sl sv tr uk vi zh_CN zh_TW subdir = cl/templates mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = DIST_COMMON = Makefile.am Makefile.in all: all-am *************** *** 156,162 **** .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu cl/templates/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 194,200 ---- .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps cl/templates/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 172,184 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 210,231 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 262,267 **** --- 309,322 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-local .PHONY: all all-am check check-am clean clean-generic clean-libtool \ *************** *** 271,278 **** 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 \ ! uninstall-local @INTLTOOL_XML_RULE@ --- 326,333 ---- install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-info-am uninstall-local @INTLTOOL_XML_RULE@ *************** *** 288,296 **** install-data-local: for locale in $(TRANSLATED_LOCALES); do \ ! $(mkinstalldirs) $(DESTDIR)$(datadir)/scrollkeeper/Templates/$$locale; \ ! $(INSTALL_DATA) $(srcdir)/$$locale/scrollkeeper_cl.xml \ ! $(DESTDIR)$(datadir)/scrollkeeper/Templates/$$locale; \ done uninstall-local: --- 343,353 ---- install-data-local: for locale in $(TRANSLATED_LOCALES); do \ ! if [ -e $(srcdir)/$$locale/scrollkeeper_cl.xml ] ; then \ ! $(mkinstalldirs) $(DESTDIR)$(datadir)/scrollkeeper/Templates/$$locale; \ ! $(INSTALL_DATA) $(srcdir)/$$locale/scrollkeeper_cl.xml \ ! $(DESTDIR)$(datadir)/scrollkeeper/Templates/$$locale; \ ! fi ; \ done uninstall-local: diff -crN ./scrollkeeper/config.h.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/config.h.in *** ./scrollkeeper/config.h.in Thu Jan 23 07:11:34 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/config.h.in Tue Jan 6 22:53:48 2004 *************** *** 68,80 **** /* Define to 1 if you have the header file. */ #undef HAVE_ARGZ_H ! /* Define if the GNU dcgettext() function is already present or preinstalled. ! */ #undef HAVE_DCGETTEXT /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H /* Define to 1 if you have the `feof_unlocked' function. */ #undef HAVE_FEOF_UNLOCKED --- 68,82 ---- /* Define to 1 if you have the header file. */ #undef HAVE_ARGZ_H ! /* Define to 1 if you have the `dcgettext' function. */ #undef HAVE_DCGETTEXT /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H + /* Define to 1 if you have the `docbParseFile' function. */ + #undef HAVE_DOCBPARSEFILE + /* Define to 1 if you have the `feof_unlocked' function. */ #undef HAVE_FEOF_UNLOCKED *************** *** 84,92 **** /* Define to 1 if you have the `getcwd' function. */ #undef HAVE_GETCWD - /* Define to 1 if you have the `getc_unlocked' function. */ - #undef HAVE_GETC_UNLOCKED - /* Define to 1 if you have the `getegid' function. */ #undef HAVE_GETEGID --- 86,91 ---- *************** *** 111,129 **** /* Define if you have the iconv() function. */ #undef HAVE_ICONV ! /* Define if exists and doesn't clash with . */ #undef HAVE_INTTYPES_H - /* Define if exists, doesn't clash with , and - declares uintmax_t. */ - #undef HAVE_INTTYPES_H_WITH_UINTMAX - /* Define if you have and nl_langinfo(CODESET). */ #undef HAVE_LANGINFO_CODESET /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H --- 110,127 ---- /* Define if you have the iconv() function. */ #undef HAVE_ICONV ! /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H /* Define if you have and nl_langinfo(CODESET). */ #undef HAVE_LANGINFO_CODESET /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES + /* Define to 1 if you have the `xml2' library (-lxml2). */ + #undef HAVE_LIBXML2 + /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H *************** *** 163,172 **** /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H - /* Define if exists, doesn't clash with , and declares - uintmax_t. */ - #undef HAVE_STDINT_H_WITH_UINTMAX - /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H --- 161,166 ---- *************** *** 176,181 **** --- 170,178 ---- /* Define to 1 if you have the `strcasecmp' function. */ #undef HAVE_STRCASECMP + /* Define to 1 if you have the `strchr' function. */ + #undef HAVE_STRCHR + /* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP *************** *** 203,211 **** /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H - /* Define if you have the unsigned long long type. */ - #undef HAVE_UNSIGNED_LONG_LONG - /* Define to 1 if you have the `__argz_count' function. */ #undef HAVE___ARGZ_COUNT --- 200,205 ---- *************** *** 218,226 **** /* Define as const if the declaration of iconv() needs const. */ #undef ICONV_CONST - /* Define if integer division by zero raises signal SIGFPE. */ - #undef INTDIV0_RAISES_SIGFPE - /* Name of package */ #undef PACKAGE --- 212,217 ---- *************** *** 239,247 **** /* Define to the version of this package. */ #undef PACKAGE_VERSION - /* Define if exists and defines unusable PRI* macros. */ - #undef PRI_MACROS_BROKEN - /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at run-time. --- 230,235 ---- *************** *** 269,278 **** /* Define to `unsigned' if does not define. */ #undef size_t - /* Define to unsigned long or unsigned long long if and - don't define. */ - #undef uintmax_t - /* We don't test for the basename function but still want to use the version in the libc when compiling for a system using glibc. */ #ifdef __GNU_LIBRARY__ --- 257,262 ---- diff -crN ./scrollkeeper/config/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/config/Makefile.in *** ./scrollkeeper/config/Makefile.in Thu Jan 23 07:11:59 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/config/Makefile.in Tue Jan 6 22:54:22 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 15,92 **** @SET_MAKE@ # copyright (C) 2001 Sun Microsystems, Inc. and Dan Mueth - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 15,80 ---- @SET_MAKE@ # copyright (C) 2001 Sun Microsystems, Inc. and Dan Mueth srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 102,145 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ pkgconfigdir = $(sysconfdir) --- 90,181 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ pkgconfigdir = $(sysconfdir) *************** *** 150,155 **** --- 186,193 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = scrollkeeper.conf + depcomp = + am__depfiles_maybe = DIST_SOURCES = DATA = $(pkgconfig_DATA) *************** *** 159,165 **** .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu config/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) scrollkeeper.conf: $(top_builddir)/config.status scrollkeeper.conf.in --- 197,203 ---- .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps config/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) scrollkeeper.conf: $(top_builddir)/config.status scrollkeeper.conf.in *************** *** 195,207 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 233,254 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 286,291 **** --- 333,346 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-pkgconfigDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ *************** *** 295,302 **** install-info-am install-man install-pkgconfigDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ ! uninstall-pkgconfigDATA # 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. --- 350,357 ---- install-info-am install-man install-pkgconfigDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-info-am uninstall-pkgconfigDATA # 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 ./scrollkeeper/configure /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/configure *** ./scrollkeeper/configure Thu Jan 23 07:12:13 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/configure Tue Jan 6 22:54:37 2004 *************** *** 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. ## ## --------------------- ## --- 1,11 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.54. # # 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. ## ## --------------------- ## *************** *** 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 --- 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 *************** *** 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\(/\)$' \| \ --- 28,66 ---- 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_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES 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\(/\)$' \| \ *************** *** 231,236 **** --- 71,77 ---- /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` + # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' *************** *** 244,250 **** 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=: --- 85,91 ---- echo "#! /bin/sh" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh ! if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: *************** *** 297,302 **** --- 138,145 ---- 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+"$@"} *************** *** 369,374 **** --- 212,223 ---- 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. *************** *** 385,436 **** IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } ! # Name of the host. ! # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ! # so uname gets run too. ! ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - exec 6>&1 ! # ! # Initializations. ! # ! ac_default_prefix=/usr/local ! cross_compiling=no ! subdirs= ! MFLAGS= ! MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} ! # Maximum number of lines to put in a shell here document. ! # This variable seems obsolete. It should probably be removed, and ! # only ac_max_sed_lines should be used. ! : ${ac_max_here_lines=38} ! # Identity of this package. ! PACKAGE_NAME= ! PACKAGE_TARNAME= ! PACKAGE_VERSION= ! PACKAGE_STRING= ! PACKAGE_BUGREPORT= ! ac_unique_file="libs/error.c" ! # Factoring default headers for most tests. ! ac_includes_default="\ ! #include ! #if HAVE_SYS_TYPES_H ! # include ! #endif ! #if HAVE_SYS_STAT_H ! # include ! #endif ! #if STDC_HEADERS ! # include ! # include ! #else # if HAVE_STDLIB_H # include # endif --- 234,445 ---- 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. ! # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ! # so uname gets run too. ! ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` ! ! exec 6>&1 ! ! # ! # Initializations. ! # ! ac_default_prefix=/usr/local ! ac_config_libobj_dir=. ! cross_compiling=no ! subdirs= ! MFLAGS= ! MAKEFLAGS= ! SHELL=${CONFIG_SHELL-/bin/sh} ! ! # Maximum number of lines to put in a shell here document. ! # This variable seems obsolete. It should probably be removed, and ! # only ac_max_sed_lines should be used. ! : ${ac_max_here_lines=38} ! ! # Identity of this package. ! PACKAGE_NAME= ! PACKAGE_TARNAME= ! PACKAGE_VERSION= ! PACKAGE_STRING= ! PACKAGE_BUGREPORT= ! ! ac_unique_file="libs/error.c" ! # Factoring default headers for most tests. ! ac_includes_default="\ ! #include ! #if HAVE_SYS_TYPES_H ! # include ! #endif ! #if HAVE_SYS_STAT_H ! # include ! #endif ! #if STDC_HEADERS ! # include ! # include ! #else # if HAVE_STDLIB_H # include # endif *************** *** 455,460 **** --- 464,471 ---- # 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 AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE ECHO RANLIB ac_ct_RANLIB LIBTOOL EXPANDED_LOCALSTATEDIR ALLOCA OMFDIRS INTLTOOL INTLTOOL_REQUIRED 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_XAM_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL XML_CONFIG XML_LIBS XML_CFLAGS LIBXML2_REQUIRED XSLT_CONFIG XSLT_LIBS XSLT_CFLAGS GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX SCROLLKEEPER_PARTIAL_DB_DIR LIBOBJS LTLIBOBJS' + ac_subst_files='' # Initialize some variables set by options. ac_init_help= *************** *** 878,883 **** --- 889,897 ---- { (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 *************** *** 997,1003 **** --enable-static=PKGS build static libraries default=yes --enable-fast-install=PKGS optimize for fast installation default=yes --disable-libtool-lock avoid locking (might break parallel builds) - --disable-rpath do not hardcode runtime library paths --disable-nls do not use Native Language Support --enable-more-warnings Maximum compiler warnings --- 1011,1016 ---- *************** *** 1008,1017 **** --with-pic try to use only PIC/non-PIC objects default=use both --with-omfdirs colon-seperated paths to search for OMF files --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib - --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-included-gettext use the GNU gettext library included here - --with-libintl-prefix=DIR search for libintl in DIR/include and DIR/lib - --without-libintl-prefix don't search for libintl in includedir and libdir Some influential environment variables: CC C compiler command --- 1021,1027 ---- *************** *** 1061,1067 **** # 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` --- 1071,1077 ---- # 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` *************** *** 1101,1107 **** 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 $@ --- 1111,1117 ---- running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.54. Invocation command line was $ $0 $@ *************** *** 1167,1178 **** *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) 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 --- 1177,1185 ---- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac ! ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. + ac_sep=" " done # When interrupted or exit'd, cleanup temporary files, and complete *************** *** 1184,1189 **** --- 1191,1197 ---- # Save into config.log some information that might help in debugging. { echo + cat <<\_ASBOX ## ---------------- ## ## Cache variables. ## *************** *** 1206,1211 **** --- 1214,1248 ---- 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 ## ----------- ## *************** *** 1213,1219 **** ## ----------- ## _ASBOX echo ! sed "/^$/d" confdefs.h echo fi test "$ac_signal" != 0 && --- 1250,1256 ---- ## ----------- ## _ASBOX echo ! sed "/^$/d" confdefs.h | sort echo fi test "$ac_signal" != 0 && *************** *** 1373,1378 **** --- 1410,1416 ---- + 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. *************** *** 1617,1625 **** # 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 --- 1655,1661 ---- # 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 *************** *** 1752,1763 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 1788,1793 ---- *************** *** 1786,1796 **** # 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;; --- 1816,1825 ---- # 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 a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do ! test -f "$ac_file" || continue case $ac_file in ! *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; a.out ) # We found the default executable, but exeext='' is most # certainly right. break;; *************** *** 1804,1811 **** 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 --- 1833,1842 ---- else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! { { echo "$as_me:$LINENO: error: C compiler cannot create executables ! check \`config.log' for details." >&5 ! echo "$as_me: error: C compiler cannot create executables ! check \`config.log' for details." >&2;} { (exit 77); exit 77; }; } fi *************** *** 1862,1870 **** # 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;; --- 1893,1902 ---- # 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;; *************** *** 1893,1904 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 1925,1930 ---- *************** *** 1915,1921 **** (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 --- 1941,1947 ---- (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 *************** *** 1943,1954 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 1969,1974 ---- *************** *** 1997,2008 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 2017,2022 ---- *************** *** 2048,2063 **** CFLAGS= fi fi ! # 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 ! # the declaration of exit, since it's the most demanding environment. cat >conftest.$ac_ext <<_ACEOF ! #ifndef __cplusplus ! choke me ! #endif _ACEOF ! rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? --- 2062,2124 ---- 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" ! #include "confdefs.h" ! #include ! #include ! #include ! #include ! /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ ! struct buf { int x; }; ! FILE * (*rcsopen) (struct buf *, struct stat *, int); ! static char *e (p, i) ! char **p; ! int i; ! { ! return p[i]; ! } ! static char *f (char * (*g) (char **, int), char **p, ...) ! { ! char *s; ! va_list v; ! va_start (v,p); ! s = g (p, va_arg (v,int)); ! va_end (v); ! return s; ! } ! int test (int i, double x); ! struct s1 {int (*f) (int a);}; ! struct s2 {int (*f) (double a);}; ! int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); ! int argc; ! char **argv; ! int ! main () ! { ! return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ! ; ! return 0; ! } _ACEOF ! # Don't try gcc -ansi; that turns off useful extensions and ! # breaks some systems' header files. ! # AIX -qlanglvl=ansi ! # Ultrix and OSF/1 -std1 ! # HP-UX 10.20 and later -Ae ! # HP-UX older versions -Aa -D_HPUX_SOURCE ! # SVR4 -Xc -D__EXTENSIONS__ ! for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ! do ! CC="$ac_save_CC $ac_arg" ! rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? *************** *** 2069,2076 **** ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! for ac_declaration in \ ! ''\ '#include ' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ --- 2130,2181 ---- 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 ! cat conftest.$ac_ext >&5 ! fi ! rm -f conftest.$ac_objext ! done ! rm -f conftest.$ac_ext conftest.$ac_objext ! CC=$ac_save_CC ! ! fi ! ! case "x$ac_cv_prog_cc_stdc" in ! x|xno) ! echo "$as_me:$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 ! # the declaration of exit, since it's the most demanding environment. ! cat >conftest.$ac_ext <<_ACEOF ! #ifndef __cplusplus ! choke me ! #endif ! _ACEOF ! rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! for ac_declaration in \ ! ''\ '#include ' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ *************** *** 2083,2094 **** #include "confdefs.h" #include $ac_declaration - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 2188,2193 ---- *************** *** 2120,2131 **** #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 () { --- 2219,2224 ---- *************** *** 2205,2211 **** 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 --- 2298,2304 ---- 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 *************** *** 2238,2244 **** 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 --- 2331,2337 ---- 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 *************** *** 2296,2302 **** 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 --- 2389,2395 ---- 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 *************** *** 2329,2335 **** 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 --- 2422,2428 ---- 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 *************** *** 2517,2522 **** --- 2610,2630 ---- + 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 *************** *** 2534,2540 **** 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 --- 2642,2648 ---- 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 *************** *** 2565,2571 **** _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no --- 2673,2679 ---- _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! $EGREP "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no *************** *** 2583,2589 **** _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no --- 2691,2697 ---- _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! $EGREP "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no *************** *** 2642,2648 **** ( 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 --- 2750,2756 ---- ( 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 *************** *** 2676,2687 **** /* 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 () { --- 2784,2789 ---- *************** *** 2803,2815 **** NONENONEs,x,x, && program_prefix=${target_alias}- ! # Add the stamp file to the list of files AC keeps track of, ! # along with our hook. ! ac_config_headers="$ac_config_headers config.h" ! ! ! am__api_version="1.6" echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case --- 2905,2913 ---- NONENONEs,x,x, && program_prefix=${target_alias}- ! ac_config_headers="$ac_config_headers config.h" ! am__api_version="1.7" echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case *************** *** 2893,2899 **** rmdir .deps 2>/dev/null ! ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} --- 2991,2997 ---- rmdir .deps 2>/dev/null ! ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} *************** *** 2914,2920 **** # 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 --- 3012,3018 ---- # 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 | grep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU *************** *** 2963,2968 **** --- 3061,3076 ---- { (exit 1); exit 1; }; } fi + # test whether we have cygpath + if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi + fi + + # Define the identity of the package. PACKAGE=scrollkeeper VERSION=0.3.12 *************** *** 3139,3145 **** 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 --- 3247,3253 ---- if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ ! $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/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 *************** *** 3160,3165 **** --- 3268,3285 ---- + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' + else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= + fi + + + # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" *************** *** 3368,3374 **** # 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" --- 3488,3510 ---- # 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" *************** *** 3490,3496 **** # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM --- 3626,3632 ---- # 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 *************** *** 3885,3891 **** 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 --- 4021,4027 ---- 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 *************** *** 4263,4269 **** case $host in *-*-irix6*) # Find out which ABI we are using. ! echo '#line 4266 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? --- 4399,4405 ---- case $host in *-*-irix6*) # Find out which ABI we are using. ! echo '#line 4402 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? *************** *** 4305,4316 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 4441,4446 ---- *************** *** 4639,4650 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 4769,4774 ---- *************** *** 4728,4739 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 4852,4857 ---- *************** *** 4799,4805 **** save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no ! if { (eval echo configure:4802: \"$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 --- 4917,4923 ---- save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no ! if { (eval echo configure:4920: \"$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 *************** *** 4843,4854 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 4961,4966 ---- *************** *** 4929,4940 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 5041,5046 ---- *************** *** 4994,4999 **** --- 5100,5106 ---- 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 *************** *** 5250,5272 **** 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 ! if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ! aix_use_runtimelinking=yes ! break ! fi ! done ! esac ! exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi # When large executables or shared objects are built, AIX ld can --- 5357,5369 ---- 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 *************** *** 5301,5315 **** 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 --- 5398,5404 ---- 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 *************** *** 5319,5326 **** # 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' --- 5408,5415 ---- # 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' *************** *** 5333,5339 **** 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 ;; --- 5422,5428 ---- 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 ;; *************** *** 5759,5780 **** 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 ;; --- 5848,5858 ---- 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 ;; *************** *** 6129,6135 **** ;; aix4*) ! if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi ;; --- 6207,6213 ---- ;; aix4*) ! if test "$host_cpu" != ia64 ; then test "$enable_shared" = yes && enable_static=no fi ;; *************** *** 6199,6210 **** char shl_load (); char (*f) (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 6277,6282 ---- *************** *** 6264,6275 **** /* 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 () { --- 6336,6341 ---- *************** *** 6324,6335 **** char dlopen (); char (*f) (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 6390,6395 ---- *************** *** 6389,6400 **** /* 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 () { --- 6449,6454 ---- *************** *** 6447,6458 **** /* 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 () { --- 6501,6506 ---- *************** *** 6505,6516 **** /* 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 () { --- 6553,6558 ---- *************** *** 6592,6598 **** 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 <&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" ! #include "confdefs.h" ! #include ! #include ! #include ! #include ! /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ ! struct buf { int x; }; ! FILE * (*rcsopen) (struct buf *, struct stat *, int); ! static char *e (p, i) ! char **p; ! int i; ! { ! return p[i]; ! } ! static char *f (char * (*g) (char **, int), char **p, ...) ! { ! char *s; ! va_list v; ! va_start (v,p); ! s = g (p, va_arg (v,int)); ! va_end (v); ! return s; ! } ! int test (int i, double x); ! struct s1 {int (*f) (int a);}; ! struct s2 {int (*f) (double a);}; ! int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); ! int argc; ! char **argv; ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif ! 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 ! cat conftest.$ac_ext >&5 fi ! rm -f conftest.$ac_objext ! done ! rm -f conftest.$ac_ext conftest.$ac_objext ! CC=$ac_save_CC - fi ! case "x$ac_cv_prog_cc_stdc" in ! x|xno) ! echo "$as_me:$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 echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 --- 7461,7481 ---- ! REAL_PREFIX= ! if test "x$prefix" = "xNONE"; then ! REAL_PREFIX=$ac_default_prefix else ! REAL_PREFIX=$prefix fi ! LOCALSTATEDIR_TMP="$localstatedir" ! old_prefix=$prefix ! prefix=$REAL_PREFIX ! EXPANDED_LOCALSTATEDIR=`eval echo $LOCALSTATEDIR_TMP` ! prefix=$old_prefix ! ALL_LINGUAS="az ca da de el es fr hu it ja ko nl no pl pt_BR ru sk sl sv tr uk vi zh_TW" echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 *************** *** 7523,7534 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 7486,7491 ---- *************** *** 7624,7631 **** #line $LINENO "configure" #include "confdefs.h" #ifndef __cplusplus ! static $ac_kw int static_foo () {return 0; } ! $ac_kw int foo () {return 0; } #endif _ACEOF --- 7581,7589 ---- #line $LINENO "configure" #include "confdefs.h" #ifndef __cplusplus ! typedef int foo_t; ! static $ac_kw foo_t static_foo () {return 0; } ! $ac_kw foo_t foo () {return 0; } #endif _ACEOF *************** *** 7674,7685 **** #line $LINENO "configure" #include "confdefs.h" $ac_includes_default - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 7632,7637 ---- *************** *** 7735,7746 **** #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 () { --- 7687,7692 ---- *************** *** 7808,7819 **** # endif #endif - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 7754,7759 ---- *************** *** 7880,7886 **** _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "webecray" >/dev/null 2>&1; then ac_cv_os_cray=yes else ac_cv_os_cray=no --- 7820,7826 ---- _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! $EGREP "webecray" >/dev/null 2>&1; then ac_cv_os_cray=yes else ac_cv_os_cray=no *************** *** 7913,7924 **** char $ac_func (); char (*f) (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 7853,7858 ---- *************** *** 8019,8025 **** ( exit $ac_status ) ac_cv_c_stack_direction=-1 fi ! rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 --- 7953,7959 ---- ( exit $ac_status ) ac_cv_c_stack_direction=-1 fi ! rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 *************** *** 8088,8094 **** 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 --- 8022,8028 ---- 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 *************** *** 8171,8182 **** char $ac_func (); char (*f) (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 8105,8110 ---- *************** *** 8380,8386 **** ( exit $ac_status ) ac_cv_func_mmap_fixed_mapped=no fi ! rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 --- 8308,8314 ---- ( exit $ac_status ) ac_cv_func_mmap_fixed_mapped=no fi ! rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 *************** *** 8421,8432 **** char $ac_func (); char (*f) (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 8349,8354 ---- *************** *** 8573,8590 **** fi fi ! INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -k -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -p' ! INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -s -u -c $(top_builddir)/po/.intltool-merge-cache' --- 8495,8518 ---- fi fi ! INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -k -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -p' ! INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -s -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! ! ! *************** *** 8669,8675 **** # 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" --- 8597,8603 ---- # 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" *************** *** 8734,8775 **** XML_CFLAGS=`$XML_CONFIG --cflags` ! LIBXML2_REQUIRED=2.4.19 ! ! ! # Extract the first word of "xslt-config", so it can be a program name with args. ! set dummy xslt-config; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_path_XSLT_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! case $XSLT_CONFIG in ! [\\/]* | ?:[\\/]*) ! ac_cv_path_XSLT_CONFIG="$XSLT_CONFIG" # Let the user override the test with a path. ! ;; ! *) ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_path_XSLT_CONFIG="$as_dir/$ac_word$ac_exec_ext" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done ! done ! ! test -z "$ac_cv_path_XSLT_CONFIG" && ac_cv_path_XSLT_CONFIG="no" ! ;; ! esac ! fi ! XSLT_CONFIG=$ac_cv_path_XSLT_CONFIG ! if test -n "$XSLT_CONFIG"; then echo "$as_me:$LINENO: result: $XSLT_CONFIG" >&5 echo "${ECHO_T}$XSLT_CONFIG" >&6 else --- 8662,8834 ---- XML_CFLAGS=`$XML_CONFIG --cflags` ! echo "$as_me:$LINENO: checking for docbParseFile in -lxml2" >&5 ! echo $ECHO_N "checking for docbParseFile in -lxml2... $ECHO_C" >&6 ! if test "${ac_cv_lib_xml2_docbParseFile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! ac_check_lib_save_LIBS=$LIBS ! LIBS="-lxml2 $LIBS" ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! #include "confdefs.h" ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" ! #endif ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char docbParseFile (); ! int ! main () ! { ! docbParseFile (); ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! ac_cv_lib_xml2_docbParseFile=yes ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! ac_cv_lib_xml2_docbParseFile=no ! fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! LIBS=$ac_check_lib_save_LIBS ! fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_docbParseFile" >&5 ! echo "${ECHO_T}$ac_cv_lib_xml2_docbParseFile" >&6 ! if test $ac_cv_lib_xml2_docbParseFile = yes; then ! cat >>confdefs.h <<_ACEOF ! #define HAVE_LIBXML2 1 ! _ACEOF ! ! LIBS="-lxml2 $LIBS" ! ! fi ! ! ! for ac_func in docbParseFile ! do ! as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ! echo "$as_me:$LINENO: checking for $ac_func" >&5 ! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ! if eval "test \"\${$as_ac_var+set}\" = set"; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! #include "confdefs.h" ! /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" ! #endif ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char $ac_func (); ! char (*f) (); ! ! int ! main () ! { ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_$ac_func) || defined (__stub___$ac_func) ! choke me ! #else ! f = $ac_func; ! #endif ! ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! eval "$as_ac_var=yes" ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! eval "$as_ac_var=no" ! fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! fi ! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ! if test `eval echo '${'$as_ac_var'}'` = yes; then ! cat >>confdefs.h <<_ACEOF ! #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ! _ACEOF ! ! fi ! done ! ! ! ! ! LIBXML2_REQUIRED=2.4.19 ! ! ! # Extract the first word of "xslt-config", so it can be a program name with args. ! set dummy xslt-config; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_path_XSLT_CONFIG+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! case $XSLT_CONFIG in ! [\\/]* | ?:[\\/]*) ! ac_cv_path_XSLT_CONFIG="$XSLT_CONFIG" # Let the user override the test with a path. ! ;; ! *) ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_path_XSLT_CONFIG="$as_dir/$ac_word$ac_exec_ext" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done ! done ! ! test -z "$ac_cv_path_XSLT_CONFIG" && ac_cv_path_XSLT_CONFIG="no" ! ;; ! esac ! fi ! XSLT_CONFIG=$ac_cv_path_XSLT_CONFIG ! ! if test -n "$XSLT_CONFIG"; then echo "$as_me:$LINENO: result: $XSLT_CONFIG" >&5 echo "${ECHO_T}$XSLT_CONFIG" >&6 else *************** *** 8789,8801 **** case "$host_os" in solaris*) - HOST_TYPE=-DSOLARIS - ;; *) echo "$as_me:$LINENO: checking for docbook-dtd412-xml" >&5 echo $ECHO_N "checking for docbook-dtd412-xml... $ECHO_C" >&6 ! if xmlcatalog /etc/xml/catalog "-//OASIS//DTD DocBook XML V4.1.2//EN" | grep "No entry" >/dev/null ; then echo "* ERROR * " echo " " echo "Couldn't find the DocBook XML V4.1.2 DTD. Please make sure that you have the docbook-dtd412-xml package installed. If it is installed, the package probably did not register the DTD in the catalog properly. Consult http://scrollkeeper.sourceforge.net/docbook.shtml for more information." --- 8848,8862 ---- case "$host_os" in solaris*) ;; *) echo "$as_me:$LINENO: checking for docbook-dtd412-xml" >&5 echo $ECHO_N "checking for docbook-dtd412-xml... $ECHO_C" >&6 ! if test x$XML_CATALOG_FILES = x; then ! XML_CATALOG_FILES=/etc/xml/catalog ! fi ! ! if xmlcatalog $XML_CATALOG_FILES "-//OASIS//DTD DocBook XML V4.1.2//EN" | grep "No entry" >/dev/null ; then echo "* ERROR * " echo " " echo "Couldn't find the DocBook XML V4.1.2 DTD. Please make sure that you have the docbook-dtd412-xml package installed. If it is installed, the package probably did not register the DTD in the catalog properly. Consult http://scrollkeeper.sourceforge.net/docbook.shtml for more information." *************** *** 8809,9103 **** ;; esac ! ! MKINSTALLDIRS= ! if test -n "$ac_aux_dir"; then ! MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ! fi ! if test -z "$MKINSTALLDIRS"; then ! MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ! fi ! ! ! ! ! ! # Extract the first word of "msgfmt", so it can be a program name with args. ! set dummy msgfmt; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! case "$MSGFMT" in ! /*) ! ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && ! (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then ! ac_cv_path_MSGFMT="$ac_dir/$ac_word" ! break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" ! ;; ! esac fi ! MSGFMT="$ac_cv_path_MSGFMT" ! if test "$MSGFMT" != ":"; then ! echo "$as_me:$LINENO: result: $MSGFMT" >&5 ! echo "${ECHO_T}$MSGFMT" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi ! # Extract the first word of "gmsgfmt", so it can be a program name with args. ! set dummy gmsgfmt; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! case $GMSGFMT in ! [\\/]* | ?:[\\/]*) ! ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ! ;; ! *) ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done ! test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ! ;; ! esac fi ! GMSGFMT=$ac_cv_path_GMSGFMT ! ! if test -n "$GMSGFMT"; then ! echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ! echo "${ECHO_T}$GMSGFMT" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi ! # Extract the first word of "xgettext", so it can be a program name with args. ! set dummy xgettext; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_path_XGETTEXT+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! case "$XGETTEXT" in ! /*) ! ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && ! (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then ! ac_cv_path_XGETTEXT="$ac_dir/$ac_word" ! break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" ! ;; ! esac ! fi ! XGETTEXT="$ac_cv_path_XGETTEXT" ! if test "$XGETTEXT" != ":"; then ! echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ! echo "${ECHO_T}$XGETTEXT" >&6 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! fi ! ! rm -f messages.po ! ! # Extract the first word of "msgmerge", so it can be a program name with args. ! set dummy msgmerge; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_path_MSGMERGE+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! case "$MSGMERGE" in ! /*) ! ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then ! ac_cv_path_MSGMERGE="$ac_dir/$ac_word" ! break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" ! ;; ! esac ! fi ! MSGMERGE="$ac_cv_path_MSGMERGE" ! if test "$MSGMERGE" != ":"; then ! echo "$as_me:$LINENO: result: $MSGMERGE" >&5 ! echo "${ECHO_T}$MSGMERGE" >&6 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! fi ! ! ! if test "$GMSGFMT" != ":"; then ! if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && ! (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then ! : ; ! else ! GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` ! echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5 ! echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6 ! GMSGFMT=":" ! fi ! fi ! ! if test "$XGETTEXT" != ":"; then ! if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && ! (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then ! : ; ! else ! echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 ! echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 ! XGETTEXT=":" ! fi ! rm -f messages.po ! fi ! ! ac_config_commands="$ac_config_commands default-2" ! ! ! if test -n "$ac_tool_prefix"; then ! # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. ! set dummy ${ac_tool_prefix}ranlib; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_prog_RANLIB+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! if test -n "$RANLIB"; then ! ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. ! else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done ! done ! ! fi ! fi ! RANLIB=$ac_cv_prog_RANLIB ! if test -n "$RANLIB"; then ! echo "$as_me:$LINENO: result: $RANLIB" >&5 ! echo "${ECHO_T}$RANLIB" >&6 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! fi ! ! fi ! if test -z "$ac_cv_prog_RANLIB"; then ! ac_ct_RANLIB=$RANLIB ! # Extract the first word of "ranlib", so it can be a program name with args. ! set dummy ranlib; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! if test -n "$ac_ct_RANLIB"; then ! ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. ! else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_ac_ct_RANLIB="ranlib" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done ! done ! ! test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" ! fi ! fi ! ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB ! if test -n "$ac_ct_RANLIB"; then ! echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ! echo "${ECHO_T}$ac_ct_RANLIB" >&6 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! fi ! ! RANLIB=$ac_ct_RANLIB ! else ! RANLIB="$ac_cv_prog_RANLIB" ! fi ! ! echo "$as_me:$LINENO: checking for off_t" >&5 ! echo $ECHO_N "checking for off_t... $ECHO_C" >&6 ! if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" $ac_includes_default - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 8870,8964 ---- ;; esac ! if test -n "$ac_tool_prefix"; then ! # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. ! set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! if test -n "$RANLIB"; then ! ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. ! else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done ! done ! fi ! fi ! RANLIB=$ac_cv_prog_RANLIB ! if test -n "$RANLIB"; then ! echo "$as_me:$LINENO: result: $RANLIB" >&5 ! echo "${ECHO_T}$RANLIB" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi ! fi ! if test -z "$ac_cv_prog_RANLIB"; then ! ac_ct_RANLIB=$RANLIB ! # Extract the first word of "ranlib", so it can be a program name with args. ! set dummy ranlib; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! if test -n "$ac_ct_RANLIB"; then ! ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. ! else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done ! test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi ! fi ! ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB ! if test -n "$ac_ct_RANLIB"; then ! echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ! echo "${ECHO_T}$ac_ct_RANLIB" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi + RANLIB=$ac_ct_RANLIB + else + RANLIB="$ac_cv_prog_RANLIB" + fi ! echo "$as_me:$LINENO: checking for off_t" >&5 ! echo $ECHO_N "checking for off_t... $ECHO_C" >&6 ! if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" $ac_includes_default int main () { *************** *** 9160,9166 **** _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "Lucky GNU user" >/dev/null 2>&1; then ac_cv_gnu_library_2_1=yes else ac_cv_gnu_library_2_1=no --- 9021,9027 ---- _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! $EGREP "Lucky GNU user" >/dev/null 2>&1; then ac_cv_gnu_library_2_1=yes else ac_cv_gnu_library_2_1=no *************** *** 9178,9300 **** - echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5 - echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6 - if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - if test "$cross_compiling" = yes; then - - # Guess based on the CPU. - case "$host_cpu" in - alpha* | i3456786 | m68k | s390*) - gt_cv_int_divbyzero_sigfpe="guessing yes";; - *) - gt_cv_int_divbyzero_sigfpe="guessing no";; - esac - - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" - - #include - #include - - static void - #ifdef __cplusplus - sigfpe_handler (int sig) - #else - sigfpe_handler (sig) int sig; - #endif - { - /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ - exit (sig != SIGFPE); - } - int x = 1; - int y = 0; - int z; - int nan; - int main () - { - signal (SIGFPE, sigfpe_handler); - /* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ - #if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) - signal (SIGTRAP, sigfpe_handler); - #endif - /* Linux/SPARC yields signal SIGILL. */ - #if defined (__sparc__) && defined (__linux__) - signal (SIGILL, sigfpe_handler); - #endif - z = x / y; - nan = y / y; - exit (1); - } - _ACEOF - rm -f conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - gt_cv_int_divbyzero_sigfpe=yes - 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 ) - gt_cv_int_divbyzero_sigfpe=no - fi - rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi - echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5 - echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6 - case "$gt_cv_int_divbyzero_sigfpe" in - *yes) value=1;; - *) value=0;; - esac - cat >>confdefs.h <<_ACEOF - #define INTDIV0_RAISES_SIGFPE $value - _ACEOF ! echo "$as_me:$LINENO: checking for inttypes.h" >&5 ! echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6 ! if test "${jm_ac_cv_header_inttypes_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! #include ! #include ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif ! int ! main () ! { ! uintmax_t i = (uintmax_t) -1; ! ; ! return 0; ! } _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 --- 9039,9074 ---- ! for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ ! stdlib.h string.h unistd.h sys/param.h ! do ! as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ! if eval "test \"\${$as_ac_Header+set}\" = set"; then ! echo "$as_me:$LINENO: checking for $ac_header" >&5 ! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ! if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 + fi + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else ! # Is the header compilable? ! echo "$as_me:$LINENO: checking $ac_header usability" >&5 ! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! $ac_includes_default ! #include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 *************** *** 9308,9407 **** ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! jm_ac_cv_header_inttypes_h=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! jm_ac_cv_header_inttypes_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext ! fi ! echo "$as_me:$LINENO: result: $jm_ac_cv_header_inttypes_h" >&5 ! echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6 ! if test $jm_ac_cv_header_inttypes_h = yes; then ! ! cat >>confdefs.h <<_ACEOF ! #define HAVE_INTTYPES_H_WITH_UINTMAX 1 ! _ACEOF ! ! fi ! ! echo "$as_me:$LINENO: checking for stdint.h" >&5 ! echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6 ! if test "${jm_ac_cv_header_stdint_h+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! #include ! #include ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif ! int ! main () ! { ! uintmax_t i = (uintmax_t) -1; ! ; ! 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 ! jm_ac_cv_header_stdint_h=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! jm_ac_cv_header_stdint_h=no fi ! rm -f conftest.$ac_objext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: $jm_ac_cv_header_stdint_h" >&5 ! echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6 ! if test $jm_ac_cv_header_stdint_h = yes; then ! cat >>confdefs.h <<_ACEOF ! #define HAVE_STDINT_H_WITH_UINTMAX 1 _ACEOF ! fi ! echo "$as_me:$LINENO: checking for unsigned long long" >&5 ! echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6 ! if test "${ac_cv_type_unsigned_long_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! unsigned long long ull = 1; int i = 63; ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } #endif int main () { ! unsigned long long ullmax = (unsigned long long) -1; ! return ull << i | ull >> i | ullmax / ull | ullmax % ull; ; return 0; } --- 9082,9225 ---- ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext ! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ! echo "${ECHO_T}$ac_header_compiler" >&6 ! # Is the header present? ! echo "$as_me:$LINENO: checking $ac_header presence" >&5 ! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! #include <$ac_header> _ACEOF ! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ! (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } >/dev/null; then ! if test -s conftest.err; then ! ac_cpp_err=$ac_c_preproc_warn_flag ! else ! ac_cpp_err= ! fi ! else ! ac_cpp_err=yes ! fi ! if test -z "$ac_cpp_err"; then ! ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! ac_header_preproc=no fi ! rm -f conftest.err conftest.$ac_ext ! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ! echo "${ECHO_T}$ac_header_preproc" >&6 ! ! # So? What about this header? ! case $ac_header_compiler:$ac_header_preproc in ! yes:no ) ! { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ! echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ! { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; ! no:yes ) ! { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ! echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ! { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ! echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ! { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; ! esac ! echo "$as_me:$LINENO: checking for $ac_header" >&5 ! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ! if eval "test \"\${$as_ac_Header+set}\" = set"; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! eval "$as_ac_Header=$ac_header_preproc" fi ! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ! fi ! if test `eval echo '${'$as_ac_Header'}'` = yes; then ! cat >>confdefs.h <<_ACEOF ! #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF ! fi ! ! done ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ ! getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ ! strdup strtoul tsearch __argz_count __argz_stringify __argz_next ! do ! as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ! echo "$as_me:$LINENO: checking for $ac_func" >&5 ! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ! if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char $ac_func (); + char (*f) (); + 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; } *************** *** 9418,9536 **** ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_type_unsigned_long_long=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_type_unsigned_long_long=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5 ! echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6 ! if test $ac_cv_type_unsigned_long_long = yes; then ! ! cat >>confdefs.h <<\_ACEOF ! #define HAVE_UNSIGNED_LONG_LONG 1 _ACEOF ! fi ! - if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then - test $ac_cv_type_unsigned_long_long = yes \ - && ac_type='unsigned long long' \ - || ac_type='unsigned long' ! cat >>confdefs.h <<_ACEOF ! #define uintmax_t $ac_type ! _ACEOF ! fi ! echo "$as_me:$LINENO: checking for inttypes.h" >&5 ! echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6 ! if test "${gt_cv_header_inttypes_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! #include ! #include ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif 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 ! gt_cv_header_inttypes_h=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - gt_cv_header_inttypes_h=no fi ! rm -f conftest.$ac_objext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5 ! echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6 ! if test $gt_cv_header_inttypes_h = yes; then ! cat >>confdefs.h <<_ACEOF ! #define HAVE_INTTYPES_H 1 _ACEOF ! fi ! ! ! ! if test $gt_cv_header_inttypes_h = yes; then ! echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5 ! echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6 ! if test "${gt_cv_inttypes_pri_broken+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" - #include - #ifdef PRId32 - char *p = PRId32; - #endif ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } #endif int main () { --- 9236,9386 ---- ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ! if test `eval echo '${'$as_ac_var'}'` = yes; then ! cat >>confdefs.h <<_ACEOF ! #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF ! fi ! done ! # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. ! if test "${with_libiconv_prefix+set}" = set; then ! withval="$with_libiconv_prefix" ! for dir in `echo "$withval" | tr : ' '`; do ! if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi ! if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi ! done + fi; ! echo "$as_me:$LINENO: checking for iconv" >&5 ! echo $ECHO_N "checking for iconv... $ECHO_C" >&6 ! if test "${am_cv_func_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! #include ! #include int main () { ! iconv_t cd = iconv_open("",""); ! iconv(cd,NULL,NULL,NULL,NULL); ! iconv_close(cd); ; return 0; } _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! am_cv_func_iconv=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 ! if test "$am_cv_func_iconv" != yes; then ! am_save_LIBS="$LIBS" ! LIBS="$LIBS -liconv" ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! #include "confdefs.h" ! #include ! #include ! int ! main () ! { ! iconv_t cd = iconv_open("",""); ! iconv(cd,NULL,NULL,NULL,NULL); ! iconv_close(cd); ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! am_cv_lib_iconv=yes ! am_cv_func_iconv=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 ! LIBS="$am_save_LIBS" ! fi fi ! echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 ! echo "${ECHO_T}$am_cv_func_iconv" >&6 ! if test "$am_cv_func_iconv" = yes; then ! cat >>confdefs.h <<\_ACEOF ! #define HAVE_ICONV 1 _ACEOF ! echo "$as_me:$LINENO: checking for iconv declaration" >&5 ! echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6 ! if test "${am_cv_proto_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! #include ! #include ! extern ! #ifdef __cplusplus ! "C" ! #endif ! #if defined(__STDC__) || defined(__cplusplus) ! size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); ! #else ! size_t iconv(); #endif + int main () { *************** *** 9551,10141 **** ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! gt_cv_inttypes_pri_broken=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! gt_cv_inttypes_pri_broken=yes fi rm -f conftest.$ac_objext conftest.$ac_ext ! fi ! echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5 ! echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6 ! fi ! if test "$gt_cv_inttypes_pri_broken" = yes; then cat >>confdefs.h <<_ACEOF ! #define PRI_MACROS_BROKEN 1 _ACEOF fi ! ! ! if test "X$prefix" = "XNONE"; then ! acl_final_prefix="$ac_default_prefix" ! else ! acl_final_prefix="$prefix" ! fi ! if test "X$exec_prefix" = "XNONE"; then ! acl_final_exec_prefix='${prefix}' ! else ! acl_final_exec_prefix="$exec_prefix" fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" ! # Check whether --with-gnu-ld or --without-gnu-ld was given. ! if test "${with_gnu_ld+set}" = set; then ! withval="$with_gnu_ld" ! test "$withval" = no || with_gnu_ld=yes else ! with_gnu_ld=no ! fi; ! ac_prog=ld ! if test "$GCC" = yes; then ! # Check if gcc -print-prog-name=ld gives a path. ! echo "$as_me:$LINENO: checking for ld used by GCC" >&5 ! echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ! case $host in ! *-*-mingw*) ! # gcc leaves a trailing carriage return which upsets mingw ! ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ! *) ! ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ! esac ! case $ac_prog in ! # Accept absolute paths. ! [\\/]* | [A-Za-z]:[\\/]*) ! re_direlt='/[^/][^/]*/\.\./' ! # Canonicalize the path of ld ! ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` ! while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ! ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` ! done ! test -z "$LD" && LD="$ac_prog" ! ;; ! "") ! # If it fails, then pretend we aren't using GCC. ! ac_prog=ld ! ;; ! *) ! # If it is relative, then search for the first ld in PATH. ! with_gnu_ld=unknown ! ;; ! esac ! elif test "$with_gnu_ld" = yes; then ! echo "$as_me:$LINENO: checking for GNU ld" >&5 ! echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 ! else ! echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ! echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 ! fi ! if test "${acl_cv_path_LD+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! if test -z "$LD"; then ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ! acl_cv_path_LD="$ac_dir/$ac_prog" ! # Check to see if the program is GNU ld. I'd rather use --version, ! # but apparently some GNU ld's only accept -v. ! # Break only if it was the GNU/non-GNU ld that we prefer. ! if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then ! test "$with_gnu_ld" != no && break ! else ! test "$with_gnu_ld" != yes && break ! fi ! fi ! done ! IFS="$ac_save_ifs" else ! acl_cv_path_LD="$LD" # Let the user override the test with a path. ! fi fi - LD="$acl_cv_path_LD" - if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 - echo "${ECHO_T}$LD" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 fi ! test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 ! echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} ! { (exit 1); exit 1; }; } ! echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ! echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 ! if test "${acl_cv_prog_gnu_ld+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! # I'd rather use --version here, but apparently some GNU ld's only accept -v. ! if $LD -v 2>&1 &5; then ! acl_cv_prog_gnu_ld=yes ! else ! acl_cv_prog_gnu_ld=no ! fi ! fi ! echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 ! echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 ! with_gnu_ld=$acl_cv_prog_gnu_ld ! echo "$as_me:$LINENO: checking for shared library run path origin" >&5 ! echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6 ! if test "${acl_cv_rpath+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! ! CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ ! ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh ! . ./conftest.sh ! rm -f ./conftest.sh ! acl_cv_rpath=done ! ! fi ! echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 ! echo "${ECHO_T}$acl_cv_rpath" >&6 ! wl="$acl_cv_wl" ! libext="$acl_cv_libext" ! shlibext="$acl_cv_shlibext" ! hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" ! hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" ! hardcode_direct="$acl_cv_hardcode_direct" ! hardcode_minus_L="$acl_cv_hardcode_minus_L" ! sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec" ! sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec" ! # Check whether --enable-rpath or --disable-rpath was given. ! if test "${enable_rpath+set}" = set; then ! enableval="$enable_rpath" ! : else ! enable_rpath=yes ! fi; ! ! ! ! ! ! ! ! use_additional=yes ! ! acl_save_prefix="$prefix" ! prefix="$acl_final_prefix" ! acl_save_exec_prefix="$exec_prefix" ! exec_prefix="$acl_final_exec_prefix" ! ! eval additional_includedir=\"$includedir\" ! eval additional_libdir=\"$libdir\" ! ! exec_prefix="$acl_save_exec_prefix" ! prefix="$acl_save_prefix" ! ! ! # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. ! if test "${with_libiconv_prefix+set}" = set; then ! withval="$with_libiconv_prefix" ! ! if test "X$withval" = "Xno"; then ! use_additional=no ! else ! if test "X$withval" = "X"; then ! ! acl_save_prefix="$prefix" ! prefix="$acl_final_prefix" ! acl_save_exec_prefix="$exec_prefix" ! exec_prefix="$acl_final_exec_prefix" ! ! eval additional_includedir=\"$includedir\" ! eval additional_libdir=\"$libdir\" ! ! exec_prefix="$acl_save_exec_prefix" ! prefix="$acl_save_prefix" ! ! else ! additional_includedir="$withval/include" ! additional_libdir="$withval/lib" ! fi ! fi ! ! fi; ! LIBICONV= ! LTLIBICONV= ! INCICONV= ! rpathdirs= ! ltrpathdirs= ! names_already_handled= ! names_next_round='iconv ' ! while test -n "$names_next_round"; do ! names_this_round="$names_next_round" ! names_next_round= ! for name in $names_this_round; do ! already_handled= ! for n in $names_already_handled; do ! if test "$n" = "$name"; then ! already_handled=yes ! break ! fi ! done ! if test -z "$already_handled"; then ! names_already_handled="$names_already_handled $name" ! uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` ! eval value=\"\$HAVE_LIB$uppername\" ! if test -n "$value"; then ! if test "$value" = yes; then ! eval value=\"\$LIB$uppername\" ! test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value" ! eval value=\"\$LTLIB$uppername\" ! test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value" ! else ! : ! fi ! else ! found_dir= ! found_la= ! found_so= ! found_a= ! if test $use_additional = yes; then ! if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then ! found_dir="$additional_libdir" ! found_so="$additional_libdir/lib$name.$shlibext" ! if test -f "$additional_libdir/lib$name.la"; then ! found_la="$additional_libdir/lib$name.la" ! fi ! else ! if test -f "$additional_libdir/lib$name.$libext"; then ! found_dir="$additional_libdir" ! found_a="$additional_libdir/lib$name.$libext" ! if test -f "$additional_libdir/lib$name.la"; then ! found_la="$additional_libdir/lib$name.la" ! fi ! fi ! fi ! fi ! if test "X$found_dir" = "X"; then ! for x in $LDFLAGS $LTLIBICONV; do ! acl_save_prefix="$prefix" ! prefix="$acl_final_prefix" ! acl_save_exec_prefix="$exec_prefix" ! exec_prefix="$acl_final_exec_prefix" ! eval x=\"$x\" ! exec_prefix="$acl_save_exec_prefix" ! prefix="$acl_save_prefix" ! ! case "$x" in ! -L*) ! dir=`echo "X$x" | sed -e 's/^X-L//'` ! if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then ! found_dir="$dir" ! found_so="$dir/lib$name.$shlibext" ! if test -f "$dir/lib$name.la"; then ! found_la="$dir/lib$name.la" ! fi ! else ! if test -f "$dir/lib$name.$libext"; then ! found_dir="$dir" ! found_a="$dir/lib$name.$libext" ! if test -f "$dir/lib$name.la"; then ! found_la="$dir/lib$name.la" ! fi ! fi ! fi ! ;; ! esac ! if test "X$found_dir" != "X"; then ! break ! fi ! done ! fi ! if test "X$found_dir" != "X"; then ! LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" ! if test "X$found_so" != "X"; then ! if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then ! LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" ! else ! haveit= ! for x in $ltrpathdirs; do ! if test "X$x" = "X$found_dir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! ltrpathdirs="$ltrpathdirs $found_dir" ! fi ! if test "$hardcode_direct" = yes; then ! LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" ! else ! if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then ! LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" ! haveit= ! for x in $rpathdirs; do ! if test "X$x" = "X$found_dir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! rpathdirs="$rpathdirs $found_dir" ! fi ! else ! haveit= ! for x in $LDFLAGS $LIBICONV; do ! ! acl_save_prefix="$prefix" ! prefix="$acl_final_prefix" ! acl_save_exec_prefix="$exec_prefix" ! exec_prefix="$acl_final_exec_prefix" ! eval x=\"$x\" ! exec_prefix="$acl_save_exec_prefix" ! prefix="$acl_save_prefix" ! ! if test "X$x" = "X-L$found_dir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" ! fi ! if test "$hardcode_minus_L" != no; then ! LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" ! else ! LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" ! fi ! fi ! fi ! fi ! else ! if test "X$found_a" != "X"; then ! LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a" ! else ! LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name" ! fi ! fi ! additional_includedir= ! case "$found_dir" in ! */lib | */lib/) ! basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` ! additional_includedir="$basedir/include" ! ;; ! esac ! if test "X$additional_includedir" != "X"; then ! if test "X$additional_includedir" != "X/usr/include"; then ! haveit= ! if test "X$additional_includedir" = "X/usr/local/include"; then ! if test -n "$GCC"; then ! case $host_os in ! linux*) haveit=yes;; ! esac ! fi ! fi ! if test -z "$haveit"; then ! for x in $CPPFLAGS $INCICONV; do - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - if test -n "$found_la"; then - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" - ;; - esac - done - fi - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - else - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - done fi fi ! if test "X$ltrpathdirs" != "X"; then ! for found_dir in $ltrpathdirs; do ! LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" ! done ! fi ! ! ! ! for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ ! stdlib.h string.h unistd.h sys/param.h ! do ! as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ! if eval "test \"\${$as_ac_Header+set}\" = set"; then ! echo "$as_me:$LINENO: checking for $ac_header" >&5 ! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ! if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi ! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else # Is the header compilable? ! echo "$as_me:$LINENO: checking $ac_header usability" >&5 ! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" $ac_includes_default ! #include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 --- 9401,9590 ---- ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! am_cv_proto_iconv_arg1="" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! am_cv_proto_iconv_arg1="const" fi rm -f conftest.$ac_objext conftest.$ac_ext ! am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" fi ! ! am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` ! echo "$as_me:$LINENO: result: ${ac_t:- ! }$am_cv_proto_iconv" >&5 ! echo "${ECHO_T}${ac_t:- ! }$am_cv_proto_iconv" >&6 cat >>confdefs.h <<_ACEOF ! #define ICONV_CONST $am_cv_proto_iconv_arg1 _ACEOF fi ! LIBICONV= ! if test "$am_cv_lib_iconv" = yes; then ! LIBICONV="-liconv" fi ! ! echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 ! echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 ! if test "${am_cv_langinfo_codeset+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 else ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! #include "confdefs.h" ! #include ! int ! main () ! { ! char* cs = nl_langinfo(CODESET); ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! am_cv_langinfo_codeset=yes else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! am_cv_langinfo_codeset=no fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5 ! echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 ! if test $am_cv_langinfo_codeset = yes; then + cat >>confdefs.h <<\_ACEOF + #define HAVE_LANGINFO_CODESET 1 + _ACEOF + fi ! if test $ac_cv_header_locale_h = yes; then ! echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 ! echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 ! if test "${am_cv_val_LC_MESSAGES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! #include "confdefs.h" ! #include ! int ! main () ! { ! return LC_MESSAGES ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! am_cv_val_LC_MESSAGES=yes else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! am_cv_val_LC_MESSAGES=no ! fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! fi ! echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 ! echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 ! if test $am_cv_val_LC_MESSAGES = yes; then ! cat >>confdefs.h <<\_ACEOF ! #define HAVE_LC_MESSAGES 1 ! _ACEOF fi fi ! echo "$as_me:$LINENO: checking whether NLS is requested" >&5 ! echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 ! # Check whether --enable-nls or --disable-nls was given. ! if test "${enable_nls+set}" = set; then ! enableval="$enable_nls" ! USE_NLS=$enableval ! else ! USE_NLS=yes ! fi; ! echo "$as_me:$LINENO: result: $USE_NLS" >&5 ! echo "${ECHO_T}$USE_NLS" >&6 + BUILD_INCLUDED_LIBINTL=no + USE_INCLUDED_LIBINTL=no + INTLLIBS= + if test "$USE_NLS" = "yes"; then + cat >>confdefs.h <<\_ACEOF + #define ENABLE_NLS 1 + _ACEOF + echo "$as_me:$LINENO: checking whether included gettext is requested" >&5 + echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 + # Check whether --with-included-gettext or --without-included-gettext was given. + if test "${with_included_gettext+set}" = set; then + withval="$with_included_gettext" + nls_cv_force_use_gnu_gettext=$withval + else + nls_cv_force_use_gnu_gettext=no + fi; + echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5 + echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + CATOBJEXT=NONE ! if test "${ac_cv_header_libintl_h+set}" = set; then ! echo "$as_me:$LINENO: checking for libintl.h" >&5 ! echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 ! if test "${ac_cv_header_libintl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi ! echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 ! echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 else # Is the header compilable? ! echo "$as_me:$LINENO: checking libintl.h usability" >&5 ! echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" $ac_includes_default ! #include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 *************** *** 10160,10176 **** echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? ! echo "$as_me:$LINENO: checking $ac_header presence" >&5 ! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 --- 9609,9625 ---- echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? ! echo "$as_me:$LINENO: checking libintl.h presence" >&5 ! echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 10197,10298 **** # So? What about this header? case $ac_header_compiler:$ac_header_preproc in yes:no ) ! { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ! echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ! { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) ! { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ! echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ! { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ! echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ! { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac ! echo "$as_me:$LINENO: checking for $ac_header" >&5 ! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ! if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! eval "$as_ac_Header=$ac_header_preproc" fi ! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 fi ! if test `eval echo '${'$as_ac_Header'}'` = yes; then ! cat >>confdefs.h <<_ACEOF ! #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ! _ACEOF ! ! fi ! ! done ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! for ac_func in feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ ! geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ ! strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next ! do ! as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ! echo "$as_me:$LINENO: checking for $ac_func" >&5 ! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ! if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" ! #endif ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char $ac_func (); ! char (*f) (); ! ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif int main () { ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_$ac_func) || defined (__stub___$ac_func) ! choke me ! #else ! f = $ac_func; ! #endif ! ; return 0; } --- 9646,9690 ---- # So? What about this header? case $ac_header_compiler:$ac_header_preproc in yes:no ) ! { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 ! echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ! { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};; no:yes ) ! { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 ! echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} ! { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 ! echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} ! { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};; esac ! echo "$as_me:$LINENO: checking for libintl.h" >&5 ! echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 ! if test "${ac_cv_header_libintl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! ac_cv_header_libintl_h=$ac_header_preproc fi ! echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 ! echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 fi ! if test $ac_cv_header_libintl_h = yes; then ! echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 ! echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 ! if test "${gt_cv_func_gnugettext1_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! #include ! extern int _nl_msg_cat_cntr; int main () { ! bindtextdomain ("", ""); ! return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } *************** *** 10309,10388 **** ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ! if test `eval echo '${'$as_ac_var'}'` = yes; then ! cat >>confdefs.h <<_ACEOF ! #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ! _ACEOF ! ! fi ! done ! ! ! ! ! ! ! ! am_save_CPPFLAGS="$CPPFLAGS" ! ! for element in $INCICONV; do ! haveit= ! for x in $CPPFLAGS; do ! ! acl_save_prefix="$prefix" ! prefix="$acl_final_prefix" ! acl_save_exec_prefix="$exec_prefix" ! exec_prefix="$acl_final_exec_prefix" ! eval x=\"$x\" ! exec_prefix="$acl_save_exec_prefix" ! prefix="$acl_save_prefix" ! ! if test "X$x" = "X$element"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" ! fi ! done ! ! echo "$as_me:$LINENO: checking for iconv" >&5 ! echo $ECHO_N "checking for iconv... $ECHO_C" >&6 ! if test "${am_cv_func_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! ! am_cv_func_iconv="no, consider installing GNU libiconv" ! am_cv_lib_iconv=no ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! #include ! #include ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif int main () { ! iconv_t cd = iconv_open("",""); ! iconv(cd,NULL,NULL,NULL,NULL); ! iconv_close(cd); ; return 0; } --- 9701,9735 ---- ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! gt_cv_func_gnugettext1_libc=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! gt_cv_func_gnugettext1_libc=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 ! echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6 ! if test "$gt_cv_func_gnugettext1_libc" != "yes"; then ! echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 ! echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6 ! if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! gt_save_LIBS="$LIBS" ! LIBS="$LIBS -lintl $LIBICONV" ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! #include ! extern int _nl_msg_cat_cntr; int main () { ! bindtextdomain ("", ""); ! return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } *************** *** 10399,11413 **** ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! am_cv_func_iconv=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 ! if test "$am_cv_func_iconv" != yes; then ! am_save_LIBS="$LIBS" ! LIBS="$LIBS $LIBICONV" ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! #include "confdefs.h" ! #include ! #include ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif ! int ! main () ! { ! iconv_t cd = iconv_open("",""); ! iconv(cd,NULL,NULL,NULL,NULL); ! iconv_close(cd); ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! am_cv_lib_iconv=yes ! am_cv_func_iconv=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 ! LIBS="$am_save_LIBS" ! fi ! fi ! echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 ! echo "${ECHO_T}$am_cv_func_iconv" >&6 ! if test "$am_cv_func_iconv" = yes; then cat >>confdefs.h <<\_ACEOF ! #define HAVE_ICONV 1 _ACEOF - fi - if test "$am_cv_lib_iconv" = yes; then - echo "$as_me:$LINENO: checking how to link with libiconv" >&5 - echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: $LIBICONV" >&5 - echo "${ECHO_T}$LIBICONV" >&6 - else - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi ! if test "$am_cv_func_iconv" = yes; then ! echo "$as_me:$LINENO: checking for iconv declaration" >&5 ! echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6 ! if test "${am_cv_proto_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! ! #include ! #include ! extern #ifdef __cplusplus ! "C" ! #endif ! #if defined(__STDC__) || defined(__cplusplus) ! size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); ! #else ! size_t iconv(); #endif - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif 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 ! am_cv_proto_iconv_arg1="" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! am_cv_proto_iconv_arg1="const" fi ! rm -f conftest.$ac_objext conftest.$ac_ext ! am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" fi ! ! am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` ! echo "$as_me:$LINENO: result: ${ac_t:- ! }$am_cv_proto_iconv" >&5 ! echo "${ECHO_T}${ac_t:- ! }$am_cv_proto_iconv" >&6 ! ! cat >>confdefs.h <<_ACEOF ! #define ICONV_CONST $am_cv_proto_iconv_arg1 _ACEOF ! fi ! echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 ! echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 ! if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! #include "confdefs.h" ! #include ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif ! int ! main () ! { ! char* cs = nl_langinfo(CODESET); ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! am_cv_langinfo_codeset=yes ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! am_cv_langinfo_codeset=no ! fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! fi ! echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5 ! echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 ! if test $am_cv_langinfo_codeset = yes; then ! ! cat >>confdefs.h <<\_ACEOF ! #define HAVE_LANGINFO_CODESET 1 ! _ACEOF ! ! fi ! ! if test $ac_cv_header_locale_h = yes; then ! ! echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 ! echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 ! if test "${am_cv_val_LC_MESSAGES+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! #include "confdefs.h" ! #include ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif ! int ! main () ! { ! return LC_MESSAGES ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! am_cv_val_LC_MESSAGES=yes else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! am_cv_val_LC_MESSAGES=no ! fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 - echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 - if test $am_cv_val_LC_MESSAGES = yes; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_LC_MESSAGES 1 - _ACEOF ! fi ! ! fi ! ! for ac_prog in bison ! 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_INTLBISON+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! if test -n "$INTLBISON"; then ! ac_cv_prog_INTLBISON="$INTLBISON" # 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_INTLBISON="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done fi ! fi ! INTLBISON=$ac_cv_prog_INTLBISON ! if test -n "$INTLBISON"; then ! echo "$as_me:$LINENO: result: $INTLBISON" >&5 ! echo "${ECHO_T}$INTLBISON" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi - test -n "$INTLBISON" && break - done - - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - echo "$as_me:$LINENO: checking version of bison" >&5 - echo $ECHO_N "checking version of bison... $ECHO_C" >&6 - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - echo "$as_me:$LINENO: result: $ac_prog_version" >&5 - echo "${ECHO_T}$ac_prog_version" >&6 - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi - - - - - - - - - - - - - ! ! echo "$as_me:$LINENO: checking whether NLS is requested" >&5 ! echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 ! # Check whether --enable-nls or --disable-nls was given. ! if test "${enable_nls+set}" = set; then ! enableval="$enable_nls" ! USE_NLS=$enableval ! else ! USE_NLS=yes ! fi; ! echo "$as_me:$LINENO: result: $USE_NLS" >&5 ! echo "${ECHO_T}$USE_NLS" >&6 ! ! ! ! BUILD_INCLUDED_LIBINTL=no ! USE_INCLUDED_LIBINTL=no ! ! LIBINTL= ! LTLIBINTL= ! POSUB= ! ! if test "$USE_NLS" = "yes"; then ! gt_use_preinstalled_gnugettext=no ! ! echo "$as_me:$LINENO: checking whether included gettext is requested" >&5 ! echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 ! ! # Check whether --with-included-gettext or --without-included-gettext was given. ! if test "${with_included_gettext+set}" = set; then ! withval="$with_included_gettext" ! nls_cv_force_use_gnu_gettext=$withval ! else ! nls_cv_force_use_gnu_gettext=no ! fi; ! echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5 ! echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 ! ! nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" ! if test "$nls_cv_force_use_gnu_gettext" != "yes"; then ! ! ! ! ! ! ! echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 ! echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 ! if test "${gt_cv_func_gnugettext1_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! #include "confdefs.h" ! #include ! extern int _nl_msg_cat_cntr; ! extern int *_nl_domain_bindings; ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif ! int ! main () ! { ! bindtextdomain ("", ""); ! return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! gt_cv_func_gnugettext1_libc=yes ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! gt_cv_func_gnugettext1_libc=no fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 - echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6 - - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then - - - - use_additional=yes - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - - # Check whether --with-libintl-prefix or --without-libintl-prefix was given. - if test "${with_libintl_prefix+set}" = set; then - withval="$with_libintl_prefix" - - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then ! acl_save_prefix="$prefix" ! prefix="$acl_final_prefix" ! acl_save_exec_prefix="$exec_prefix" ! exec_prefix="$acl_final_exec_prefix" ! eval additional_includedir=\"$includedir\" ! eval additional_libdir=\"$libdir\" ! ! exec_prefix="$acl_save_exec_prefix" ! prefix="$acl_save_prefix" ! ! else ! additional_includedir="$withval/include" ! additional_libdir="$withval/lib" ! fi ! fi - fi; - LIBINTL= - LTLIBINTL= - INCINTL= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='intl ' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value" - else - : - fi - else - found_dir= - found_la= - found_so= - found_a= - if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIBINTL; do - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then - found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" - else - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - if test "$hardcode_direct" = yes; then - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - haveit= - for x in $LDFLAGS $LIBINTL; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" - fi - if test "$hardcode_minus_L" != no; then - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" - else - LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a" - else - LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name" - fi - fi - additional_includedir= - case "$found_dir" in - */lib | */lib/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INCINTL; do ! acl_save_prefix="$prefix" ! prefix="$acl_final_prefix" ! acl_save_exec_prefix="$exec_prefix" ! exec_prefix="$acl_final_exec_prefix" ! eval x=\"$x\" ! exec_prefix="$acl_save_exec_prefix" ! prefix="$acl_save_prefix" ! ! if test "X$x" = "X-I$additional_includedir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! if test -d "$additional_includedir"; then ! INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir" ! fi ! fi ! fi ! fi ! fi ! if test -n "$found_la"; then ! save_libdir="$libdir" ! case "$found_la" in ! */* | *\\*) . "$found_la" ;; ! *) . "./$found_la" ;; ! esac ! libdir="$save_libdir" ! for dep in $dependency_libs; do ! case "$dep" in ! -L*) ! additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` ! if test "X$additional_libdir" != "X/usr/lib"; then ! haveit= ! if test "X$additional_libdir" = "X/usr/local/lib"; then ! if test -n "$GCC"; then ! case $host_os in ! linux*) haveit=yes;; ! esac ! fi ! fi ! if test -z "$haveit"; then ! haveit= ! for x in $LDFLAGS $LIBINTL; do ! ! acl_save_prefix="$prefix" ! prefix="$acl_final_prefix" ! acl_save_exec_prefix="$exec_prefix" ! exec_prefix="$acl_final_exec_prefix" ! eval x=\"$x\" ! exec_prefix="$acl_save_exec_prefix" ! prefix="$acl_save_prefix" ! ! if test "X$x" = "X-L$additional_libdir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! if test -d "$additional_libdir"; then ! LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir" ! fi ! fi ! haveit= ! for x in $LDFLAGS $LTLIBINTL; do ! ! acl_save_prefix="$prefix" ! prefix="$acl_final_prefix" ! acl_save_exec_prefix="$exec_prefix" ! exec_prefix="$acl_final_exec_prefix" ! eval x=\"$x\" ! exec_prefix="$acl_save_exec_prefix" ! prefix="$acl_save_prefix" ! ! if test "X$x" = "X-L$additional_libdir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! if test -d "$additional_libdir"; then ! LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir" ! fi ! fi ! fi ! fi ! ;; ! -R*) ! dir=`echo "X$dep" | sed -e 's/^X-R//'` ! if test "$enable_rpath" != no; then ! haveit= ! for x in $rpathdirs; do ! if test "X$x" = "X$dir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! rpathdirs="$rpathdirs $dir" ! fi ! haveit= ! for x in $ltrpathdirs; do ! if test "X$x" = "X$dir"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! ltrpathdirs="$ltrpathdirs $dir" ! fi ! fi ! ;; ! -l*) ! names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ! ;; ! *.la) ! names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` ! ;; ! *) ! LIBINTL="${LIBINTL}${LIBINTL:+ }$dep" ! LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep" ! ;; ! esac ! done ! fi ! else ! LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" ! LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name" ! fi fi fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" - else - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - for found_dir in $ltrpathdirs; do - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" - done - fi ! echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 ! echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6 ! if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! gt_save_CPPFLAGS="$CPPFLAGS" ! CPPFLAGS="$CPPFLAGS $INCINTL" ! gt_save_LIBS="$LIBS" ! LIBS="$LIBS $LIBINTL" ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! #include "confdefs.h" ! #include ! extern int _nl_msg_cat_cntr; ! extern ! #ifdef __cplusplus ! "C" ! #endif ! const char *_nl_expand_alias (); ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif ! int ! main () ! { ! bindtextdomain ("", ""); ! return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! gt_cv_func_gnugettext1_libintl=yes else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! gt_cv_func_gnugettext1_libintl=no fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then - LIBS="$LIBS $LIBICONV" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" - #include - extern int _nl_msg_cat_cntr; - extern - #ifdef __cplusplus - "C" - #endif - const char *_nl_expand_alias (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif - int - main () - { - bindtextdomain ("", ""); - return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext1_libintl=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 ! fi ! CPPFLAGS="$gt_save_CPPFLAGS" ! LIBS="$gt_save_LIBS" fi - echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5 - echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 - fi ! if test "$gt_cv_func_gnugettext1_libc" = "yes" \ ! || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ ! && test "$PACKAGE" != gettext; }; then ! gt_use_preinstalled_gnugettext=yes ! else ! LIBINTL= ! LTLIBINTL= ! INCINTL= ! fi ! if test "$gt_use_preinstalled_gnugettext" != "yes"; then ! nls_cv_use_gnu_gettext=yes ! fi fi ! if test "$nls_cv_use_gnu_gettext" = "yes"; then ! INTLOBJS="\$(GETTOBJS)" ! BUILD_INCLUDED_LIBINTL=yes ! USE_INCLUDED_LIBINTL=yes ! LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV" ! LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV" ! LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi ! if test "$gt_use_preinstalled_gnugettext" = "yes" \ ! || test "$nls_cv_use_gnu_gettext" = "yes"; then ! CATOBJEXT=.gmo fi - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - cat >>confdefs.h <<\_ACEOF - #define ENABLE_NLS 1 - _ACEOF ! else ! USE_NLS=no fi - fi ! if test "$USE_NLS" = "yes"; then ! ! if test "$gt_use_preinstalled_gnugettext" = "yes"; then ! if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then ! echo "$as_me:$LINENO: checking how to link with libintl" >&5 ! echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6 ! echo "$as_me:$LINENO: result: $LIBINTL" >&5 ! echo "${ECHO_T}$LIBINTL" >&6 ! ! for element in $INCINTL; do ! haveit= ! for x in $CPPFLAGS; do ! ! acl_save_prefix="$prefix" ! prefix="$acl_final_prefix" ! acl_save_exec_prefix="$exec_prefix" ! exec_prefix="$acl_final_exec_prefix" ! eval x=\"$x\" ! exec_prefix="$acl_save_exec_prefix" ! prefix="$acl_save_prefix" ! ! if test "X$x" = "X$element"; then ! haveit=yes ! break ! fi ! done ! if test -z "$haveit"; then ! CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" ! fi ! done ! fi ! cat >>confdefs.h <<\_ACEOF ! #define HAVE_GETTEXT 1 ! _ACEOF - cat >>confdefs.h <<\_ACEOF - #define HAVE_DCGETTEXT 1 - _ACEOF - fi - POSUB=po - fi - if test "$PACKAGE" = gettext; then - BUILD_INCLUDED_LIBINTL=yes - fi --- 9746,10197 ---- ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! gt_cv_func_gnugettext1_libintl=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 + gt_cv_func_gnugettext1_libintl=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! LIBS="$gt_save_LIBS" fi ! echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5 ! echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 ! fi ! if test "$gt_cv_func_gnugettext1_libc" = "yes" \ ! || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ ! && test "$PACKAGE" != gettext; }; then cat >>confdefs.h <<\_ACEOF ! #define HAVE_GETTEXT 1 _ACEOF + if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + INTLLIBS="-lintl $LIBICONV" + fi + gt_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" ! for ac_func in dcgettext ! do ! as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ! echo "$as_me:$LINENO: checking for $ac_func" >&5 ! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ! if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include ! /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus ! extern "C" #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char $ac_func (); + char (*f) (); int main () { + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else + f = $ac_func; + #endif ; return 0; } _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ! if test `eval echo '${'$as_ac_var'}'` = yes; then ! cat >>confdefs.h <<_ACEOF ! #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF ! fi ! done + LIBS="$gt_save_LIBS" ! # Extract the first word of "msgfmt", so it can be a program name with args. ! set dummy msgfmt; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! case "$MSGFMT" in ! /*) ! ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then ! ac_cv_path_MSGFMT="$ac_dir/$ac_word" ! break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" ! ;; ! esac fi ! MSGFMT="$ac_cv_path_MSGFMT" ! if test "$MSGFMT" != ":"; then ! echo "$as_me:$LINENO: result: $MSGFMT" >&5 ! echo "${ECHO_T}$MSGFMT" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 fi ! # Extract the first word of "gmsgfmt", so it can be a program name with args. ! set dummy gmsgfmt; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! case $GMSGFMT in ! [\\/]* | ?:[\\/]*) ! ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ! ;; ! *) ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; + esac fi ! GMSGFMT=$ac_cv_path_GMSGFMT ! ! if test -n "$GMSGFMT"; then ! echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ! echo "${ECHO_T}$GMSGFMT" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi ! # Extract the first word of "xgettext", so it can be a program name with args. ! set dummy xgettext; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! case "$XGETTEXT" in ! /*) ! ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then ! ac_cv_path_XGETTEXT="$ac_dir/$ac_word" ! break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" ! ;; ! esac fi ! XGETTEXT="$ac_cv_path_XGETTEXT" ! if test "$XGETTEXT" != ":"; then ! echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ! echo "${ECHO_T}$XGETTEXT" >&6 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 fi ! CATOBJEXT=.gmo ! fi ! fi ! if test "$CATOBJEXT" = "NONE"; then ! nls_cv_use_gnu_gettext=yes fi fi ! if test "$nls_cv_use_gnu_gettext" = "yes"; then ! INTLOBJS="\$(GETTOBJS)" ! # Extract the first word of "msgfmt", so it can be a program name with args. ! set dummy msgfmt; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! case "$MSGFMT" in ! /*) ! ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then ! ac_cv_path_MSGFMT="$ac_dir/$ac_word" ! break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" ! ;; ! esac ! fi ! MSGFMT="$ac_cv_path_MSGFMT" ! if test "$MSGFMT" != ":"; then ! echo "$as_me:$LINENO: result: $MSGFMT" >&5 ! echo "${ECHO_T}$MSGFMT" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 fi ! # Extract the first word of "gmsgfmt", so it can be a program name with args. ! set dummy gmsgfmt; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_path_GMSGFMT+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! case $GMSGFMT in ! [\\/]* | ?:[\\/]*) ! ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ! ;; ! *) ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done ! done ! ! test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ! ;; ! esac fi ! GMSGFMT=$ac_cv_path_GMSGFMT ! ! if test -n "$GMSGFMT"; then ! echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ! echo "${ECHO_T}$GMSGFMT" >&6 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 fi ! # Extract the first word of "xgettext", so it can be a program name with args. ! set dummy xgettext; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_path_XGETTEXT+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! case "$XGETTEXT" in ! /*) ! ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then ! ac_cv_path_XGETTEXT="$ac_dir/$ac_word" ! break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" ! ;; ! esac ! fi ! XGETTEXT="$ac_cv_path_XGETTEXT" ! if test "$XGETTEXT" != ":"; then ! echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ! echo "${ECHO_T}$XGETTEXT" >&6 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! fi ! BUILD_INCLUDED_LIBINTL=yes ! USE_INCLUDED_LIBINTL=yes ! CATOBJEXT=.gmo ! INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" ! LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi ! if test "$GMSGFMT" != ":"; then ! if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then ! : ; ! else ! echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 ! echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6 ! GMSGFMT=":" ! fi fi ! if test "$XGETTEXT" != ":"; then ! if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then ! : ; ! else ! echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 ! echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 ! XGETTEXT=":" ! fi fi + POSUB=po + fi + ac_config_commands="$ac_config_commands default-2" ! if test "$PACKAGE" = gettext; then ! BUILD_INCLUDED_LIBINTL=yes fi ! for ac_prog in bison ! 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_INTLBISON+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! if test -n "$INTLBISON"; then ! ac_cv_prog_INTLBISON="$INTLBISON" # 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_INTLBISON="$ac_prog" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done ! done ! fi ! fi ! INTLBISON=$ac_cv_prog_INTLBISON ! if test -n "$INTLBISON"; then ! echo "$as_me:$LINENO: result: $INTLBISON" >&5 ! echo "${ECHO_T}$INTLBISON" >&6 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! fi + test -n "$INTLBISON" && break + done ! if test -z "$INTLBISON"; then ! ac_verc_fail=yes ! else ! echo "$as_me:$LINENO: checking version of bison" >&5 ! echo $ECHO_N "checking version of bison... $ECHO_C" >&6 ! ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` ! case $ac_prog_version in ! '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; ! 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) ! ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; ! *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; ! esac ! echo "$as_me:$LINENO: result: $ac_prog_version" >&5 ! echo "${ECHO_T}$ac_prog_version" >&6 ! fi ! if test $ac_verc_fail = yes; then ! INTLBISON=: ! fi + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done *************** *** 11426,11440 **** GENCAT=gencat - INTL_LIBTOOL_SUFFIX_PREFIX= - ! INTLLIBS="$LIBINTL" ! --- 10210,10259 ---- GENCAT=gencat + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 + echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + echo "$as_me:$LINENO: result: $LINGUAS" >&5 + echo "${ECHO_T}$LINGUAS" >&6 + fi ! if test -n "$LINGUAS"; then ! for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ! fi ! fi + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + INTL_LIBTOOL_SUFFIX_PREFIX= *************** *** 11468,11479 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 10287,10292 ---- *************** *** 11527,11533 **** echo "$as_me:$LINENO: result: partial database directory is $SCROLLKEEPER_PARTIAL_DB_DIR" >&5 echo "${ECHO_T}partial database directory is $SCROLLKEEPER_PARTIAL_DB_DIR" >&6 ! ac_config_files="$ac_config_files libs/Makefile libs/scrollkeeper.h libuuid/Makefile cl/Makefile cl/src/Makefile buildtools/Makefile cl/templates/Makefile extract/Makefile extract/src/Makefile extract/stylesheets/Makefile extract/dtds/Makefile scripts/scrollkeeper-config scripts/scrollkeeper-get-content-list scripts/scrollkeeper-get-extended-content-list scripts/scrollkeeper-get-toc-from-id scripts/scrollkeeper-get-toc-from-docpath scripts/scrollkeeper-get-index-from-docpath scripts/scrollkeeper-rebuilddb scripts/Makefile man/Makefile man/man1/Makefile man/man5/Makefile man/man7/Makefile man/man8/Makefile config/scrollkeeper.conf config/Makefile intl/Makefile po/Makefile.in doc/Makefile doc/writing_scrollkeeper_omf_files/Makefile doc/writing_scrollkeeper_omf_files/C/Makefile Makefile scrollkeeper.spec" 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 --- 10340,10346 ---- echo "$as_me:$LINENO: result: partial database directory is $SCROLLKEEPER_PARTIAL_DB_DIR" >&5 echo "${ECHO_T}partial database directory is $SCROLLKEEPER_PARTIAL_DB_DIR" >&6 ! ac_config_files="$ac_config_files libs/Makefile libs/scrollkeeper.h libuuid/Makefile cl/Makefile cl/src/Makefile buildtools/Makefile cl/templates/Makefile extract/Makefile extract/src/Makefile extract/stylesheets/Makefile extract/dtds/Makefile scripts/scrollkeeper-config scripts/scrollkeeper-get-content-list scripts/scrollkeeper-get-extended-content-list scripts/scrollkeeper-get-toc-from-id scripts/scrollkeeper-get-toc-from-docpath scripts/scrollkeeper-get-index-from-docpath scripts/scrollkeeper-rebuilddb scripts/Makefile man/Makefile man/man1/Makefile man/man5/Makefile man/man7/Makefile man/man8/Makefile config/scrollkeeper.conf config/Makefile intl/Makefile po/Makefile.in doc/Makefile doc/writing_scrollkeeper_omf_files/Makefile doc/writing_scrollkeeper_omf_files/C/Makefile Makefile scrollkeeper.spec" 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 *************** *** 11538,11544 **** # 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. --- 10351,10357 ---- # 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. *************** *** 11604,11609 **** --- 10417,10437 ---- 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 + + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 *************** *** 11611,11620 **** Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi mv -f po/POTFILES po/POTFILES.tmp ! sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp --- 10439,10455 ---- Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi mv -f po/POTFILES po/POTFILES.tmp ! sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp *************** *** 11636,11642 **** _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## --- 10471,10476 ---- *************** *** 11645,11655 **** 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 --- 10479,10491 ---- 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 *************** *** 11657,11690 **** 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\(/\)$' \| \ --- 10493,10531 ---- 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_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES 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\(/\)$' \| \ *************** *** 11695,11700 **** --- 10536,10542 ---- /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` + # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' *************** *** 11708,11714 **** 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=: --- 10550,10556 ---- echo "#! /bin/sh" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh ! if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: *************** *** 11762,11767 **** --- 10604,10611 ---- 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+"$@"} *************** *** 11835,11840 **** --- 10679,10690 ---- 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. *************** *** 11851,11857 **** IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } exec 6>&1 --- 10701,10707 ---- IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH exec 6>&1 *************** *** 11868,11874 **** 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 --- 10718,10724 ---- cat >&5 <<_CSEOF This file was extended by $as_me, which was ! generated by GNU Autoconf 2.54. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS *************** *** 11930,11936 **** 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 --- 10780,10786 ---- cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.54, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 *************** *** 11951,11967 **** --*=*) 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 --- 10801,10820 ---- --*=*) 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 *************** *** 11984,11995 **** --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. --- 10837,10848 ---- --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;; # This is an error. *************** *** 12014,12025 **** AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" INTLTOOL_PERL=${INTLTOOL_PERL} - # Capture the value of obsolete $ALL_LINGUAS because we need it to compute - # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it - # from automake. - eval 'ALL_LINGUAS''="$ALL_LINGUAS"' - # Capture the value of LINGUAS because we need it to compute CATALOGS. - LINGUAS="${LINGUAS-%UNSET%}" _ACEOF --- 10867,10872 ---- *************** *** 12164,12169 **** --- 11011,11017 ---- s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@LN_S@,$LN_S,;t t s,@SET_MAKE@,$SET_MAKE,;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 *************** *** 12176,12181 **** --- 11024,11030 ---- s,@target_cpu@,$target_cpu,;t t s,@target_vendor@,$target_vendor,;t t s,@target_os@,$target_os,;t t + s,@CYGPATH_W@,$CYGPATH_W,;t t s,@PACKAGE@,$PACKAGE,;t t s,@VERSION@,$VERSION,;t t s,@ACLOCAL@,$ACLOCAL,;t t *************** *** 12195,12204 **** --- 11044,11056 ---- s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s,@CCDEPMODE@,$CCDEPMODE,;t t + s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t + s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t s,@ECHO@,$ECHO,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@LIBTOOL@,$LIBTOOL,;t t + s,@EXPANDED_LOCALSTATEDIR@,$EXPANDED_LOCALSTATEDIR,;t t s,@ALLOCA@,$ALLOCA,;t t s,@OMFDIRS@,$OMFDIRS,;t t s,@INTLTOOL@,$INTLTOOL,;t t *************** *** 12206,12220 **** --- 11058,11075 ---- s,@INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t s,@INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t s,@INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t + s,@INTLTOOL_PROP_RULE@,$INTLTOOL_PROP_RULE,;t t s,@INTLTOOL_OAF_RULE@,$INTLTOOL_OAF_RULE,;t t s,@INTLTOOL_PONG_RULE@,$INTLTOOL_PONG_RULE,;t t s,@INTLTOOL_SERVER_RULE@,$INTLTOOL_SERVER_RULE,;t t s,@INTLTOOL_SHEET_RULE@,$INTLTOOL_SHEET_RULE,;t t s,@INTLTOOL_SOUNDLIST_RULE@,$INTLTOOL_SOUNDLIST_RULE,;t t s,@INTLTOOL_UI_RULE@,$INTLTOOL_UI_RULE,;t t + s,@INTLTOOL_XAM_RULE@,$INTLTOOL_XAM_RULE,;t t s,@INTLTOOL_XML_RULE@,$INTLTOOL_XML_RULE,;t t s,@INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t s,@INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t + s,@INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t s,@INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t s,@INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t s,@INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t *************** *** 12226,12255 **** s,@XSLT_CONFIG@,$XSLT_CONFIG,;t t s,@XSLT_LIBS@,$XSLT_LIBS,;t t s,@XSLT_CFLAGS@,$XSLT_CFLAGS,;t t ! s,@HOST_TYPE@,$HOST_TYPE,;t t ! s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t s,@MSGFMT@,$MSGFMT,;t t s,@GMSGFMT@,$GMSGFMT,;t t s,@XGETTEXT@,$XGETTEXT,;t t - s,@MSGMERGE@,$MSGMERGE,;t t - s,@GLIBC21@,$GLIBC21,;t t - s,@LIBICONV@,$LIBICONV,;t t - s,@LTLIBICONV@,$LTLIBICONV,;t t s,@INTLBISON@,$INTLBISON,;t t - s,@USE_NLS@,$USE_NLS,;t t s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t s,@CATOBJEXT@,$CATOBJEXT,;t t s,@INTLOBJS@,$INTLOBJS,;t t s,@DATADIRNAME@,$DATADIRNAME,;t t s,@INSTOBJEXT@,$INSTOBJEXT,;t t s,@GENCAT@,$GENCAT,;t t s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t - s,@INTLLIBS@,$INTLLIBS,;t t - s,@LIBINTL@,$LIBINTL,;t t - s,@LTLIBINTL@,$LTLIBINTL,;t t - s,@POSUB@,$POSUB,;t t s,@SCROLLKEEPER_PARTIAL_DB_DIR@,$SCROLLKEEPER_PARTIAL_DB_DIR,;t t CEOF _ACEOF --- 11081,11110 ---- s,@XSLT_CONFIG@,$XSLT_CONFIG,;t t s,@XSLT_LIBS@,$XSLT_LIBS,;t t s,@XSLT_CFLAGS@,$XSLT_CFLAGS,;t t ! s,@GLIBC21@,$GLIBC21,;t t ! s,@LIBICONV@,$LIBICONV,;t t ! s,@USE_NLS@,$USE_NLS,;t t s,@MSGFMT@,$MSGFMT,;t t s,@GMSGFMT@,$GMSGFMT,;t t s,@XGETTEXT@,$XGETTEXT,;t t s,@INTLBISON@,$INTLBISON,;t t s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t + s,@CATALOGS@,$CATALOGS,;t t s,@CATOBJEXT@,$CATOBJEXT,;t t + s,@GMOFILES@,$GMOFILES,;t t + s,@INTLLIBS@,$INTLLIBS,;t t s,@INTLOBJS@,$INTLOBJS,;t t + s,@POFILES@,$POFILES,;t t + s,@POSUB@,$POSUB,;t t s,@DATADIRNAME@,$DATADIRNAME,;t t s,@INSTOBJEXT@,$INSTOBJEXT,;t t s,@GENCAT@,$GENCAT,;t t + s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t s,@SCROLLKEEPER_PARTIAL_DB_DIR@,$SCROLLKEEPER_PARTIAL_DB_DIR,;t t + s,@LIBOBJS@,$LIBOBJS,;t t + s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF _ACEOF *************** *** 12320,12344 **** /^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=. --- 11175,11204 ---- /^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=. *************** *** 12368,12374 **** # 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` --- 11228,11234 ---- # 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` *************** *** 12558,12564 **** # 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 --- 11418,11424 ---- # 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 *************** *** 12582,12588 **** 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 --- 11442,11448 ---- 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 *************** *** 12638,12662 **** /^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 --- 11498,11527 ---- /^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 *************** *** 12665,12676 **** 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 for config.h' >"./stamp-h1" ! ;; ! esac done _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF --- 11530,11548 ---- cat $tmp/config.h rm -f $tmp/config.h fi ! _am_stamp_count=`expr ${_am_stamp_count-0} + 1` ! echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || ! $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X$ac_file : 'X\(//\)[^/]' \| \ ! X$ac_file : 'X\(//\)$' \| \ ! X$ac_file : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || ! echo X$ac_file | ! sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ! /^X\(\/\/\)[^/].*/{ s//\1/; q; } ! /^X\(\/\/\)$/{ s//\1/; q; } ! /^X\(\/\).*/{ s//\1/; q; } ! s/.*/./; q'`/stamp-h$_am_stamp_count done _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF *************** *** 12721,12727 **** # 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` --- 11593,11599 ---- # 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` *************** *** 12790,12814 **** /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! { case $dirpart/$fdir in ! [\\/]* | ?:[\\/]* ) as_incr_dir=;; ! *) as_incr_dir=.;; ! esac ! as_dummy=$dirpart/$fdir ! 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 $dirpart/$fdir" >&5 ! echo "$as_me: error: cannot create $dirpart/$fdir" >&2;} ! { (exit 1); exit 1; }; } ! ;; ! esac ! done; } # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" --- 11662,11691 ---- /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! { if $as_mkdir_p; then ! mkdir -p $dirpart/$fdir ! else ! as_dir=$dirpart/$fdir ! 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 $dirpart/$fdir" >&5 ! echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} ! { (exit 1); exit 1; }; }; } # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" *************** *** 12845,12946 **** chmod u+w intltool-update ;; ! default-2 ) ! for ac_file in $CONFIG_FILES; do ! # Support "outfile[:infile[:infile...]]" ! case "$ac_file" in ! *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; ! esac ! # PO directories have a Makefile.in generated from Makefile.in.in. ! case "$ac_file" in */Makefile.in) ! # Adjust a relative srcdir. ! ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` ! ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" ! ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` ! # In autoconf-2.13 it is called $ac_given_srcdir. ! # In autoconf-2.50 it is called $srcdir. ! test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" ! case "$ac_given_srcdir" in ! .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; ! /*) top_srcdir="$ac_given_srcdir" ;; ! *) top_srcdir="$ac_dots$ac_given_srcdir" ;; esac ! if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then ! rm -f "$ac_dir/POTFILES" ! test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" ! cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" ! # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend ! # on $ac_dir but don't depend on user-specified configuration ! # parameters. ! if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then ! # The LINGUAS file contains the set of available languages. ! if test -n "$ALL_LINGUAS"; then ! test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" ! fi ! ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` ! # Hide the ALL_LINGUAS assigment from automake. ! eval 'ALL_LINGUAS''=$ALL_LINGUAS_' ! fi case "$ac_given_srcdir" in ! .) srcdirpre= ;; ! *) srcdirpre='$(srcdir)/' ;; esac ! POFILES= ! GMOFILES= ! UPDATEPOFILES= ! DUMMYPOFILES= ! for lang in $ALL_LINGUAS; do ! POFILES="$POFILES $srcdirpre$lang.po" ! GMOFILES="$GMOFILES $srcdirpre$lang.gmo" ! UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" ! DUMMYPOFILES="$DUMMYPOFILES $lang.nop" ! done ! # CATALOGS depends on both $ac_dir and the user's LINGUAS ! # environment variable. ! INST_LINGUAS= ! if test -n "$ALL_LINGUAS"; then ! for presentlang in $ALL_LINGUAS; do ! useit=no ! if test "%UNSET%" != "$LINGUAS"; then ! desiredlanguages="$LINGUAS" ! else ! desiredlanguages="$ALL_LINGUAS" ! fi ! for desiredlang in $desiredlanguages; do ! # Use the presentlang catalog if desiredlang is ! # a. equal to presentlang, or ! # b. a variant of presentlang (because in this case, ! # presentlang can be used as a fallback for messages ! # which are not translated in the desiredlang catalog). ! case "$desiredlang" in ! "$presentlang"*) useit=yes;; ! esac ! done ! if test $useit = yes; then ! INST_LINGUAS="$INST_LINGUAS $presentlang" ! fi ! done ! fi ! CATALOGS= ! if test -n "$INST_LINGUAS"; then ! for lang in $INST_LINGUAS; do ! CATALOGS="$CATALOGS $lang.gmo" ! done fi ! test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" ! sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" ! for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do ! if test -f "$f"; then ! case "$f" in ! *.orig | *.bak | *~) ;; ! *) cat "$f" >> "$ac_dir/Makefile" ;; ! esac ! fi ! done ! fi ! ;; ! esac ! done ;; esac done _ACEOF --- 11722,11756 ---- chmod u+w intltool-update ;; ! default-2 ) for ac_file in $CONFIG_FILES; do ! # Support "outfile[:infile[:infile...]]" ! case "$ac_file" in ! *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; esac ! # PO directories have a Makefile.in generated from Makefile.in.in. ! case "$ac_file" in */Makefile.in) ! # Adjust a relative srcdir. ! ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` ! ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" ! ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` ! # In autoconf-2.13 it is called $ac_given_srcdir. ! # In autoconf-2.50 it is called $srcdir. ! test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" case "$ac_given_srcdir" in ! .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; ! /*) top_srcdir="$ac_given_srcdir" ;; ! *) top_srcdir="$ac_dots$ac_given_srcdir" ;; esac ! if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then ! rm -f "$ac_dir/POTFILES" ! test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" ! sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" ! test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" ! sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" fi ! ;; ! esac ! done ;; esac done _ACEOF diff -crN ./scrollkeeper/doc/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/doc/Makefile.in *** ./scrollkeeper/doc/Makefile.in Thu Jan 23 07:12:00 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/doc/Makefile.in Tue Jan 6 22:54:22 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,90 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 13,78 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 100,143 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ SUBDIRS = \ writing_scrollkeeper_omf_files --- 88,179 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ SUBDIRS = \ writing_scrollkeeper_omf_files *************** *** 150,161 **** mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = 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 --- 186,200 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-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 *************** *** 163,169 **** .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu doc/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 202,208 ---- .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps doc/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 231,240 **** --- 270,286 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 265,284 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__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) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 311,351 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 376,398 **** 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. --- 443,475 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive ctags \ ! ctags-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 pdf pdf-am \ ! pdf-recursive ps ps-am ps-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. diff -crN ./scrollkeeper/doc/writing_scrollkeeper_omf_files/C/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/doc/writing_scrollkeeper_omf_files/C/Makefile.in *** ./scrollkeeper/doc/writing_scrollkeeper_omf_files/C/Makefile.in Thu Jan 23 07:12:00 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/doc/writing_scrollkeeper_omf_files/C/Makefile.in Tue Jan 6 22:54:23 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 57,134 **** # Note: This make file is not incorporated into xmldocs.make because, in # general, there will be other documents install besides XML documents # and the makefiles for these formats should also include this file. - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 57,122 ---- # Note: This make file is not incorporated into xmldocs.make because, in # general, there will be other documents install besides XML documents # and the makefiles for these formats should also include this file. srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 144,187 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ figdir = docname = writing_scrollkeeper_omf_files lang = C --- 132,223 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ figdir = docname = writing_scrollkeeper_omf_files lang = C *************** *** 205,218 **** mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = ! DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/doc/xmldocs.make $(top_srcdir)/doc/omf.make $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu doc/writing_scrollkeeper_omf_files/C/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 241,257 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = ! DIST_COMMON = $(top_srcdir)/doc/omf.make $(top_srcdir)/doc/xmldocs.make \ ! Makefile.am Makefile.in all: all-am .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/doc/xmldocs.make $(top_srcdir)/doc/omf.make $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps doc/writing_scrollkeeper_omf_files/C/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 228,240 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 267,289 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! $(mkinstalldirs) $(distdir)/../../../doc ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 255,261 **** fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="${top_distdir}" distdir="$(distdir)" \ dist-hook check-am: all-am check: check-am --- 304,310 ---- fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook check-am: all-am check: check-am *************** *** 324,329 **** --- 373,386 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-local .PHONY: all all-am check check-am clean clean-generic clean-libtool \ *************** *** 333,347 **** 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 \ ! uninstall-local omf: omf_timestamp omf_timestamp: $(omffile) -for file in $(omffile); do \ ! $(top_builddir)/cl/src/scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $(srcdir)/$$file.out; \ done touch omf_timestamp --- 390,411 ---- install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-info-am uninstall-local omf: omf_timestamp + #omf_timestamp: $(omffile) + # -for file in $(omffile); do \ + # $(top_builddir)/cl/src/scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $(srcdir)/$$file.out; \ + # done + # touch omf_timestamp + + # ?? : BV : changed directory for $file.out from $(srcdir) to . omf_timestamp: $(omffile) -for file in $(omffile); do \ ! $(top_builddir)/cl/src/scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file ./$$file.out; \ done touch omf_timestamp *************** *** 349,355 **** install-data-hook-omf: $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) for file in $(omffile); do \ ! $(INSTALL_DATA) $(srcdir)/$$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ done # Remove our OMF files and directory --- 413,419 ---- install-data-hook-omf: $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) for file in $(omffile); do \ ! $(INSTALL_DATA) ./$$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ done # Remove our OMF files and directory diff -crN ./scrollkeeper/doc/writing_scrollkeeper_omf_files/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/doc/writing_scrollkeeper_omf_files/Makefile.in *** ./scrollkeeper/doc/writing_scrollkeeper_omf_files/Makefile.in Thu Jan 23 07:12:01 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/doc/writing_scrollkeeper_omf_files/Makefile.in Tue Jan 6 22:54:23 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,90 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 13,78 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 100,154 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ SUBDIRS = C subdir = doc/writing_scrollkeeper_omf_files mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = 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 --- 88,193 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ SUBDIRS = C subdir = doc/writing_scrollkeeper_omf_files mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-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 *************** *** 156,162 **** .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu doc/writing_scrollkeeper_omf_files/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 195,201 ---- .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps doc/writing_scrollkeeper_omf_files/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 224,233 **** --- 263,279 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 258,277 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__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) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 304,344 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 369,391 **** 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. --- 436,468 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive ctags \ ! ctags-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 pdf pdf-am \ ! pdf-recursive ps ps-am ps-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. diff -crN ./scrollkeeper/extract/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/extract/Makefile.in *** ./scrollkeeper/extract/Makefile.in Thu Jan 23 07:12:02 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/extract/Makefile.in Tue Jan 6 22:54:24 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 15,92 **** @SET_MAKE@ # copyright (C) 2001 Sun Microsystems, Inc. - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 15,80 ---- @SET_MAKE@ # copyright (C) 2001 Sun Microsystems, Inc. srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 102,157 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ SUBDIRS = stylesheets src dtds subdir = extract mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = 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 --- 90,196 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ SUBDIRS = stylesheets src dtds subdir = extract mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-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 *************** *** 159,165 **** .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu extract/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 198,204 ---- .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps extract/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 227,236 **** --- 266,282 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 261,280 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__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) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 307,347 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 372,394 **** 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. --- 439,471 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive ctags \ ! ctags-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 pdf pdf-am \ ! pdf-recursive ps ps-am ps-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. diff -crN ./scrollkeeper/extract/dtds/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/extract/dtds/Makefile.in *** ./scrollkeeper/extract/dtds/Makefile.in Thu Jan 23 07:12:02 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/extract/dtds/Makefile.in Tue Jan 6 22:54:25 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,90 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 13,78 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 100,143 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ CATALOG = $(sysconfdir)/xml/catalog dtdsdir = $(datadir)/xml/scrollkeeper/dtds dtds_HEADERS = scrollkeeper-omf.dtd scrollkeeper-cl.dtd --- 88,179 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ CATALOG = $(sysconfdir)/xml/catalog dtdsdir = $(datadir)/xml/scrollkeeper/dtds dtds_HEADERS = scrollkeeper-omf.dtd scrollkeeper-cl.dtd *************** *** 145,150 **** --- 181,188 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = HEADERS = $(dtds_HEADERS) *************** *** 154,160 **** .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu extract/dtds/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 192,198 ---- .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps extract/dtds/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 189,194 **** --- 227,235 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 214,233 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__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) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 255,295 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 315,331 **** mostlyclean-am: mostlyclean-generic mostlyclean-libtool uninstall-am: uninstall-dtdsHEADERS uninstall-info-am uninstall-local ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool distclean distclean-generic distclean-libtool \ ! distclean-tags distdir dvi dvi-am info info-am install \ ! install-am install-data install-data-am install-dtdsHEADERS \ ! 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 tags \ ! uninstall uninstall-am uninstall-dtdsHEADERS uninstall-info-am \ uninstall-local --- 377,402 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-dtdsHEADERS uninstall-info-am uninstall-local ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool ctags distclean distclean-generic \ ! distclean-libtool distclean-tags distdir dvi dvi-am info \ ! info-am install install-am install-data install-data-am \ ! install-dtdsHEADERS 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 pdf pdf-am ps ps-am tags uninstall \ ! uninstall-am uninstall-dtdsHEADERS uninstall-info-am \ uninstall-local diff -crN ./scrollkeeper/extract/src/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/extract/src/Makefile.in *** ./scrollkeeper/extract/src/Makefile.in Thu Jan 23 07:12:04 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/extract/src/Makefile.in Tue Jan 6 22:54:25 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 15,92 **** @SET_MAKE@ # copyright (C) 2001 Sun Microsystems, Inc. - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 15,80 ---- @SET_MAKE@ # copyright (C) 2001 Sun Microsystems, Inc. srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 102,145 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ INCLUDES = \ -I$(top_srcdir)/libs \ --- 90,181 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ INCLUDES = \ -I$(top_srcdir)/libs \ *************** *** 150,158 **** --- 186,196 ---- LDADD = \ $(XML_LIBS) \ $(XSLT_LIBS) \ + $(INTLLIBS) \ $(top_builddir)/libs/libscrollkeeper.la + # ?? : Changed by BV : Added $(INTLLIBS) scrollkeeper_extract_SOURCES = \ scrollkeeper-extract.c *************** *** 172,185 **** $(top_builddir)/libs/libscrollkeeper.la scrollkeeper_extract_LDFLAGS = - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/scrollkeeper-extract.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 210,218 ---- $(top_builddir)/libs/libscrollkeeper.la scrollkeeper_extract_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 187,193 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(scrollkeeper_extract_SOURCES) DIST_COMMON = Makefile.am Makefile.in SOURCES = $(scrollkeeper_extract_SOURCES) --- 220,225 ---- *************** *** 198,204 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu extract/src/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) --- 230,236 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps extract/src/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) *************** *** 212,218 **** ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ done --- 244,250 ---- ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ else :; fi; \ done *************** *** 240,268 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrollkeeper-extract.Po@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 272,285 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 277,282 **** --- 294,302 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 302,321 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__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) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 322,362 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 372,379 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 413,420 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 402,420 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-binPROGRAMS uninstall-info-am ! .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ ! clean-generic clean-libtool distclean distclean-compile \ ! distclean-depend 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-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-binPROGRAMS 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. --- 443,469 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-binPROGRAMS uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ ! clean-generic clean-libtool ctags 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-info install-info-am install-man install-strip \ ! installcheck installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ! tags uninstall uninstall-am uninstall-binPROGRAMS \ ! uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./scrollkeeper/extract/stylesheets/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/extract/stylesheets/Makefile.in *** ./scrollkeeper/extract/stylesheets/Makefile.in Thu Jan 23 07:12:04 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/extract/stylesheets/Makefile.in Tue Jan 6 22:54:26 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 15,92 **** @SET_MAKE@ # copyright (C) 2001 Sun Microsystems, Inc. - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 15,80 ---- @SET_MAKE@ # copyright (C) 2001 Sun Microsystems, Inc. srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 102,145 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ stylesheetsdir = $(datadir)/scrollkeeper/stylesheets stylesheets_HEADERS = toc.xsl index.xsl categories.xsl --- 90,181 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ stylesheetsdir = $(datadir)/scrollkeeper/stylesheets stylesheets_HEADERS = toc.xsl index.xsl categories.xsl *************** *** 147,152 **** --- 183,190 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = HEADERS = $(stylesheets_HEADERS) *************** *** 156,162 **** .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu extract/stylesheets/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 194,200 ---- .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps extract/stylesheets/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 191,196 **** --- 229,237 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 216,235 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__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) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 257,297 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 315,332 **** mostlyclean-am: mostlyclean-generic mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-stylesheetsHEADERS ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool distclean 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 install-stylesheetsHEADERS installcheck \ ! installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool tags uninstall uninstall-am \ ! uninstall-info-am uninstall-stylesheetsHEADERS # 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. --- 377,402 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-stylesheetsHEADERS ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool ctags distclean 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 install-stylesheetsHEADERS \ ! installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ ! uninstall-am uninstall-info-am uninstall-stylesheetsHEADERS # 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 ./scrollkeeper/install-sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/install-sh *** ./scrollkeeper/install-sh Mon Jul 29 13:39:53 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/install-sh Tue Jan 6 22:54:17 2004 *************** *** 109,115 **** echo "install: no input file specified" exit 1 else ! : fi if [ x"$dir_arg" != x ]; then --- 109,115 ---- echo "install: no input file specified" exit 1 else ! true fi if [ x"$dir_arg" != x ]; then *************** *** 120,126 **** instcmd=: chmodcmd="" else ! instcmd=$mkdirprog fi else --- 120,126 ---- instcmd=: chmodcmd="" else ! instcmd=mkdir fi else *************** *** 128,136 **** # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. ! if [ -f "$src" ] || [ -d "$src" ] then ! : else echo "install: $src does not exist" exit 1 --- 128,136 ---- # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. ! if [ -f $src -o -d $src ] then ! true else echo "install: $src does not exist" exit 1 *************** *** 141,147 **** echo "install: no destination specified" exit 1 else ! : fi # If destination is a directory, append the input filename; if your system --- 141,147 ---- echo "install: no destination specified" exit 1 else ! true fi # If destination is a directory, append the input filename; if your system *************** *** 151,157 **** then dst="$dst"/`basename $src` else ! : fi fi --- 151,157 ---- then dst="$dst"/`basename $src` else ! true fi fi *************** *** 163,170 **** # Skip lots of stat calls in the usual case. if [ ! -d "$dstdir" ]; then ! defaultIFS=' ! ' IFS="${IFS-${defaultIFS}}" oIFS="${IFS}" --- 163,170 ---- # Skip lots of stat calls in the usual case. if [ ! -d "$dstdir" ]; then ! defaultIFS=' ! ' IFS="${IFS-${defaultIFS}}" oIFS="${IFS}" *************** *** 183,189 **** then $mkdirprog "${pathcomp}" else ! : fi pathcomp="${pathcomp}/" --- 183,189 ---- then $mkdirprog "${pathcomp}" else ! true fi pathcomp="${pathcomp}/" *************** *** 194,203 **** then $doit $instcmd $dst && ! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && ! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && ! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi else # If we're going to rename the final executable, determine the name now. --- 194,203 ---- then $doit $instcmd $dst && ! 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 # If we're going to rename the final executable, determine the name now. *************** *** 216,222 **** then dstfile=`basename $dst` else ! : fi # Make a temp file name in the proper directory. --- 216,222 ---- then dstfile=`basename $dst` else ! true fi # Make a temp file name in the proper directory. *************** *** 235,244 **** # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $instcmd $src $dsttmp" command. ! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && ! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && ! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && # Now rename the file to the real destination. --- 235,244 ---- # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $instcmd $src $dsttmp" command. ! 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 ./scrollkeeper/intltool-extract.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/intltool-extract.in *** ./scrollkeeper/intltool-extract.in Thu Jan 23 07:11:19 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/intltool-extract.in Tue Jan 6 22:53:21 2004 *************** *** 4,10 **** # # The Intltool Message Extractor # ! # Copyright (C) 2000-2001 Free Software Foundation. # # Intltool is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as --- 4,10 ---- # # The Intltool Message Extractor # ! # Copyright (C) 2000-2001, 2003 Free Software Foundation. # # Intltool is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as *************** *** 32,38 **** ## Release information my $PROGRAM = "intltool-extract"; my $PACKAGE = "intltool"; ! my $VERSION = "0.22"; ## Loaded modules use strict; --- 32,38 ---- ## Release information my $PROGRAM = "intltool-extract"; my $PACKAGE = "intltool"; ! my $VERSION = "0.27.2"; ## Loaded modules use strict; *************** *** 124,158 **** ## Sub for printing release information sub version{ ! print "${PROGRAM} (${PACKAGE}) $VERSION\n"; ! print "Copyright (C) 2000 Free Software Foundation, Inc.\n"; ! print "Written by Kenneth Christiansen, 2000.\n\n"; ! print "This is free software; see the source for copying conditions. There is NO\n"; ! print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; exit; } ## Sub for printing usage information ! sub help{ ! print "Usage: ${PROGRAM} [FILENAME] [OPTIONS] ...\n"; ! print "Generates a header file from an xml source file.\n\nGrabs all strings "; ! print "between <_translatable_node> and it's end tag,\nwhere tag are all allowed "; ! print "xml tags. Read the docs for more info.\n\n"; ! print " -v, --version shows the version\n"; ! print " -h, --help shows this help page\n"; ! print " -q, --quiet quiet mode\n"; ! print "\nReport bugs to .\n"; exit; } ## Sub for printing error messages sub error{ ! print "Try `${PROGRAM} --help' for more information.\n"; exit; } sub message { ! print "Generating C format header file for translation.\n"; } sub extract { --- 124,175 ---- ## Sub for printing release information sub version{ ! print <<_EOF_; ! ${PROGRAM} (${PACKAGE}) $VERSION ! Copyright (C) 2000, 2003 Free Software Foundation, Inc. ! Written by Kenneth Christiansen, 2000. ! ! This is free software; see the source for copying conditions. There is NO ! warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! _EOF_ exit; } ## Sub for printing usage information ! sub help { ! print <<_EOF_; ! Usage: ${PROGRAM} [OPTION]... [FILENAME] ! Generates a header file from an XML source file. ! ! It grabs all strings between <_translatable_node> and its end tag in ! XML files. Read manpage (man ${PROGRAM}) for more info. ! ! --type=TYPE Specify the file type of FILENAME. Currently supports: ! "gettext/glade", "gettext/ini", "gettext/keys" ! "gettext/rfc822deb", "gettext/schemas", ! "gettext/scheme", "gettext/xml" ! -l, --local Writes output into current working directory ! (conflicts with --update) ! --update Writes output into the same directory the source file ! reside (conflicts with --local) ! -v, --version Output version information and exit ! -h, --help Display this help and exit ! -q, --quiet Quiet mode ! ! Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") ! or send email to . ! _EOF_ exit; } ## Sub for printing error messages sub error{ ! print STDERR "Try `${PROGRAM} --help' for more information.\n"; exit; } sub message { ! print "Generating C format header file for translation.\n" unless $QUIET_ARG; } sub extract { *************** *** 183,188 **** --- 200,206 ---- &type_glade if $gettext_type eq "glade"; &type_scheme if $gettext_type eq "scheme"; &type_schemas if $gettext_type eq "schemas"; + &type_rfc822deb if $gettext_type eq "rfc822deb"; } sub entity_decode_minimal *************** *** 241,255 **** sub type_xml { ### For generic translatable XML files ### ! while ($input =~ /\s_$w+=\"([^"]+)\"/sg) { # " $messages{entity_decode_minimal($1)} = []; } ! while ($input =~ /<_($w+)>(.+?)<\/_\1>/sg) { ! $_ = $2; ! s/\s+/ /g; ! s/^ //; ! s/ $//; $messages{entity_decode_minimal($_)} = []; } } --- 259,275 ---- sub type_xml { ### For generic translatable XML files ### ! while ($input =~ /\s_$w+\s*=\s*\"([^"]+)\"/sg) { # " $messages{entity_decode_minimal($1)} = []; } ! while ($input =~ /<_($w+)(?: xml:space="($w+)")?>(.+?)<\/_\1>/sg) { ! $_ = $3; ! if (!defined($2) || $2 ne "preserve") { ! s/\s+/ /g; ! s/^ //; ! s/ $//; ! } $messages{entity_decode_minimal($_)} = []; } } *************** *** 258,270 **** ### For schemas XML files ### # FIXME: We should handle escaped < (less than) ! while ($input =~ /<(short|long)>([^<]+)<\/\1>/sg) { ! $_ = $2; s/\s+/ /g; - s/^ //; - s/ $//; $messages{entity_decode_minimal($_)} = []; } } sub type_glade { --- 278,351 ---- ### For schemas XML files ### # FIXME: We should handle escaped < (less than) ! while ($input =~ / ! \s* ! (\s*(.*?)\s*<\/default>\s*)? ! (\s*(.*?)\s*<\/short>\s*)? ! (\s*(.*?)\s*<\/long>\s*)? ! <\/locale> ! /sgx) { ! my @totranslate = ($2,$4,$6); ! foreach (@totranslate) { ! next if !$_; s/\s+/ /g; $messages{entity_decode_minimal($_)} = []; + } + } + } + + sub type_rfc822deb { + ### For rfc822-style Debian configuration files ### + + while ($input =~ /(?:^|\n)_[^:]+:\s*(.*?)(?=\n\S|$)/sg) { + my @str_list = rfc822deb_split($1); + for my $str (@str_list) { + # As rfc822deb is for configuration files, duplicates + # should never happen. Developers must use the + # [] construct to make msgid unique, see also intltool-merge + print STDERR "Warning: msgid multiply defined:\n $str\n" + if defined($messages{$str}); + $messages{$str} = []; + } + } + } + + sub rfc822deb_split { + # Debian defines a special way to deal with rfc822-style files: + # when a value contain newlines, it consists of + # 1. a short form (first line) + # 2. a long description, all lines begin with a space, + # and paragraphs are separated by a single dot on a line + # This routine returns an array of all paragraphs, and reformat + # them. + my $text = shift; + $text =~ s/^ //mg; + return ($text) if $text !~ /\n/; + + $text =~ s/([^\n]*)\n//; + my @list = ($1); + my $str = ''; + for my $line (split (/\n/, $text)) { + chomp $line; + $line =~ /\s+$/; + if ($line =~ /^\.$/) { + # New paragraph + $str =~ s/\s*$//; + push(@list, $str); + $str = ''; + } elsif ($line =~ /^\s/) { + # Line which must not be reformatted + $str .= "\n" if length ($str) && $str !~ /\n$/; + $str .= $line."\n"; + } else { + # Continuation line, remove newline + $str .= " " if length ($str) && $str !~ /[\n ]$/; + $str .= $line; + } } + $str =~ s/\s*$//; + push(@list, $str) if length ($str); + return @list; } sub type_glade { *************** *** 295,301 **** } sub type_scheme { ! while ($input =~ /_\(?"((?:[^"\\]+|\\.)*)"\)?/sg) { $messages{$1} = []; } } --- 376,382 ---- } sub type_scheme { ! while ($input =~ /_\w*\(?"((?:[^"\\]+|\\.)*)"\)?/sg) { $messages{$1} = []; } } *************** *** 304,310 **** for my $message (sort keys %messages) { print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/; ! my @lines = split (/\n/, $message); for (my $n = 0; $n < @lines; $n++) { if ($n == 0) { print OUT "char *s = N_(\""; --- 385,391 ---- for my $message (sort keys %messages) { print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/; ! my @lines = split (/\n/, $message, -1); for (my $n = 0; $n < @lines; $n++) { if ($n == 0) { print OUT "char *s = N_(\""; diff -crN ./scrollkeeper/intltool-merge.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/intltool-merge.in *** ./scrollkeeper/intltool-merge.in Thu Jan 23 07:11:19 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/intltool-merge.in Tue Jan 6 22:53:21 2004 *************** *** 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 --- 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 *************** *** 34,44 **** ## Release information my $PROGRAM = "intltool-merge"; my $PACKAGE = "intltool"; ! my $VERSION = "0.22"; ## Loaded modules use strict; use Getopt::Long; ## Scalars used by the option stuff my $HELP_ARG = 0; --- 34,45 ---- ## Release information my $PROGRAM = "intltool-merge"; my $PACKAGE = "intltool"; ! my $VERSION = "0.27.2"; ## Loaded modules use strict; use Getopt::Long; + use Text::Wrap; ## Scalars used by the option stuff my $HELP_ARG = 0; *************** *** 48,53 **** --- 49,55 ---- my $KEYS_STYLE_ARG = 0; my $DESKTOP_STYLE_ARG = 0; my $SCHEMAS_STYLE_ARG = 0; + my $RFC822DEB_STYLE_ARG = 0; my $QUIET_ARG = 0; my $PASS_THROUGH_ARG = 0; my $UTF8_ARG = 0; *************** *** 65,70 **** --- 67,73 ---- "keys-style|k" => \$KEYS_STYLE_ARG, "desktop-style|d" => \$DESKTOP_STYLE_ARG, "schemas-style|s" => \$SCHEMAS_STYLE_ARG, + "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG, "pass-through|p" => \$PASS_THROUGH_ARG, "utf8|u" => \$UTF8_ARG, "cache|c=s" => \$cache_file *************** *** 76,81 **** --- 79,85 ---- my %po_files_by_lang = (); my %translations = (); + my $iconv = $ENV{"INTLTOOL_ICONV"} || "iconv"; # Use this instead of \w for XML files to handle more possible characters. my $w = "[-A-Za-z0-9._:]"; *************** *** 85,122 **** ## Check for options. ! if ($VERSION_ARG) { &print_version; ! } elsif ($HELP_ARG) { &print_help; ! } elsif ($BA_STYLE_ARG && @ARGV > 2) { &preparation; &print_message; &ba_merge_translations; &finalize; ! } elsif ($XML_STYLE_ARG && @ARGV > 2) { &utf8_sanity_check; &preparation; &print_message; &xml_merge_translations; &finalize; ! } elsif ($KEYS_STYLE_ARG && @ARGV > 2) { &utf8_sanity_check; &preparation; &print_message; &keys_merge_translations; &finalize; ! } elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) { &preparation; &print_message; &desktop_merge_translations; &finalize; ! } elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2) { &preparation; &print_message; &schemas_merge_translations; &finalize; ! } else { &print_help; } --- 89,148 ---- ## Check for options. ! if ($VERSION_ARG) ! { &print_version; ! } ! elsif ($HELP_ARG) ! { &print_help; ! } ! elsif ($BA_STYLE_ARG && @ARGV > 2) ! { &preparation; &print_message; &ba_merge_translations; &finalize; ! } ! elsif ($XML_STYLE_ARG && @ARGV > 2) ! { &utf8_sanity_check; &preparation; &print_message; &xml_merge_translations; &finalize; ! } ! elsif ($KEYS_STYLE_ARG && @ARGV > 2) ! { &utf8_sanity_check; &preparation; &print_message; &keys_merge_translations; &finalize; ! } ! elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) ! { &preparation; &print_message; &desktop_merge_translations; &finalize; ! } ! elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2) ! { &preparation; &print_message; &schemas_merge_translations; &finalize; ! } ! elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2) ! { ! &preparation; ! &print_message; ! &rfc822deb_merge_translations; ! &finalize; ! } ! else ! { &print_help; } *************** *** 125,158 **** ## Sub for printing release information sub print_version { ! print "${PROGRAM} (${PACKAGE}) ${VERSION}\n"; ! print "Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen.\n\n"; ! print "Copyright (C) 2000-2002 Free Software Foundation, Inc.\n"; ! print "Copyright (C) 2000-2001 Eazel, Inc.\n"; ! print "This is free software; see the source for copying conditions. There is NO\n"; ! print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; exit; } ## Sub for printing usage information sub print_help { ! print "Usage: ${PROGRAM} [OPTIONS] PO_DIRECTORY FILENAME OUTPUT_FILE\n"; ! print "Generates an output file that includes translated versions of some attributes,\n"; ! print "from an untranslated source and a po directory that includes translations.\n\n"; ! print " -b, --ba-style includes translations in the bonobo-activation style\n"; ! print " -d, --desktop-style includes translations in the desktop style\n"; ! print " -k, --keys-style includes translations in the keys style\n"; ! print " -s, --schemas-style includes translations in the schemas style\n"; ! print " -x, --xml-style includes translations in the standard xml style\n"; ! print " -u, --utf8 convert all strings to UTF-8 before merging\n"; ! print " -p, --pass-through use strings as found in .po files, without\n"; ! print " conversion (STRONGLY unrecommended with -x)\n"; ! print " -q, --quiet suppress most messages\n"; ! print " --help display this help and exit\n"; ! print " --version output version information and exit\n"; ! print "\nReport bugs to bugzilla.gnome.org, module intltool, or contact us through \n"; ! print ".\n"; exit; } --- 151,197 ---- ## Sub for printing release information sub print_version { ! print <<_EOF_; ! ${PROGRAM} (${PACKAGE}) ${VERSION} ! Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen. ! ! Copyright (C) 2000-2003 Free Software Foundation, Inc. ! Copyright (C) 2000-2001 Eazel, Inc. ! This is free software; see the source for copying conditions. There is NO ! warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! _EOF_ exit; } ## Sub for printing usage information sub print_help { ! print <<_EOF_; ! Usage: ${PROGRAM} [OPTION]... PO_DIRECTORY FILENAME OUTPUT_FILE ! Generates an output file that includes some localized attributes from an ! untranslated source file. ! ! Mandatory options: (exactly one must be specified) ! -b, --ba-style includes translations in the bonobo-activation style ! -d, --desktop-style includes translations in the desktop style ! -k, --keys-style includes translations in the keys style ! -s, --schemas-style includes translations in the schemas style ! -r, --rfc822deb-style includes translations in the RFC822 style ! -x, --xml-style includes translations in the standard xml style ! ! Other options: ! -u, --utf8 convert all strings to UTF-8 before merging ! -p, --pass-through use strings as found in .po files, without ! conversion (STRONGLY unrecommended with -x) ! -c, --cache=FILE specify cache file name ! (usually \$top_builddir/po/.intltool-merge-cache) ! -q, --quiet suppress most messages ! --help display this help and exit ! --version output version information and exit ! ! Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") ! or send email to . ! _EOF_ exit; } *************** *** 160,166 **** ## Sub for printing error messages sub print_error { ! print "Try `${PROGRAM} --help' for more information.\n"; exit; } --- 199,205 ---- ## Sub for printing error messages sub print_error { ! print STDERR "Try `${PROGRAM} --help' for more information.\n"; exit; } *************** *** 197,228 **** } } sub get_po_encoding { my ($in_po_file) = @_; my $encoding = ""; open IN_PO_FILE, $in_po_file or die; ! while () { ## example: "Content-Type: text/plain; charset=ISO-8859-1\n" ! if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/) { $encoding = $1; last; } } close IN_PO_FILE; ! if (!$encoding) { ! print "Warning: no encoding found in $in_po_file. Assuming ISO-8859-1\n"; $encoding = "ISO-8859-1"; } return $encoding } sub utf8_sanity_check { ! if (!$UTF8_ARG) { ! if (!$PASS_THROUGH_ARG) { $PASS_THROUGH_ARG="1"; } } --- 236,301 ---- } } + 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) + + if (open CHARSET_ALIAS, $alias_file) + { + while () + { + next if /^\#/; + return $1 if (/^\s*([-._a-zA-Z0-9]+)\s+$encoding\b/i) + } + + close CHARSET_ALIAS; + } + + # if not found, return input string + + return $encoding; + } + sub get_po_encoding { my ($in_po_file) = @_; my $encoding = ""; open IN_PO_FILE, $in_po_file or die; ! while () ! { ## example: "Content-Type: text/plain; charset=ISO-8859-1\n" ! if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/) ! { $encoding = $1; last; } } close IN_PO_FILE; ! if (!$encoding) ! { ! print STDERR "Warning: no encoding found in $in_po_file. Assuming ISO-8859-1\n" unless $QUIET_ARG; $encoding = "ISO-8859-1"; } + + system ("$iconv -f $encoding -t UTF-8 /dev/null"); + if ($?) { + $encoding = get_local_charset($encoding); + } + return $encoding } sub utf8_sanity_check { ! if (!$UTF8_ARG) ! { ! if (!$PASS_THROUGH_ARG) ! { $PASS_THROUGH_ARG="1"; } } *************** *** 241,251 **** { my $newest_age; ! foreach my $file (values %po_files_by_lang) { my $file_age = -M $file; $newest_age = $file_age if !$newest_age || $file_age < $newest_age; } return $newest_age; } --- 314,327 ---- { my $newest_age; ! foreach my $file (values %po_files_by_lang) ! { my $file_age = -M $file; $newest_age = $file_age if !$newest_age || $file_age < $newest_age; } + $newest_age = 0 if !$newest_age; + return $newest_age; } *************** *** 277,284 **** sub get_cached_translation_database { my $cache_file_age = -M $cache_file; ! if (defined $cache_file_age) { ! if ($cache_file_age <= &get_newest_po_age) { &load_cache; return; } --- 353,362 ---- sub get_cached_translation_database { my $cache_file_age = -M $cache_file; ! if (defined $cache_file_age) ! { ! if ($cache_file_age <= &get_newest_po_age) ! { &load_cache; return; } *************** *** 290,307 **** sub create_translation_database { ! for my $lang (keys %po_files_by_lang) { my $po_file = $po_files_by_lang{$lang}; ! if ($UTF8_ARG) { my $encoding = get_po_encoding ($po_file); ! if (lc $encoding eq "utf-8") { open PO_FILE, "<$po_file"; ! } else { ! my $iconv = $ENV{"INTLTOOL_ICONV"} || "iconv"; open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|"; } ! } else { open PO_FILE, "<$po_file"; } --- 368,394 ---- sub create_translation_database { ! for my $lang (keys %po_files_by_lang) ! { my $po_file = $po_files_by_lang{$lang}; ! if ($UTF8_ARG) ! { my $encoding = get_po_encoding ($po_file); ! ! if (lc $encoding eq "utf-8") ! { open PO_FILE, "<$po_file"; ! } ! else ! { ! print STDERR "WARNING: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;; ! open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|"; } ! } ! else ! { open PO_FILE, "<$po_file"; } *************** *** 310,318 **** my $inmsgstr = 0; my $msgid = ""; my $msgstr = ""; ! while () { $nextfuzzy = 1 if /^#, fuzzy/; ! if (/^msgid "((\\.|[^\\])*)"/ ) { $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; $msgid = ""; $msgstr = ""; --- 397,409 ---- my $inmsgstr = 0; my $msgid = ""; my $msgstr = ""; ! ! while () ! { $nextfuzzy = 1 if /^#, fuzzy/; ! ! if (/^msgid "((\\.|[^\\])*)"/ ) ! { $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; $msgid = ""; $msgstr = ""; *************** *** 326,337 **** $inmsgstr = 0; $nextfuzzy = 0; } ! if (/^msgstr "((\\.|[^\\])*)"/) { $msgstr = unescape_po_string($1); $inmsgstr = 1; $inmsgid = 0; } ! if (/^"((\\.|[^\\])*)"/) { $msgid .= unescape_po_string($1) if $inmsgid; $msgstr .= unescape_po_string($1) if $inmsgstr; } --- 417,432 ---- $inmsgstr = 0; $nextfuzzy = 0; } ! ! if (/^msgstr "((\\.|[^\\])*)"/) ! { $msgstr = unescape_po_string($1); $inmsgstr = 1; $inmsgid = 0; } ! ! if (/^"((\\.|[^\\])*)"/) ! { $msgid .= unescape_po_string($1) if $inmsgid; $msgstr .= unescape_po_string($1) if $inmsgstr; } *************** *** 350,355 **** --- 445,451 ---- return "\\" if $sequence eq "\\\\"; return "\"" if $sequence eq "\\\""; + return "\n" if $sequence eq "\\n"; # gettext also handles \n, \t, \b, \r, \f, \v, \a, \xxx (octal), # \xXX (hex) and has a comment saying they want to handle \u and \U. *************** *** 366,371 **** --- 462,469 ---- return $string; } + ## NOTE: deal with < - < but not > - > because it seems its ok to have + ## > in the entity. For further info please look at #84738. sub entity_decode { local ($_) = @_; *************** *** 373,381 **** --- 471,485 ---- s/'/'/g; # ' s/"/"/g; # " s/&/&/g; + s/</ 127 || $_ == 34 || $_ == 38 || $_ == 39) { # the ($_ > 127) should probably be removed return "&#" . $_ . ";"; ! } else { return chr $_; } } --- 503,521 ---- return """ if $_ == 34; return "&" if $_ == 38; return "'" if $_ == 39; + return "<" if $_ == 60; return chr $_; } sub entity_encode_int_even_high_bit { ! if ($_ > 127 || $_ == 34 || $_ == 38 || $_ == 39 || $_ == 60) ! { # the ($_ > 127) should probably be removed return "&#" . $_ . ";"; ! } ! else ! { return chr $_; } } *************** *** 432,438 **** open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE: $!"; ! while ($source =~ s|^(.*?)([ \t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s) { print OUTPUT $1; my $node = $2 . "\n"; --- 544,551 ---- open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE: $!"; ! while ($source =~ s|^(.*?)([ \t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s) ! { print OUTPUT $1; my $node = $2 . "\n"; *************** *** 445,457 **** print OUTPUT; my %langs; ! for my $string (@strings) { ! for my $lang (keys %po_files_by_lang) { $langs{$lang} = 1 if $translations{$lang, $string}; } } ! for my $lang (sort keys %langs) { $_ = $node; s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s; s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3) . '"'/seg; --- 558,573 ---- print OUTPUT; my %langs; ! for my $string (@strings) ! { ! for my $lang (keys %po_files_by_lang) ! { $langs{$lang} = 1 if $translations{$lang, $string}; } } ! for my $lang (sort keys %langs) ! { $_ = $node; s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s; s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3) . '"'/seg; *************** *** 487,493 **** $source =~ s|<\s*_($w+)\s*/>|<$1/>|g; # Support for <_foo>blah style translations. ! while ($source =~ s|^(.*?)([ \t]*)<\s*_($w+)\s*>(.*?)<\s*/_\3\s*>([ \t]*\n)?||s) { print OUTPUT $1; my $spaces = $2; --- 603,610 ---- $source =~ s|<\s*_($w+)\s*/>|<$1/>|g; # Support for <_foo>blah style translations. ! while ($source =~ s|^(.*?)([ \t]*)<\s*_($w+)\s*>(.*?)<\s*/_\3\s*>([ \t]*\n)?||s) ! { print OUTPUT $1; my $spaces = $2; *************** *** 501,507 **** $string =~ s/ $//; $string = entity_decode($string); ! for my $lang (sort keys %po_files_by_lang) { my $translation = $translations{$lang, $string}; next if !$translation; $translation = entity_encode($translation); --- 618,625 ---- $string =~ s/ $//; $string = entity_decode($string); ! for my $lang (sort keys %po_files_by_lang) ! { my $translation = $translations{$lang, $string}; next if !$translation; $translation = entity_encode($translation); *************** *** 519,533 **** open INPUT, "<${FILE}" or die; open OUTPUT, ">${OUTFILE}" or die; ! while () { ! if (s/^(\s*)_(\w+=(.*))/$1$2/) { my $string = $3; print OUTPUT; my $non_translated_line = $_; ! for my $lang (sort keys %po_files_by_lang) { my $translation = $translations{$lang, $string}; next if !$translation; --- 637,654 ---- open INPUT, "<${FILE}" or die; open OUTPUT, ">${OUTFILE}" or die; ! while () ! { ! if (s/^(\s*)_(\w+=(.*))/$1$2/) ! { my $string = $3; print OUTPUT; my $non_translated_line = $_; ! for my $lang (sort keys %po_files_by_lang) ! { my $translation = $translations{$lang, $string}; next if !$translation; *************** *** 535,541 **** s/(\w+)=.*/[$lang]$1=$translation/; print OUTPUT; } ! } else { print OUTPUT; } } --- 656,664 ---- s/(\w+)=.*/[$lang]$1=$translation/; print OUTPUT; } ! } ! else ! { print OUTPUT; } } *************** *** 549,563 **** open INPUT, "<${FILE}" or die; open OUTPUT, ">${OUTFILE}" or die; ! while () { ! if (s/^(\s*)_(\w+=(.*))/$1$2/) { my $string = $3; print OUTPUT; my $non_translated_line = $_; ! for my $lang (sort keys %po_files_by_lang) { my $translation = $translations{$lang, $string}; next if !$translation; --- 672,689 ---- open INPUT, "<${FILE}" or die; open OUTPUT, ">${OUTFILE}" or die; ! while () ! { ! if (s/^(\s*)_(\w+=(.*))/$1$2/) ! { my $string = $3; print OUTPUT; my $non_translated_line = $_; ! for my $lang (sort keys %po_files_by_lang) ! { my $translation = $translations{$lang, $string}; next if !$translation; *************** *** 565,571 **** s/(\w+)=.*/${1}[$lang]=$translation/; print OUTPUT; } ! } else { print OUTPUT; } } --- 691,699 ---- s/(\w+)=.*/${1}[$lang]=$translation/; print OUTPUT; } ! } ! else ! { print OUTPUT; } } *************** *** 593,650 **** # For example, <_foo/> is just replaced by . $source =~ s|<\s*_($w+)\s*/>|<$1/>|g; ! # Support for <_foo>blah style translations. ! ! my $regex_start = "^(.*?)([ \t]*)"; ! my $regex_short = "([ \t\n]*)(.*?)"; ! my $regex_long = "([ \t\n]*)(.*?)"; ! my $regex_end = "([ \t\n]*)"; ! ! while ($source =~ s|$regex_start$regex_short$regex_long$regex_end||s) { print OUTPUT $1; ! my $locale_start_spaces = $2; ! my $locale_end_spaces = $7; ! my $short_spaces = $3; ! my $short_string = $4; ! my $long_spaces = $5; ! my $long_string = $6; ! ! # English first ! ! print OUTPUT "$locale_start_spaces"; ! print OUTPUT "$short_spaces$short_string"; ! print OUTPUT "$long_spaces$long_string"; ! print OUTPUT "$locale_end_spaces"; $short_string =~ s/\s+/ /g; - $short_string =~ s/^ //; - $short_string =~ s/ $//; $short_string = entity_decode($short_string); - $long_string =~ s/\s+/ /g; - $long_string =~ s/^ //; - $long_string =~ s/ $//; $long_string = entity_decode($long_string); ! for my $lang (sort keys %po_files_by_lang) { my $short_translation = $translations{$lang, $short_string}; my $long_translation = $translations{$lang, $long_string}; ! next if (!$short_translation && !$long_translation); print OUTPUT "\n$locale_start_spaces"; if ($short_translation) { ! $short_translation = entity_encode($short_translation); ! print OUTPUT "$short_spaces$short_translation"; } if ($long_translation) { ! $long_translation = entity_encode($long_translation); ! print OUTPUT "$long_spaces$long_translation"; } print OUTPUT "$locale_end_spaces"; --- 721,791 ---- # For example, <_foo/> is just replaced by . $source =~ s|<\s*_($w+)\s*/>|<$1/>|g; ! while ($source =~ s/ ! (.*?) ! (\s+)((\s*) ! (\s*(.*?)\s*<\/default>)?(\s*) ! (\s*(.*?)\s*<\/short>)?(\s*) ! (\s*(.*?)\s*<\/long>)?(\s*) ! <\/locale>) ! //sx) ! { print OUTPUT $1; ! my $locale_start_spaces = $2 ? $2 : ''; ! my $default_spaces = $4 ? $4 : ''; ! my $short_spaces = $7 ? $7 : ''; ! my $long_spaces = $10 ? $10 : ''; ! my $locale_end_spaces = $13 ? $13 : ''; ! my $c_default_block = $3 ? $3 : ''; ! my $default_string = $6 ? $6 : ''; ! my $short_string = $9 ? $9 : ''; ! my $long_string = $12 ? $12 : ''; ! ! $c_default_block =~ s/default>\[.*?\]/default>/s; ! ! print OUTPUT "$locale_start_spaces$c_default_block"; + $default_string =~ s/\s+/ /g; + $default_string = entity_decode($default_string); $short_string =~ s/\s+/ /g; $short_string = entity_decode($short_string); $long_string =~ s/\s+/ /g; $long_string = entity_decode($long_string); ! for my $lang (sort keys %po_files_by_lang) ! { ! my $default_translation = $translations{$lang, $default_string}; my $short_translation = $translations{$lang, $short_string}; my $long_translation = $translations{$lang, $long_string}; ! next if (!$default_translation && !$short_translation && ! !$long_translation); print OUTPUT "\n$locale_start_spaces"; + print OUTPUT "$default_spaces"; + + if ($default_translation) + { + $default_translation = entity_encode($default_translation); + print OUTPUT "$default_translation"; + } + + print OUTPUT "$short_spaces"; + if ($short_translation) { ! $short_translation = entity_encode($short_translation); ! print OUTPUT "$short_translation"; } + print OUTPUT "$long_spaces"; + if ($long_translation) { ! $long_translation = entity_encode($long_translation); ! print OUTPUT "$long_translation"; } print OUTPUT "$locale_end_spaces"; *************** *** 655,657 **** --- 796,933 ---- close OUTPUT; } + + sub rfc822deb_merge_translations + { + my $source; + + $Text::Wrap::huge = 'overflow'; + + { + local $/; # slurp mode + open INPUT, "<$FILE" or die "can't open $FILE: $!"; + $source = ; + close INPUT; + } + + open OUTPUT, ">${OUTFILE}" or die; + + while ($source =~ /(^|\n+)(_)?([^:_\n]+)(:\s*)(.*?)(?=\n[\S\n]|$)/sg) + { + my $sep = $1; + my $non_translated_line = $3.$4; + my $string = $5; + my $is_translatable = defined($2); + # Remove [] dummy strings + $string =~ s/\[\s[^\[\]]*\]$//; + $non_translated_line .= $string; + + print OUTPUT $sep.$non_translated_line; + + if ($is_translatable) + { + my @str_list = rfc822deb_split($string); + + for my $lang (sort keys %po_files_by_lang) + { + my $is_translated = 1; + my $str_translated = ''; + my $first = 1; + + for my $str (@str_list) + { + my $translation = $translations{$lang, $str}; + + if (!$translation) + { + $is_translated = 0; + last; + } + + # $translation may also contain [] dummy + # strings, mostly to indicate an empty string + $translation =~ s/\[\s[^\[\]]*\]$//; + + if ($first) + { + $str_translated .= + Text::Tabs::expand($translation) . + "\n"; + } + else + { + $str_translated .= Text::Tabs::expand( + Text::Wrap::wrap(' ', ' ', $translation)) . + "\n .\n"; + } + $first = 0; + + # To fix some problems with Text::Wrap::wrap + $str_translated =~ s/(\n )+\n/\n .\n/g; + } + next unless $is_translated; + + $str_translated =~ s/\n \.\n$//; + $str_translated =~ s/\s+$//; + + $_ = $non_translated_line; + s/^(\w+):\s*.*/$sep${1}-$lang: $str_translated/s; + print OUTPUT; + } + } + } + print OUTPUT "\n"; + + close OUTPUT; + close INPUT; + } + + sub rfc822deb_split + { + # Debian defines a special way to deal with rfc822-style files: + # when a value contain newlines, it consists of + # 1. a short form (first line) + # 2. a long description, all lines begin with a space, + # and paragraphs are separated by a single dot on a line + # This routine returns an array of all paragraphs, and reformat + # them. + my $text = shift; + $text =~ s/^ //mg; + return ($text) if $text !~ /\n/; + + $text =~ s/([^\n]*)\n//; + my @list = ($1); + my $str = ''; + + for my $line (split (/\n/, $text)) + { + chomp $line; + $line =~ /\s+$/; + + if ($line =~ /^\.$/) + { + # New paragraph + $str =~ s/\s*$//; + push(@list, $str); + $str = ''; + } + elsif ($line =~ /^\s/) + { + # Line which must not be reformatted + $str .= "\n" if length ($str) && $str !~ /\n$/; + $str .= $line."\n"; + } + else + { + # Continuation line, remove newline + $str .= " " if length ($str) && $str !~ /[\n ]$/; + $str .= $line; + } + } + + $str =~ s/\s*$//; + push(@list, $str) if length ($str); + + return @list; + } + diff -crN ./scrollkeeper/intltool-update.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/intltool-update.in *** ./scrollkeeper/intltool-update.in Thu Jan 23 07:11:19 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/intltool-update.in Tue Jan 6 22:53:21 2004 *************** *** 3,9 **** # # The Intltool Message Updater # ! # Copyright (C) 2000-2002 Free Software Foundation. # # Intltool is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License --- 3,9 ---- # # The Intltool Message Updater # ! # Copyright (C) 2000-2003 Free Software Foundation. # # Intltool is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License *************** *** 29,35 **** ## Release information my $PROGRAM = "intltool-update"; ! my $VERSION = "0.22"; my $PACKAGE = "intltool"; ## Loaded modules --- 29,35 ---- ## Release information my $PROGRAM = "intltool-update"; ! my $VERSION = "0.27.2"; my $PACKAGE = "intltool"; ## Loaded modules *************** *** 49,56 **** --- 49,58 ---- my $REPORT_ARG = 0; my $VERBOSE = 0; my $GETTEXT_PACKAGE = ""; + my $OUTPUT_FILE = ""; my @languages; + my %varhash = (); my %po_files_by_lang = (); # Regular expressions to categorize file types. *************** *** 59,68 **** --- 61,72 ---- my $xml_extension = "xml(\.in)*|". # .in is not required "ui|". + "lang|". "glade2?(\.in)*|". # .in is not required "scm(\.in)*|". # .in is not required "oaf(\.in)+|". "etspec|". + "server(\.in)+|". "sheet(\.in)+|". "schemas(\.in)+|". "pong(\.in)+"; *************** *** 73,81 **** "directory(\.in)+|". "soundlist(\.in)+|". "keys(\.in)+|". ! "server(\.in)+"; ! ## Always print as the first thing $| = 1; ## Handle options --- 77,85 ---- "directory(\.in)+|". "soundlist(\.in)+|". "keys(\.in)+|". ! "theme(\.in)+"; ! ## Always flush buffer when printing $| = 1; ## Handle options *************** *** 90,95 **** --- 94,100 ---- "report|r" => \$REPORT_ARG, "verbose|x" => \$VERBOSE, "gettext-package|g=s" => \$GETTEXT_PACKAGE, + "output-file|o=s" => \$OUTPUT_FILE, ) or &print_error_invalid_option; &print_help if $HELP_ARG; *************** *** 100,132 **** + ($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; ! } } exit; --- 105,155 ---- + ($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 ($POT_ARG) ! { &generate_headers; &generate_po_template; ! } ! elsif ($HEADERS_ARG) ! { &generate_headers; ! } ! elsif ($MAINTAIN_ARG) ! { &find_leftout_files; ! } ! elsif ($REPORT_ARG) ! { ! &generate_headers; ! &generate_po_template; &print_report; ! } ! elsif ((defined $ARGV[0]) && $ARGV[0] =~ /^[a-z]/) ! { ! my $lang = $ARGV[0]; ! ! ## Report error if the language file supplied ! ## to the command line is non-existent ! &print_error_not_existing("$lang.po") if ! -s "$lang.po"; ! ! if (!$DIST_ARG) ! { ! print "Working, please wait..." if $VERBOSE; ! &generate_headers; ! &generate_po_template; ! } ! &update_po_file ($lang, $OUTPUT_FILE); ! &print_status ($lang, $OUTPUT_FILE); ! } ! else ! { ! &print_help; } exit; *************** *** 135,222 **** sub print_version { ! ## Print version information ! print "${PROGRAM} (${PACKAGE}) $VERSION\n"; ! print "Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler.\n\n"; ! print "Copyright (C) 2000-2002 Free Software Foundation, Inc.\n"; ! print "This is free software; see the source for copying conditions. There is NO\n"; ! print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; exit; } sub print_help { ! ## Print usage information ! print "Usage: ${PROGRAM} [OPTIONS] ...LANGCODE\n"; ! print "Updates PO template files and merge them with the translations.\n\n"; ! print " -p, --pot generate the PO template only\n"; ! print " -s, --headers generate the header files in POTFILES.in\n"; ! print " -m, --maintain search for left out files from POTFILES.in\n"; ! print " -r, --report display a status report for the module.\n"; ! print " -x, --verbose display lots of feedback\n"; ! print " --help display this help and exit\n"; ! print " --version output version information and exit\n"; ! print "\nExamples of use:\n"; ! print "${PROGRAM} --pot just creates a new PO template from the source\n"; ! print "${PROGRAM} da created new PO template and updated the da.po file\n\n"; ! print "Report bugs to bugzilla.gnome.org, module 'intltool'.\n"; exit; } - 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"; - - print "Working, please wait..." unless $VERBOSE; - &generate_headers; - &generate_po_template; - &update_po_file ($lang); - &print_status ($lang); - } - sub determine_type ($) { my $type = $_; my $gettext_type; ! # FIXME: Use $xml_extentions, and maybe do all this even nicer my $xml_regex = ! "(?:xml(\.in)*|ui|oaf(?:\.in)+|server(?:\.in)+|sheet(?:\.in)+|". "pong(?:\.in)+|etspec|schemas(?:\.in)+)"; my $ini_regex = ! "(?:desktop(?:\.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"; } sub find_leftout_files { my (@buf_i18n_plain, --- 158,274 ---- sub print_version { ! print <<_EOF_; ! ${PROGRAM} (${PACKAGE}) $VERSION ! Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler. ! ! Copyright (C) 2000-2003 Free Software Foundation, Inc. ! This is free software; see the source for copying conditions. There is NO ! warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! _EOF_ exit; } sub print_help { ! print <<_EOF_; ! Usage: ${PROGRAM} [OPTION]... LANGCODE ! Updates PO template files and merge them with the translations. ! ! Mode of operation (only one is allowed): ! -p, --pot generate the PO template only ! -s, --headers generate the header files in POTFILES.in ! -m, --maintain search for left out files from POTFILES.in ! -r, --report display a status report for the module ! -d, --dist merge LANGCODE.po with existing PO template ! ! Extra options: ! -g, --gettext-package=NAME override PO template name, useful with --pot ! -o, --output-file=FILE write merged translation to FILE ! -x, --verbose display lots of feedback ! --help display this help and exit ! --version output version information and exit ! ! Examples of use: ! ${PROGRAM} --pot just create a new PO template ! ${PROGRAM} xy create new PO template and merge xy.po with it ! ! Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") ! or send email to . ! _EOF_ exit; } sub determine_type ($) { my $type = $_; my $gettext_type; ! # FIXME: Use $xml_extension, and maybe do all this even nicer my $xml_regex = ! "(?:xml(\.in)*|ui|lang|oaf(?:\.in)+|server(?:\.in)+|sheet(?:\.in)+|". "pong(?:\.in)+|etspec|schemas(?:\.in)+)"; my $ini_regex = ! "(?: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"; } + sub determine_code ($) + { + my $gettext_code="ASCII"; # All files are ASCII by default + my $filetype=`file $_ | cut -d ' ' -f 2`; + + if ($? eq "0") + { + if ($filetype =~ /^(ISO|UTF)/) + { + chomp ($gettext_code = $filetype); + } + elsif ($filetype =~ /^XML/) + { + $gettext_code="UTF-8"; # We asume that .glade and other .xml files are UTF-8 + } + } + + return $gettext_code; + } + + sub find_leftout_files { my (@buf_i18n_plain, *************** *** 232,359 **** ## Search and find all translatable files find sub { ! push @buf_i18n_plain, "$File::Find::name" if /\.(c|y|cc|cpp|c\+\+|h|gob)$/ ! }, ".."; ! find sub { ! push @buf_i18n_xml, "$File::Find::name" if /\.($xml_extension)$/ }, ".."; - find sub { - push @buf_i18n_ini, "$File::Find::name" if /\.($ini_extension)$/ - }, ".."; - find sub { - push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/ - }, ".."; ! open POTFILES, "POTFILES.in" or die "$PROGRAM: there's no POTFILES.in!\n"; - @buf_potfiles = grep /^[^#]/, ; - print "Searching for missing translatable files...\n" if $VERBOSE; ## 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, $_; ! } ! } ! print "Found $ignore: Ignoring files...\n" if $VERBOSE; ! @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles); ! } } 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"; } --- 284,428 ---- ## Search and find all translatable files find sub { ! push @buf_i18n_plain, "$File::Find::name" if /\.(c|y|cc|cpp|c\+\+|h|gob)$/; ! push @buf_i18n_xml, "$File::Find::name" if /\.($xml_extension)$/; ! push @buf_i18n_ini, "$File::Find::name" if /\.($ini_extension)$/; ! push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; }, ".."; ! open POTFILES, "; ! close POTFILES; ! ! foreach (@buf_potfiles) { ! s/^\[.*]\s*//; ! } print "Searching for missing translatable files...\n" if $VERBOSE; ## Check if we should ignore some found files, when ## comparing with POTFILES.in ! foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") ! { ! (-s $ignore) or next; ! ! if ("$ignore" eq "POTFILES.ignore") ! { ! print "The usage of POTFILES.ignore is deprecated. Please consider moving the\n". ! "content of this file to POTFILES.skip.\n"; ! } ! ! print "Found $ignore: Ignoring files...\n" if $VERBOSE; ! open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n"; ! ! while () ! { ! push @buf_potfiles_ignore, $_ unless /^(#|\s*$)/; ! } ! close FILE; ! ! @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles); } 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 () ! { ! # FIXME: share the pattern matching code with intltool-extract ! if (/\s_(.*)=\"/ || /<_[^>]+>/ || /translatable=\"yes\"/) ! { ! push @buf_allfiles, unpack("x3 A*", $file) . "\n"; ! last; ! } ! } ! close FILE; } ! foreach my $file (@buf_i18n_ini) ! { ! open FILE, "<$file"; ! while () ! { ! if (/_(.*)=/) ! { ! push @buf_allfiles, unpack("x3 A*", $file) . "\n"; ! last; ! } ! } ! close FILE; ! } ! ! foreach my $file (@buf_i18n_xml_unmarked) ! { ! push @buf_allfiles, unpack("x3 A*", $file) . "\n"; } *************** *** 361,402 **** @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; ! print "The following files contain translations and are currently not in use. Please\n"; ! print "consider adding these to the POTFILES.in file, located in the po/ directory.\n\n"; ! print @result, "\n"; ! print "If some of these files are left out on purpose then please add them to\n"; ! print "POTFILES.skip instead of POTFILES.in. A file 'missing' containing this list\n"; ! print "of left out files has been written in the current directory.\n"; } ## If there is nothing to complain about, notify the user else { ! print "\nAll files containing translations are present in POTFILES.in.\n"; } } sub print_error_invalid_option { ## Handle invalid arguments ! print "Try `${PROGRAM} --help' for more information.\n"; exit 1; } --- 430,503 ---- @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, $_ ! } ! } ! ! my @buf_potfiles_notexist; ! ! foreach (@buf_potfiles_sorted) ! { ! chomp (my $dummy = $_); ! if ("$dummy" ne "" and ! -f "../$dummy") ! { ! push @buf_potfiles_notexist, $_; ! } } ## Save file with information about the files missing ## if any, and give information about this procedure. ! if (@result + @buf_potfiles_notexist > 0) ! { ! if (@result) ! { ! print "\n" if $VERBOSE; ! unlink "missing"; ! open OUT, ">missing"; ! print OUT @result; ! close OUT; ! warn "\e[1mThe following files contain translations and are currently not in use. Please\e[0m\n". ! "\e[1mconsider adding these to the POTFILES.in file, located in the po/ directory.\e[0m\n\n"; ! print STDERR @result, "\n"; ! warn "If some of these files are left out on purpose then please add them to\n". ! "POTFILES.skip instead of POTFILES.in. A file \e[1m'missing'\e[0m containing this list\n". ! "of left out files has been written in the current directory.\n"; ! } ! if (@buf_potfiles_notexist) ! { ! unlink "notexist"; ! open OUT, ">notexist"; ! print OUT @buf_potfiles_notexist; ! close OUT; ! warn "\n" if ($VERBOSE or @result); ! warn "\e[1mThe following files do not exist anymore:\e[0m\n\n"; ! warn @buf_potfiles_notexist, "\n"; ! warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n". ! "containing this list of absent files has been written in the current directory.\n"; ! } } ## If there is nothing to complain about, notify the user else { ! print "\nAll files containing translations are present in POTFILES.in.\n" if $VERBOSE; } } sub print_error_invalid_option { ## Handle invalid arguments ! print STDERR "Try `${PROGRAM} --help' for more information.\n"; exit 1; } *************** *** 409,512 **** ## Generate the .h header files, so we can allow glade and ## xml translation support ! if (! -s $EXTRACT) { ! print "\n *** The intltool-extract script wasn't found!" ."\n *** Without it, intltool-update can not generate files.\n"; exit; } else { ! open FILE, ") { ! chomp; ! ## Find xml files in POTFILES.in and generate the ! ## files with help from the extract script 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); ! } ! } } close FILE; } } sub generate_po_template { ! ## Generate the potfiles from the POTFILES.in file ! ! print "Building the $MODULE.pot...\n" if $VERBOSE; ! move ("POTFILES.in", "POTFILES.in.old"); ! open INFILE, "POTFILES.in"; ! while () { ! s/\.($xml_extension|$ini_extension)$/$&.h/; ! s/^\[.*]\s*(.*)/$1.h/; ! print OUTFILE $_; } - close OUTFILE; - close INFILE; - - system ("xgettext", "--default-domain\=$MODULE", - "--directory\=\.\.", - "--add-comments", - "--keyword\=\_", - "--keyword\=N\_", - "--keyword\=U\_", - "--files-from\=\.\/POTFILES\.in"); ! move ("POTFILES.in.old", "POTFILES.in"); ! print "Removing generated header (.h) files..." if $VERBOSE; ! open FILE, ") { ! chomp; ! unlink "../$_.h" if /\.($xml_extension|$ini_extension)$/; } ! 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; } sub update_po_file { ! my ($lang) = @_; print "Merging $lang.po with $MODULE.pot..." if $VERBOSE; ! copy ("$lang.po", "$lang.po.old") || die "copy failed: $!"; ! # 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"; } sub print_error_not_existing --- 510,738 ---- ## Generate the .h header files, so we can allow glade and ## xml translation support ! if (! -x "$EXTRACT") { ! print STDERR "\n *** The intltool-extract script wasn't found!" ."\n *** Without it, intltool-update can not generate files.\n"; exit; } else { ! open (FILE, ") ! { ! chomp; ! next if /^\[\s*encoding/; ! ## Find xml files in POTFILES.in and generate the ! ## files with help from the extract script 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); ! } ! } } close FILE; } } + # + # Generate .pot file from POTFILES.in + # sub generate_po_template { ! my $XGETTEXT = `which xgettext 2>/dev/null`; ! chomp $XGETTEXT; ! $XGETTEXT = $ENV{"XGETTEXT"} if $ENV{"XGETTEXT"}; ! if (! -x $XGETTEXT) ! { ! print STDERR " *** xgettext is not found on this system!\n". ! " *** Without it, intltool-update can not extract strings.\n"; ! exit; } ! print "Building $MODULE.pot...\n" if $VERBOSE; ! open INFILE, "POTFILES.in.temp"; ! my $gettext_support_nonascii = 0; ! # checks for GNU gettext >= 0.12 ! # don't use argument list, since shell interpretation is desired here ! if (system("$XGETTEXT --version --from-code=UTF-8 >&/dev/null") == 0) { ! $gettext_support_nonascii = 1; } + else + { + # urge everybody to upgrade gettext + print STDERR "WARNING: This version of gettext does not support extracting non-ASCII\n". + " strings. That means you should install a version of gettext\n". + " that supports non-ASCII strings (such as GNU gettext >= 0.12),\n". + " or have to let non-ASCII strings untranslated.\n"; + } + + my $encoding = "ASCII"; + my $forced_gettext_code; + my @temp_headers; + my $encoding_problem_is_reported = 0; + + while () + { + next if (/^#/ or /^\s*$/); + + chomp; ! my $gettext_code; ! if (/^\[\s*encoding:\s*(.*)\s*\]/) ! { ! $forced_gettext_code=$1; ! } ! elsif (/\.($xml_extension|$ini_extension)$/ || /^\[/) ! { ! s/^\[.*]\s*//; ! print OUTFILE "$_.h\n"; ! push @temp_headers, "../$_.h"; ! $gettext_code = &determine_code ("../$_.h") if ($gettext_support_nonascii and not defined $forced_gettext_code); ! } ! else ! { ! print OUTFILE "$_\n"; ! $gettext_code = &determine_code ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code); ! } ! ! next if (! $gettext_support_nonascii); ! ! if (defined $forced_gettext_code) ! { ! $encoding=$forced_gettext_code; ! } ! elsif (defined $gettext_code and "$encoding" ne "$gettext_code") ! { ! if ($encoding eq "ASCII") ! { ! $encoding=$gettext_code; ! } ! elsif ($gettext_code ne "ASCII") ! { ! # Only report once because the message is quite long ! if (! $encoding_problem_is_reported) ! { ! print STDERR "WARNING: You should use the same file encoding for all your project files,\n". ! " but $PROGRAM thinks that most of the source files are in\n". ! " $encoding encoding, while \"$_\" is (likely) in\n". ! " $gettext_code encoding. If you are sure that all translatable strings\n". ! " are in same encoding (say UTF-8), please \e[1m*prepend*\e[0m the following\n". ! " line to POTFILES.in:\n\n". ! " [encoding: UTF-8]\n\n". ! " and make sure that configure.in/ac checks for $PACKAGE >= 0.27 .\n". ! "(such warning message will only be reported once.)\n"; ! $encoding_problem_is_reported = 1; ! } ! } ! } } ! close OUTFILE; ! close INFILE; ! ! unlink "$MODULE.pot"; ! my @xgettext_argument=("$XGETTEXT", ! "--add-comments", ! "--directory\=\.\.", ! "--keyword\=\_", ! "--keyword\=N\_", ! "--keyword\=U\_", ! "--output\=$MODULE\.pot", ! "--files-from\=\.\/POTFILES\.in\.temp"); ! push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii); ! my $xgettext_command = join ' ', @xgettext_argument; ! ! # intercept xgettext error message ! my $xgettext_error_msg = `$xgettext_command 2>\&1`; ! my $command_failed = $?; ! ! unlink "POTFILES.in.temp"; ! ! print "Removing generated header (.h) files..." if $VERBOSE; ! unlink foreach (@temp_headers); ! print "done.\n" if $VERBOSE; ! if (! $command_failed) ! { ! if (! -e "$MODULE.pot") ! { ! print "None of the files in POTFILES.in contain strings marked for translation.\n" if $VERBOSE; ! } ! else ! { ! print "Wrote $MODULE.pot\n" if $VERBOSE; ! } ! } ! else ! { ! if ($xgettext_error_msg =~ /--from-code/) ! { ! # replace non-ASCII error message with a more useful one. ! print STDERR "ERROR: xgettext failed to generate PO template file because there is non-ASCII\n". ! " string marked for translation. Please make sure that all strings marked\n". ! " for translation are in uniform encoding (say UTF-8), then \e[1m*prepend*\e[0m the\n". ! " following line to POTFILES.in and rerun $PROGRAM:\n\n". ! " [encoding: UTF-8]\n\n"; ! } ! else ! { ! print STDERR "$xgettext_error_msg"; ! if (-e "$MODULE.pot") ! { ! # is this possible? ! print STDERR "ERROR: xgettext failed but still managed to generate PO template file.\n". ! " Please consult error message above if there is any.\n"; ! } ! else ! { ! print STDERR "ERROR: xgettext failed to generate PO template file. Please consult\n". ! " error message above if there is any.\n"; ! } ! } ! exit (1); ! } } sub update_po_file { ! -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n"; ! ! my ($lang, $outfile) = @_; print "Merging $lang.po with $MODULE.pot..." if $VERBOSE; ! my $infile = "$lang.po"; ! $outfile = "$lang.po" if ($outfile eq ""); ! # I think msgmerge won't overwrite old file if merge is not successful ! system ("msgmerge", "-o", $outfile, $infile, "$MODULE.pot"); } sub print_error_not_existing *************** *** 514,521 **** my ($file) = @_; ## Report error if supplied language file is non-existing ! print "$PROGRAM: $file does not exist!\n"; ! print "Try '$PROGRAM --help' for more information.\n"; exit; } --- 740,747 ---- my ($file) = @_; ## Report error if supplied language file is non-existing ! print STDERR "$PROGRAM: $file does not exist!\n"; ! print STDERR "Try '$PROGRAM --help' for more information.\n"; exit; } *************** *** 525,634 **** @languages = map (&po_file2lang, @po_files); ! foreach my $lang (@languages) { $po_files_by_lang{$lang} = shift (@po_files); } } sub po_file2lang ($) { ! my $tmp = $_; ! $tmp =~ s/^.*\/(.*)\.po$/$1/; ! return $tmp; } sub print_status { ! my ($lang) = @_; ! system ("msgfmt", "--statistics", "$lang.po"); ! print "\n"; } sub print_report { - &generate_headers; - &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; } --- 751,923 ---- @languages = map (&po_file2lang, @po_files); ! foreach my $lang (@languages) ! { $po_files_by_lang{$lang} = shift (@po_files); } } sub po_file2lang ($) { ! s/^(.*\/)?(.+)\.po$/$2/; ! return $_; } sub print_status { ! my ($lang, $output_file) = @_; ! $output_file = "$lang.po" if ($output_file eq ""); ! ! system ("msgfmt", "-o", "/dev/null", "--statistics", $output_file); } sub print_report { &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", "-o", "/dev/null", "--statistics", "$lang.po"); } } ! sub substitute_var ! { ! my ($str) = @_; ! ! # always need to rewind file whenever it has been accessed ! seek (CONF, 0, 0); ! ! # 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.ac") ! { $conf_in = "../configure.ac"; ! } ! elsif (-f "../configure.in") ! { ! $conf_in = "../configure.in"; ! } ! 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; } } ! close IN; ! $conf_in || die "Cannot find top_srcdir in Makefile."; } ! ! open (CONF, "<$conf_in") || die "can't open $conf_in: $!"; } + else + { + print STDERR "$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") || die "can't open configure.in/configure.ac: $!"; ! seek (IN, 0, 0); ! local $/; # slurp mode ! $conf_source = ; ! close IN; ! } ! ! my $name = "untitled"; ! my $version; ! ! # priority for getting package name: ! # 1. GETTEXT_PACKAGE ! # 2. first argument of AC_INIT (with >= 2 arguments) ! # 3. first argument of AM_INIT_AUTOMAKE (with >= 2 argument) ! ! # /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m ! # the \s makes this not work, why? ! if ($conf_source =~ /^AM_INIT_AUTOMAKE\(([^,\)]+),([^,\)]+)/m) ! { ! ($name, $version) = ($1, $2); ! $name =~ s/[\[\]\s]//g; ! ($varhash{"AC_PACKAGE_VERSION"} = $version) =~ s/[\[\]\s]//g; ! } ! ! if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m) ! { ! ($name, $version) = ($1, $2); ! $name=~ s/[\[\]\s]//g; ! $varhash{"AC_PACKAGE_NAME"} = $name; ! ($varhash{"AC_PACKAGE_VERSION"} = $version) =~ s/[\[\]\s]//g; ! } ! ! # \s makes this not work, why? ! $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m; ! ! # prepend '$' to auto* internal variables, usually they are ! # used in configure.in/ac without the '$' ! $name =~ s/AC_/\$AC_/g; ! $name =~ s/\$\$/\$/g; ! ! $name = substitute_var ($name); ! ! return $name if $name; } diff -crN ./scrollkeeper/libs/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/libs/Makefile.in *** ./scrollkeeper/libs/Makefile.in Thu Jan 23 07:12:05 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/libs/Makefile.in Tue Jan 6 22:54:27 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,90 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 13,78 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 100,143 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ lib_LTLIBRARIES = libscrollkeeper.la INCLUDES = \ --- 88,180 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ + lib_LTLIBRARIES = libscrollkeeper.la INCLUDES = \ *************** *** 160,166 **** update-url.c ! libscrollkeeper_la_LIBADD = $(XML_LIBS) $(XSLT_LIBS) subdir = libs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h --- 197,203 ---- update-url.c ! libscrollkeeper_la_LIBADD = $(XML_LIBS) $(XSLT_LIBS) $(INTLLIBS) subdir = libs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h *************** *** 173,190 **** extract.lo install.lo database.lo uninstall.lo update-url.lo libscrollkeeper_la_OBJECTS = $(am_libscrollkeeper_la_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/database.Plo ./$(DEPDIR)/error.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/extract.Plo ./$(DEPDIR)/file.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/i18n.Plo ./$(DEPDIR)/install.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/merge.Plo ./$(DEPDIR)/uninstall.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/update-url.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 210,218 ---- extract.lo install.lo database.lo uninstall.lo update-url.lo libscrollkeeper_la_OBJECTS = $(am_libscrollkeeper_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 192,198 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libscrollkeeper_la_SOURCES) DIST_COMMON = Makefile.am Makefile.in scrollkeeper.h.in SOURCES = $(libscrollkeeper_la_SOURCES) --- 220,225 ---- *************** *** 203,209 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu libs/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) scrollkeeper.h: $(top_builddir)/config.status scrollkeeper.h.in --- 230,236 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps libs/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) scrollkeeper.h: $(top_builddir)/config.status scrollkeeper.h.in *************** *** 232,238 **** -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --- 259,265 ---- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done *************** *** 245,281 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/database.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extract.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i18n.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/merge.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uninstall.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/update-url.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 272,285 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 290,295 **** --- 294,302 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 315,334 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__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) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 322,362 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 386,393 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 414,421 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 416,434 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libLTLIBRARIES clean-libtool distclean distclean-compile \ ! distclean-depend 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-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 uninstall-libLTLIBRARIES # 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. --- 444,471 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libLTLIBRARIES clean-libtool ctags 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-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ! tags uninstall uninstall-am uninstall-info-am \ ! uninstall-libLTLIBRARIES # 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 ./scrollkeeper/libuuid/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/libuuid/Makefile.in *** ./scrollkeeper/libuuid/Makefile.in Thu Jan 23 07:12:05 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/libuuid/Makefile.in Tue Jan 6 22:54:28 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,90 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 13,78 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 100,143 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ noinst_LTLIBRARIES = libuuid.la noinst_HEADERS = \ --- 88,179 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ noinst_LTLIBRARIES = libuuid.la noinst_HEADERS = \ *************** *** 169,186 **** isnull.lo pack.lo parse.lo unpack.lo unparse.lo uuid_time.lo libuuid_la_OBJECTS = $(am_libuuid_la_OBJECTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/clear.Plo ./$(DEPDIR)/compare.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/copy.Plo ./$(DEPDIR)/gen_uuid.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/isnull.Plo ./$(DEPDIR)/pack.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/parse.Plo ./$(DEPDIR)/unpack.Plo \ ! @AMDEP_TRUE@ ./$(DEPDIR)/unparse.Plo ./$(DEPDIR)/uuid_time.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 205,213 ---- isnull.lo pack.lo parse.lo unpack.lo unparse.lo uuid_time.lo libuuid_la_OBJECTS = $(am_libuuid_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 188,194 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(libuuid_la_SOURCES) HEADERS = $(noinst_HEADERS) --- 215,220 ---- *************** *** 201,207 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu libuuid/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 227,233 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps libuuid/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 209,215 **** -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --- 235,241 ---- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done *************** *** 222,259 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clear.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compare.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_uuid.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isnull.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pack.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unpack.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unparse.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uuid_time.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 248,261 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 268,273 **** --- 270,278 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 293,312 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__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) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 298,338 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 363,370 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 389,396 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 393,411 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-info-am ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstLTLIBRARIES distclean \ ! distclean-compile distclean-depend 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. --- 419,444 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstLTLIBRARIES ctags 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 pdf \ ! pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./scrollkeeper/ltmain.sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/ltmain.sh *** ./scrollkeeper/ltmain.sh Thu Jan 23 07:11:19 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/ltmain.sh Tue Jan 6 22:53:20 2004 *************** *** 177,184 **** --mode) prevopt="--mode" prev=mode ;; --mode=*) mode="$optarg" ;; - --preserve-dup-deps) duplicate_deps="yes" ;; - --quiet | --silent) show=: ;; --- 177,182 ---- *************** *** 469,475 **** 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 *************** *** 759,765 **** linker_flags= dllsearchpath= lib_search_path=`pwd` - inst_prefix_dir= avoid_version=no dlfiles= --- 757,762 ---- *************** *** 890,900 **** prev= continue ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; release) release="-$arg" prev= --- 887,892 ---- *************** *** 996,1006 **** 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]*:*) --- 988,993 ---- *************** *** 1316,1326 **** output_objdir="$output_objdir/$objdir" fi # Create the object directory. ! if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir status=$? ! if test "$status" -ne 0 && test ! -d "$output_objdir"; then exit $status fi fi --- 1303,1313 ---- output_objdir="$output_objdir/$objdir" fi # Create the object directory. ! if test ! -d $output_objdir; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir status=$? ! if test $status -ne 0 && test ! -d $output_objdir; then exit $status fi fi *************** *** 1343,1374 **** # 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 - - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" - - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if test "X$duplicate_deps" = "Xyes" ; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; - esac - pre_post_deps="$pre_post_deps $pre_post_dep" - done - fi - pre_post_deps= - fi - deplibs= newdependency_libs= newlib_search_path= --- 1330,1340 ---- # 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= newdependency_libs= newlib_search_path= *************** *** 1400,1406 **** ;; esac for pass in $passes; do ! if test "$linkmode" = prog; then # Determine which files to process case $pass in dlopen) --- 1366,1372 ---- ;; esac for pass in $passes; do ! if test $linkmode = prog; then # Determine which files to process case $pass in dlopen) *************** *** 1417,1427 **** found=no case $deplib in -l*) ! if test "$linkmode" = oldlib && test "$linkmode" = obj; then $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 continue fi ! if test "$pass" = conv; then deplibs="$deplib $deplibs" continue fi --- 1383,1393 ---- found=no case $deplib in -l*) ! if test $linkmode = oldlib && test $linkmode = obj; then $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 continue fi ! if test $pass = conv; then deplibs="$deplib $deplibs" continue fi *************** *** 1441,1447 **** finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" ! test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" fi continue fi --- 1407,1413 ---- finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" ! test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs" fi continue fi *************** *** 1450,1465 **** case $linkmode in lib) deplibs="$deplib $deplibs" ! test "$pass" = conv && continue newdependency_libs="$deplib $newdependency_libs" newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` ;; prog) ! if test "$pass" = conv; then deplibs="$deplib $deplibs" continue fi ! if test "$pass" = scan; then deplibs="$deplib $deplibs" newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` else --- 1416,1431 ---- case $linkmode in lib) deplibs="$deplib $deplibs" ! test $pass = conv && continue newdependency_libs="$deplib $newdependency_libs" newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` ;; prog) ! if test $pass = conv; then deplibs="$deplib $deplibs" continue fi ! if test $pass = scan; then deplibs="$deplib $deplibs" newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` else *************** *** 1474,1480 **** continue ;; # -L -R*) ! if test "$pass" = link; then dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` # Make sure the xrpath contains only unique directories. case "$xrpath " in --- 1440,1446 ---- continue ;; # -L -R*) ! if test $pass = link; then dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` # Make sure the xrpath contains only unique directories. case "$xrpath " in *************** *** 1487,1493 **** ;; *.la) lib="$deplib" ;; *.$libext) ! if test "$pass" = conv; then deplibs="$deplib $deplibs" continue fi --- 1453,1459 ---- ;; *.la) lib="$deplib" ;; *.$libext) ! if test $pass = conv; then deplibs="$deplib $deplibs" continue fi *************** *** 1508,1514 **** continue ;; prog) ! if test "$pass" != link; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" --- 1474,1480 ---- continue ;; prog) ! if test $pass != link; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" *************** *** 1519,1525 **** esac # linkmode ;; # *.$libext *.lo | *.$objext) ! if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then # If there is no dlopen support or we're linking statically, # we need to preload. newdlprefiles="$newdlprefiles $deplib" --- 1485,1491 ---- esac # linkmode ;; # *.$libext *.lo | *.$objext) ! if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then # If there is no dlopen support or we're linking statically, # we need to preload. newdlprefiles="$newdlprefiles $deplib" *************** *** 1535,1541 **** continue ;; esac # case $deplib ! if test "$found" = yes || test -f "$lib"; then : else $echo "$modename: cannot find the library \`$lib'" 1>&2 exit 1 --- 1501,1507 ---- continue ;; esac # case $deplib ! if test $found = yes || test -f "$lib"; then : else $echo "$modename: cannot find the library \`$lib'" 1>&2 exit 1 *************** *** 1569,1581 **** if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || ! { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then # Add dl[pre]opened files of deplib test -n "$dlopen" && dlfiles="$dlfiles $dlopen" test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" fi ! if test "$pass" = conv; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then --- 1535,1547 ---- if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || ! { test $linkmode = oldlib && test $linkmode = obj; }; then # Add dl[pre]opened files of deplib test -n "$dlopen" && dlfiles="$dlfiles $dlopen" test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" fi ! if test $pass = conv; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then *************** *** 1589,1602 **** 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 $echo "$modename: \`$lib' is not a convenience library" 1>&2 exit 1 fi --- 1555,1566 ---- 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 $echo "$modename: \`$lib' is not a convenience library" 1>&2 exit 1 fi *************** *** 1614,1620 **** fi # This library was specified with -dlopen. ! if test "$pass" = dlopen; then if test -z "$libdir"; then $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 exit 1 --- 1578,1584 ---- fi # This library was specified with -dlopen. ! if test $pass = dlopen; then if test -z "$libdir"; then $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 exit 1 *************** *** 1663,1669 **** name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` # This library was specified with -dlpreopen. ! if test "$pass" = dlpreopen; then if test -z "$libdir"; then $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 exit 1 --- 1627,1633 ---- name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` # This library was specified with -dlpreopen. ! if test $pass = dlpreopen; then if test -z "$libdir"; then $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 exit 1 *************** *** 1682,1688 **** if test -z "$libdir"; then # Link the convenience library ! if test "$linkmode" = lib; then deplibs="$dir/$old_library $deplibs" elif test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$dir/$old_library $compile_deplibs" --- 1646,1652 ---- if test -z "$libdir"; then # Link the convenience library ! if test $linkmode = lib; then deplibs="$dir/$old_library $deplibs" elif test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$dir/$old_library $compile_deplibs" *************** *** 1693,1699 **** continue fi ! if test "$linkmode" = prog && test "$pass" != link; then newlib_search_path="$newlib_search_path $ladir" deplibs="$lib $deplibs" --- 1657,1663 ---- continue fi ! if test $linkmode = prog && test $pass != link; then newlib_search_path="$newlib_search_path $ladir" deplibs="$lib $deplibs" *************** *** 1709,1726 **** -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test esac # Need to link against all dependency_libs? ! if test "$linkalldeplibs" = yes; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # 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 --- 1673,1688 ---- -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test esac # Need to link against all dependency_libs? ! if test $linkalldeplibs = yes; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # 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 *************** *** 1732,1738 **** # Link against this shared library if test "$linkmode,$pass" = "prog,link" || ! { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. --- 1694,1700 ---- # Link against this shared library if test "$linkmode,$pass" = "prog,link" || ! { test $linkmode = lib && test $hardcode_into_libs = yes; }; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. *************** *** 1754,1760 **** esac ;; esac ! if test "$linkmode" = prog; then # We need to hardcode the library path if test -n "$shlibpath_var"; then # Make sure the rpath contains only unique directories. --- 1716,1722 ---- esac ;; esac ! if test $linkmode = prog; then # We need to hardcode the library path if test -n "$shlibpath_var"; then # Make sure the rpath contains only unique directories. *************** *** 1836,1844 **** # make sure the library variables are pointing to the new library dir=$output_objdir linklib=$newlib ! fi # test -n "$old_archive_from_expsyms_cmds" ! if test "$linkmode" = prog || test "$mode" != relink; then add_shlibpath= add_dir= add= --- 1798,1806 ---- # make sure the library variables are pointing to the new library dir=$output_objdir linklib=$newlib ! fi # test -n $old_archive_from_expsyms_cmds ! if test $linkmode = prog || test "$mode" != relink; then add_shlibpath= add_dir= add= *************** *** 1887,1893 **** *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; esac fi ! if test "$linkmode" = prog; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else --- 1849,1855 ---- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; esac fi ! if test $linkmode = prog; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else *************** *** 1904,1910 **** fi fi ! if test "$linkmode" = prog || test "$mode" = relink; then add_shlibpath= add_dir= add= --- 1866,1872 ---- fi fi ! if test $linkmode = prog || test "$mode" = relink; then add_shlibpath= add_dir= add= *************** *** 1912,1927 **** 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 *************** *** 1931,1950 **** 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 ! if test "$linkmode" = prog; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else --- 1884,1894 ---- add="-l$name" else # We cannot seem to hardcode it, guess we'll fake it. ! add_dir="-L$libdir" add="-l$name" fi ! if test $linkmode = prog; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else *************** *** 1952,1958 **** test -n "$add" && deplibs="$add $deplibs" fi fi ! elif test "$linkmode" = prog; then if test "$alldeplibs" = yes && { test "$deplibs_check_method" = pass_all || { test "$build_libtool_libs" = yes && --- 1896,1902 ---- test -n "$add" && deplibs="$add $deplibs" fi fi ! elif test $linkmode = prog; then if test "$alldeplibs" = yes && { test "$deplibs_check_method" = pass_all || { test "$build_libtool_libs" = yes && *************** *** 2011,2020 **** fi fi # link shared/static library? ! if test "$linkmode" = lib; then if test -n "$dependency_libs" && ! { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || ! test "$link_static" = yes; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do --- 1955,1964 ---- fi fi # link shared/static library? ! if test $linkmode = lib; then if test -n "$dependency_libs" && ! { test $hardcode_into_libs != yes || test $build_old_libs = yes || ! test $link_static = yes; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do *************** *** 2037,2051 **** 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 ! if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do case $deplib in --- 1981,1993 ---- 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 ! if test $link_all_deplibs != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do case $deplib in *************** *** 2088,2102 **** fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs ! if test "$pass" = dlpreopen; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi ! if test "$pass" != dlopen; then ! test "$pass" != scan && dependency_libs="$newdependency_libs" ! if test "$pass" != conv; then # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do --- 2030,2044 ---- fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs ! if test $pass = dlpreopen; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi ! if test $pass != dlopen; then ! test $pass != scan && dependency_libs="$newdependency_libs" ! if test $pass != conv; then # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do *************** *** 2154,2160 **** deplibs= fi done # for pass ! if test "$linkmode" = prog; then dlfiles="$newdlfiles" dlprefiles="$newdlprefiles" fi --- 2096,2102 ---- deplibs= fi done # for pass ! if test $linkmode = prog; then dlfiles="$newdlfiles" dlprefiles="$newdlprefiles" fi *************** *** 2231,2237 **** fi set dummy $rpath ! if test "$#" -gt 2; then $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 fi install_libdir="$2" --- 2173,2179 ---- fi set dummy $rpath ! if test $# -gt 2; then $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 fi install_libdir="$2" *************** *** 2272,2278 **** # Check that each of the things are valid numbers. case $current in ! [0-9]*) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 --- 2214,2220 ---- # Check that each of the things are valid numbers. case $current in ! 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 *************** *** 2281,2287 **** esac case $revision in ! [0-9]*) ;; *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 --- 2223,2229 ---- esac case $revision in ! 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 *************** *** 2290,2296 **** esac case $age in ! [0-9]*) ;; *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 --- 2232,2238 ---- esac case $age in ! 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 *************** *** 2298,2304 **** ;; esac ! if test "$age" -gt "$current"; then $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit 1 --- 2240,2246 ---- ;; esac ! if test $age -gt $current; then $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit 1 *************** *** 2337,2343 **** # Add in all the interfaces that we are compatible with. loop=$revision ! while test "$loop" -ne 0; do iface=`expr $revision - $loop` loop=`expr $loop - 1` verstring="sgi$major.$iface:$verstring" --- 2279,2285 ---- # 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" *************** *** 2360,2366 **** # Add in all the interfaces that we are compatible with. loop=$age ! while test "$loop" -ne 0; do iface=`expr $current - $loop` loop=`expr $loop - 1` verstring="$verstring:${iface}.0" --- 2302,2308 ---- # Add in all the interfaces that we are compatible with. loop=$age ! while test $loop != 0; do iface=`expr $current - $loop` loop=`expr $loop - 1` verstring="$verstring:${iface}.0" *************** *** 2461,2467 **** *) finalize_rpath="$finalize_rpath $libdir" ;; esac done ! if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then dependency_libs="$temp_xrpath $dependency_libs" fi fi --- 2403,2409 ---- *) finalize_rpath="$finalize_rpath $libdir" ;; esac done ! if test $hardcode_into_libs != yes || test $build_old_libs = yes; then dependency_libs="$temp_xrpath $dependency_libs" fi fi *************** *** 2504,2510 **** ;; *) # Add libc to deplibs on all other systems if necessary. ! if test "$build_libtool_need_lc" = "yes"; then deplibs="$deplibs -lc" fi ;; --- 2446,2452 ---- ;; *) # Add libc to deplibs on all other systems if necessary. ! if test $build_libtool_need_lc = "yes"; then deplibs="$deplibs -lc" fi ;; *************** *** 2545,2551 **** EOF $rm conftest $CC -o conftest conftest.c $deplibs ! if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do name="`expr $i : '-l\(.*\)'`" --- 2487,2493 ---- EOF $rm conftest $CC -o conftest conftest.c $deplibs ! if test $? -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do name="`expr $i : '-l\(.*\)'`" *************** *** 2579,2585 **** $rm conftest $CC -o conftest conftest.c $i # Did it work? ! if test "$?" -eq 0 ; then ldd_output=`ldd conftest` libname=`eval \\$echo \"$libname_spec\"` deplib_matches=`eval \\$echo \"$library_names_spec\"` --- 2521,2527 ---- $rm conftest $CC -o conftest conftest.c $i # Did it work? ! if test $? -eq 0 ; then ldd_output=`ldd conftest` libname=`eval \\$echo \"$libname_spec\"` deplib_matches=`eval \\$echo \"$library_names_spec\"` *************** *** 2750,2756 **** echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." ! if test "$allow_undefined" = no; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" --- 2692,2698 ---- echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." ! if test $allow_undefined = no; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" *************** *** 2777,2783 **** # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then ! if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= dep_rpath= --- 2719,2725 ---- # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then ! if test $hardcode_into_libs = yes; then # Hardcode the library paths hardcode_libdirs= dep_rpath= *************** *** 2908,2914 **** $show "mkdir $gentop" $run mkdir "$gentop" status=$? ! if test "$status" -ne 0 && test ! -d "$gentop"; then exit $status fi generated="$generated $gentop" --- 2850,2856 ---- $show "mkdir $gentop" $run mkdir "$gentop" status=$? ! if test $status -ne 0 && test ! -d "$gentop"; then exit $status fi generated="$generated $gentop" *************** *** 2927,2933 **** $show "mkdir $xdir" $run mkdir "$xdir" status=$? ! if test "$status" -ne 0 && test ! -d "$xdir"; then exit $status fi $show "(cd $xdir && $AR x $xabs)" --- 2869,2875 ---- $show "mkdir $xdir" $run mkdir "$xdir" status=$? ! if test $status -ne 0 && test ! -d "$xdir"; then exit $status fi $show "(cd $xdir && $AR x $xabs)" *************** *** 3047,3053 **** $show "mkdir $gentop" $run mkdir "$gentop" status=$? ! if test "$status" -ne 0 && test ! -d "$gentop"; then exit $status fi generated="$generated $gentop" --- 2989,2995 ---- $show "mkdir $gentop" $run mkdir "$gentop" status=$? ! if test $status -ne 0 && test ! -d "$gentop"; then exit $status fi generated="$generated $gentop" *************** *** 3066,3072 **** $show "mkdir $xdir" $run mkdir "$xdir" status=$? ! if test "$status" -ne 0 && test ! -d "$xdir"; then exit $status fi $show "(cd $xdir && $AR x $xabs)" --- 3008,3014 ---- $show "mkdir $xdir" $run mkdir "$xdir" status=$? ! if test $status -ne 0 && test ! -d "$xdir"; then exit $status fi $show "(cd $xdir && $AR x $xabs)" *************** *** 3176,3181 **** --- 3118,3128 ---- ;; esac + # AIX needs explicit runtime linking option + + compile_command="$compile_command $use_runtimelinking" + finalize_command="$finalize_command $use_runtimelinking" + compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" *************** *** 3461,3467 **** finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` fi ! if test "$need_relink" = no || test "$build_libtool_libs" != yes; then # Replace the output file specification. compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" --- 3408,3414 ---- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` fi ! if test $need_relink = no || test "$build_libtool_libs" != yes; then # Replace the output file specification. compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" *************** *** 3586,3592 **** 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 *************** *** 3829,3835 **** $show "mkdir $gentop" $run mkdir "$gentop" status=$? ! if test "$status" -ne 0 && test ! -d "$gentop"; then exit $status fi generated="$generated $gentop" --- 3776,3782 ---- $show "mkdir $gentop" $run mkdir "$gentop" status=$? ! if test $status -ne 0 && test ! -d "$gentop"; then exit $status fi generated="$generated $gentop" *************** *** 3849,3855 **** $show "mkdir $xdir" $run mkdir "$xdir" status=$? ! if test "$status" -ne 0 && test ! -d "$xdir"; then exit $status fi $show "(cd $xdir && $AR x $xabs)" --- 3796,3802 ---- $show "mkdir $xdir" $run mkdir "$xdir" status=$? ! if test $status -ne 0 && test ! -d "$xdir"; then exit $status fi $show "(cd $xdir && $AR x $xabs)" *************** *** 3916,3922 **** 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. *************** *** 3972,3977 **** --- 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 *************** *** 4006,4012 **** # Directory that this library needs to be installed in: libdir='$install_libdir'" ! if test "$installed" = no && test "$need_relink" = yes; then $echo >> $output "\ relink_command=\"$relink_command\"" fi --- 3954,3960 ---- # Directory that this library needs to be installed in: libdir='$install_libdir'" ! if test "$installed" = no && test $need_relink = yes; then $echo >> $output "\ relink_command=\"$relink_command\"" fi *************** *** 4142,4148 **** # Not a directory, so check to see that there is only one file specified. set dummy $files ! if test "$#" -gt 2; then $echo "$modename: \`$dest' is not a directory" 1>&2 $echo "$help" 1>&2 exit 1 --- 4090,4096 ---- # Not a directory, so check to see that there is only one file specified. set dummy $files ! if test $# -gt 2; then $echo "$modename: \`$dest' is not a directory" 1>&2 $echo "$help" 1>&2 exit 1 *************** *** 4216,4248 **** 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 *************** *** 4252,4258 **** 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" *************** *** 4262,4268 **** $run eval "$striplib $destdir/$realname" || exit $? fi ! if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. for linkname do --- 4196,4202 ---- $run eval "$striplib $destdir/$realname" || exit $? fi ! if test $# -gt 0; then # Delete the old symlinks, and create new ones. for linkname do *************** *** 4395,4405 **** 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 *************** *** 4524,4530 **** fi # Exit here if they wanted silent mode. ! test "$show" = : && exit 0 echo "----------------------------------------------------------------------" echo "Libraries have been installed in:" --- 4454,4460 ---- fi # Exit here if they wanted silent mode. ! test "$show" = ":" && exit 0 echo "----------------------------------------------------------------------" echo "Libraries have been installed in:" *************** *** 4690,4696 **** 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 *************** *** 4740,4749 **** objdir="$dir/$objdir" fi name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` ! test "$mode" = uninstall && objdir="$dir" # Remember objdir for removal later, being careful to avoid duplicates ! if test "$mode" = clean; then case " $rmdirs " in *" $objdir "*) ;; *) rmdirs="$rmdirs $objdir" ;; --- 4670,4679 ---- objdir="$dir/$objdir" fi name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` ! test $mode = uninstall && objdir="$dir" # Remember objdir for removal later, being careful to avoid duplicates ! if test $mode = clean; then case " $rmdirs " in *" $objdir "*) ;; *) rmdirs="$rmdirs $objdir" ;; *************** *** 4775,4783 **** rmfiles="$rmfiles $objdir/$n" done test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" ! test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ! if test "$mode" = uninstall; then if test -n "$library_names"; then # Do each command in the postuninstall commands. eval cmds=\"$postuninstall_cmds\" --- 4705,4713 ---- rmfiles="$rmfiles $objdir/$n" done test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" ! test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ! if test $mode = uninstall; then if test -n "$library_names"; then # Do each command in the postuninstall commands. eval cmds=\"$postuninstall_cmds\" *************** *** 4786,4792 **** IFS="$save_ifs" $show "$cmd" $run eval "$cmd" ! if test "$?" -ne 0 && test "$rmforce" != yes; then exit_status=1 fi done --- 4716,4722 ---- IFS="$save_ifs" $show "$cmd" $run eval "$cmd" ! if test $? != 0 && test "$rmforce" != yes; then exit_status=1 fi done *************** *** 4801,4807 **** IFS="$save_ifs" $show "$cmd" $run eval "$cmd" ! if test "$?" -ne 0 && test "$rmforce" != yes; then exit_status=1 fi done --- 4731,4737 ---- IFS="$save_ifs" $show "$cmd" $run eval "$cmd" ! if test $? != 0 && test "$rmforce" != yes; then exit_status=1 fi done *************** *** 4821,4827 **** *) # 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 --- 4751,4757 ---- *) # 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 ./scrollkeeper/man/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/man/Makefile.in *** ./scrollkeeper/man/Makefile.in Thu Jan 23 07:12:06 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/man/Makefile.in Tue Jan 6 22:54:28 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,90 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 13,78 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 100,154 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ SUBDIRS = man1 man5 man7 man8 subdir = man mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = 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 --- 88,193 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ SUBDIRS = man1 man5 man7 man8 subdir = man mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-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 *************** *** 156,162 **** .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu man/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 195,201 ---- .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps man/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 224,233 **** --- 263,279 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 258,277 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__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) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 304,344 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 369,391 **** 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. --- 436,468 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive ctags \ ! ctags-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 pdf pdf-am \ ! pdf-recursive ps ps-am ps-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. diff -crN ./scrollkeeper/man/man1/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/man/man1/Makefile.in *** ./scrollkeeper/man/man1/Makefile.in Thu Jan 23 07:12:07 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/man/man1/Makefile.in Tue Jan 6 22:54:29 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,90 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 13,78 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 100,143 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ man_MANS = \ scrollkeeper-config.1 \ scrollkeeper-gen-seriesid.1 --- 88,179 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ man_MANS = \ scrollkeeper-config.1 \ scrollkeeper-gen-seriesid.1 *************** *** 151,156 **** --- 187,194 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = NROFF = nroff *************** *** 161,167 **** .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu man/man1/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 199,205 ---- .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps man/man1/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 220,232 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 258,279 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 311,316 **** --- 358,371 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-man uninstall-man: uninstall-man1 *************** *** 322,329 **** install-info-am install-man install-man1 install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ ! uninstall-man uninstall-man1 # 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. --- 377,384 ---- install-info-am install-man install-man1 install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-info-am uninstall-man uninstall-man1 # 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 ./scrollkeeper/man/man5/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/man/man5/Makefile.in *** ./scrollkeeper/man/man5/Makefile.in Thu Jan 23 07:12:07 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/man/man5/Makefile.in Tue Jan 6 22:54:30 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,90 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 13,78 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 100,143 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ man_MANS = \ scrollkeeper.conf.5 --- 88,179 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ man_MANS = \ scrollkeeper.conf.5 *************** *** 149,154 **** --- 185,192 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = NROFF = nroff *************** *** 159,165 **** .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu man/man5/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 197,203 ---- .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps man/man5/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 218,230 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 256,277 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 309,314 **** --- 356,369 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-man uninstall-man: uninstall-man5 *************** *** 320,327 **** install-info-am install-man install-man5 install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ ! uninstall-man uninstall-man5 # 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. --- 375,382 ---- install-info-am install-man install-man5 install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-info-am uninstall-man uninstall-man5 # 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 ./scrollkeeper/man/man7/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/man/man7/Makefile.in *** ./scrollkeeper/man/man7/Makefile.in Thu Jan 23 07:12:08 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/man/man7/Makefile.in Tue Jan 6 22:54:30 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,90 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 13,78 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 100,143 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ man_MANS = \ scrollkeeper.7 --- 88,179 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ man_MANS = \ scrollkeeper.7 *************** *** 149,154 **** --- 185,192 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = NROFF = nroff *************** *** 159,165 **** .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu man/man7/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 197,203 ---- .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps man/man7/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 218,230 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 256,277 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 309,314 **** --- 356,369 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-man uninstall-man: uninstall-man7 *************** *** 320,327 **** install-info-am install-man install-man7 install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ ! uninstall-man uninstall-man7 # 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. --- 375,382 ---- install-info-am install-man install-man7 install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-info-am uninstall-man uninstall-man7 # 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 ./scrollkeeper/man/man8/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/man/man8/Makefile.in *** ./scrollkeeper/man/man8/Makefile.in Thu Jan 23 07:12:08 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/man/man8/Makefile.in Tue Jan 6 22:54:31 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,90 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 13,78 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 100,143 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ man_MANS = \ scrollkeeper-preinstall.8 \ scrollkeeper-rebuilddb.8 \ --- 88,179 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ man_MANS = \ scrollkeeper-preinstall.8 \ scrollkeeper-rebuilddb.8 \ *************** *** 153,158 **** --- 189,196 ---- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = + depcomp = + am__depfiles_maybe = DIST_SOURCES = NROFF = nroff *************** *** 163,169 **** .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu man/man8/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --- 201,207 ---- .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps man/man8/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) *************** *** 222,234 **** tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 260,281 ---- tags: TAGS TAGS: + ctags: CTAGS + CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 313,318 **** --- 360,373 ---- mostlyclean-am: mostlyclean-generic mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-man uninstall-man: uninstall-man8 *************** *** 324,331 **** install-info-am install-man install-man8 install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ ! uninstall-man uninstall-man8 # 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. --- 379,386 ---- install-info-am install-man install-man8 install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-info-am uninstall-man uninstall-man8 # 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 ./scrollkeeper/mkinstalldirs /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/mkinstalldirs *** ./scrollkeeper/mkinstalldirs Mon Jul 29 13:39:53 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/mkinstalldirs Tue Jan 6 22:54:17 2004 *************** *** 12,29 **** # process command line arguments while test $# -gt 0 ; do ! case "${1}" in ! -h | --help | --h* ) # -h for help ! echo "${usage}" 1>&2; exit 0 ;; ! -m ) # -m PERM arg ! shift ! test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ! dirmode="${1}" ! shift ;; ! -- ) shift; break ;; # stop option processing ! -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option ! * ) break ;; # first non-opt arg ! esac done for file --- 12,40 ---- # process command line arguments while test $# -gt 0 ; do ! case $1 in ! -h | --help | --h*) # -h for help ! echo "$usage" 1>&2 ! exit 0 ! ;; ! -m) # -m PERM arg ! shift ! test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } ! dirmode=$1 ! shift ! ;; ! --) # stop option processing ! shift ! break ! ;; ! -*) # unknown option ! echo "$usage" 1>&2 ! exit 1 ! ;; ! *) # first non-opt arg ! break ! ;; ! esac done for file *************** *** 36,99 **** done case $# in ! 0) exit 0 ;; esac case $dirmode in ! '') ! if mkdir -p -- . 2>/dev/null; then ! echo "mkdir -p -- $*" ! exec mkdir -p -- "$@" ! fi ;; ! *) ! if mkdir -m "$dirmode" -p -- . 2>/dev/null; then ! echo "mkdir -m $dirmode -p -- $*" ! exec mkdir -m "$dirmode" -p -- "$@" ! fi ;; esac for file do ! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ! shift ! pathcomp= ! for d ! do ! pathcomp="$pathcomp$d" ! case "$pathcomp" in ! -* ) pathcomp=./$pathcomp ;; ! esac ! ! if test ! -d "$pathcomp"; then ! echo "mkdir $pathcomp" ! ! mkdir "$pathcomp" || lasterr=$? ! ! if test ! -d "$pathcomp"; then ! errstatus=$lasterr ! else ! if test ! -z "$dirmode"; then ! echo "chmod $dirmode $pathcomp" ! ! lasterr="" ! chmod "$dirmode" "$pathcomp" || lasterr=$? ! ! if test ! -z "$lasterr"; then ! errstatus=$lasterr ! fi ! fi ! fi ! fi ! pathcomp="$pathcomp/" ! done done exit $errstatus # Local Variables: # mode: shell-script ! # sh-indentation: 3 # End: # mkinstalldirs ends here --- 47,111 ---- done case $# in ! 0) exit 0 ;; esac case $dirmode in ! '') ! if mkdir -p -- . 2>/dev/null; then ! echo "mkdir -p -- $*" ! exec mkdir -p -- "$@" ! fi ! ;; ! *) ! if mkdir -m "$dirmode" -p -- . 2>/dev/null; then ! echo "mkdir -m $dirmode -p -- $*" ! exec mkdir -m "$dirmode" -p -- "$@" ! fi ! ;; esac for file do ! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ! shift ! pathcomp= ! for d ! do ! pathcomp="$pathcomp$d" ! case $pathcomp in ! -*) pathcomp=./$pathcomp ;; ! esac ! ! if test ! -d "$pathcomp"; then ! echo "mkdir $pathcomp" ! ! mkdir "$pathcomp" || lasterr=$? ! ! if test ! -d "$pathcomp"; then ! errstatus=$lasterr ! else ! if test ! -z "$dirmode"; then ! echo "chmod $dirmode $pathcomp" ! lasterr="" ! chmod "$dirmode" "$pathcomp" || lasterr=$? ! ! if test ! -z "$lasterr"; then ! errstatus=$lasterr ! fi ! fi ! fi ! fi ! pathcomp="$pathcomp/" ! done done exit $errstatus # Local Variables: # mode: shell-script ! # sh-indentation: 2 # End: # mkinstalldirs ends here diff -crN ./scrollkeeper/po/ca.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/ca.gmo Binary files ./scrollkeeper/po/ca.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/ca.gmo differ diff -crN ./scrollkeeper/po/da.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/da.gmo Binary files ./scrollkeeper/po/da.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/da.gmo differ diff -crN ./scrollkeeper/po/de.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/de.gmo Binary files ./scrollkeeper/po/de.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/de.gmo differ diff -crN ./scrollkeeper/po/el.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/el.gmo Binary files ./scrollkeeper/po/el.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/el.gmo differ diff -crN ./scrollkeeper/po/es.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/es.gmo Binary files ./scrollkeeper/po/es.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/es.gmo differ diff -crN ./scrollkeeper/po/fr.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/fr.gmo Binary files ./scrollkeeper/po/fr.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/fr.gmo differ diff -crN ./scrollkeeper/po/hu.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/hu.gmo Binary files ./scrollkeeper/po/hu.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/hu.gmo differ diff -crN ./scrollkeeper/po/ja.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/ja.gmo Binary files ./scrollkeeper/po/ja.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/ja.gmo differ diff -crN ./scrollkeeper/po/ko.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/ko.gmo Binary files ./scrollkeeper/po/ko.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/ko.gmo differ diff -crN ./scrollkeeper/po/nl.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/nl.gmo Binary files ./scrollkeeper/po/nl.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/nl.gmo differ diff -crN ./scrollkeeper/po/no.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/no.gmo Binary files ./scrollkeeper/po/no.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/no.gmo differ diff -crN ./scrollkeeper/po/pl.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/pl.gmo Binary files ./scrollkeeper/po/pl.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/pl.gmo differ diff -crN ./scrollkeeper/po/pt_BR.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/pt_BR.gmo Binary files ./scrollkeeper/po/pt_BR.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/pt_BR.gmo differ diff -crN ./scrollkeeper/po/ru.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/ru.gmo Binary files ./scrollkeeper/po/ru.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/ru.gmo differ diff -crN ./scrollkeeper/po/sk.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/sk.gmo Binary files ./scrollkeeper/po/sk.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/sk.gmo differ diff -crN ./scrollkeeper/po/sl.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/sl.gmo Binary files ./scrollkeeper/po/sl.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/sl.gmo differ diff -crN ./scrollkeeper/po/sv.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/sv.gmo Binary files ./scrollkeeper/po/sv.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/sv.gmo differ diff -crN ./scrollkeeper/po/tr.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/tr.gmo Binary files ./scrollkeeper/po/tr.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/tr.gmo differ diff -crN ./scrollkeeper/po/uk.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/uk.gmo Binary files ./scrollkeeper/po/uk.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/uk.gmo differ diff -crN ./scrollkeeper/po/zh_TW.gmo /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/zh_TW.gmo Binary files ./scrollkeeper/po/zh_TW.gmo and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/po/zh_TW.gmo differ diff -crN ./scrollkeeper/scripts/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/scripts/Makefile.in *** ./scrollkeeper/scripts/Makefile.in Thu Jan 23 07:12:09 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./scrollkeeper/scripts/Makefile.in Tue Jan 6 22:54:32 2004 *************** *** 1,4 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 --- 1,4 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 *************** *** 13,90 **** # PARTICULAR PURPOSE. @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ - host_alias = @host_alias@ host_triplet = @host@ - target_alias = @target_alias@ target_triplet = @target@ ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ ! AS = @AS@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ ! HOST_TYPE = @HOST_TYPE@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ --- 13,78 ---- # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ ! ACLOCAL = @ACLOCAL@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ + GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 100,143 **** INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! OBJDUMP = @OBJDUMP@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ bin_SCRIPTS = scrollkeeper-config scrollkeeper-get-content-list scrollkeeper-get-toc-from-id scrollkeeper-get-toc-from-docpath scrollkeeper-get-index-from-docpath scrollkeeper-get-extended-content-list scrollkeeper-rebuilddb CLEANFILES = scrollkeeper-config scrollkeeper-get-content-list scrollkeeper-get-toc-from-id scrollkeeper-get-toc-from-docpath scrollkeeper-get-index-from-docpath scrollkeeper-get-extended-content-list scrollkeeper-rebuilddb --- 88,179 ---- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_REQUIRED = @INTLTOOL_REQUIRED@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ + INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ ! LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ ! MSGFMT = @MSGFMT@ ! OBJEXT = @OBJEXT@ OMFDIRS = @OMFDIRS@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCROLLKEEPER_PARTIAL_DB_DIR = @SCROLLKEEPER_PARTIAL_DB_DIR@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_CONFIG = @XML_CONFIG@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ XSLT_CONFIG = @XSLT_CONFIG@ XSLT_LIBS = @XSLT_LIBS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ bin_SCRIPTS = scrollkeeper-config scrollkeeper-get-content-list scrollkeeper-get-toc-from-id scrollkeeper-get-toc-from-docpath scrollkeeper-get-index-from-docpath scrollkeeper-get-extended-content-list scrollkeeper-rebuilddb CLEANFILES = scrollkeeper-config scrollkeeper-get-content-list scrollkeeper-get-toc-from-id scrollkeeper-get-toc-from-docpath scrollkeeper-get-index-from-docpath scrollkeeper-get-extended-content-list scrollkeeper-rebuilddb *************** *** 175,188 **** SCRIPTS = $(bin_SCRIPTS) - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gen-docuid.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ --- 211,219 ---- SCRIPTS = $(bin_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ *************** *** 190,196 **** CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ DIST_SOURCES = $(scrollkeeper_gen_seriesid_SOURCES) DIST_COMMON = Makefile.am Makefile.in scrollkeeper-config.in \ scrollkeeper-get-content-list.in \ --- 221,226 ---- *************** *** 206,212 **** .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu scripts/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) scrollkeeper-config: $(top_builddir)/config.status scrollkeeper-config.in --- 236,242 ---- .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps scripts/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) scrollkeeper-config: $(top_builddir)/config.status scrollkeeper-config.in *************** *** 234,240 **** ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ done --- 264,270 ---- ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ else :; fi; \ done *************** *** 282,310 **** distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen-docuid.Po@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` .c.lo: - @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo --- 312,325 ---- distclean-compile: -rm -f *.tab.c .c.o: $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .c.lo: $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 319,324 **** --- 334,342 ---- ETAGS = etags ETAGSFLAGS = + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 344,363 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: here=`$(am__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) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ --- 362,402 ---- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ *************** *** 415,422 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 454,461 ---- distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 445,465 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ uninstall-info-am ! .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ ! clean-generic clean-libtool distclean distclean-compile \ ! distclean-depend distclean-generic distclean-libtool \ ! distclean-tags distdir dvi dvi-am info info-am install \ ! install-am install-binPROGRAMS install-binSCRIPTS 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-binPROGRAMS uninstall-binSCRIPTS \ ! 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. --- 484,511 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ ! clean-generic clean-libtool ctags distclean distclean-compile \ ! distclean-generic distclean-libtool distclean-tags distdir dvi \ ! dvi-am info info-am install install-am install-binPROGRAMS \ ! install-binSCRIPTS 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 pdf \ ! pdf-am ps ps-am tags uninstall uninstall-am \ ! uninstall-binPROGRAMS uninstall-binSCRIPTS 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.