[sword-cvs] sword Makefile.in,1.40,1.41 aclocal.m4,1.6,1.7

sword@www.crosswire.org sword@www.crosswire.org
Wed, 30 Apr 2003 13:45:19 -0700


Update of /usr/local/cvsroot/sword
In directory www:/tmp/cvs-serv10422

Modified Files:
	Makefile.in aclocal.m4 
Log Message:


Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/sword/Makefile.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** Makefile.in	4 Mar 2003 11:35:52 -0000	1.40
--- Makefile.in	30 Apr 2003 20:45:16 -0000	1.41
***************
*** 1,6 ****
! # Makefile.in generated by automake 1.7.3 from Makefile.am.
  # @configure_input@
  
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
  # Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
--- 1,6 ----
! # Makefile.in generated by automake 1.6.3 from Makefile.am.
  # @configure_input@
  
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
  # Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
***************
*** 14,21 ****
--- 14,37 ----
  
  @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@
***************
*** 23,33 ****
  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 = :
--- 39,57 ----
  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 = :
***************
*** 36,164 ****
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
  host_triplet = @host@
! @BUILDTESTS_TRUE@am__append_1 = tests
! @BUILDUTILS_TRUE@am__append_2 = utilities
! @BUILDEXAMPLES_TRUE@am__append_3 = examples
! ACLOCAL = @ACLOCAL@
! AMDEP_FALSE = @AMDEP_FALSE@
! AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
! AUTOCONF = @AUTOCONF@
! AUTOHEADER = @AUTOHEADER@
! AUTOMAKE = @AUTOMAKE@
  AWK = @AWK@
- BUILDEXAMPLES_FALSE = @BUILDEXAMPLES_FALSE@
- BUILDEXAMPLES_TRUE = @BUILDEXAMPLES_TRUE@
- BUILDTESTS_FALSE = @BUILDTESTS_FALSE@
- BUILDTESTS_TRUE = @BUILDTESTS_TRUE@
- BUILDUTILS_FALSE = @BUILDUTILS_FALSE@
- BUILDUTILS_TRUE = @BUILDUTILS_TRUE@
  CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
- CONFDEF_FALSE = @CONFDEF_FALSE@
- CONFDEF_TRUE = @CONFDEF_TRUE@
- CPPFLAGS = @CPPFLAGS@
  CURL_CFLAGS = @CURL_CFLAGS@
  CURL_CONFIG = @CURL_CONFIG@
  CURL_LIBS = @CURL_LIBS@
  CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
  DEPDIR = @DEPDIR@
  ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
  GENCCODE = @GENCCODE@
  GENCMN = @GENCMN@
  GENRB = @GENRB@
- ICUSWORD_FALSE = @ICUSWORD_FALSE@
- ICUSWORD_TRUE = @ICUSWORD_TRUE@
- ICU_FALSE = @ICU_FALSE@
- ICU_TRUE = @ICU_TRUE@
- INSTALLMGR_FALSE = @INSTALLMGR_FALSE@
- INSTALLMGR_TRUE = @INSTALLMGR_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTCONF_FALSE = @INSTCONF_FALSE@
- INSTCONF_TRUE = @INSTCONF_TRUE@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
  MAINT = @MAINT@
! MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
! MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
! MAKEINFO = @MAKEINFO@
! MINGW_FALSE = @MINGW_FALSE@
! MINGW_TRUE = @MINGW_TRUE@
! OBJEXT = @OBJEXT@
  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@
  PKGDATA = @PKGDATA@
  RANLIB = @RANLIB@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
  STRIP = @STRIP@
  VERSION = @VERSION@
- ZLIB_FALSE = @ZLIB_FALSE@
- ZLIB_TRUE = @ZLIB_TRUE@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- 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__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
  am__include = @am__include@
- am__leading_dot = @am__leading_dot@
  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@
  dir_confdef = @dir_confdef@
  enable_debug = @enable_debug@
  enable_profile = @enable_profile@
- 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_mingw32 = @target_mingw32@
--- 60,99 ----
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
+ host_alias = @host_alias@
  host_triplet = @host@
! 
! EXEEXT = @EXEEXT@
! OBJEXT = @OBJEXT@
! PATH_SEPARATOR = @PATH_SEPARATOR@
  AMTAR = @AMTAR@
