diff options
author | Reid Spencer <rspencer@reidspencer.com> | 2004-12-27 08:51:55 +0000 |
---|---|---|
committer | Reid Spencer <rspencer@reidspencer.com> | 2004-12-27 08:51:55 +0000 |
commit | bb87426ad659127023d8d228ec872b1a755931ba (patch) | |
tree | 8773db47586b73ad3995b1eaee94ef5b9f9f0e04 | |
parent | f3664e0a4f261f4dcc3d6a6e8ce2b23188b7eee5 (diff) | |
download | external_llvm-bb87426ad659127023d8d228ec872b1a755931ba.zip external_llvm-bb87426ad659127023d8d228ec872b1a755931ba.tar.gz external_llvm-bb87426ad659127023d8d228ec872b1a755931ba.tar.bz2 |
Clean up some autoconf cruft
* Make the source detection use a file unique to Stacker
* Configure Makefile.common.in with AC_CONFIG_FILES not AC_CONFIG_MAKEFILE
* Use new autoconf format for invoking AC_OUTPUT
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19165 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | projects/Stacker/autoconf/configure.ac | 8 | ||||
-rwxr-xr-x | projects/Stacker/configure | 62 |
2 files changed, 37 insertions, 33 deletions
diff --git a/projects/Stacker/autoconf/configure.ac b/projects/Stacker/autoconf/configure.ac index 757c8d0..3f5326e 100644 --- a/projects/Stacker/autoconf/configure.ac +++ b/projects/Stacker/autoconf/configure.ac @@ -7,10 +7,12 @@ 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.common.in]) +AC_CONFIG_SRCDIR([lib/compiler/StackerParser.y]) + +AC_CONFIG_FILES([Makefile.common]) dnl Configure Makefiles -dnl List every Makefile that ecists within your source tree +dnl List every Makefile that exists within your source tree AC_CONFIG_MAKEFILE(Makefile) AC_CONFIG_MAKEFILE(lib/Makefile) @@ -74,4 +76,4 @@ AC_ARG_WITH(llvmobj,AC_HELP_STRING([--with-llvmobj],[Location of LLVM Object Cod dnl ************************************************************************** dnl * Create the output files dnl ************************************************************************** -AC_OUTPUT(Makefile.common) +AC_OUTPUT diff --git a/projects/Stacker/configure b/projects/Stacker/configure index 2fce6a2..a3c2ba6 100755 --- a/projects/Stacker/configure +++ b/projects/Stacker/configure @@ -427,7 +427,7 @@ PACKAGE_VERSION='[1.0]' PACKAGE_STRING='[Stacker] [1.0]' PACKAGE_BUGREPORT='rspencer@x10sys.com' -ac_unique_file="Makefile.common.in" +ac_unique_file="lib/compiler/StackerParser.y" # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -1533,6 +1533,9 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + ac_config_files="$ac_config_files Makefile.common" + + ac_config_commands="$ac_config_commands Makefile" @@ -3112,7 +3115,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3115 "configure"' > conftest.$ac_ext + echo '#line 3118 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4575,7 +4578,7 @@ fi # Provide some information about the compiler. -echo "$as_me:4578:" \ +echo "$as_me:4581:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -5606,11 +5609,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5609: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5612: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5613: \$? = $ac_status" >&5 + echo "$as_me:5616: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -5838,11 +5841,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5841: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5844: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5845: \$? = $ac_status" >&5 + echo "$as_me:5848: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -5905,11 +5908,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5908: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5911: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:5912: \$? = $ac_status" >&5 + echo "$as_me:5915: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8023,7 +8026,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8026 "configure" +#line 8029 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -8121,7 +8124,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8124 "configure" +#line 8127 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10277,11 +10280,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10280: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10283: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10284: \$? = $ac_status" >&5 + echo "$as_me:10287: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -10344,11 +10347,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10347: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10350: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10351: \$? = $ac_status" >&5 + echo "$as_me:10354: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11673,7 +11676,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 11676 "configure" +#line 11679 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11771,7 +11774,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 11774 "configure" +#line 11777 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12593,11 +12596,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12596: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12599: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12600: \$? = $ac_status" >&5 + echo "$as_me:12603: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12660,11 +12663,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12663: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12666: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12667: \$? = $ac_status" >&5 + echo "$as_me:12670: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14626,11 +14629,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14629: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14632: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14633: \$? = $ac_status" >&5 + echo "$as_me:14636: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -14858,11 +14861,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14861: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14864: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14865: \$? = $ac_status" >&5 + echo "$as_me:14868: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -14925,11 +14928,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14928: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14931: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14932: \$? = $ac_status" >&5 + echo "$as_me:14935: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17043,7 +17046,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 17046 "configure" +#line 17049 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17141,7 +17144,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 17144 "configure" +#line 17147 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18190,7 +18193,6 @@ else fi; - ac_config_files="$ac_config_files Makefile.common" 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 |