X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fhttp_getter%2Fconfigure.in;h=2412b10094704c474eb7ed3eab4b4df7b684225b;hb=5d7d6bd5090f3f82279bef0b93b4b361a5b1d751;hp=07539a646b948e87a6b96dcfd06637e9140aaf4e;hpb=d63ee0bf0e50f012f55369034e769343f5ac7478;p=helm.git

diff --git a/helm/http_getter/configure.in b/helm/http_getter/configure.in
index 07539a646..2412b1009 100644
--- a/helm/http_getter/configure.in
+++ b/helm/http_getter/configure.in
@@ -2,10 +2,19 @@ AC_INIT(http_getter.pl.in)
 
 PACKAGE=helm_http_getter
 MAJOR_VERSION=0
-MINOR_VERSION=0
-MICRO_VERSION=1
+MINOR_VERSION=1
+MICRO_VERSION=54
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 
+DEFAULT_HELM_LIB_DIR=/usr/local/lib/helm
+
+AC_ARG_ENABLE(
+	defaults,
+	[  --enable-defaults[=ARG] if yes then use defaults (don't ask user) [default=auto]],
+	USE_DEFAULTS=$enableval,
+	USE_DEFAULTS=auto
+)
+
 if test "x$prefix" != xNONE; then
   RESOLVED_PREFIX=$prefix
 else
@@ -18,18 +27,38 @@ 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)
+HELM_CGI_DIR=$RESOLVED_PREFIX/bin
+
+if test $USE_DEFAULTS = auto; then
+	AC_CHECK_PROG(HAVE_HELM_CONFIG, helm-config, yes, no)
+	if test $HAVE_HELM_CONFIG = yes; then
+		HELM_LIB_DIR=`helm-config --lib-dir`
+	else
+		USE_DEFAULTS=no
+	fi
 fi
 
-DEFAULT_HELM_LIB_DIR=`helm-config --lib-dir`
+if test $USE_DEFAULTS = no; then
+	echo
+	echo "\`helm-config' is not installed (or I can't find it in your path)."
+	echo "Please, insert the lib directory HELM..."
+	echo
+	echo -n "[[$DEFAULT_HELM_LIB_DIR]] ? "
+	read HELM_LIB_DIR
+	if test "x$HELM_LIB_DIR" = "x"; then
+		HELM_LIB_DIR=$DEFAULT_HELM_LIB_DIR
+	fi
+elif test $USE_DEFAULTS = yes; then
+	HELM_LIB_DIR=$DEFAULT_HELM_LIB_DIR
+fi
 
-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)
+AC_MSG_CHECKING(for $HELM_LIB_DIR/configuration.pl)
+if test -f $HELM_LIB_DIR/configuration.pl; then
+	AC_MSG_RESULT(ok)
+else
+	AC_MSG_RESULT(no)
+	AC_MSG_ERROR(please check your installation)
 fi
-AC_MSG_RESULT(in $DEFAULT_HELM_LIB_DIR)
 
 AC_PATH_PROG(PERL_BINARY,perl,no)
 if test $PERL_BINARY = no ; then
@@ -37,7 +66,7 @@ if test $PERL_BINARY = no ; then
 fi
 
 dnl Perl modules checks
-PERL_MODS="HTTP::Daemon HTTP::Status HTTP::Request LWP::UserAgent DB_File Compress::Zlib"
+PERL_MODS="HTTP::Daemon HTTP::Status HTTP::Request LWP::UserAgent DB_File Compress::Zlib CGI"
 PERL_INC=`perl -e 'print(join(" ",@INC))'`
 for perl_mod in $PERL_MODS; do
 	AC_MSG_CHECKING("for perl module: $perl_mod")
@@ -59,8 +88,9 @@ AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(RESOLVED_PREFIX)
 AC_SUBST(RESOLVED_EXEC_PREFIX)
-AC_SUBST(DEFAULT_HELM_LIB_DIR)
+AC_SUBST(HELM_LIB_DIR)
 AC_SUBST(PERL_BINARY)
+AC_SUBST(HELM_CGI_DIR)
 
 AC_OUTPUT([
   Makefile