[llvm-commits] [support] r39997 - in /support/trunk: Makefile.config.in autoconf/AutoRegen.sh autoconf/Makefile autoconf/Makefile.mod autoconf/configure.ac autoconf/m4/config_makefile.m4 autoconf/m4/config_project.m4 autoconf/m4/module_support.m4 build-for-llvm-top.sh configure

Reid Spencer rspencer at reidspencer.com
Wed Jul 18 01:01:43 PDT 2007 

Author: reid
Date: Wed Jul 18 03:01:43 2007
New Revision: 39997

URL: http://llvm.org/viewvc/llvm-project?rev=39997&view=rev
Log:
Prepare the sample module for being the basis for all things autoconf. This
includes some new macros:

THIS_IS_LLVM_MODULE(module_name)
   used in a module's configure.ac this macro declares the name of the
   module as its accessed from subversion. It also initializes a bunch of
   variables and handles other tedium that cleans up the module's configure.ac

CONFIG_LLVM_MAKEFILE(path_to_makefile)
   This instructions the source makefile to be copied to the object dir.

Additionally, the Makefile.mod was added so that instead of copying around
the AutoRegen.sh script from module to module, it just lives in the support
module and is invoked from Makefile.mod. This makes setting up a new module
very each autoconf wise. All you do is:

   1. Put "include ../support/autoconf/Makefile.mod" into your "Makefile"
   2. Put at least 4 lines into your configure script:
          AC_INIT([long name],[version],[buglist],[tarball name])
          THIS_IS_LLVM_MODULE(module_name)
          CONFIG_LLVM_MAKEFILE(Makefile)
          AC_OUTPUT

No other files are needed. You can, of course, make it *much* more complex :)

Finally, set the support module up to use all this and also allow it to be
built from llvm-top.

Added:
    support/trunk/autoconf/Makefile
    support/trunk/autoconf/Makefile.mod
    support/trunk/autoconf/m4/module_support.m4
Removed:
    support/trunk/autoconf/m4/config_makefile.m4
    support/trunk/autoconf/m4/config_project.m4
Modified:
    support/trunk/Makefile.config.in
    support/trunk/autoconf/AutoRegen.sh
    support/trunk/autoconf/configure.ac
    support/trunk/build-for-llvm-top.sh
    support/trunk/configure

Modified: support/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/support/trunk/Makefile.config.in?rev=39997&r1=39996&r2=39997&view=diff

==============================================================================
--- support/trunk/Makefile.config.in (original)
+++ support/trunk/Makefile.config.in Wed Jul 18 03:01:43 2007
@@ -13,7 +13,7 @@
 #===------------------------------------------------------------------------===#
 
 # Define LLVM specific info and directories based on the autoconf variables
-LLVMPackageName   := @PACKAGE_NAME@
+LLVMPackageName   := @LLVM_MODULE_NAME@
 LLVMVersion       := @PACKAGE_VERSION@
 LLVM_CONFIGTIME   := @LLVM_CONFIGTIME@
 

Modified: support/trunk/autoconf/AutoRegen.sh
URL: http://llvm.org/viewvc/llvm-project/support/trunk/autoconf/AutoRegen.sh?rev=39997&r1=39996&r2=39997&view=diff

==============================================================================
--- support/trunk/autoconf/AutoRegen.sh (original)
+++ support/trunk/autoconf/AutoRegen.sh Wed Jul 18 03:01:43 2007
@@ -38,11 +38,23 @@
 echo "######################################################################"
 echo ""
 echo "Regenerating aclocal.m4 with aclocal 1.9.6"
+aclocal_opts="--force -I $LLVM_TOP/support/autoconf/m4"
 cwd=`pwd`
-aclocal --force -I $cwd/m4 || die "aclocal failed"
+if test -d $cwd/m4 ; then
+  aclocal_opts="$aclocal_opts -I $cwd/m4"
+fi
+echo "command: aclocal $aclocal_opts"
+aclocal $aclocal_opts || die "aclocal failed"
 echo "Regenerating configure with autoconf $want_autoconf_version_clean"
 autoconf --force --warnings=all -o ../$outfile $configfile || die "autoconf failed"