! AS = @AS@
  AWK = @AWK@
  CC = @CC@
  CURL_CFLAGS = @CURL_CFLAGS@
  CURL_CONFIG = @CURL_CONFIG@
  CURL_LIBS = @CURL_LIBS@
  CXX = @CXX@
  DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
  ECHO = @ECHO@
  GENCCODE = @GENCCODE@
  GENCMN = @GENCMN@
  GENRB = @GENRB@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
  MAINT = @MAINT@
! OBJDUMP = @OBJDUMP@
  PACKAGE = @PACKAGE@
  PKGDATA = @PKGDATA@
  RANLIB = @RANLIB@
  STRIP = @STRIP@
  VERSION = @VERSION@
  am__include = @am__include@
  am__quote = @am__quote@
  dir_confdef = @dir_confdef@
  enable_debug = @enable_debug@
  enable_profile = @enable_profile@
  install_sh = @install_sh@
  target_cpu = @target_cpu@
  target_mingw32 = @target_mingw32@
***************
*** 187,192 ****
  
  # need regular expression stuff?
- @MINGW_FALSE@need_local_regex := no
  @MINGW_TRUE@need_local_regex := yes
  
  # shared library - set to yes if you would like to build
--- 122,127 ----
  
  # need regular expression stuff?
  @MINGW_TRUE@need_local_regex := yes
+ @MINGW_FALSE@need_local_regex := no
  
  # shared library - set to yes if you would like to build
***************
*** 223,227 ****
  globalconfdir := @sysconfdir@
  
! SUBDIRS = lib . icu apps $(am__append_1) $(am__append_2) $(am__append_3)
  
  INCLUDES = -I $(top_srcdir)/include
--- 158,165 ----
  globalconfdir := @sysconfdir@
  
! @BUILDEXAMPLES_TRUE@SUBDIRS = examples
! SUBDIRS = lib . icu apps
! @BUILDTESTS_TRUE@SUBDIRS = tests
! @BUILDUTILS_TRUE@SUBDIRS = utilities
  
  INCLUDES = -I $(top_srcdir)/include
***************
*** 257,261 ****
--- 195,203 ----
  testlib_LDFLAGS =
  
+ DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
***************
*** 269,287 ****
  CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  DIST_SOURCES = $(testlib_SOURCES)
  DATA = $(sysconf_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 $(srcdir)/locales.d/Makefile.am \
! 	$(srcdir)/samples/Makefile.am AUTHORS COPYING ChangeLog INSTALL \
! 	Makefile.am Makefile.in NEWS aclocal.m4 config.guess \
! 	config.h.in config.sub configure configure.ac depcomp \
! 	install-sh ltmain.sh missing mkinstalldirs
! DIST_SUBDIRS = lib . icu apps tests utilities examples
  SOURCES = $(testlib_SOURCES)
  
--- 211,228 ----
  CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ CXXFLAGS = @CXXFLAGS@
  DIST_SOURCES = $(testlib_SOURCES)
  DATA = $(sysconf_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 AUTHORS COPYING ChangeLog INSTALL Makefile.am \
! 	Makefile.in NEWS aclocal.m4 config.guess config.h.in config.sub \
! 	configure configure.ac depcomp install-sh ltmain.sh missing \
! 	mkinstalldirs
! DIST_SUBDIRS = lib . icu apps utilities tests examples
  SOURCES = $(testlib_SOURCES)
  
***************
*** 296,300 ****
  $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(srcdir)/locales.d/Makefile.am $(srcdir)/samples/Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
  	cd $(top_srcdir) && \
! 	  $(AUTOMAKE) --foreign  Makefile
  Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
  	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
--- 237,241 ----
  $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(srcdir)/locales.d/Makefile.am $(srcdir)/samples/Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
  	cd $(top_srcdir) && \
! 	  $(AUTOMAKE) --gnu  Makefile
  Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
  	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
***************
*** 347,381 ****
  
  .cpp.o:
! @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCXX_TRUE@	fi
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  
  .cpp.obj:
! @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
! @am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCXX_TRUE@	fi
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
  
  .cpp.lo:
! @am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
! @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCXX_TRUE@	fi
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  
  mostlyclean-libtool:
--- 288,308 ----
  
  .cpp.o:
! @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  
  .cpp.obj:
! @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
  
  .cpp.lo:
! @AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
! @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
! CXXDEPMODE = @CXXDEPMODE@
  
  mostlyclean-libtool:
***************
*** 461,475 ****
  	  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
  
--- 388,395 ----
***************
*** 502,520 ****
  	     $$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` \
--- 422,425 ----
***************
*** 523,527 ****
  
  distclean-tags:
! 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  
--- 428,432 ----
  
  distclean-tags:
! 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  
***************
*** 535,539 ****
  
  GZIP_ENV = --best
- distuninstallcheck_listfiles = find . -type f -print
  distcleancheck_listfiles = find . -type f -print
  
--- 440,443 ----
***************
*** 541,552 ****
  	$(am__remove_distdir)
  	mkdir $(distdir)
! 	$(mkinstalldirs) $(distdir)/./locales.d $(distdir)/./samples $(distdir)/locales.d $(distdir)/samples/mods.d
! 	@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,/[^/]*$$,,'`; \
--- 445,450 ----
  	$(am__remove_distdir)
  	mkdir $(distdir)
! 	$(mkinstalldirs) $(distdir)/locales.d $(distdir)/samples/mods.d
! 	@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,/[^/]*$$,,'`; \
***************
*** 601,611 ****
  	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
  	chmod -R a-w $(distdir); chmod a+w $(distdir)
! 	mkdir $(distdir)/_build
! 	mkdir $(distdir)/_inst
  	chmod a-w $(distdir)
! 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
! 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
! 	  && cd $(distdir)/_build \
! 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
  	    $(DISTCHECK_CONFIGURE_FLAGS) \
  	  && $(MAKE) $(AM_MAKEFLAGS) \
--- 499,508 ----
  	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
  	chmod -R a-w $(distdir); chmod a+w $(distdir)
! 	mkdir $(distdir)/=build
! 	mkdir $(distdir)/=inst
  	chmod a-w $(distdir)
! 	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
! 	  && cd $(distdir)/=build \
! 	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
  	    $(DISTCHECK_CONFIGURE_FLAGS) \
  	  && $(MAKE) $(AM_MAKEFLAGS) \
***************
*** 615,629 ****
  	  && $(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 \
--- 512,519 ----
  	  && $(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 \
***************
*** 632,644 ****
  	@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 \
--- 522,525 ----
***************
*** 647,651 ****
  	fi
  	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
! 	  || { echo "ERROR: files left in build directory after distclean:" ; \
  	       $(distcleancheck_listfiles) ; \
  	       exit 1; } >&2
--- 528,532 ----
  	fi
  	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
! 	  || { echo "ERROR: files left after distclean:" ; \
  	       $(distcleancheck_listfiles) ; \
  	       exit 1; } >&2
***************
*** 718,751 ****
  	mostlyclean-libtool
  
- pdf: pdf-recursive
- 
- pdf-am:
- 
- ps: ps-recursive
- 
- ps-am:
- 
  uninstall-am: uninstall-info-am uninstall-sysconfDATA
  
  uninstall-info: uninstall-info-recursive
  
! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
  	clean-generic clean-libtool clean-noinstPROGRAMS \
! 	clean-recursive ctags ctags-recursive dist dist-all dist-gzip \
! 	distcheck distclean distclean-compile distclean-depend \
! 	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 \
! 	install-info-recursive install-man install-recursive \
! 	install-strip install-sysconfDATA installcheck installcheck-am \
! 	installdirs installdirs-am installdirs-recursive \
! 	maintainer-clean maintainer-clean-generic \
  	maintainer-clean-recursive mostlyclean mostlyclean-compile \
  	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 \
  	uninstall-sysconfDATA
--- 599,622 ----
  	mostlyclean-libtool
  
  uninstall-am: uninstall-info-am uninstall-sysconfDATA
  
  uninstall-info: uninstall-info-recursive
  
! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
  	clean-generic clean-libtool clean-noinstPROGRAMS \
! 	clean-recursive dist dist-all dist-gzip distcheck distclean \
! 	distclean-compile distclean-depend 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 install-info-recursive install-man \
! 	install-recursive install-strip install-sysconfDATA \
! 	installcheck installcheck-am installdirs installdirs-am \
! 	installdirs-recursive maintainer-clean maintainer-clean-generic \
  	maintainer-clean-recursive mostlyclean mostlyclean-compile \
  	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
! 	tags tags-recursive uninstall uninstall-am uninstall-info-am \
  	uninstall-info-recursive uninstall-recursive \
  	uninstall-sysconfDATA

Index: aclocal.m4
===================================================================
RCS file: /usr/local/cvsroot/sword/aclocal.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** aclocal.m4	27 Feb 2003 09:33:01 -0000	1.6
--- aclocal.m4	30 Apr 2003 20:45:16 -0000	1.7
***************
*** 1,5 ****
! # generated automatically by aclocal 1.7.3 -*- Autoconf -*-
  
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
  # Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
--- 1,5 ----
! # 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
***************
*** 17,21 ****
  # your package does certain things.  But this isn't really a big deal.
  
! # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
  # Free Software Foundation, Inc.
  
--- 17,21 ----
  # your package does certain things.  But this isn't really a big deal.
  
! # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
  # Free Software Foundation, Inc.
  
***************
*** 35,39 ****
  # 02111-1307, USA.
  
! # serial 9
  
  # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
--- 35,39 ----
  # 02111-1307, USA.
  
! # serial 8
  
  # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
***************
*** 44,48 ****
  
  
! AC_PREREQ([2.54])
  
  # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
--- 44,48 ----
  
  
! AC_PREREQ([2.52])
  
  # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
***************
*** 70,83 ****
  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.
--- 70,73 ----
***************
*** 87,92 ****
   AC_SUBST([VERSION], [$2])],
  [_AM_SET_OPTIONS([$1])dnl
!  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
!  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
  
  _AM_IF_OPTION([no-define],,
--- 77,82 ----
   AC_SUBST([VERSION], [$2])],
  [_AM_SET_OPTIONS([$1])dnl
!  AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
!  AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
  
  _AM_IF_OPTION([no-define],,
***************
*** 109,147 ****
  AC_REQUIRE([AC_PROG_AWK])dnl
  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
- AC_REQUIRE([AM_SET_LEADING_DOT])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],
- [# Compute $1's index in $config_headers.
- _am_stamp_count=1
- for _am_header in $config_headers :; do
-   case $_am_header in
-     $1 | $1:* )
-       break ;;
-     * )
-       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-   esac
- done
- echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
- 
  # Copyright 2002  Free Software Foundation, Inc.
  
--- 99,115 ----
  AC_REQUIRE([AC_PROG_AWK])dnl
  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.
  
***************
*** 164,168 ****
  # 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
--- 132,136 ----
  # 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
***************
*** 171,175 ****
  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
! 	 [AM_AUTOMAKE_VERSION([1.7.3])])
  
  # Helper functions for option handling.                    -*- Autoconf -*-
--- 139,143 ----
  # 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 -*-
***************
*** 457,496 ****
  AC_SUBST([INSTALL_STRIP_PROGRAM])])
  
! #                                                          -*- Autoconf -*-
! # Copyright (C) 2003  Free Software Foundation, Inc.
! 
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2, or (at your option)
! # any later version.
! 
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! # GNU General Public License for more details.
! 
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
! 
! # serial 1
! 
! # Check whether the underlying file-system supports filenames
! # with a leading dot.  For instance MS-DOS doesn't.
! AC_DEFUN([AM_SET_LEADING_DOT],
! [rm -rf .tst 2>/dev/null
! mkdir .tst 2>/dev/null
! if test -d .tst; then
!   am__leading_dot=.
! else
!   am__leading_dot=_
! fi
! rmdir .tst 2>/dev/null
! AC_SUBST([am__leading_dot])])
! 
! # serial 5						-*- Autoconf -*-
  
! # Copyright (C) 1999, 2000, 2001, 2002, 2003  Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
--- 425,431 ----
  AC_SUBST([INSTALL_STRIP_PROGRAM])])
  
