X-Git-Url: http://git.hcoop.net/bpt/coccinelle.git/blobdiff_plain/feec80c30d140c69f5d894bd09b6071247d0fbaa..d6ce1786f27a05efa53cabeca92fc8e744a4b239:/setup/cocci.m4

diff --git a/setup/cocci.m4 b/setup/cocci.m4
index 74fc281..2f673a2 100644
--- a/setup/cocci.m4
+++ b/setup/cocci.m4
@@ -85,6 +85,7 @@ AC_DEFUN([AC_CHECK_COCCI_EXTPKG],
       [dnl  when explicitly requested the global version
         AC_MSG_ERROR([OCaml package $1 is not available but requested explicitly])
       ])
+      AC_MSG_NOTICE([OCaml package $1 is not available])
       AC_SUBST(AS_TR_SH([enable_$1]),[no])
     ])
   ])
@@ -110,6 +111,7 @@ AC_DEFUN([AC_CHECK_COCCI_EXTPKG],
   [dnl
     AC_SUBST(AS_TR_SH([FEATURE_$1]),[1])
     AC_SUBST(AS_TR_SH([FLAGS_$1]),['$([]AS_TR_SH([FLAGS_$1]))'])
+    AC_SUBST(AS_TR_SH([OPTFLAGS_$1]),['$([]AS_TR_SH([OPTFLAGS_$1]))'])
 
     dnl  distinguish global/local
     AS_IF([test "x$[]AS_TR_SH([enable_$1])" = xlocal],
@@ -167,12 +169,22 @@ AC_DEFUN([AC_COCCI_PYVER],
 [dnl
   AS_IF([test -z "$PYVER"],
   [dnl  PYVER not set before, determine it
+
+    dnl  first try the generic "python" executable or what the user configured
+    dnl  as commandline parameter
     AC_COCCI_TOOL([PYTHON],[python],[])
 
+    dnl  some fall-back alternatives in case the above did not find anything
+    AS_IF([test "x$PYTHON" = xno -a -z "$with_python"],
+    [dnl
+      AC_PATH_PROGS([PYTHON],[python python3 python3.2 python3.1 python2 python2.7 python2.6 python2.5])
+      AS_IF([test -z "$PYTHON"],[AC_SUBST([PYTHON],[no])])
+    ])
+
     AS_IF([test "x$PYTHON" = xno -a -n "$with_python" -a "x$with_python" != xyes],
     [dnl  python interpreter not found, but perhaps it was a version
-      AC_MSG_NOTICE([$1 is not a found as tool, therefore interpreted as version])
-      AC_SUBST([PYVER],["$1"])
+      AC_MSG_NOTICE([$with_python is not a found as tool, therefore interpreted as version])
+      AC_SUBST([PYVER],["$with_python"])
     ])
 
     AS_IF([test "x$PYTHON" != xno],
@@ -186,6 +198,10 @@ AC_DEFUN([AC_COCCI_PYVER],
   [dnl  PYVER set before
     AC_MSG_NOTICE([python version assumed to be $PYVER])
   ])
+
+  dnl  determine major version of pyver
+  AC_SUBST([PYVER_MAJOR],[${PYVER%%.*}])
+  AC_MSG_NOTICE([python major version: $PYVER_MAJOR])
 ])
 
 
@@ -251,18 +267,25 @@ AC_DEFUN([AC_COCCI_TOOL],
 [dnl
   AC_ARG_VAR([$1], [path to $2])
   AC_ARG_WITH([$2], [AS_HELP_STRING([--with-$2], [whether/which $2 to use (default: auto)])])
-  AC_SUBST([with_$1],["$with_[]AS_TR_SH([$2])"])
+  AC_SUBST([with_$1],["$with_[]AS_TR_SH([$2])"])  dnl sets with_$1
 
   dnl  explicit tool or command given
   AS_IF([test -n "$with_[]$1" -a "x$with_[]$1" != xno -a "x$with_[]$1" != xyes],
   [dnl  custom $with_$1 given
     AC_SUBST([$1], ["$with_[]$1"])
+  ],
+  [dnl  otherwise, use the default command name
+    AC_SUBST([$1], ["$2"])
   ])
 
   dnl  searches for the tool (result either empty or 'no' if not found)
-  AS_IF([test "x$with_$1" != xno],
+  AS_IF([test "x$with_$1" = xno],
+  [dnl  disabled
+    AC_MSG_NOTICE([$2 is disabled explicitly])
+    AC_SUBST([$1], [no])
+  ],
   [dnl  find the tool
-    AC_COCCI_FINDTOOL([$1],[$2])
+    AC_COCCI_FINDTOOL([$1],[[$]$1])
   ])
 
   AS_IF([test -z "[$]$1" -o "x[$]$1" = xno],