missed conflict resolved, merge

diff --git a/helm/http_getter/Makefile.in b/helm/http_getter/Makefile.in
index f7f047813a61344e93bea02de9e9ca443d22e9b4..48160a2f8d24e89ceb5d1779fc3cbea8d15fde8a 100644 (file)
--- a/helm/http_getter/Makefile.in
+++ b/helm/http_getter/Makefile.in
@@ -7,7 +7,7 @@ install:
 
 distclean:
        rm -f Makefile configure config.log config.cache config.status \
-         http_getter.pl
+         http_getter.pl *.spec
 
 .PHONY: all install distclean
 

diff --git a/helm/http_getter/configure.in b/helm/http_getter/configure.in
index ff45d0e1577707feb55d902ee8e632300f7716cc..07539a646b948e87a6b96dcfd06637e9140aaf4e 100644 (file)
--- a/helm/http_getter/configure.in
+++ b/helm/http_getter/configure.in
@@ -1,5 +1,11 @@
 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
@@ -12,20 +18,18 @@ else
   RESOLVED_EXEC_PREFIX=$RESOLVED_PREFIX
 fi
 
-dnl General
+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
+
+DEFAULT_HELM_LIB_DIR=`helm-config --lib-dir`
+
 AC_MSG_CHECKING("for configuration.pl")
-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)
+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)
 fi
-AC_CACHE_SAVE
+AC_MSG_RESULT(in $DEFAULT_HELM_LIB_DIR)
 
 AC_PATH_PROG(PERL_BINARY,perl,no)
 if test $PERL_BINARY = no ; then
@@ -51,15 +55,16 @@ for perl_mod in $PERL_MODS; do
        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(PACKAGE)
+AC_SUBST(VERSION)
+AC_SUBST(RESOLVED_PREFIX)
+AC_SUBST(RESOLVED_EXEC_PREFIX)
+AC_SUBST(DEFAULT_HELM_LIB_DIR)
 AC_SUBST(PERL_BINARY)
 
 AC_OUTPUT([
- Makefile
- http_getter.pl
-],chmod +x http_getter.pl)
+  Makefile
+  http_getter.pl
+  helm_http_getter.spec
+], chmod +x http_getter.pl)
+

diff --git a/helm/http_getter/isterix b/helm/http_getter/isterix
deleted file mode 100755 (executable)
index ec4724f..0000000
--- a/helm/http_getter/isterix
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-
-# WARNING!!! No "//" in the middle of the path, nor a "/" at the end!!!!
-#export HELM_CONFIGURATION_PREFIX=~/libraries/installation