-cd ..
-echo "Regenerating config.h.in with autoheader $want_autoheader_version_clean"
-autoheader --warnings=all -I autoconf -I autoconf/m4 autoconf/$configfile || die "autoheader failed"
+NUM_CONFIG_HEADERS=`grep AC_CONFIG_HEADERS $configfile | wc -l`
+if test "$NUM_CONFIG_HEADERS" -gt 0 ; then
+  cd ..
+  echo "Regenerating config.h.in with autoheader $want_autoheader_version_clean"
+  autoheader_opts="--warnings=all -I autoconf -I $LLVM_TOP/support/autoconf/m4"
+  if test -d $cwd/m4 ; then
+    autoheader_opts="$autoheader_opts -I $cwd/m4 autoconf/$configfile"
+  fi
+  autoheader $autoheader_opts || die "autoheader failed"
+fi
 exit 0

Added: support/trunk/autoconf/Makefile
URL: http://llvm.org/viewvc/llvm-project/support/trunk/autoconf/Makefile?rev=39997&view=auto

==============================================================================
--- support/trunk/autoconf/Makefile (added)
+++ support/trunk/autoconf/Makefile Wed Jul 18 03:01:43 2007
@@ -0,0 +1,9 @@
+#===- autoconf/Makefile ------------------------------------*- Makefile -*--===#
+# 
+#                     The LLVM Support Autoconf Makefile
+#
+# This file was developed by the Reid Spencer and is distributed under the
+# University of Illinois Open Source License. See LICENSE.TXT for details.
+# 
+#===------------------------------------------------------------------------===#
+-include ./Makefile.mod

Added: support/trunk/autoconf/Makefile.mod
URL: http://llvm.org/viewvc/llvm-project/support/trunk/autoconf/Makefile.mod?rev=39997&view=auto

