make sure people don't confuse the MASTER branche with the 1.5 branche ...

diff --git a/Makefile.in b/Makefile.in
index 079859f0fc92a128a676346f3b72d3a6b20f94e2..6877abd225695a1e79e7650615df8d5260419e29 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,7 +81,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@BUILD_EXAMPLES_TRUE@am__append_1 = examples
+@BUILD_DOCS_TRUE@am__append_1 = doc
+@BUILD_EXAMPLES_TRUE@am__append_2 = examples
 subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(top_srcdir)/configure $(am__configure_deps) \
@@ -202,7 +203,7 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
-DIST_SUBDIRS = po src doc bindings tests examples
+DIST_SUBDIRS = po src bindings tests doc examples
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -448,7 +449,7 @@ top_srcdir = @top_srcdir@
 RSYNC = rsync --rsh=ssh
 
 # build the following subdirectories
-SUBDIRS = po src doc bindings tests $(am__append_1)
+SUBDIRS = po src bindings tests $(am__append_1) $(am__append_2)
 EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \
              rrdtool.spec favicon.ico bootstrap \
              libtool \

diff --git a/VERSION b/VERSION
index 94fe62c2740fdca94618a4f448e6c2575f123592..6b989b82b1057c4f6748ce1b12043610709280cd 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.4
+1.5.999

diff --git a/configure b/configure
index 70349dfe6d020906b6374fca242c0c5b1ab721e7..2aaef3e37c8e6e555b61da2a377a64aabc05105f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for rrdtool 1.5.4.
+# Generated by GNU Autoconf 2.69 for rrdtool 1.5.999.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='rrdtool'
 PACKAGE_TARNAME='rrdtool'
-PACKAGE_VERSION='1.5.4'
-PACKAGE_STRING='rrdtool 1.5.4'
+PACKAGE_VERSION='1.5.999'
+PACKAGE_STRING='rrdtool 1.5.999'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -769,6 +769,8 @@ BUILD_RRDCGI_FALSE
 BUILD_RRDCGI_TRUE
 BUILD_EXAMPLES_FALSE
 BUILD_EXAMPLES_TRUE
+BUILD_DOCS_FALSE
+BUILD_DOCS_TRUE
 RRDGRAPH_YLEGEND_ANGLE
 MAINT
 MAINTAINER_MODE_FALSE
@@ -879,6 +881,7 @@ enable_option_checking
 enable_dependency_tracking
 enable_silent_rules
 enable_maintainer_mode
+enable_docs
 enable_examples
 enable_rrdcached
 enable_rrdcgi
