ready for 2.6.10

oetiker · Oct 29, 2014 · 5200191 · 5200191
1 parent b48e6b5
commit 5200191
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 31 deletions.
diff --git a/PERL_MODULES b/PERL_MODULES
@@ -0,0 +1,12 @@
+FCGI
+CGI
+CGI::Fast
+Config::Grammar
+Digest::HMAC_MD5
+Net::Telnet
+Net::OpenSSH
+Net::SNMP
+Net::LDAP
+Net::DNS
+IO::Pty
+LWP
diff --git a/VERSION b/VERSION
@@ -0,0 +1 @@
+2.6.10
diff --git a/autogen.sh → bootstrap b/autogen.sh → bootstrap
diff --git a/configure.ac b/configure.ac
@@ -17,13 +17,14 @@
 #
 
 
-AC_INIT([smokeping],[2.6.9],[[email protected]])
+AC_INIT([smokeping],m4_esyscmd([tr -d '\n' < VERSION]),[[email protected]])
 AC_PREREQ([2.59])
 AC_CONFIG_AUX_DIR(conftools)
-AC_CANONICAL_TARGET
-m4_version_prereq(2.60, [AC_USE_SYSTEM_EXTENSIONS], [#])
-AM_INIT_AUTOMAKE(1.9)
+
+# need this to allow long path names
+AM_INIT_AUTOMAKE([1.9 tar-ustar foreign no-dependencies no-installinfo no-texinfo.tex nostdinc ])
 AM_MAINTAINER_MODE
+
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_PREFIX_DEFAULT(/opt/smokeping-$PACKAGE_VERSION)
@@ -60,16 +61,13 @@ AC_SUBST(enable_pkgonly)
 # $prefix stores the value of the --prefix command line option, or
 # NONE if the option wasn't set.  In the case that it wasn't set, make
 # it be the default, so that we can use it to expand directories now.
-if test "x$prefix" = "xNONE"; then
-  prefix=$ac_default_prefix
-fi
 
-# and similarly for $exec_prefix
-if test "x$exec_prefix" = "xNONE"; then
-  exec_prefix=$prefix
+actual_prefix=$prefix
+if test x$actual_prefix = xNONE; then
+    actual_prefix=$ac_default_prefix
 fi
-
-HTDOCSDIR=${prefix}/htdocs
+    
+HTDOCSDIR=${actual_prefix}/htdocs
 AC_ARG_WITH(htdocs-dir,AC_HELP_STRING([--with-htdocs-dir=DIR],[Where to install htdocs [PREFIX/htdocs]]), [HTDOCSDIR=$withval])
 AC_SUBST(HTDOCSDIR)
 
@@ -81,9 +79,10 @@ AC_SUBST(PERL5LIB)
 
 mod_ok=1
 if test "$enable_pkgonly" != yes; then
-   for module in RRDs FCGI CGI CGI::Fast Config::Grammar Digest::HMAC_MD5 LWP; do
+   MODULES=`dirname $0`/PERL_MODULES
+   for module in `sed -e 's/\@.*//' $MODULES` RRDs; do 
      AC_MSG_CHECKING([checking for perl module '$module'])
-     if ${PERL} -I$prefix/thirdparty/lib/perl5 -e 'use '$module 2>/dev/null ; then
+     if ${PERL} -I$actual_prefix/thirdparty/lib/perl5 -e 'use '$module; then
          AC_MSG_RESULT([Ok])
      else
          AC_MSG_RESULT([Failed])
@@ -104,7 +103,7 @@ if test "$enable_pkgonly" != yes; then
    Now you can install local copies of the missing modules 
    by running
 
-     ./setup/build-perl-modules.sh ${prefix}/thirdparty
+     ./setup/build-perl-modules.sh ${actual_prefix}/thirdparty
 
    The RRDs perl module is part of RRDtool. Either use the rrdtool
    package provided by your OS or install rrdtool from source. 

diff --git a/setup/build-perl-modules.sh b/setup/build-perl-modules.sh
@@ -1,22 +1,11 @@
 #!/bin/bash
 
-. `dirname $0`/sdbs.inc
+dir=`dirname $0`;
+. $dir/sdbs.inc
 
-for module in \
-    FCGI \
-    CGI \
-    CGI::Fast \
-    Config::Grammar \
-    Digest::HMAC_MD5 \
-    Net::Telnet \
-    Net::OpenSSH \
-    Net::SNMP \
-    Net::LDAP \
-    Net::DNS \
-    IO::Pty \
-    LWP \
-; do
+
+for module in `perl -ne 'chomp; print qq{$_ }' $dir/../PERL_MODULES `; do
     perlmodule $module
 done
-
+