==============================================================================
--- support/trunk/autoconf/Makefile.mod (added)
+++ support/trunk/autoconf/Makefile.mod Wed Jul 18 03:01:43 2007
@@ -0,0 +1,41 @@
+#=== autoconf/Makefile.module - autoconf makefile for modules-*- Makefile -*===#
+# 
+#                     The LLVM Support Autoconf Makefile
+#
+# This file was developed by the Reid Spencer and is distributed under the
+# University of Illinois Open Source License. See LICENSE.TXT for details.
+# 
+#===------------------------------------------------------------------------===#
+
+# See if we can't intuit some paths that we need, based on the assumption that
+# this thing is checked out into an llvm-top directory and the things we need
+# are in llvm-top
+# be set if LLVM_TOP.
+ifndef LLVM_TOP
+  LLVM_TOP := $(shell cd ../.. ; /bin/pwd)
+endif
+ifndef MODULE_DIR
+  MODULE_DIR := $(shell cd .. ; /bin/pwd)
+endif
+
+AUTOREGEN=$(LLVM_TOP)/support/autoconf/AutoRegen.sh
+CONFIGURE=$(MODULE_DIR)/configure
+CONFIGURE_AC=$(MODULE_DIR)/autoconf/configure.ac
+M4_FILES := $(wildcard $(LLVM_TOP)/support/autoconf/m4/*.m4)
+M4_FILES += $(wildcard $(MODULE_DIR)/autoconf/m4/*.m4)
+MODULE_INFO=$(MODULE_DIR)/ModuleInfo.txt
+
+all: $(CONFIGURE)
+
+$(CONFIGURE) : $(AUTOREGEN) $(CONFIGURE_AC) $(M4_FILES) $(MODULE_INFO)
+	@LLVM_TOP="$(LLVM_TOP)" $(AUTOREGEN)
+
+$(CONFIGURE_AC):
+	@echo "Your module ($(MODULE_DIR)) needs a configure.ac file"
+
+print:
+	@echo "LLVM_TOP=$(LLVM_TOP)"
+	@echo "MODULE_DIR=$(MODULE_DIR)"
+	@echo "CONFIGURE=$(CONFIGURE)"
+	@echo "CONFIGURE_AC=$(CONFIGURE_AC)"
+	@echo "M4_FILES=$(M4_FILES)"

Modified: support/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/support/trunk/autoconf/configure.ac?rev=39997&r1=39996&r2=39997&view=diff

==============================================================================
--- support/trunk/autoconf/configure.ac (original)
+++ support/trunk/autoconf/configure.ac Wed Jul 18 03:01:43 2007
@@ -33,7 +33,8 @@
 dnl===-----------------------------------------------------------------------===
 dnl Initialize autoconf and define the package name, version number and
 dnl email address for reporting bugs.
-AC_INIT([[support]],[[2.1svn]],[llvmbugs at cs.uiuc.edu])
+AC_INIT([[Support Module]],[[2.1svn]],[http://llvm.org/bugs],[llvm-support])
+THIS_IS_LLVM_MODULE([support])
 
 dnl Provide a copyright substitution and ensure the copyright notice is included
 dnl in the output of --version option of the generated configure script.
@@ -780,13 +781,9 @@
 AC_CONFIG_HEADERS([include/llvm/ADT/hash_set])
 AC_CONFIG_HEADERS([include/llvm/ADT/iterator])
 
-dnl Configure the makefile's configuration data
-AC_CONFIG_FILES([Makefile.config])
-
 dnl Do special configuration of Makefiles
-AC_CONFIG_MAKEFILE(Makefile)
-AC_CONFIG_MAKEFILE(Makefile.common)
-AC_CONFIG_MAKEFILE(lib/Makefile)
+CONFIG_LLVM_MAKEFILE(Makefile)
+CONFIG_LLVM_MAKEFILE(lib/Makefile)
 
 dnl Finally, crank out the output
 AC_OUTPUT

Removed: support/trunk/autoconf/m4/config_makefile.m4
URL: http://llvm.org/viewvc/llvm-project/support/trunk/autoconf/m4/config_makefile.m4?rev=39996&view=auto

==============================================================================
--- support/trunk/autoconf/m4/config_makefile.m4 (original)
+++ support/trunk/autoconf/m4/config_makefile.m4 (removed)
@@ -1,9 +0,0 @@
-#
-# Configure a Makefile without clobbering it if it exists and is not out of
-# date.  This macro is unique to LLVM.
-#
-AC_DEFUN([AC_CONFIG_MAKEFILE],
-[AC_CONFIG_COMMANDS($1,
-  [${LLVM_TOP}/support/autoconf/mkinstalldirs `dirname $1`
-   ${SHELL} ${LLVM_TOP}/support/autoconf/install-sh -c ${srcdir}/$1 $1])
-])

Removed: support/trunk/autoconf/m4/config_project.m4
URL: http://llvm.org/viewvc/llvm-project/support/trunk/autoconf/m4/config_project.m4?rev=39996&view=auto

==============================================================================
--- support/trunk/autoconf/m4/config_project.m4 (original)
+++ support/trunk/autoconf/m4/config_project.m4 (removed)
@@ -1,14 +0,0 @@
-#
-# Provide the arguments and other processing needed for an LLVM project
-#
-AC_DEFUN([LLVM_CONFIG_PROJECT],
-  [AC_ARG_WITH([llvmsrc],
-    AS_HELP_STRING([--with-llvmsrc],[Location of LLVM Source Code]),
-    [llvm_src="$withval"],[llvm_src="]$1["])
-  AC_SUBST(LLVM_SRC,$llvm_src)
-  AC_ARG_WITH([llvmobj],
-    AS_HELP_STRING([--with-llvmobj],[Location of LLVM Object Code]),
-    [llvm_obj="$withval"],[llvm_obj="]$2["])
-  AC_SUBST(LLVM_OBJ,$llvm_obj)
-  AC_CONFIG_COMMANDS([setup],,[llvm_src="${LLVM_SRC}"])
-])

Added: support/trunk/autoconf/m4/module_support.m4
URL: http://llvm.org/viewvc/llvm-project/support/trunk/autoconf/m4/module_support.m4?rev=39997&view=auto

==============================================================================
--- support/trunk/autoconf/m4/module_support.m4 (added)
+++ support/trunk/autoconf/m4/module_support.m4 Wed Jul 18 03:01:43 2007
@@ -0,0 +1,49 @@
+dnl
+dnl Provide the arguments and other processing needed for an LLVM module
+dnl
+dnl This script must be used after AC_INIT. It sets up various LLVM_MODULE
+dnl variables, extracts the module's dependencies, validates the directory
+dnl is correct, etc.
+AC_DEFUN([THIS_IS_LLVM_MODULE],[
+  LLVM_MODULE_NAME="$1"
+  LLVM_MODULE_FULLNAME="AC_PACKAGE_NAME"
+  LLVM_MODULE_TARNAME="AC_PACKAGE_TARNAME"
+  LLVM_MODULE_VERSION="AC_PACKAGE_VERSION"
+  LLVM_MODULE_BUGREPORT="AC_PACKAGE_BUGREPORT"
+  LLVM_TOP=`cd .. ; pwd`
+  LLVM_MODULE_DEPENDS_ON=`grep DepModules: ModuleInfo.txt | \
+    sed 's/DepModules: *//'`
+  AC_CONFIG_SRCDIR([$2])
+  if test -r Makefile.config.in ; then
+    AC_CONFIG_FILES([Makefile.config])
+  fi
+  if test -r Makefile.common.in ; then
+    AC_CONFIG_FILES([Makefile.common])
+  fi
+  AC_SUBST(LLVM_TOP,[$LLVM_TOP])
+  AC_SUBST(LLVM_MODULE_NAME,"$1")
+  AC_SUBST(LLVM_MODULE_FULLNAME,"AC_PACKAGE_NAME")
+  AC_SUBST(LLVM_MODULE_TARNAME,"AC_PACKAGE_TARNAME")
+  AC_SUBST(LLVM_MODULE_VERSION,"AC_PACKAGE_VERSION")
+  AC_SUBST(LLVM_MODULE_BUGREPORT,"AC_PACKAGE_BUGREPORT")
+  AC_SUBST(LLVM_MODULE_DEPENDS_ON,"$LLVM_MODULE_DEPENDS_ON")
+  AC_ARG_WITH([llvmsrc],
+    AS_HELP_STRING([--with-llvmsrc],[Location of LLVM Source Code]),
+    [llvm_src="$withval"],[llvm_src="]$1["])
+  AC_SUBST(LLVM_SRC,$llvm_src)
+  AC_ARG_WITH([llvmobj],
+    AS_HELP_STRING([--with-llvmobj],[Location of LLVM Object Code]),
+    [llvm_obj="$withval"],[llvm_obj="]$2["])
+  AC_SUBST(LLVM_OBJ,$llvm_obj)
+  AC_CONFIG_COMMANDS([setup],,[LLVM_TOP="${LLVM_TOP}"])
+])
+
+dnl
+dnl Configure a Makefile without clobbering it if it exists and is not out of
+dnl date.  This macro is unique to LLVM.
+dnl
+AC_DEFUN([CONFIG_LLVM_MAKEFILE],
+  [AC_CONFIG_COMMANDS($1,
+    [${LLVM_TOP}/support/autoconf/mkinstalldirs `dirname $1`
+     ${SHELL} ${LLVM_TOP}/support/autoconf/install-sh -c ${srcdir}/$1 $1])
+])

