Added perl modules check

diff --git a/helm/http_getter/configure.in b/helm/http_getter/configure.in
index 38069607d7f73595b5680873a91ad25a5fce1c6e..ff45d0e1577707feb55d902ee8e632300f7716cc 100644 (file)
--- a/helm/http_getter/configure.in
+++ b/helm/http_getter/configure.in
@@ -1,11 +1,5 @@
 AC_INIT(http_getter.pl.in)
 
-PACKAGE=helm_http_getter
-MAJOR_VERSION=0
-MINOR_VERSION=0
-MICRO_VERSION=1
-VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
-
 if test "x$prefix" != xNONE; then
   RESOLVED_PREFIX=$prefix
 else
@@ -18,36 +12,54 @@ else
   RESOLVED_EXEC_PREFIX=$RESOLVED_PREFIX
 fi
 
-AC_CHECK_PROG(HAVE_HELM_CONFIG, helm-config, yes, no)
-if test $HAVE_HELM_CONFIG = no; then
-  AC_MSG_ERROR(helm-config not found)
-fi
-
-dnl MISSING CHECKS:
-dnl perl-libwww-perl, perl-URI, MIME-Base64, perl-HTML-Parser, perl-XML-Parser, more...
-
-DEFAULT_HELM_LIB_DIR=`helm-config --lib-dir`
-
+dnl General
 AC_MSG_CHECKING("for configuration.pl")
-if test ! -f $DEFAULT_HELM_LIB_DIR/configuration.pl; then
-  AC_MSG_ERROR(Could not find configuration.pl in $DEFAULT_HELM_LIB_DIR, please check your installation)
+RES=""
+AC_CACHE_VAL(helm_cv_DEFAULT_HELM_LIBRARY_DIR,
+  echo "Where is configuration.pl (part of the helm_configuration package)?"
+  read helm_cv_DEFAULT_HELM_LIBRARY_DIR
+  RES="Asked"
+)
+DEFAULT_HELM_LIBRARY_DIR=$helm_cv_DEFAULT_HELM_LIBRARY_DIR
+if test "$RES" != "Asked" ; then
+   DEFAULT_HELM_LIBRARY_DIR=`eval "echo $DEFAULT_HELM_LIBRARY_DIR"`
+   AC_MSG_RESULT($DEFAULT_HELM_LIBRARY_DIR)
 fi
-AC_MSG_RESULT(in $DEFAULT_HELM_LIB_DIR)
+AC_CACHE_SAVE
 
-AC_PATH_PROG(PERL_BINARY, perl, no)
+AC_PATH_PROG(PERL_BINARY,perl,no)
 if test $PERL_BINARY = no ; then
    AC_MSG_ERROR(Could not find perl)
 fi
 
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-AC_SUBST(RESOLVED_PREFIX)
-AC_SUBST(RESOLVED_EXEC_PREFIX)
-AC_SUBST(DEFAULT_HELM_LIB_DIR)
+dnl Perl modules checks
+PERL_MODS="HTTP::Daemon HTTP::Status HTTP::Request LWP::UserAgent DB_File Compress::Zlib"
+PERL_INC=`perl -e 'print(join(" ",@INC))'`
+for perl_mod in $PERL_MODS; do
+       AC_MSG_CHECKING("for perl module: $perl_mod")
+       perl_mod_file=`echo $perl_mod | sed -e 's/::/\//' -e 's/$/\.pm/'`
+       module_found="false"
+       for perl_lib_dir in $PERL_INC; do
+               if test -f "$perl_lib_dir/$perl_mod_file"; then
+                       module_found="true"
+                       AC_MSG_RESULT("found in $perl_lib_dir")
+                       break
+               fi
+       done
+       if test "$module_found" != "true"; then
+               AC_MSG_ERROR("not found")
+       fi
+done
+
+AC_MSG_CHECKING("for the bin dir")
+HELM_BIN_DIR=$RESOLVED_EXEC_PREFIX/bin
+AC_MSG_RESULT($HELM_BIN_DIR)
+
+AC_SUBST(HELM_BIN_DIR)
+AC_SUBST(DEFAULT_HELM_LIBRARY_DIR)
 AC_SUBST(PERL_BINARY)
 
 AC_OUTPUT([
-  Makefile
-  http_getter.pl
-  helm_http_getter.spec
-], chmod +x http_getter.pl)
+ Makefile
+ http_getter.pl
+],chmod +x http_getter.pl)