[sword-cvs] sword Makefile.am,1.30,1.31 Makefile.in,1.37,1.38 configure,1.24,1.25 configure.ac,1.17,1.18

Sat, 1 Mar 2003 11:57:08 -0700

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

Modified Files:
	Makefile.am Makefile.in configure configure.ac 
Log Message:
Martin: bugs in the make system fixed under Daniel's supervision.
Now ready for "make dist".

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Makefile.am	28 Feb 2003 22:44:03 -0000	1.30
--- Makefile.am	1 Mar 2003 18:57:05 -0000	1.31
***************
*** 2,6 ****
  # General defines

! version := 1.5.6

--- 2,6 ----
  # General defines

! version := 1.5.5.99

***************
*** 72,76 ****

  INCLUDES = -I $(top_srcdir)/include
! EXTRA_DIST = sword.spec sword.kdevprj sword.bmp 

  if INSTCONF
--- 72,76 ----

  INCLUDES = -I $(top_srcdir)/include
! EXTRA_DIST = sword.spec sword.kdevprj sword.bmp usrinst.sh autogen.sh

  if INSTCONF

Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/sword/Makefile.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Makefile.in	28 Feb 2003 22:46:47 -0000	1.37
--- Makefile.in	1 Mar 2003 18:57:05 -0000	1.38
***************
*** 172,176 ****

  # General defines
! version := 1.5.6

--- 172,176 ----

  # General defines
! version := 1.5.5.99

***************
*** 226,230 ****

  INCLUDES = -I $(top_srcdir)/include
! EXTRA_DIST = sword.spec sword.kdevprj sword.bmp 

  @INSTCONF_TRUE@sysconf_DATA = sword.conf
--- 226,230 ----

  INCLUDES = -I $(top_srcdir)/include
! EXTRA_DIST = sword.spec sword.kdevprj sword.bmp usrinst.sh autogen.sh

  @INSTCONF_TRUE@sysconf_DATA = sword.conf

Index: configure
===================================================================
RCS file: /usr/local/cvsroot/sword/configure,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** configure	27 Feb 2003 23:34:21 -0000	1.24
--- configure	1 Mar 2003 18:57:05 -0000	1.25
***************
*** 2,6 ****
  # 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.
  #
  # Report bugs to <sword-bugs@crosswire.org>.
--- 2,6 ----
  # 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.99.
  #
  # Report bugs to <sword-bugs@crosswire.org>.
***************
*** 429,434 ****
  PACKAGE_NAME='sword'
  PACKAGE_TARNAME='sword'
! PACKAGE_VERSION='1.5.5'
! PACKAGE_STRING='sword 1.5.5'
  PACKAGE_BUGREPORT='sword-bugs@crosswire.org'

--- 429,434 ----
  PACKAGE_NAME='sword'
  PACKAGE_TARNAME='sword'
! PACKAGE_VERSION='1.5.5.99'
! PACKAGE_STRING='sword 1.5.5.99'
  PACKAGE_BUGREPORT='sword-bugs@crosswire.org'

***************
*** 948,952 ****
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
! \`configure' configures sword 1.5.5 to adapt to many kinds of systems.

  Usage: $0 [OPTION]... [VAR=VALUE]...
--- 948,952 ----
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
! \`configure' configures sword 1.5.5.99 to adapt to many kinds of systems.

  Usage: $0 [OPTION]... [VAR=VALUE]...
***************
*** 1015,1019 ****
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of sword 1.5.5:";;
     esac
    cat <<\_ACEOF
--- 1015,1019 ----
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of sword 1.5.5.99:";;
     esac
    cat <<\_ACEOF
***************
*** 1124,1128 ****
  if $ac_init_version; then
    cat <<\_ACEOF
! sword configure 1.5.5
  generated by GNU Autoconf 2.57

--- 1124,1128 ----
  if $ac_init_version; then
    cat <<\_ACEOF
! sword configure 1.5.5.99
  generated by GNU Autoconf 2.57

***************
*** 1139,1143 ****
  running configure, to aid debugging if configure makes a mistake.

! It was created by sword $as_me 1.5.5, which was
  generated by GNU Autoconf 2.57.  Invocation command line was

--- 1139,1143 ----
  running configure, to aid debugging if configure makes a mistake.

! It was created by sword $as_me 1.5.5.99, which was
  generated by GNU Autoconf 2.57.  Invocation command line was

***************
*** 1834,1838 ****
  # Define the identity of the package.
   PACKAGE=sword
!  VERSION=1.5.5

--- 1834,1838 ----
  # Define the identity of the package.
   PACKAGE=sword
!  VERSION=1.5.5.99

***************
*** 9610,9614 ****
  cat >&5 <<_CSEOF

! This file was extended by sword $as_me 1.5.5, which was
  generated by GNU Autoconf 2.57.  Invocation command line was

--- 9610,9614 ----
  cat >&5 <<_CSEOF

! This file was extended by sword $as_me 1.5.5.99, which was
  generated by GNU Autoconf 2.57.  Invocation command line was

***************
*** 9673,9677 ****
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
! sword config.status 1.5.5
  configured by $0, generated by GNU Autoconf 2.57,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
--- 9673,9677 ----
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
! sword config.status 1.5.5.99
  configured by $0, generated by GNU Autoconf 2.57,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/sword/configure.ac,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** configure.ac	27 Feb 2003 21:22:02 -0000	1.17
--- configure.ac	1 Mar 2003 18:57:05 -0000	1.18
***************
*** 2,6 ****
  # Initialisation
  # ---------------------------------------------------------------------
! AC_INIT(sword, 1.5.5, sword-bugs@crosswire.org)
  AC_CONFIG_SRCDIR(sword.bmp)
  AC_PREREQ(2.52)
--- 2,7 ----
  # Initialisation
  # ---------------------------------------------------------------------
! 
! AC_INIT(sword, 1.5.5.99, sword-bugs@crosswire.org)
  AC_CONFIG_SRCDIR(sword.bmp)
  AC_PREREQ(2.52)
***************
*** 8,12 ****

  AC_CANONICAL_TARGET
! AM_INIT_AUTOMAKE(sword,1.5.5)

  AM_CONFIG_HEADER(config.h)
--- 9,13 ----

  AC_CANONICAL_TARGET
! AM_INIT_AUTOMAKE(sword, 1.5.5.99)

  AM_CONFIG_HEADER(config.h)