Changeset 00cc023 for configure.ac

Timestamp:

May 31, 2015, 1:54:23 PM (10 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

5cb5f842

Parents:

86bd7c1f

Message:

redo automake first attempt

File:

• configure.ac (modified) (7 diffs)

configure.ac

@@ -4 +4 @@
 AC_PREREQ([2.68])
 AC_INIT([cfa-cc],[1.0.0],[cforall@plg.uwaterloo.ca])
+AC_CONFIG_AUX_DIR([automake])
+AC_CONFIG_SRCDIR([src/main.cc])
+AC_CONFIG_HEADERS([config.h])
+
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE(disable)
-AC_CONFIG_SRCDIR([src/main.cc])
-AC_CONFIG_HEADERS([config.h])
 
 # Installation paths
@@ -15 +17 @@
             backcompiler=$withval, backcompiler="")
   if test x$backcompiler != x; then
-     AC_DEFINE_UNQUOTED(GCC_PATH, "${backcompiler}")
-     BACKEND_CC=${backcompiler}
+        AC_DEFINE_UNQUOTED(GCC_PATH, "${backcompiler}")
+        BACKEND_CC=${backcompiler}
   else
-     AC_PATH_PROG(GCC_PATH, gcc, N/A)
-     if test "$GCC_PATH" = "N/A"; then
-        AC_MSG_ERROR(some version of gcc is needed. Get it at ftp://ftp.gnu.org)
-        exit 1
-     fi
-     AC_DEFINE_UNQUOTED(GCC_PATH, "${GCC_PATH}", [Path/name of C compiler.])
-     BACKEND_CC=${GCC_PATH}
+        AC_PATH_PROG(GCC_PATH, gcc, N/A)
+        if test "$GCC_PATH" = "N/A"; then
+                AC_MSG_ERROR(some version of gcc is needed. Get it at ftp://ftp.gnu.org)
+                exit 1
+        fi
+        AC_DEFINE_UNQUOTED(GCC_PATH, "${GCC_PATH}", [Path/name of C compiler.])
+        BACKEND_CC=${GCC_PATH}
   fi
 AC_SUBST(BACKEND_CC)
 
-CFA_PREFIX=
 if test "x$prefix" = "xNONE"; then
-        cfa_prefix=${ac_default_prefix}
+        cfa_prefix=${ac_default_prefix}
 else
-        cfa_prefix=${prefix}
+        cfa_prefix=${prefix}
 fi 
 AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa files.])
-CFA_PREFIX=${cfa_prefix}
-AC_SUBST(CFA_PREFIX)
+AC_SUBST(CFA_PREFIX, ${cfa_prefix})
 
-CFA_INCDIR=
 if test "$includedir" = '${prefix}/include'; then
         cfa_incdir="${cfa_prefix}/include"
@@ -45 +44 @@
 fi 
 AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
-CFA_INCDIR=${cfa_incdir}
-AC_SUBST(CFA_INCDIR)
+AC_SUBST(CFA_INCDIR, ${cfa_incdir})
 
-CFA_BINDIR=
 if test "$bindir" = '${exec_prefix}/bin'; then
         cfa_bindir="${cfa_prefix}/bin"
@@ -55 +52 @@
 fi 
 AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.])
-CFA_BINDIR=${cfa_bindir}
-AC_SUBST(CFA_BINDIR)
+AC_SUBST(CFA_BINDIR, ${cfa_bindir})
 
-CFA_LIBDIR=
 if test "$libdir" = '${exec_prefix}/lib'; then
         cfa_libdir=${cfa_prefix}/lib
@@ -65 +60 @@
 fi 
 AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
-CFA_LIBDIR=${cfa_libdir}
-AC_SUBST(CFA_LIBDIR)
+AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
 
 # Checks for programs.
@@ -72 +66 @@
 AC_PROG_AWK
 AC_PROG_CC
+AM_PROG_CC_C_O  # deprecated
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
+AC_PROG_RANLIB
 
 # Checks for libraries.
@@ -96 +92 @@
 AC_CHECK_FUNCS([memset putenv strchr strtol])
 
-AC_CONFIG_FILES([Makefile
-                 src/Makefile
-                 driver/Makefile
-                 libcfa/Makefile
-                 src/examples/Makefile])
+AC_CONFIG_FILES([
+        Makefile
+        driver/Makefile
+        src/Makefile
+        src/examples/Makefile
+        libcfa/Makefile
+        ])
 
 AC_OUTPUT