[llvm-commits] CVS: llvm-test/autoconf/configure.ac

[Reid Spencer]

Changes in directory llvm-test/autoconf:

configure.ac updated: 1.14 -> 1.15
---
Log message:

* Bump version number to 1.5
* Place all command line options in one section
* Remove check for Python - not needed any more
* Put all the AC_CONFIG_* invocations together.


---
Diffs of the changes:  (+16 -21)

Index: llvm-test/autoconf/configure.ac
diff -u llvm-test/autoconf/configure.ac:1.14 llvm-test/autoconf/configure.ac:1.15
--- llvm-test/autoconf/configure.ac:1.14	Wed Dec 29 01:28:21 2004
+++ llvm-test/autoconf/configure.ac	Wed Dec 29 13:35:29 2004
@@ -1,13 +1,14 @@
 dnl Initialize autoconf
-AC_INIT([[LLVM-TEST]],[[1.4]],[llvmbugs at cs.uiuc.edu])
+AC_INIT([[LLVM-TEST]],[[1.5]],[llvmbugs at cs.uiuc.edu])
 
 dnl Place all of the extra autoconf files into the config subdirectory
 AC_CONFIG_AUX_DIR([autoconf])
 
 dnl Verify that the source directory is valid
-AC_CONFIG_SRCDIR(["Makefile.config.in"])
+AC_CONFIG_SRCDIR([SingleSource/Benchmarks/Makefile])
 
 dnl Do special configuration of Makefiles
+AC_CONFIG_FILES([Makefile.config])
 AC_CONFIG_MAKEFILE(Makefile)
 AC_CONFIG_MAKEFILE(Makefile.common)
 AC_CONFIG_MAKEFILE(Makefile.f2c)
@@ -43,7 +44,7 @@
 AC_CONFIG_MAKEFILE(SingleSource/Makefile.singlesrc)
 
 dnl **************************************************************************
-dnl * Set the location of various third-party software packages
+dnl * Get command line options
 dnl **************************************************************************
 
 dnl Location of LLVM source code
@@ -52,6 +53,18 @@
 dnl Location of LLVM object code
 AC_ARG_WITH(llvmobj,AS_HELP_STRING(--with-llvmobj,Location of LLVM Object Code),AC_SUBST(LLVM_OBJ,[$withval]),AC_SUBST(LLVM_OBJ,[`cd ../..; pwd`]))
 
+dnl LLC Diff Option
+AC_ARG_ENABLE(llc_diffs,
+  AS_HELP_STRING(--enable-llc_diffs,
+                 [Enable LLC Diffs when testing (default is YES)]),,
+              enableval=yes)
+if test ${enableval} = "no"
+then
+      AC_SUBST(DISABLE_LLC_DIFFS,[DISABLE_LLC_DIFFS:=1])
+else
+      AC_SUBST(DISABLE_LLC_DIFFS,[[]])
+fi
+
 dnl **************************************************************************
 dnl * Check for things needed by the test suite programs
 dnl **************************************************************************
@@ -75,12 +88,6 @@
 AC_PROG_BISON
 AC_PROG_LIBTOOL
 
-AC_PATH_PROG(PYTHON,[python],[true python])
-if test "$PYTHON" = "false"
-then
-  AC_MSG_WARN([Python is required for the test suite, but it was not found])
-fi
-
 dnl Checks for header files.
 dnl We don't check for ancient stuff or things that are guaranteed to be there
 dnl by the C++ standard. We always use the <cfoo> versions of <foo.h> C headers.
@@ -108,17 +115,5 @@
   CHECK_F2C_ENABLE()
 fi
 
-dnl LLC Diff Option
-AC_ARG_ENABLE(llc_diffs,AS_HELP_STRING(--enable-llc_diffs,Enable LLC Diffs
-                                        when testing (default is
-                                                      YES)),,enableval=yes)
-if test ${enableval} = "no"
-then
-      AC_SUBST(DISABLE_LLC_DIFFS,[DISABLE_LLC_DIFFS:=1])
-else
-      AC_SUBST(DISABLE_LLC_DIFFS,[[]])
-fi
-
 dnl Create the output files
-AC_CONFIG_FILES([Makefile.config])
 AC_OUTPUT