[llvm-commits] CVS: llvm-test/autoconf/m4/f2c.m4

[Reid Spencer]

Changes in directory llvm-test/autoconf/m4:

f2c.m4 updated: 1.4 -> 1.5
---
Log message:

Make the search for the f2c program include a search of the user's path.


---
Diffs of the changes:  (+13 -2)

 f2c.m4 |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)


Index: llvm-test/autoconf/m4/f2c.m4
diff -u llvm-test/autoconf/m4/f2c.m4:1.4 llvm-test/autoconf/m4/f2c.m4:1.5
--- llvm-test/autoconf/m4/f2c.m4:1.4	Wed Jul 13 23:49:51 2005
+++ llvm-test/autoconf/m4/f2c.m4	Thu Jul 14 00:53:56 2005
@@ -18,9 +18,20 @@
 
 AC_DEFUN([CHECK_F2C_ALL],
 [AC_ARG_WITH(f2c,
-  AS_HELP_STRING(--with-f2c=DIR,Use f2c with install prefix DIR),
-  f2cdir=$withval)
+  AS_HELP_STRING(--with-f2c=DIR,[Use f2c with install prefix DIR]),
+  [f2cdir=$withval],[f2cdir=notfound])
 AC_MSG_CHECKING([for installed f2c components])
+if test "$f2cdir" = "notfound" ; then
+ f2cdir=`which f2c`
+ if test "$f2cdir"x  != "x" ; then 
+   if test -d "${f2cdir%*f2c}" -a -d "${f2cdir%*f2c}/.." ; then
+     f2cdir=`cd "${f2cdir%*f2c}/.." ; pwd`
+     if test ! -d "$f2cdir" ; then
+       f2cdir="notfound";
+     fi
+   fi
+ fi
+fi
 CHECK_F2C($f2cdir)
 if test "x$F2C" = "x"; then
   CHECK_F2C("/usr")