! # serial 4						-*- Autoconf -*-
  
! # Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
***************
*** 584,598 ****
         source=conftest.c object=conftest.o \
         depfile=conftest.Po tmpdepfile=conftest.TPo \
!        $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \
!          >/dev/null 2>conftest.err &&
         grep conftest.h conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
!       # icc doesn't choke on unknown options, it will just issue warnings
!       # (even with -Werror).  So we grep stderr for any message
!       # that says an option was ignored.
!       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
!         am_cv_$1_dependencies_compiler_type=$depmode
!         break
!       fi
      fi
    done
--- 519,527 ----
         source=conftest.c object=conftest.o \
         depfile=conftest.Po tmpdepfile=conftest.TPo \
!        $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
         grep conftest.h conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
!       am_cv_$1_dependencies_compiler_type=$depmode
!       break
      fi
    done
***************
*** 605,611 ****
  ])
  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])
  ])
  
--- 534,537 ----
***************
*** 616,621 ****
  # This macro is AC_REQUIREd in _AM_DEPENDENCIES
  AC_DEFUN([AM_SET_DEPDIR],
! [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
! AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
  ])
  
--- 542,555 ----
  # This macro is AC_REQUIREd in _AM_DEPENDENCIES
  AC_DEFUN([AM_SET_DEPDIR],
! [rm -f .deps 2>/dev/null
! mkdir .deps 2>/dev/null
! if test -d .deps; then
!   DEPDIR=.deps
! else
!   # MS-DOS does not allow filenames that begin with a dot.
!   DEPDIR=_deps
! fi
! rmdir .deps 2>/dev/null
! AC_SUBST([DEPDIR])
  ])
  