@@ -1478,7 +1481,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures rrdtool 1.5.4 to adapt to many kinds of systems.
+\`configure' configures rrdtool 1.5.999 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1549,7 +1552,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rrdtool 1.5.4:";;
+     short | recursive ) echo "Configuration of rrdtool 1.5.999:";;
    esac
   cat <<\_ACEOF
 
@@ -1566,6 +1569,7 @@ Optional Features:
   --enable-maintainer-mode
                           enable make rules and dependencies not useful (and
                           sometimes confusing) to the casual installer
+  --disable-docs          disable building documentation
   --disable-examples      disable building of examples
   --disable-rrdcached     disable building of rrdcached
   --disable-rrdcgi        disable building of rrdcgi
@@ -1733,7 +1737,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rrdtool configure 1.5.4
+rrdtool configure 1.5.999
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2438,7 +2442,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by rrdtool $as_me 1.5.4, which was
+It was created by rrdtool $as_me 1.5.999, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2822,10 +2826,10 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-NUMVERS=1.5005
+NUMVERS=1.6000
 
 
-LIBVERS=7:5:3
+LIBVERS=8:0:0
 
 
 # Make sure we can run config.sub.
@@ -4794,7 +4798,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rrdtool'
- VERSION='1.5.4'
+ VERSION='1.5.999'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5103,6 +5107,14 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+# Check whether --enable-docs was given.
+if test "${enable_docs+set}" = set; then :
+  enableval=$enable_docs;
+else
+  enable_docs=yes
+fi
+
+
 # Check whether --enable-examples was given.
 if test "${enable_examples+set}" = set; then :
   enableval=$enable_examples;
@@ -5143,6 +5155,14 @@ else
 fi
 
 
+ if test $enable_docs != no; then
+  BUILD_DOCS_TRUE=
+  BUILD_DOCS_FALSE='#'
+else
+  BUILD_DOCS_TRUE='#'
+  BUILD_DOCS_FALSE=
+fi
+
  if test $enable_examples != no; then
   BUILD_EXAMPLES_TRUE=
   BUILD_EXAMPLES_FALSE='#'
@@ -21927,6 +21947,8 @@ fi
 
 
 
+if test $enable_docs != no; then
+
 
 for ac_prog in gnroff nroff
 do
@@ -22030,6 +22052,8 @@ fi
 if test -z "$RRDDOCDIR"; then
    RRDDOCDIR='${datadir}/doc/${PACKAGE}-${VERSION}'; fi
 
+fi
+
 # systemd check
 
 
@@ -22301,6 +22325,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${BUILD_DOCS_TRUE}" && test -z "${BUILD_DOCS_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_DOCS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${BUILD_EXAMPLES_TRUE}" && test -z "${BUILD_EXAMPLES_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_EXAMPLES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -22771,7 +22799,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by rrdtool $as_me 1.5.4, which was
+This file was extended by rrdtool $as_me 1.5.999, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22837,7 +22865,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-rrdtool config.status 1.5.4
+rrdtool config.status 1.5.999
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -24611,12 +24639,12 @@ fi
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -24939,6 +24967,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${BUILD_DOCS_TRUE}" && test -z "${BUILD_DOCS_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_DOCS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${BUILD_EXAMPLES_TRUE}" && test -z "${BUILD_EXAMPLES_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_EXAMPLES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -25417,7 +25449,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by rrdtool $as_me 1.5.4, which was
+This file was extended by rrdtool $as_me 1.5.999, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25483,7 +25515,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-rrdtool config.status 1.5.4
+rrdtool config.status 1.5.999
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -27280,12 +27312,12 @@ fi
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES

diff --git a/conftools/depcomp b/conftools/depcomp
index d6fe445054ed7036d03b250afc9738af0bde2c20..4ebd5b3a2f2d689de95251c9424e2763aa159de5 100755 (executable)
--- a/conftools/depcomp
+++ b/conftools/depcomp
@@ -198,7 +198,7 @@ gcc3)
   ;;
 
 gcc)
-## Note that this doesn't just cater to obsolete pre-3.x GCC compilers.
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
 ## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
 ## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's

diff --git a/conftools/ltmain.sh b/conftools/ltmain.sh
index 4edb7e3e82bfa7a17297a2b586f032e543905f7f..a356acafa4548959e97355d1e8044b7201661754 100644 (file)
--- a/conftools/ltmain.sh
+++ b/conftools/ltmain.sh
@@ -360,7 +360,7 @@ func_relative_path ()
     func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
   fi
 
-  # Normalization. If bindir is libdir, return empty string,
+  # Normalisation. If bindir is libdir, return empty string,
   # else relative path ending with a slash; either way, target
   # file name can be directly appended.
   if test ! -z "$func_relative_path_result"; then
@@ -3276,7 +3276,7 @@ extern \"C\" {
 
 /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
 #if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 can't be const, because runtime
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
    relocations are performed -- see ld's documentation on pseudo-relocs.  */
 # define LT_DLSYM_CONST
 #elif defined(__osf__)

diff --git a/doc/rrdbuild.pod b/doc/rrdbuild.pod
index 721c5a09c5b6b22815e85bfb745014baa21d5b9c..cca13bd284786038d62c96197a6d976a51a8f8ef 100644 (file)
--- a/doc/rrdbuild.pod
+++ b/doc/rrdbuild.pod
@@ -41,7 +41,7 @@ Where you want to install the software.
 Once you have decided. Save the two locations into environment variables.
 
  BUILD_DIR=/tmp/rrdbuild
- INSTALL_DIR=/opt/rrdtool-1.5.5
+ INSTALL_DIR=/opt/rrdtool-1.5.999
 
 
 If your F</tmp> is mounted with the option noexec (RHEL seems todo that) you have to choose
@@ -55,9 +55,9 @@ Now make sure the BUILD_DIR exists and go there:
 Lets first assume you already have all the necessary libraries
 pre-installed. 
 
- wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.5.tar.gz
- gunzip -c rrdtool-1.5.5.tar.gz | tar xf -
- cd rrdtool-1.5.5
+ wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.999.tar.gz
+ gunzip -c rrdtool-1.5.999.tar.gz | tar xf -
+ cd rrdtool-1.5.999
  ./configure --prefix=$INSTALL_DIR && make && make install
 
 Ok, this was very optimistic. This try will probably have ended with
@@ -345,7 +345,7 @@ because it seems that a fair number of people have ill configured python and
 tcl setups that would prevent RRDtool from building if they are included in
 their current state.
 
- cd $BUILD_DIR/rrdtool-1.5.5
+ cd $BUILD_DIR/rrdtool-1.5.999
  ./configure --prefix=$INSTALL_DIR --disable-tcl --disable-python
  $MAKE clean
  $MAKE