Modified: support/trunk/build-for-llvm-top.sh
URL: http://llvm.org/viewvc/llvm-project/support/trunk/build-for-llvm-top.sh?rev=39997&r1=39996&r2=39997&view=diff

==============================================================================
--- support/trunk/build-for-llvm-top.sh (original)
+++ support/trunk/build-for-llvm-top.sh Wed Jul 18 03:01:43 2007
@@ -1,40 +1,19 @@
 #!/bin/sh
 
-is_debug=1
-for arg in "$@" ; do
-  case "$arg" in
-    LLVM_TOP=*)
-      LLVM_TOP=`echo "$arg" | sed -e 's/LLVM_TOP=//'`
-      ;;
-    PREFIX=*)
-      PREFIX=`echo "$arg" | sed -e 's/PREFIX=//'`
-      ;;
-    MODULE=*)
-      MODULE=`echo "$arg" | sed -e 's/MODULE=//'`
-      ;;
-    *=*)
-      build_opts="$build_opts $arg"
-      ;;
-    --*)
-      config_opts="$config_opts $arg"
-      ;;
-    *)
-      die 1 "Unrecognized option: $arg"
-      ;;
-  esac
-done
-
 # This includes the Bourne shell library from llvm-top. Since this file is
 # generally only used when building from llvm-top, it is safe to assume that
 # llvm is checked out into llvm-top in which case .. just works.
 . $LLVM_TOP/library.sh
 
