[sword-cvs] sword Makefile.am,1.28,1.29 configure.ac,1.16,1.17

[sword@www.crosswire.org]

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

Modified Files:
	Makefile.am configure.ac 
Log Message:

experimental attempt at optional build of tests, utilities and examples


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Makefile.am	2 Oct 2002 23:50:39 -0000	1.28
--- Makefile.am	27 Feb 2003 21:22:02 -0000	1.29
***************
*** 2,6 ****
  # General defines
  
! version := 1.5.5
  
  
--- 2,6 ----
  # General defines
  
! version := 1.5.6
  
  
***************
*** 60,64 ****
  globalconfdir := @sysconfdir@
  
! SUBDIRS = lib . icu tests utilities examples apps
  INCLUDES = -I $(top_srcdir)/include
  EXTRA_DIST = sword.spec sword.kdevprj sword.bmp options.conf
--- 60,74 ----
  globalconfdir := @sysconfdir@
  
! SUBDIRS = lib . icu apps
! if BUILDTESTS
! SUBDIRS += tests
! endif
! if BUILDUTILS
! SUBDIRS += utilities
! endif
! if BUILDEXAMPLES
! SUBDIRS += examples
! endif
! 
  INCLUDES = -I $(top_srcdir)/include
  EXTRA_DIST = sword.spec sword.kdevprj sword.bmp options.conf

Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/sword/configure.ac,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** configure.ac	27 Feb 2003 21:14:24 -0000	1.16
--- configure.ac	27 Feb 2003 21:22:02 -0000	1.17
***************
*** 47,51 ****
  AC_ARG_ENABLE(tests,[  --enable-tests          build test programs [default=no]],,enable_tests=no)
  AC_ARG_ENABLE(utilities,[  --enable-utilities      build utilities [default=yes]],,enable_utilities=yes)
! 
  AM_MAINTAINER_MODE
  
--- 47,51 ----
  AC_ARG_ENABLE(tests,[  --enable-tests          build test programs [default=no]],,enable_tests=no)
  AC_ARG_ENABLE(utilities,[  --enable-utilities      build utilities [default=yes]],,enable_utilities=yes)
! AC_ARG_ENABLE(examples,[  --enable-examples       build examples [default=no]],,enable_examples=no)
  AM_MAINTAINER_MODE
  
***************
*** 88,97 ****
  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"
--- 88,97 ----
  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"
***************
*** 200,204 ****
  #AM_CONDITIONAL(DEBUG, test x$with_debug = xyes)
  #AM_CONDITIONAL(PROFILE, test x$with_profile = xyes)
! 
  
  # ---------------------------------------------------------------------
--- 200,206 ----
  #AM_CONDITIONAL(DEBUG, test x$with_debug = xyes)
  #AM_CONDITIONAL(PROFILE, test x$with_profile = xyes)
! AM_CONDITIONAL(BUILDTESTS, test x$enable_tests = xyes)
! AM_CONDITIONAL(BUILDUTILS, test x$enable_utilities = xyes)
! AM_CONDITIONAL(BUILDEXAMPLES, test x$enable_examples = xyes)
  
  # ---------------------------------------------------------------------