diff options
| author | Tobi Oetiker <tobi@oetiker.ch> | 2011-09-29 00:34:38 +0200 |
|---|---|---|
| committer | Tobi Oetiker <tobi@oetiker.ch> | 2011-09-29 00:34:38 +0200 |
| commit | f05d11a794291157f39778907c698c9008cd7edf (patch) | |
| tree | 42649e5fa0d81d599589344f703af2a91d3e4762 /configure.ac | |
| parent | a0d01155dc7b2774435721aa319625c9c42d9e59 (diff) | |
| download | smokeping-f05d11a794291157f39778907c698c9008cd7edf.tar.gz smokeping-f05d11a794291157f39778907c698c9008cd7edf.tar.xz | |
* silent build
* add perl and library path to the scripts on install
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 0807b97..ac11427 100644 --- a/configure.ac +++ b/configure.ac @@ -20,9 +20,11 @@ AC_INIT([smokeping],[2.5.2],[tobi@oetiker.ch]) AC_PREREQ([2.59]) AC_CONFIG_AUX_DIR(conftools) -AC_CANONICAL_HOST +AC_CANONICAL_TARGET +m4_version_prereq(2.60, [AC_USE_SYSTEM_EXTENSIONS], [#]) AM_INIT_AUTOMAKE(1.9) AM_MAINTAINER_MODE +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PREFIX_DEFAULT( /opt/smokeping-$PACKAGE_VERSION ) @@ -36,6 +38,7 @@ AC_PATH_PROG(RM, rm, no) AC_PATH_PROG(RMDIR, rmdir, no) AC_PATH_PROG(MKDIR, mkdir, no) AC_PATH_PROG(FIND, find, no) +AC_PATH_PROGS(NROFF, [gnroff nroff]) AC_ARG_ENABLE(pkgonly, @@ -46,32 +49,22 @@ AC_SUBST(enable_pkgonly) HTDOCSDIR=${prefix}/htdocs AC_ARG_WITH(htdocs-dir,[ --with-htdocs-dir=[DIR] Where to install htdocs [PREFIX/htdocs]], [HTDOCSDIR=$withval]) AC_SUBST(HTDOCSDIR) - -PERLLIBDIRS= - -PERLOPTS= -AC_ARG_WITH(perl-inc,[ --with-perl-inc=[DIRS] Additional space-separated Perl library paths], [PERLINC=$withval]) -AC_ARG_VAR(PERLINC, [[] Additional space-separated Perl library paths]) -if test ! -z "$PERLINC"; then - for d in $PERLINC; do - PERLOPTS="${PERLOPTS} -I${d}" - perllibdirs=${perllibdirs}"\,\'"${d}"\'" - done -fi -AC_SUBST(PERLOPTS) -AC_SUBST(PERLLIBDIRS, [${perllibdirs}]) +#AC_ARG_WITH(perl5lib, [ --with-perl5lib=[A:B:C] Colon separated list of perl library directories], [PERL5LIB=$withval]) + +AC_ARG_VAR(PERL5LIB, [[] Colon separated list of perl library directories]) +AC_SUBST(PERL5LIB) # Check the necessary Perl modules if test "$enable_pkgonly" != yes; then for module in RRDs FCGI CGI CGI::Fast Config::Grammar Digest::HMAC_MD5; do AC_MSG_CHECKING([presence of $module]) - if ${PERL} ${PERLOPTS} -e 'use '$module; then + if ${PERL} -e 'use '$module; then AC_MSG_RESULT([Ok]) else - AC_MSG_ERROR([Perl cannot find $module ($PERLOPTS)]); + AC_MSG_ERROR([Perl cannot find $module ($PERL5LIB)]); fi done fi |