prep for 1.2rc3 release

[rrdtool.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 57d23e4..2d97a5a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl
 dnl Inspiration from http://autoconf-archive.cryp.to
 
 dnl tell automake the this script is for rrdtool
-AC_INIT([rrdtool],[1.2rc1])
+AC_INIT([rrdtool],[1.2rc3])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
@@ -20,14 +20,7 @@ dnl determine the type of system we are running on
 
 AC_SUBST(VERSION)
 
-dnl where we install our stuff ...
-if [ -d /opt ]; then
-   xxpreinst = /opt
-else 
-   xxpreinst = /usr/local
-fi
-
-AC_PREFIX_DEFAULT( $xxpreinst/rrdtool-$PACKAGE_VERSION )
+AC_PREFIX_DEFAULT( /usr/local/rrdtool-$PACKAGE_VERSION )
 
 dnl Minimum Autoconf version required.
 AC_PREREQ(2.59)
@@ -316,7 +309,10 @@ AC_MSG_CHECKING(Perl Modules to build)
 AC_MSG_RESULT(${COMP_PERL:-No Perl Modules will be built})
 
 # Options to pass when configuring perl module
-PERL_MAKE_OPTIONS="PREFIX=$prefix LIB=$prefix/lib/perl/$PERL_VERSION"
+ppref=$prefix
+test "x$ppref" = xNONE && ppref=$ac_default_prefix
+
+PERL_MAKE_OPTIONS="PREFIX=$ppref LIB=$ppref/lib/perl/$PERL_VERSION"
 
 dnl pass additional perl options when generating Makefile from Makefile.PL
 AC_ARG_ENABLE(perl-site-install,
@@ -449,7 +445,7 @@ echo "      Tcl Config: $tcl_config"
 echo "    Build rrdcgi: $enable_rrdcgi"
 echo " Build librrd MT: $enable_pthread"
 echo
-ech
+echo
 echo "Type 'make' to compile the software and use 'make install' to "
 echo "install everything to: $prefix."
 echo