+# Call the library function to process the arguments
+process_builder_args "$@"
+
 # See if we have previously been configured by sensing the presense
 # of the config.status scripts
 if test ! -x "config.status" ; then
   # We must configure so build a list of configure options
   config_options="--prefix=$PREFIX --with-llvm-top=$LLVM_TOP "
-  config_options="$config_options $config_opts"
+  config_options="$config_options $OPTIONS_DASH_DASH"
   msg 0 Configuring $module with:
   msg 0 "  ./configure" $config_options
   ./configure $config_options || (echo "Can't configure llvm" ; exit 1)

Modified: support/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/support/trunk/configure?rev=39997&r1=39996&r2=39997&view=diff

==============================================================================
--- support/trunk/configure (original)
+++ support/trunk/configure Wed Jul 18 03:01:43 2007
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for support 2.1svn.
+# Generated by GNU Autoconf 2.60 for Support Module 2.1svn.
 #
-# Report bugs to <llvmbugs at cs.uiuc.edu>.
+# Report bugs to <http://llvm.org/bugs>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -713,12 +713,13 @@
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
-PACKAGE_NAME='support'
-PACKAGE_TARNAME='-support-'
+PACKAGE_NAME='Support Module'
+PACKAGE_TARNAME='llvm-support'
 PACKAGE_VERSION='2.1svn'
-PACKAGE_STRING='support 2.1svn'
-PACKAGE_BUGREPORT='llvmbugs at cs.uiuc.edu'
+PACKAGE_STRING='Support Module 2.1svn'
+PACKAGE_BUGREPORT='http://llvm.org/bugs'
 
+ac_unique_file=""
 ac_unique_file="lib/System/Path.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -793,6 +794,15 @@
 build_alias
 host_alias
 target_alias
+LLVM_TOP
+LLVM_MODULE_NAME
+LLVM_MODULE_FULLNAME
+LLVM_MODULE_TARNAME
+LLVM_MODULE_VERSION
+LLVM_MODULE_BUGREPORT
+LLVM_MODULE_DEPENDS_ON
+LLVM_SRC
+LLVM_OBJ
 LLVM_COPYRIGHT
 build
 build_cpu
@@ -827,7 +837,6 @@
 BUILD_CC
 BUILD_EXEEXT
 CVSBUILD
-LLVM_TOP
 ENABLE_OPTIMIZED
 DISABLE_ASSERTIONS
 ENABLE_EXPENSIVE_CHECKS
@@ -912,7 +921,6 @@
 LLVM_INFODIR
 LLVM_MANDIR
 LLVM_CONFIGTIME
