[llvm-commits] CVS: llvm-test/configure Makefile.config.in
Reid Spencer
reid at x10sys.com
Wed Jul 13 21:50:03 PDT 2005
Changes in directory llvm-test:
configure updated: 1.21 -> 1.22
Makefile.config.in updated: 1.16 -> 1.17
---
Log message:
Minor adjustments to make --with-f2c a little easier to use and understand.
---
Diffs of the changes: (+208 -196)
Makefile.config.in | 1
configure | 403 +++++++++++++++++++++++++++--------------------------
2 files changed, 208 insertions(+), 196 deletions(-)
Index: llvm-test/configure
diff -u llvm-test/configure:1.21 llvm-test/configure:1.22
--- llvm-test/configure:1.21 Tue Jul 12 12:35:53 2005
+++ llvm-test/configure Wed Jul 13 23:49:51 2005
@@ -465,7 +465,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ DISABLE_LLC_DIFFS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL HAVE_RE_COMP SPEC95_ROOT USE_SPEC95 SPEC2000_ROOT USE_SPEC2000 POVRAY_ROOT USE_POVRAY NAMD_ROOT USE_NAMD SWEEP3D_ROOT USE_SWEEP3D FPGROWTH_ROOT USE_FPGROWTH F2C F2C_INC F2C_LIB USE_F2C LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ DISABLE_LLC_DIFFS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL F2C F2C_INC F2C_LIB USE_F2C F2C_DIR HAVE_RE_COMP SPEC95_ROOT USE_SPEC95 SPEC2000_ROOT USE_SPEC2000 POVRAY_ROOT USE_POVRAY NAMD_ROOT USE_NAMD SWEEP3D_ROOT USE_SWEEP3D FPGROWTH_ROOT USE_FPGROWTH LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -18750,6 +18750,207 @@
+
+# Check whether --with-f2c or --without-f2c was given.
+if test "${with_f2c+set}" = set; then
+ withval="$with_f2c"
+ f2cdir=$withval
+fi;
+echo "$as_me:$LINENO: checking for installed f2c components" >&5
+echo $ECHO_N "checking for installed f2c components... $ECHO_C" >&6
+
+if test -d "$f2cdir" &&
+ test -d "$f2cdir/bin" && test -f "$f2cdir/bin/f2c" &&
+ test -d "$f2cdir/include" && test -f "$f2cdir/include/f2c.h" &&
+ test -d "$f2cdir/lib" && test -f "$f2cdir/lib/libf2c.a"
+then
+ F2C=$f2cdir/bin/f2c
+
+ F2C_INC=$f2cdir/include
+
+ F2C_LIB=$f2cdir/lib
+
+ USE_F2C=USE_F2C=1
+
+ F2C_DIR=$f2cdir
+
+fi
+
+if test "x$F2C" = "x"; then
+
+if test -d ""/usr"" &&
+ test -d ""/usr"/bin" && test -f ""/usr"/bin/f2c" &&
+ test -d ""/usr"/include" && test -f ""/usr"/include/f2c.h" &&
+ test -d ""/usr"/lib" && test -f ""/usr"/lib/libf2c.a"
+then
+ F2C="/usr"/bin/f2c
+
+ F2C_INC="/usr"/include
+
+ F2C_LIB="/usr"/lib
+
+ USE_F2C=USE_F2C=1
+
+ F2C_DIR="/usr"
+
+fi
+
+ if test "x$F2C" = "x"; then
+
+if test -d ""/usr/local"" &&
+ test -d ""/usr/local"/bin" && test -f ""/usr/local"/bin/f2c" &&
+ test -d ""/usr/local"/include" && test -f ""/usr/local"/include/f2c.h" &&
+ test -d ""/usr/local"/lib" && test -f ""/usr/local"/lib/libf2c.a"
+then
+ F2C="/usr/local"/bin/f2c
+
+ F2C_INC="/usr/local"/include
+
+ F2C_LIB="/usr/local"/lib
+
+ USE_F2C=USE_F2C=1
+
+ F2C_DIR="/usr/local"
+
+fi
+
+ if test "x$F2C" = "x"; then
+
+if test -d ""/sw"" &&
+ test -d ""/sw"/bin" && test -f ""/sw"/bin/f2c" &&
+ test -d ""/sw"/include" && test -f ""/sw"/include/f2c.h" &&
+ test -d ""/sw"/lib" && test -f ""/sw"/lib/libf2c.a"
+then
+ F2C="/sw"/bin/f2c
+
+ F2C_INC="/sw"/include
+
+ F2C_LIB="/sw"/lib
+
+ USE_F2C=USE_F2C=1
+
+ F2C_DIR="/sw"
+
+fi
+
+ if test "x$F2C" = "x"; then
+
+if test -d ""/opt"" &&
+ test -d ""/opt"/bin" && test -f ""/opt"/bin/f2c" &&
+ test -d ""/opt"/include" && test -f ""/opt"/include/f2c.h" &&
+ test -d ""/opt"/lib" && test -f ""/opt"/lib/libf2c.a"
+then
+ F2C="/opt"/bin/f2c
+
+ F2C_INC="/opt"/include
+
+ F2C_LIB="/opt"/lib
+
+ USE_F2C=USE_F2C=1
+
+ F2C_DIR="/opt"
+
+fi
+
+ if test "x$F2C" = "x"; then
+ F2C=
+
+ F2C_INC=
+
+ F2C_LIB=
+
+ USE_F2C=
+
+ checkresult="no"
+ else
+ checkresult="yes, all 3 found"
+ fi
+ else
+ checkresult="yes, all 3 found"
+ fi
+ else
+ checkresult="yes, all 3 found"
+ fi
+ else
+ checkresult="yes, all 3 found"
+ fi
+else
+ checkresult="yes, all 3 found"
+fi
+echo "$as_me:$LINENO: result: $checkresult" >&5
+echo "${ECHO_T}$checkresult" >&6
+
+if test "x${F2C}" = "x"; then
+
+# Check whether --with-f2cbin or --without-f2cbin was given.
+if test "${with_f2cbin+set}" = set; then
+ withval="$with_f2cbin"
+ f2cbin=$withval
+fi;
+echo "$as_me:$LINENO: checking for f2c binary" >&5
+echo $ECHO_N "checking for f2c binary... $ECHO_C" >&6
+if test -d "$f2cbin" && test -f "$f2cbin/f2c"; then
+ F2C=$f2cbin/f2c
+
+ checkresult="yes"
+else
+ checkresult="no"
+fi
+echo "$as_me:$LINENO: result: $checkresult" >&5
+echo "${ECHO_T}$checkresult" >&6
+
+
+# Check whether --with-f2cinc or --without-f2cinc was given.
+if test "${with_f2cinc+set}" = set; then
+ withval="$with_f2cinc"
+ f2cinc=$withval
+fi;
+echo "$as_me:$LINENO: checking for f2c.h" >&5
+echo $ECHO_N "checking for f2c.h... $ECHO_C" >&6
+if test -d "$f2cinc" && test -f "$f2cinc/f2c.h"; then
+ F2C_INC=$f2cinc
+
+ checkresult="yes"
+else
+ checkresult="no"
+fi
+echo "$as_me:$LINENO: result: $checkresult" >&5
+echo "${ECHO_T}$checkresult" >&6
+
+
+# Check whether --with-f2clib or --without-f2clib was given.
+if test "${with_f2clib+set}" = set; then
+ withval="$with_f2clib"
+ f2clib=$withval
+fi;
+echo "$as_me:$LINENO: checking for libf2c.a" >&5
+echo $ECHO_N "checking for libf2c.a... $ECHO_C" >&6
+if test -d "$f2clib" && test -f "$f2clib/libf2c.a"; then
+ F2C_LIB=$f2clib
+
+ checkresult="yes"
+else
+ checkresult="no"
+fi
+echo "$as_me:$LINENO: result: $checkresult" >&5
+echo "${ECHO_T}$checkresult" >&6
+
+ echo "$as_me:$LINENO: checking whether f2c install is complete" >&5
+echo $ECHO_N "checking whether f2c install is complete... $ECHO_C" >&6
+if test -f "$F2C" && test -d "$F2C_INC" && test -d "$F2C_LIB"; then
+ USE_F2C=USE_F2C=1
+
+ checkresult="yes"
+else
+ USE_F2C=
+
+ checkresult="no"
+fi
+echo "$as_me:$LINENO: result: $checkresult" >&5
+echo "${ECHO_T}$checkresult" >&6
+
+fi
+
echo "$as_me:$LINENO: checking for ANSI C header files" >&5
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
if test "${ac_cv_header_stdc+set}" = set; then
@@ -19449,197 +19650,6 @@
-
-# Check whether --with-f2c or --without-f2c was given.
-if test "${with_f2c+set}" = set; then
- withval="$with_f2c"
- f2cdir=$withval
-fi;
-echo "$as_me:$LINENO: checking for installed f2c components" >&5
-echo $ECHO_N "checking for installed f2c components... $ECHO_C" >&6
-
-if test -d "$f2cdir" &&
- test -d "$f2cdir/bin" && test -f "$f2cdir/bin/f2c" &&
- test -d "$f2cdir/include" && test -f "$f2cdir/include/f2c.h" &&
- test -d "$f2cdir/lib" && test -f "$f2cdir/lib/libf2c.a"
-then
- F2C=$f2cdir/bin/f2c
-
- F2C_INC=$f2cdir/include
-
- F2C_LIB=$f2cdir/lib
-
- USE_F2C=USE_F2C=1
-
-fi
-
-if test "x$F2C" = "x"; then
-
-if test -d ""/usr"" &&
- test -d ""/usr"/bin" && test -f ""/usr"/bin/f2c" &&
- test -d ""/usr"/include" && test -f ""/usr"/include/f2c.h" &&
- test -d ""/usr"/lib" && test -f ""/usr"/lib/libf2c.a"
-then
- F2C="/usr"/bin/f2c
-
- F2C_INC="/usr"/include
-
- F2C_LIB="/usr"/lib
-
- USE_F2C=USE_F2C=1
-
-fi
-
- if test "x$F2C" = "x"; then
-
-if test -d ""/usr/local"" &&
- test -d ""/usr/local"/bin" && test -f ""/usr/local"/bin/f2c" &&
- test -d ""/usr/local"/include" && test -f ""/usr/local"/include/f2c.h" &&
- test -d ""/usr/local"/lib" && test -f ""/usr/local"/lib/libf2c.a"
-then
- F2C="/usr/local"/bin/f2c
-
- F2C_INC="/usr/local"/include
-
- F2C_LIB="/usr/local"/lib
-
- USE_F2C=USE_F2C=1
-
-fi
-
- if test "x$F2C" = "x"; then
-
-if test -d ""/sw"" &&
- test -d ""/sw"/bin" && test -f ""/sw"/bin/f2c" &&
- test -d ""/sw"/include" && test -f ""/sw"/include/f2c.h" &&
- test -d ""/sw"/lib" && test -f ""/sw"/lib/libf2c.a"
-then
- F2C="/sw"/bin/f2c
-
- F2C_INC="/sw"/include
-
- F2C_LIB="/sw"/lib
-
- USE_F2C=USE_F2C=1
-
-fi
-
- if test "x$F2C" = "x"; then
-
-if test -d ""/opt"" &&
- test -d ""/opt"/bin" && test -f ""/opt"/bin/f2c" &&
- test -d ""/opt"/include" && test -f ""/opt"/include/f2c.h" &&
- test -d ""/opt"/lib" && test -f ""/opt"/lib/libf2c.a"
-then
- F2C="/opt"/bin/f2c
-
- F2C_INC="/opt"/include
-
- F2C_LIB="/opt"/lib
-
- USE_F2C=USE_F2C=1
-
-fi
-
- if test "x$F2C" = "x"; then
- F2C=
-
- F2C_INC=
-
- F2C_LIB=
-
- USE_F2C=
-
- checkresult="no"
- else
- checkresult="yes, all 3 found"
- fi
- else
- checkresult="yes, all 3 found"
- fi
- else
- checkresult="yes, all 3 found"
- fi
- else
- checkresult="yes, all 3 found"
- fi
-else
- checkresult="yes, all 3 found"
-fi
-echo "$as_me:$LINENO: result: $checkresult" >&5
-echo "${ECHO_T}$checkresult" >&6
-
-if test "x${F2C}" = "x"; then
-
-# Check whether --with-f2cbin or --without-f2cbin was given.
-if test "${with_f2cbin+set}" = set; then
- withval="$with_f2cbin"
- f2cbin=$withval
-fi;
-echo "$as_me:$LINENO: checking for f2c binary" >&5
-echo $ECHO_N "checking for f2c binary... $ECHO_C" >&6
-if test -d "$f2cbin" && test -f "$f2cbin/f2c"; then
- F2C=$f2cbin/f2c
-
- checkresult="yes"
-else
- checkresult="no"
-fi
-echo "$as_me:$LINENO: result: $checkresult" >&5
-echo "${ECHO_T}$checkresult" >&6
-
-
-# Check whether --with-f2cinc or --without-f2cinc was given.
-if test "${with_f2cinc+set}" = set; then
- withval="$with_f2cinc"
- f2cinc=$withval
-fi;
-echo "$as_me:$LINENO: checking for f2c.h" >&5
-echo $ECHO_N "checking for f2c.h... $ECHO_C" >&6
-if test -d "$f2cinc" && test -f "$f2cinc/f2c.h"; then
- F2C_INC=$f2cinc
-
- checkresult="yes"
-else
- checkresult="no"
-fi
-echo "$as_me:$LINENO: result: $checkresult" >&5
-echo "${ECHO_T}$checkresult" >&6
-
-
-# Check whether --with-f2clib or --without-f2clib was given.
-if test "${with_f2clib+set}" = set; then
- withval="$with_f2clib"
- f2clib=$withval
-fi;
-echo "$as_me:$LINENO: checking for libf2c.a" >&5
-echo $ECHO_N "checking for libf2c.a... $ECHO_C" >&6
-if test -d "$f2clib" && test -f "$f2clib/libf2c.a"; then
- F2C_LIB=$f2clib
-
- checkresult="yes"
-else
- checkresult="no"
-fi
-echo "$as_me:$LINENO: result: $checkresult" >&5
-echo "${ECHO_T}$checkresult" >&6
-
- echo "$as_me:$LINENO: checking whether f2c install is complete" >&5
-echo $ECHO_N "checking whether f2c install is complete... $ECHO_C" >&6
-if test -f "$F2C" && test -d "$F2C_INC" && test -d "$F2C_LIB"; then
- USE_F2C=USE_F2C=1
-
- checkresult="yes"
-else
- USE_F2C=
-
- checkresult="no"
-fi
-echo "$as_me:$LINENO: result: $checkresult" >&5
-echo "${ECHO_T}$checkresult" >&6
-
-fi
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -20362,6 +20372,11 @@
s, at FFLAGS@,$FFLAGS,;t t
s, at ac_ct_F77@,$ac_ct_F77,;t t
s, at LIBTOOL@,$LIBTOOL,;t t
+s, at F2C@,$F2C,;t t
+s, at F2C_INC@,$F2C_INC,;t t
+s, at F2C_LIB@,$F2C_LIB,;t t
+s, at USE_F2C@,$USE_F2C,;t t
+s, at F2C_DIR@,$F2C_DIR,;t t
s, at HAVE_RE_COMP@,$HAVE_RE_COMP,;t t
s, at SPEC95_ROOT@,$SPEC95_ROOT,;t t
s, at USE_SPEC95@,$USE_SPEC95,;t t
@@ -20375,10 +20390,6 @@
s, at USE_SWEEP3D@,$USE_SWEEP3D,;t t
s, at FPGROWTH_ROOT@,$FPGROWTH_ROOT,;t t
s, at USE_FPGROWTH@,$USE_FPGROWTH,;t t
-s, at F2C@,$F2C,;t t
-s, at F2C_INC@,$F2C_INC,;t t
-s, at F2C_LIB@,$F2C_LIB,;t t
-s, at USE_F2C@,$USE_F2C,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Index: llvm-test/Makefile.config.in
diff -u llvm-test/Makefile.config.in:1.16 llvm-test/Makefile.config.in:1.17
--- llvm-test/Makefile.config.in:1.16 Tue Jul 12 12:35:53 2005
+++ llvm-test/Makefile.config.in Wed Jul 13 23:49:51 2005
@@ -44,6 +44,7 @@
# F2C: Enable LLVM to run Fortran benchmarks without a Fortran front-end
@USE_F2C@
+F2C_DIR := @F2C_DIR@
F2C := @F2C@
F2C_INC := @F2C_INC@
F2C_LIB := @F2C_LIB@
More information about the llvm-commits
mailing list