*** empty log message ***

[helm.git] / helm / DEVEL / lablgtkmathview / configure.in

diff --git a/helm/DEVEL/lablgtkmathview/configure.in b/helm/DEVEL/lablgtkmathview/configure.in
index c1403adea00fdebbc6d92ce0ee1f8794caa3a7d7..54d95f48df1a69a000ada2cb414452aadbce5167 100644 (file)
--- a/helm/DEVEL/lablgtkmathview/configure.in
+++ b/helm/DEVEL/lablgtkmathview/configure.in
@@ -1,9 +1,15 @@
 AC_INIT(gMathView.ml)
 
+PACKAGE=lablgtkmathview
+
 LABLGTKMATHVIEW_MAJOR_VERSION=0
 LABLGTKMATHVIEW_MINOR_VERSION=2
 LABLGTKMATHVIEW_MICRO_VERSION=2
 LABLGTKMATHVIEW_VERSION=$LABLGTKMATHVIEW_MAJOR_VERSION.$LABLGTKMATHVIEW_MINOR_VERSION.$LABLGTKMATHVIEW_MICRO_VERSION
+VERSION=$LABLGTKMATHVIEW_VERSION
+
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
 
 AC_CHECK_PROG(HAVE_GTKMATHVIEW, gtkmathview-config, yes, no)
 if test $HAVE_GTKMATHVIEW = "no"; then
@@ -16,19 +22,19 @@ if test $HAVE_OCAMLC = "no"; then
 fi
 
 AC_MSG_CHECKING(for the ocaml library dir)
-OCAML_ROOT=`ocamlc -v | grep "^Standard" | sed 's/^.*: *//'`
-AC_MSG_RESULT($OCAML_ROOT)
+OCAML_LIB_DIR=`ocamlc -v | grep "^Standard" | sed 's/^.*: *//'`
+AC_MSG_RESULT($OCAML_LIB_DIR)
 
-RES="yes"
-AC_CHECK_FILE($OCAML_ROOT/lablgtk/gtk.ml,
-  LABLGTK_LIB_DIR=$OCAML_ROOT/lablgtk,
+AC_CHECK_FILE($OCAML_LIB_DIR/lablgtk/gtk.ml,
+  RES="yes"
+  LABLGTK_LIB_DIR=$OCAML_LIB_DIR/lablgtk,
   RES="no"
 )
 
 if test $RES = "no"; then
   RES=""
   AC_CACHE_VAL(lablgtkmathview_cv_LABLGTK_LIB_DIR,
-    echo "In which directory can I find the lablgtk library? (I haven't found it in the usual location $OCAML_ROOT/lablgtk)"
+    echo "In which directory can I find the lablgtk library? (I haven't found it in the usual location $OCAML_LIB_DIR/lablgtk)"
     read lablgtkmathview_cv_LABLGTK_LIB_DIR
     RES="Asked"
   )
@@ -39,16 +45,16 @@ if test $RES = "no"; then
   AC_CACHE_SAVE
 fi
 
-RES="yes"
-AC_CHECK_FILE($OCAML_ROOT/mlminidom/minidom.mli,
-  MLMINIDOM_LIB_DIR=$OCAML_ROOT/mlminidom,
+AC_CHECK_FILE($OCAML_LIB_DIR/mlminidom/minidom.mli,
+  RES="yes"
+  MLMINIDOM_LIB_DIR=$OCAML_LIB_DIR/mlminidom,
   RES="no"
 )
 
 if test $RES = "no"; then
   RES=""
   AC_CACHE_VAL(lablgtkmathview_cv_MLMINIDOM_LIB_DIR,
-    echo "In which directory can I find the mlminidom library? (I haven't found it in the usual location $OCAML_ROOT/mlminidom)"
+    echo "In which directory can I find the mlminidom library? (I haven't found it in the usual location $OCAML_LIB_DIR/mlminidom)"
     read lablgtkmathview_cv_MLMINIDOM_LIB_DIR
     RES="Asked"
   )
@@ -60,8 +66,11 @@ if test $RES = "no"; then
 fi
 
 AC_SUBST(LABLGTKMATHVIEW_VERSION)
-AC_SUBST(OCAML_ROOT)
+AC_SUBST(OCAML_LIB_DIR)
 AC_SUBST(LABLGTK_LIB_DIR)
 AC_SUBST(MLMINIDOM_LIB_DIR)
 
-AC_OUTPUT([Makefile])
+AC_OUTPUT([
+  Makefile
+  lablgtkmathview.spec
+])