-CONFIG_HEADERS
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
@@ -1434,7 +1442,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures support 2.1svn to adapt to many kinds of systems.
+\`configure' configures Support Module 2.1svn to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1482,7 +1490,7 @@
   --infodir=DIR          info documentation [DATAROOTDIR/info]
   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/-support-]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/llvm-support]
   --htmldir=DIR          html documentation [DOCDIR]
   --dvidir=DIR           dvi documentation [DOCDIR]
   --pdfdir=DIR           pdf documentation [DOCDIR]
@@ -1500,7 +1508,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of support 2.1svn:";;
+     short | recursive ) echo "Configuration of Support Module 2.1svn:";;
    esac
   cat <<\_ACEOF
 
@@ -1531,6 +1539,8 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-llvmsrc          Location of LLVM Source Code
+  --with-llvmobj          Location of LLVM Object Code
   --with-llvm-top         Specify where the llvm-top directory is
   --with-extra-options    Specify addtional options to compile LLVM with
   --with-tclinclude       directory where tcl headers are
@@ -1562,7 +1572,7 @@
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <llvmbugs at cs.uiuc.edu>.
+Report bugs to <http://llvm.org/bugs>.
 _ACEOF
 ac_status=$?
 fi
@@ -1623,7 +1633,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-support configure 2.1svn
+Support Module configure 2.1svn
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1639,7 +1649,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by support $as_me 2.1svn, which was
+It was created by Support Module $as_me 2.1svn, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -1993,6 +2003,61 @@
 
 
 
+  LLVM_MODULE_NAME="support"
+  LLVM_MODULE_FULLNAME="Support Module"
+  LLVM_MODULE_TARNAME="llvm-support"
+  LLVM_MODULE_VERSION="2.1svn"
+  LLVM_MODULE_BUGREPORT="http://llvm.org/bugs"
+  LLVM_TOP=`cd .. ; pwd`
+  LLVM_MODULE_DEPENDS_ON=`grep DepModules: ModuleInfo.txt | \
+    sed 's/DepModules: *//'`
+
+  if test -r Makefile.config.in ; then
+    ac_config_files="$ac_config_files Makefile.config"
+
+  fi
+  if test -r Makefile.common.in ; then
+    ac_config_files="$ac_config_files Makefile.common"
+
+  fi
+  LLVM_TOP=$LLVM_TOP
+
+  LLVM_MODULE_NAME="support"
+
+  LLVM_MODULE_FULLNAME="Support Module"
+
+  LLVM_MODULE_TARNAME="llvm-support"
+
+  LLVM_MODULE_VERSION="2.1svn"
+
+  LLVM_MODULE_BUGREPORT="http://llvm.org/bugs"
+
+  LLVM_MODULE_DEPENDS_ON="$LLVM_MODULE_DEPENDS_ON"
+
+
+# Check whether --with-llvmsrc was given.
+if test "${with_llvmsrc+set}" = set; then
+  withval=$with_llvmsrc; llvm_src="$withval"
+else
+  llvm_src="support"
+fi
+
+  LLVM_SRC=$llvm_src
+
+
+# Check whether --with-llvmobj was given.
+if test "${with_llvmobj+set}" = set; then
+  withval=$with_llvmobj; llvm_obj="$withval"
+else
+  llvm_obj=""
+fi
+
+  LLVM_OBJ=$llvm_obj
+
+  ac_config_commands="$ac_config_commands setup"
+
+
+
 LLVM_COPYRIGHT="Copyright (c) 2003-2007 University of Illinois at Urbana-Champaign."
 
 
@@ -8445,7 +8510,7 @@
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
+## Report this to http://llvm.org/bugs ##
 ## ----------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -10257,7 +10322,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10260 "configure"
+#line 10325 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10589,7 +10654,7 @@
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
+## Report this to http://llvm.org/bugs ##
 ## ----------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -10989,7 +11054,7 @@
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
+## Report this to http://llvm.org/bugs ##
 ## ----------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -11161,7 +11226,7 @@
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
+## Report this to http://llvm.org/bugs ##
 ## ----------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -11331,7 +11396,7 @@
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
+## Report this to http://llvm.org/bugs ##
 ## ----------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -12401,7 +12466,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 12404 "configure"' > conftest.$ac_ext
+  echo '#line 12469 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -14119,11 +14184,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14122: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14187: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14126: \$? = $ac_status" >&5
+   echo "$as_me:14191: \$? = $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 other than the usual output.
@@ -14387,11 +14452,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14390: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14455: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14394: \$? = $ac_status" >&5
+   echo "$as_me:14459: \$? = $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 other than the usual output.
@@ -14491,11 +14556,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14494: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14559: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14498: \$? = $ac_status" >&5
+   echo "$as_me:14563: \$? = $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
@@ -16943,7 +17008,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 16946 "configure"
+#line 17011 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17043,7 +17108,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17046 "configure"
+#line 17111 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19411,11 +19476,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19414: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19479: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19418: \$? = $ac_status" >&5
+   echo "$as_me:19483: \$? = $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 other than the usual output.
@@ -19515,11 +19580,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19518: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19583: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19522: \$? = $ac_status" >&5
+   echo "$as_me:19587: \$? = $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
@@ -21085,11 +21150,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21088: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:21153: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:21092: \$? = $ac_status" >&5
+   echo "$as_me:21157: \$? = $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 other than the usual output.
@@ -21189,11 +21254,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21192: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:21257: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:21196: \$? = $ac_status" >&5
+   echo "$as_me:21261: \$? = $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
@@ -23424,11 +23489,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:23427: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:23492: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:23431: \$? = $ac_status" >&5
+   echo "$as_me:23496: \$? = $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 other than the usual output.
@@ -23692,11 +23757,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:23695: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:23760: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:23699: \$? = $ac_status" >&5
+   echo "$as_me:23764: \$? = $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 other than the usual output.
@@ -23796,11 +23861,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:23799: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:23864: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:23803: \$? = $ac_status" >&5
+   echo "$as_me:23868: \$? = $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
@@ -28560,7 +28625,7 @@
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
+## Report this to http://llvm.org/bugs ##
 ## ----------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -28734,7 +28799,7 @@
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
+## Report this to http://llvm.org/bugs ##
 ## ----------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -28907,7 +28972,7 @@
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
+## Report this to http://llvm.org/bugs ##
 ## ----------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -29078,7 +29143,7 @@
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
+## Report this to http://llvm.org/bugs ##
 ## ----------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -29243,7 +29308,7 @@
 echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
+## Report this to http://llvm.org/bugs ##
 ## ----------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -33013,7 +33078,7 @@
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
+## Report this to http://llvm.org/bugs ##
 ## ----------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -33557,18 +33622,10 @@
 
 ac_config_headers="$ac_config_headers include/llvm/ADT/iterator"
 
-CONFIG_HEADERS=$CONFIG_HEADERS
-
-
-ac_config_files="$ac_config_files Makefile.config"
-
 
 ac_config_commands="$ac_config_commands Makefile"
 
 
-ac_config_commands="$ac_config_commands Makefile.common"
-
-
 ac_config_commands="$ac_config_commands lib/Makefile"
 
 
@@ -33970,7 +34027,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by support $as_me 2.1svn, which was
+This file was extended by Support Module $as_me 2.1svn, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -34023,7 +34080,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-support config.status 2.1svn
+Support Module config.status 2.1svn
 configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -34123,6 +34180,11 @@
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
+#
+# INIT-COMMANDS
+#
+LLVM_TOP="${LLVM_TOP}"
+
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -34131,14 +34193,15 @@
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
+    "Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
+    "Makefile.common") CONFIG_FILES="$CONFIG_FILES Makefile.common" ;;
+    "setup") CONFIG_COMMANDS="$CONFIG_COMMANDS setup" ;;
     "include/llvm/Config/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/llvm/Config/config.h" ;;
     "include/llvm/Support/DataTypes.h") CONFIG_HEADERS="$CONFIG_HEADERS include/llvm/Support/DataTypes.h" ;;
     "include/llvm/ADT/hash_map") CONFIG_HEADERS="$CONFIG_HEADERS include/llvm/ADT/hash_map" ;;
     "include/llvm/ADT/hash_set") CONFIG_HEADERS="$CONFIG_HEADERS include/llvm/ADT/hash_set" ;;
     "include/llvm/ADT/iterator") CONFIG_HEADERS="$CONFIG_HEADERS include/llvm/ADT/iterator" ;;
-    "Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
     "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
-    "Makefile.common") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.common" ;;
     "lib/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Makefile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -34239,6 +34302,15 @@
 build_alias!$build_alias$ac_delim
 host_alias!$host_alias$ac_delim
 target_alias!$target_alias$ac_delim
+LLVM_TOP!$LLVM_TOP$ac_delim
+LLVM_MODULE_NAME!$LLVM_MODULE_NAME$ac_delim
+LLVM_MODULE_FULLNAME!$LLVM_MODULE_FULLNAME$ac_delim
+LLVM_MODULE_TARNAME!$LLVM_MODULE_TARNAME$ac_delim
+LLVM_MODULE_VERSION!$LLVM_MODULE_VERSION$ac_delim
+LLVM_MODULE_BUGREPORT!$LLVM_MODULE_BUGREPORT$ac_delim
+LLVM_MODULE_DEPENDS_ON!$LLVM_MODULE_DEPENDS_ON$ac_delim
+LLVM_SRC!$LLVM_SRC$ac_delim
+LLVM_OBJ!$LLVM_OBJ$ac_delim
 LLVM_COPYRIGHT!$LLVM_COPYRIGHT$ac_delim
 build!$build$ac_delim
 build_cpu!$build_cpu$ac_delim
@@ -34273,7 +34345,6 @@
 BUILD_CC!$BUILD_CC$ac_delim
 BUILD_EXEEXT!$BUILD_EXEEXT$ac_delim
 CVSBUILD!$CVSBUILD$ac_delim
-LLVM_TOP!$LLVM_TOP$ac_delim
 ENABLE_OPTIMIZED!$ENABLE_OPTIMIZED$ac_delim
 DISABLE_ASSERTIONS!$DISABLE_ASSERTIONS$ac_delim
 ENABLE_EXPENSIVE_CHECKS!$ENABLE_EXPENSIVE_CHECKS$ac_delim
@@ -34291,14 +34362,6 @@
 LEXLIB!$LEXLIB$ac_delim
 LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
 FLEX!$FLEX$ac_delim
-YACC!$YACC$ac_delim
-YFLAGS!$YFLAGS$ac_delim
-BISON!$BISON$ac_delim
-NM!$NM$ac_delim
-ifGNUmake!$ifGNUmake$ac_delim
-LN_S!$LN_S$ac_delim
-CMP!$CMP$ac_delim
-CP!$CP$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -34340,6 +34403,14 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+YACC!$YACC$ac_delim
+YFLAGS!$YFLAGS$ac_delim
+BISON!$BISON$ac_delim
+NM!$NM$ac_delim
+ifGNUmake!$ifGNUmake$ac_delim
+LN_S!$LN_S$ac_delim
+CMP!$CMP$ac_delim
+CP!$CP$ac_delim
 DATE!$DATE$ac_delim
 FIND!$FIND$ac_delim
 MKDIR!$MKDIR$ac_delim
@@ -34399,12 +34470,11 @@
 LLVM_INFODIR!$LLVM_INFODIR$ac_delim
 LLVM_MANDIR!$LLVM_MANDIR$ac_delim
 LLVM_CONFIGTIME!$LLVM_CONFIGTIME$ac_delim
-CONFIG_HEADERS!$CONFIG_HEADERS$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 69; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -34808,11 +34878,9 @@
 
   case $ac_file$ac_mode in
     "Makefile":C) ${LLVM_TOP}/support/autoconf/mkinstalldirs `dirname Makefile`
-   ${SHELL} ${LLVM_TOP}/support/autoconf/install-sh -c ${srcdir}/Makefile Makefile ;;
-    "Makefile.common":C) ${LLVM_TOP}/support/autoconf/mkinstalldirs `dirname Makefile.common`
-   ${SHELL} ${LLVM_TOP}/support/autoconf/install-sh -c ${srcdir}/Makefile.common Makefile.common ;;
+     ${SHELL} ${LLVM_TOP}/support/autoconf/install-sh -c ${srcdir}/Makefile Makefile ;;
     "lib/Makefile":C) ${LLVM_TOP}/support/autoconf/mkinstalldirs `dirname lib/Makefile`
-   ${SHELL} ${LLVM_TOP}/support/autoconf/install-sh -c ${srcdir}/lib/Makefile lib/Makefile ;;
+     ${SHELL} ${LLVM_TOP}/support/autoconf/install-sh -c ${srcdir}/lib/Makefile lib/Makefile ;;
 
   esac
 done # for ac_tag

More information about the llvm-commits mailing list