[sword-cvs] sword Makefile.in,1.35,1.36 configure,1.23,1.24
sword@www.crosswire.org
sword@www.crosswire.org
Thu, 27 Feb 2003 16:34:23 -0700
Update of /usr/local/cvsroot/sword
In directory www:/tmp/cvs-serv18458
Modified Files:
Makefile.in configure
Log Message:
final updates to swbuf. works as expected.
Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/sword/Makefile.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Makefile.in 27 Feb 2003 09:33:01 -0000 1.35
--- Makefile.in 27 Feb 2003 23:34:21 -0000 1.36
***************
*** 37,40 ****
--- 37,43 ----
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@
***************
*** 45,48 ****
--- 48,57 ----
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@
***************
*** 163,167 ****
# General defines
! version := 1.5.5
--- 172,176 ----
# General defines
! version := 1.5.6
***************
*** 214,218 ****
globalconfdir := @sysconfdir@
! SUBDIRS = lib . icu tests utilities examples apps
INCLUDES = -I $(top_srcdir)/include
EXTRA_DIST = sword.spec sword.kdevprj sword.bmp options.conf
--- 223,228 ----
globalconfdir := @sysconfdir@
! SUBDIRS = lib . icu apps $(am__append_1) $(am__append_2) $(am__append_3)
!
INCLUDES = -I $(top_srcdir)/include
EXTRA_DIST = sword.spec sword.kdevprj sword.bmp options.conf
***************
*** 271,275 ****
config.h.in config.sub configure configure.ac depcomp \
install-sh ltmain.sh missing mkinstalldirs
! DIST_SUBDIRS = $(SUBDIRS)
SOURCES = $(testlib_SOURCES)
--- 281,285 ----
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)
***************
*** 284,288 ****
$(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)
--- 294,298 ----
$(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)
***************
*** 556,560 ****
fi; \
done
! list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
--- 566,570 ----
fi; \
done
! list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
Index: configure
===================================================================
RCS file: /usr/local/cvsroot/sword/configure,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** configure 27 Feb 2003 09:33:01 -0000 1.23
--- configure 27 Feb 2003 23:34:21 -0000 1.24
***************
*** 1,4 ****
#! /bin/sh
! # 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.
--- 1,4 ----
#! /bin/sh
! # From configure.ac Revision: 1.17 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for sword 1.5.5.
***************
*** 471,475 ****
#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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LN_S ECHO RANLIB ac_ct_RANLIB CXXCPP EGREP LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PKGDATA GENCCODE GENCMN GENRB CURL_CONFIG with_zlib with_icu with_conf dir_confdef CURL_CFLAGS CURL_LIBS enable_debug enable_profile target_system target_mingw32 MINGW_TRUE MINGW_FALSE ICU_TRUE ICU_FALSE ICUSWORD_TRUE ICUSWORD_FALSE ZLIB_TRUE ZLIB_FALSE INSTCONF_TRUE INSTCONF_FALSE INSTALLMGR_TRUE INSTALLMGR_FALSE CONFDEF_TRUE CONFDEF_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
--- 471,475 ----
#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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LN_S ECHO RANLIB ac_ct_RANLIB CXXCPP EGREP LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PKGDATA GENCCODE GENCMN GENRB CURL_CONFIG with_zlib with_icu with_conf dir_confdef CURL_CFLAGS CURL_LIBS enable_debug enable_profile target_system target_mingw32 MINGW_TRUE MINGW_FALSE ICU_TRUE ICU_FALSE ICUSWORD_TRUE ICUSWORD_FALSE ZLIB_TRUE ZLIB_FALSE INSTCONF_TRUE INSTCONF_FALSE INSTALLMGR_TRUE INSTALLMGR_FALSE CONFDEF_TRUE CONFDEF_FALSE BUILDTESTS_TRUE BUILDTESTS_FALSE BUILDUTILS_TRUE BUILDUTILS_FALSE BUILDEXAMPLES_TRUE BUILDEXAMPLES_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
***************
*** 1032,1035 ****
--- 1032,1038 ----
--enable-profile allow profiling default=no
--enable-profilefn allow functioncheck profiling default=no
+ --enable-tests build test programs default=no
+ --enable-utilities build utilities default=yes
+ --enable-examples build examples default=no
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
***************
*** 5122,5126 ****
*-*-irix6*)
# Find out which ABI we are using.
! echo '#line 5124 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
--- 5125,5129 ----
*-*-irix6*)
# Find out which ABI we are using.
! echo '#line 5127 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
***************
*** 5651,5655 ****
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
! if { (eval echo configure:5653: \"$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
--- 5654,5658 ----
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
! if { (eval echo configure:5656: \"$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
***************
*** 7496,7500 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7498 "configure"
#include "confdefs.h"
--- 7499,7503 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7501 "configure"
#include "confdefs.h"
***************
*** 7594,7598 ****
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7596 "configure"
#include "confdefs.h"
--- 7597,7601 ----
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
! #line 7599 "configure"
#include "confdefs.h"
***************
*** 8655,8658 ****
--- 8658,8682 ----
enable_profilefn=no
fi;
+ # Check whether --enable-tests or --disable-tests was given.
+ if test "${enable_tests+set}" = set; then
+ enableval="$enable_tests"
+
+ else
+ enable_tests=no
+ fi;
+ # Check whether --enable-utilities or --disable-utilities was given.
+ if test "${enable_utilities+set}" = set; then
+ enableval="$enable_utilities"
+
+ else
+ enable_utilities=yes
+ fi;
+ # Check whether --enable-examples or --disable-examples was given.
+ if test "${enable_examples+set}" = set; then
+ enableval="$enable_examples"
+
+ else
+ enable_examples=no
+ fi;
echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
***************
*** 8917,8926 ****
if test x$enable_debug = xyes; then
if test x$ac_cv_prog_cc_g = xyes; then
! CFLAGS="-g -O0"
else
CFLAGS="-O0"
fi
if test x$ac_cv_prog_cxx_g = xyes; then
! CXXFLAGS="-g -O0"
else
CXXFLAGS="-O0"
--- 8941,8950 ----
if test x$enable_debug = xyes; then
if test x$ac_cv_prog_cc_g = xyes; then
! CFLAGS="-g3 -O0"
else
CFLAGS="-O0"
fi
if test x$ac_cv_prog_cxx_g = xyes; then
! CXXFLAGS="-g3 -O0"
else
CXXFLAGS="-O0"
***************
*** 9094,9097 ****
--- 9118,9150 ----
+ if test x$enable_tests = xyes; then
+ BUILDTESTS_TRUE=
+ BUILDTESTS_FALSE='#'
+ else
+ BUILDTESTS_TRUE='#'
+ BUILDTESTS_FALSE=
+ fi
+
+
+
+ if test x$enable_utilities = xyes; then
+ BUILDUTILS_TRUE=
+ BUILDUTILS_FALSE='#'
+ else
+ BUILDUTILS_TRUE='#'
+ BUILDUTILS_FALSE=
+ fi
+
+
+
+ if test x$enable_examples = xyes; then
+ BUILDEXAMPLES_TRUE=
+ BUILDEXAMPLES_FALSE='#'
+ else
+ BUILDEXAMPLES_TRUE='#'
+ BUILDEXAMPLES_FALSE=
+ fi
+
+
# ---------------------------------------------------------------------
# Final output
***************
*** 9267,9270 ****
--- 9320,9344 ----
{ (exit 1); exit 1; }; }
fi
+ if test -z "${BUILDTESTS_TRUE}" && test -z "${BUILDTESTS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BUILDTESTS\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"BUILDTESTS\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${BUILDUTILS_TRUE}" && test -z "${BUILDUTILS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BUILDUTILS\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"BUILDUTILS\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${BUILDEXAMPLES_TRUE}" && test -z "${BUILDEXAMPLES_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BUILDEXAMPLES\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"BUILDEXAMPLES\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
: ${CONFIG_STATUS=./config.status}
***************
*** 9899,9902 ****
--- 9973,9982 ----
s,@CONFDEF_TRUE@,$CONFDEF_TRUE,;t t
s,@CONFDEF_FALSE@,$CONFDEF_FALSE,;t t
+ s,@BUILDTESTS_TRUE@,$BUILDTESTS_TRUE,;t t
+ s,@BUILDTESTS_FALSE@,$BUILDTESTS_FALSE,;t t
+ s,@BUILDUTILS_TRUE@,$BUILDUTILS_TRUE,;t t
+ s,@BUILDUTILS_FALSE@,$BUILDUTILS_FALSE,;t t
+ s,@BUILDEXAMPLES_TRUE@,$BUILDEXAMPLES_TRUE,;t t
+ s,@BUILDEXAMPLES_FALSE@,$BUILDEXAMPLES_FALSE,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t