***************
*** 719,725 ****
  ])
  
! # 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
--- 653,657 ----
  ])
  
! # Copyright 2001 Free Software Foundation, Inc.             -*- Autoconf -*-
  
  # This program is free software; you can redistribute it and/or modify
***************
*** 761,765 ****
  # 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=
--- 693,697 ----
  # 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=
***************
*** 821,825 ****
  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])])
--- 753,757 ----
  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])])
***************
*** 848,853 ****
  # serial 6
  
! # AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
! AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
  
  # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
--- 780,837 ----
  # 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
  
  # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
***************
*** 2877,2892 ****
    ;;
  
- freebsd*-gnu*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-   soname_spec='${libname}${release}.so$major'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-   hardcode_into_libs=yes
-   dynamic_linker='GNU/FreeBSD ld.so'
-   ;;
- 
  freebsd*)
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--- 2861,2864 ----
***************
*** 2995,2998 ****
--- 2967,2990 ----
    # assume the GNU/Linux dynamic linker is in use.
    dynamic_linker='GNU/Linux ld.so'
+ 
+   # Find out which ABI we are using (multilib Linux x86_64 hack).
+   libsuff=
+   case "$host_cpu" in
+   x86_64*|s390x*)
+     echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+     if AC_TRY_EVAL(ac_compile); then
+       case `/usr/bin/file conftest.$ac_objext` in
+       *64-bit*)
+         libsuff=64
+         ;;
+       esac
+     fi
+     rm -rf conftest*
+     ;;
+   *)
+     ;;
+   esac
+   sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+   sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
    ;;
  
***************
*** 3054,3058 ****
    version_type=osf
    need_version=no
-   need_lib_prefix=no
    soname_spec='${libname}${release}.so$major'
    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--- 3046,3049 ----
***************
*** 4189,4193 ****
  linux-gnu*)
    case $host_cpu in
!   alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
      lt_cv_deplibs_check_method=pass_all ;;
    *)
--- 4180,4184 ----
  linux-gnu*)
    case $host_cpu in
!   alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | x86_64*)
      lt_cv_deplibs_check_method=pass_all ;;
    *)
***************
*** 4488,4492 ****
  # From Jim Meyering
  
! # Copyright 1996, 1998, 2000, 2001, 2002  Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
--- 4479,4483 ----
  # From Jim Meyering
  
! # Copyright 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
***************
*** 4505,4509 ****
  # 02111-1307, USA.
  
! # serial 2
  
  AC_DEFUN([AM_MAINTAINER_MODE],
--- 4496,4500 ----
  # 02111-1307, USA.
  
! # serial 1
  
  AC_DEFUN([AM_MAINTAINER_MODE],
***************
*** 4521,4525 ****
  ]
  )
- 
- AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
  
--- 4512,4514 ----