[sword-cvs] sword Makefile.in,1.33,1.34 aclocal.m4,1.4,1.5 configure,1.21,1.22
sword@www.crosswire.org
sword@www.crosswire.org
Thu, 13 Feb 2003 15:27:55 -0700
Update of /usr/local/cvsroot/sword
In directory www:/tmp/cvs-serv3089
Modified Files:
Makefile.in aclocal.m4 configure
Log Message:
updates to make system. hope it works.
Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/sword/Makefile.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Makefile.in 30 Dec 2002 23:06:15 -0000 1.33
--- Makefile.in 13 Feb 2003 22:27:52 -0000 1.34
***************
*** 1,3 ****
! # Makefile.in generated by automake 1.6.3 from Makefile.am.
# @configure_input@
--- 1,3 ----
! # Makefile.in generated by automake 1.7.2 from Makefile.am.
# @configure_input@
***************
*** 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@
--- 14,21 ----
***************
*** 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 = :
--- 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 = :
***************
*** 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@
--- 36,154 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
! ACLOCAL = @ACLOCAL@
! AMDEP_FALSE = @AMDEP_FALSE@
! AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
! AUTOCONF = @AUTOCONF@
! AUTOHEADER = @AUTOHEADER@
! AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
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__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@
***************
*** 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
--- 177,182 ----
# 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
***************
*** 169,173 ****
@ICU_TRUE@testlib_LDADD = -L./lib -lsword -licui18n -licuuc
@ICU_FALSE@testlib_LDADD = -L./lib -lsword
! localeDATA = locales.d/abbr.conf locales.d/cs.conf locales.d/da.conf locales.d/de.conf locales.d/de_abbrev.conf locales.d/es.conf locales.d/fi.conf locales.d/fr.conf locales.d/fr_FR.ISO-8859-1.conf locales.d/it.conf locales.d/la.conf locales.d/nl.conf locales.d/no.conf locales.d/pl.conf locales.d/pt.conf locales.d/id.conf locales.d/pt_BR.conf locales.d/sk.conf locales.d/et.conf locales.d/et_abbr.conf locales.d/ru_RU-cp1251.conf locales.d/ru_RU-koi8-r.conf locales.d/uk_UA-koi8-u.conf locales.d/uk_UA-cp1251.conf
localedatadir = $(pkgdatadir)/locales.d
--- 224,228 ----
@ICU_TRUE@testlib_LDADD = -L./lib -lsword -licui18n -licuuc
@ICU_FALSE@testlib_LDADD = -L./lib -lsword
! localeDATA = locales.d/abbr.conf locales.d/cs.conf locales.d/da.conf locales.d/de.conf locales.d/de_abbrev.conf locales.d/es.conf locales.d/fi.conf locales.d/fr.conf locales.d/fr_FR.ISO-8859-1.conf locales.d/it.conf locales.d/la.conf locales.d/nl.conf locales.d/no.conf locales.d/pl.conf locales.d/pt.conf locales.d/id.conf locales.d/pt_BR.conf locales.d/sk.conf locales.d/et.conf locales.d/et_abbr.conf locales.d/ru_RU-cp1251.conf locales.d/ru_RU-koi8-r.conf locales.d/uk_UA-koi8-u.conf locales.d/uk_UA-cp1251.conf locales.d/ro.conf
localedatadir = $(pkgdatadir)/locales.d
***************
*** 189,197 ****
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
--- 244,248 ----
***************
*** 205,221 ****
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 = $(SUBDIRS)
SOURCES = $(testlib_SOURCES)
--- 256,273 ----
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 = $(SUBDIRS)
SOURCES = $(testlib_SOURCES)
***************
*** 282,302 ****
.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:
--- 334,368 ----
.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:
***************
*** 382,389 ****
--- 448,462 ----
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
***************
*** 416,419 ****
--- 489,507 ----
$$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,426 ****
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--- 510,514 ----
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
***************
*** 434,437 ****
--- 522,526 ----
GZIP_ENV = --best
+ distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
***************
*** 439,443 ****
$(am__remove_distdir)
mkdir $(distdir)
! @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,/[^/]*$$,,'`; \
--- 528,539 ----
$(am__remove_distdir)
mkdir $(distdir)
! $(mkinstalldirs) $(distdir)/./locales.d $(distdir)/./samples
! @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,/[^/]*$$,,'`; \
***************
*** 496,501 ****
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) \
--- 592,598 ----
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" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
***************
*** 505,512 ****
&& $(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 \
--- 602,616 ----
&& $(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 \
***************
*** 515,518 ****
--- 619,631 ----
@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 \
***************
*** 521,525 ****
fi
test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
! || { echo "ERROR: files left after distclean:" ; \
$(distcleancheck_listfiles) ; \
exit 1; } >&2
--- 634,638 ----
fi
test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
! || { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \
exit 1; } >&2
***************
*** 592,615 ****
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
--- 705,738 ----
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
Index: aclocal.m4
===================================================================
RCS file: /usr/local/cvsroot/sword/aclocal.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** aclocal.m4 18 Oct 2002 20:02:40 -0000 1.4
--- aclocal.m4 13 Feb 2003 22:27:52 -0000 1.5
***************
*** 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
--- 1,5 ----
! # generated automatically by aclocal 1.7.2 -*- Autoconf -*-
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
***************
*** 44,48 ****
! AC_PREREQ([2.52])
# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
--- 44,48 ----
! AC_PREREQ([2.54])
# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
***************
*** 70,73 ****
--- 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.
***************
*** 101,115 ****
_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.
--- 111,137 ----
_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.
***************
*** 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
--- 154,158 ----
# 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
***************
*** 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 -*-
--- 161,165 ----
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
! [AM_AUTOMAKE_VERSION([1.7.2])])
# Helper functions for option handling. -*- Autoconf -*-
***************
*** 519,523 ****
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
--- 541,545 ----
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
***************
*** 534,537 ****
--- 556,562 ----
])
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])
])
***************
*** 653,657 ****
])
! # Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*-
# This program is free software; you can redistribute it and/or modify
--- 678,684 ----
])
! # 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
***************
*** 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=
--- 720,724 ----
# 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=
***************
*** 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])])
--- 780,784 ----
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])])
***************
*** 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-*-
--- 807,812 ----
# 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-*-
***************
*** 864,867 ****
--- 839,844 ----
AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
AC_REQUIRE([AC_PROG_NM])dnl
+ AC_REQUIRE([LT_AC_PROG_SED])dnl
+
AC_REQUIRE([AC_PROG_LN_S])dnl
AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
***************
*** 1031,1037 ****
lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
! irix*)
symcode='[[BCDEGRST]]'
;;
solaris* | sysv5*)
symcode='[[BDT]]'
--- 1008,1017 ----
lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
! irix* | nonstopux*)
symcode='[[BCDEGRST]]'
;;
+ osf*)
+ symcode='[[BCDEGQRST]]'
+ ;;
solaris* | sysv5*)
symcode='[[BDT]]'
***************
*** 1130,1134 ****
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$no_builtin_flag"
! if AC_TRY_EVAL(ac_link) && test -s conftest; then
pipe_works=yes
fi
--- 1110,1114 ----
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$no_builtin_flag"
! if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
pipe_works=yes
fi
***************
*** 1674,1678 ****
lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
;;
! beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
--- 1654,1658 ----
lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
;;
! beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
***************
*** 1717,1721 ****
;;
! irix5* | irix6*)
lt_cv_prog_cc_wl='-Wl,'
lt_cv_prog_cc_static='-non_shared'
--- 1697,1701 ----
;;
! irix5* | irix6* | nonstopux*)
lt_cv_prog_cc_wl='-Wl,'
lt_cv_prog_cc_static='-non_shared'
***************
*** 1761,1769 ****
lt_cv_prog_cc_pic='-KPIC'
lt_cv_prog_cc_static='-Bstatic'
! if test "x$host_vendor" = xsni; then
! lt_cv_prog_cc_wl='-LD'
! else
! lt_cv_prog_cc_wl='-Wl,'
! fi
;;
--- 1741,1745 ----
lt_cv_prog_cc_pic='-KPIC'
lt_cv_prog_cc_static='-Bstatic'
! lt_cv_prog_cc_wl='-Wl,'
;;
***************
*** 2130,2134 ****
# is EXPORTS), use it as is.
# If DATA tags from a recent dlltool are present, honour them!
! archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
cp $export_symbols $output_objdir/$soname-def;
else
--- 2106,2110 ----
# is EXPORTS), use it as is.
# If DATA tags from a recent dlltool are present, honour them!
! archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
cp $export_symbols $output_objdir/$soname-def;
else
***************
*** 2139,2142 ****
--- 2115,2119 ----
case \[$]# in
2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
+ 4) echo " \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
*) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
esac;
***************
*** 2251,2258 ****
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
--- 2228,2237 ----
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
for ld_flag in $LDFLAGS; do
! case $ld_flag in
! *-brtl*)
aix_use_runtimelinking=yes
break
! ;;
! esac
done
esac
***************
*** 2368,2373 ****
# FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not
! # yet detect zsh echo's removal of \ escapes.
! archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
--- 2347,2353 ----
# FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not
! # yet detect zsh echo's removal of \ escapes. Also zsh mangles
! # `"' quotes if we put them in here... so don't!
! archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
***************
*** 2421,2431 ****
;;
! irix5* | irix6*)
if test "$GCC" = yes; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
fi
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=:
link_all_deplibs=yes
--- 2401,2412 ----
;;
! irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ hardcode_libdir_flag_spec='-rpath $libdir'
fi
hardcode_libdir_separator=:
link_all_deplibs=yes
***************
*** 2455,2459 ****
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
--- 2436,2440 ----
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
***************
*** 2465,2469 ****
;;
*)
! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
--- 2446,2450 ----
;;
*)
! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
***************
*** 2577,2587 ****
sysv4)
! if test "x$host_vendor" = xsno; then
! archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
! hardcode_direct=yes # is this really true???
! else
! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
! hardcode_direct=no #Motorola manual says yes, but my tests say they lie
! fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
--- 2558,2578 ----
sysv4)
! case $host_vendor in
! sni)
! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
! hardcode_direct=yes # is this really true???
! ;;
! siemens)
! ## LD is ld it makes a PLAMLIB
! ## CC just makes a GrossModule.
! archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
! reload_cmds='$CC -r -o $output$reload_objs'
! hardcode_direct=no
! ;;
! motorola)
! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
! hardcode_direct=no #Motorola manual says yes, but my tests say they lie
! ;;
! esac
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
***************
*** 2724,2727 ****
--- 2715,2721 ----
aix4* | aix5*)
version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
if test "$host_cpu" = ia64; then
# AIX 5 supports IA64
***************
*** 2762,2765 ****
--- 2756,2760 ----
shlibpath_var=LIBPATH
fi
+ hardcode_into_libs=yes
;;
***************
*** 2809,2813 ****
yes,mingw*)
library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
! sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
;;
yes,pw32*)
--- 2804,2808 ----
yes,mingw*)
library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
! sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
;;
yes,pw32*)
***************
*** 2841,2844 ****
--- 2836,2851 ----
;;
+ 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`
***************
*** 2892,2897 ****
;;
! irix5* | irix6*)
! version_type=irix
need_lib_prefix=no
need_version=no
--- 2899,2907 ----
;;
! irix5* | irix6* | nonstopux*)
! case $host_os in
! nonstopux*) version_type=nonstopux ;;
! *) version_type=irix ;;
! esac
need_lib_prefix=no
need_version=no
***************
*** 2899,2903 ****
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
case $host_os in
! irix5*)
libsuff= shlibsuff=
;;
--- 2909,2913 ----
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
case $host_os in
! irix5* | nonstopux*)
libsuff= shlibsuff=
;;
***************
*** 3003,3011 ****
version_type=osf
need_version=no
! soname_spec='${libname}${release}.so'
! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
--- 3013,3023 ----
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'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ hardcode_into_libs=yes
;;
***************
*** 3050,3053 ****
--- 3062,3071 ----
sni)
shlibpath_overrides_runpath=no
+ need_lib_prefix=no
+ export_dynamic_flag_spec='${wl}-Blargedynsym'
+ runpath_var=LD_RUN_PATH
+ ;;
+ siemens)
+ need_lib_prefix=no
;;
motorola)
***************
*** 3204,3208 ****
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
! for var in echo old_CC old_CFLAGS \
AR AR_FLAGS CC LD LN_S NM SHELL \
reload_flag reload_cmds wl \
--- 3222,3226 ----
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
! for var in echo old_CC old_CFLAGS SED \
AR AR_FLAGS CC LD LN_S NM SHELL \
reload_flag reload_cmds wl \
***************
*** 3266,3271 ****
# the same distribution terms that you use for the rest of that program.
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
! Xsed="sed -e s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout
--- 3284,3292 ----
# the same distribution terms that you use for the rest of that program.
+ # A sed that does not truncate output.
+ SED=$lt_SED
+
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
! Xsed="${SED} -e s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout
***************
*** 4028,4032 ****
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
! [AC_CACHE_CHECK([how to recognise dependant libraries],
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
--- 4049,4053 ----
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
! [AC_CACHE_CHECK([how to recognise dependent libraries],
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
***************
*** 4103,4109 ****
;;
! irix5* | irix6*)
case $host_os in
! irix5*)
# this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
--- 4124,4130 ----
;;
! irix5* | irix6* | nonstopux*)
case $host_os in
! irix5* | nonstopux*)
# this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
***************
*** 4127,4131 ****
linux-gnu*)
case $host_cpu in
! alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
lt_cv_deplibs_check_method=pass_all ;;
*)
--- 4148,4152 ----
linux-gnu*)
case $host_cpu in
! alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
lt_cv_deplibs_check_method=pass_all ;;
*)
***************
*** 4198,4201 ****
--- 4219,4225 ----
lt_cv_file_magic_test_file=/lib/libc.so
;;
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
;;
***************
*** 4263,4272 ****
# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
! # the libltdl convenience library and INCLTDL to the include flags for
# the libltdl header and adds --enable-ltdl-convenience to the
! # configure arguments. Note that LIBLTDL and INCLTDL are not
# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not
# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed
! # with '${top_builddir}/' and INCLTDL will be prefixed with
# '${top_srcdir}/' (note the single quotes!). If your package is not
# flat and you're not using automake, define top_builddir and
--- 4287,4296 ----
# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
! # the libltdl convenience library and LTDLINCL to the include flags for
# the libltdl header and adds --enable-ltdl-convenience to the
! # configure arguments. Note that LIBLTDL and LTDLINCL are not
# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not
# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed
! # with '${top_builddir}/' and LTDLINCL will be prefixed with
# '${top_srcdir}/' (note the single quotes!). If your package is not
# flat and you're not using automake, define top_builddir and
***************
*** 4280,4293 ****
esac
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
! INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
])
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
! # the libltdl installable library and INCLTDL to the include flags for
# the libltdl header and adds --enable-ltdl-install to the configure
! # arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed
# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will
! # be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
# with '${top_srcdir}/' (note the single quotes!). If your package is
# not flat and you're not using automake, define top_builddir and
--- 4304,4319 ----
esac
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
! LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
! # For backwards non-gettext consistent compatibility...
! INCLTDL="$LTDLINCL"
])
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
! # the libltdl installable library and LTDLINCL to the include flags for
# the libltdl header and adds --enable-ltdl-install to the configure
! # arguments. Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is
# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed
# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will
! # be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed
# with '${top_srcdir}/' (note the single quotes!). If your package is
# not flat and you're not using automake, define top_builddir and
***************
*** 4307,4316 ****
ac_configure_args="$ac_configure_args --enable-ltdl-install"
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
! INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
else
ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
LIBLTDL="-lltdl"
! INCLTDL=
fi
])
--- 4333,4344 ----
ac_configure_args="$ac_configure_args --enable-ltdl-install"
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
! LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
else
ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
LIBLTDL="-lltdl"
! LTDLINCL=
fi
+ # For backwards non-gettext consistent compatibility...
+ INCLTDL="$LTDLINCL"
])
***************
*** 4327,4334 ****
ifelse([AC_DISABLE_FAST_INSTALL])
# Add --enable-maintainer-mode option to configure.
# From Jim Meyering
! # Copyright 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
--- 4355,4451 ----
ifelse([AC_DISABLE_FAST_INSTALL])
+ # NOTE: This macro has been submitted for inclusion into #
+ # GNU Autoconf as AC_PROG_SED. When it is available in #
+ # a released version of Autoconf we should remove this #
+ # macro and use it instead. #
+ # LT_AC_PROG_SED
+ # --------------
+ # Check for a fully-functional sed program, that truncates
+ # as few characters as possible. Prefer GNU sed if found.
+ AC_DEFUN([LT_AC_PROG_SED],
+ [AC_MSG_CHECKING([for a sed that does not truncate output])
+ AC_CACHE_VAL(lt_cv_path_SED,
+ [# Loop through the user's path and test for sed and gsed.
+ # Then use that list of sed's as ones to test for truncation.
+ as_executable_p="test -f"
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
+ fi
+ done
+ done
+ done
+
+ # Create a temporary directory, and hook for its removal unless debugging.
+ $debug ||
+ {
+ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+ trap '{ (exit 1); exit 1; }' 1 2 13 15
+ }
+
+ # Create a (secure) tmp directory for tmp files.
+ : ${TMPDIR=/tmp}
+ {
+ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
+ test -n "$tmp" && test -d "$tmp"
+ } ||
+ {
+ tmp=$TMPDIR/sed$$-$RANDOM
+ (umask 077 && mkdir $tmp)
+ } ||
+ {
+ echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+ { (exit 1); exit 1; }
+ }
+ _max=0
+ _count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for _sed in $_sed_list /usr/xpg4/bin/sed; do
+ test ! -f ${_sed} && break
+ cat /dev/null > "$tmp/sed.in"
+ _count=0
+ echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
+ # Check for GNU sed and select it if it is found.
+ if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
+ lt_cv_path_SED=${_sed}
+ break
+ fi
+ while true; do
+ cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
+ mv "$tmp/sed.tmp" "$tmp/sed.in"
+ cp "$tmp/sed.in" "$tmp/sed.nl"
+ echo >>"$tmp/sed.nl"
+ ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
+ cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
+ # 40000 chars as input seems more than enough
+ test $_count -gt 10 && break
+ _count=`expr $_count + 1`
+ if test $_count -gt $_max; then
+ _max=$_count
+ lt_cv_path_SED=$_sed
+ fi
+ done
+ done
+ rm -rf "$tmp"
+ ])
+ if test "X$SED" != "X"; then
+ lt_cv_path_SED=$SED
+ else
+ SED=$lt_cv_path_SED
+ fi
+ AC_MSG_RESULT([$SED])
+ ])
+
# Add --enable-maintainer-mode option to configure.
# 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
***************
*** 4347,4351 ****
# 02111-1307, USA.
! # serial 1
AC_DEFUN([AM_MAINTAINER_MODE],
--- 4464,4468 ----
# 02111-1307, USA.
! # serial 2
AC_DEFUN([AM_MAINTAINER_MODE],
***************
*** 4363,4365 ****
--- 4480,4484 ----
]
)
+
+ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
Index: configure
===================================================================
RCS file: /usr/local/cvsroot/sword/configure,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** configure 18 Oct 2002 20:02:40 -0000 1.21
--- configure 13 Feb 2003 22:27:52 -0000 1.22
***************
*** 2,6 ****
# From configure.ac Revision: 1.14 .
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.53 for sword 1.5.5.
#
# Report bugs to <sword-bugs@crosswire.org>.
--- 2,6 ----
# From configure.ac Revision: 1.14 .
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.57 for sword 1.5.5.
#
[...4340 lines suppressed...]
# echo "creating $dirpart/$file"
***************
*** 9938,9943 ****
if test "$no_create" != yes; then
ac_cs_success=:
exec 5>/dev/null
! $SHELL $CONFIG_STATUS || ac_cs_success=false
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
--- 10497,10505 ----
if test "$no_create" != yes; then
ac_cs_success=:
+ ac_config_status_args=
+ test "$silent" = yes &&
+ ac_config_status_args="$ac_config_status_args --quiet"
exec 5>/dev/null
! $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which