Changes in configure.ac [ad486c5b:47c1928]

File:

• configure.ac (modified) (5 diffs)

configure.ac

@@ -7 +7 @@
 #AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_HEADERS([config.h:src/config.h.in])
-AM_SILENT_RULES([no])
+AM_SILENT_RULES([yes])
+
+m4_include([automake/cfa.m4])
+
+# don't use the default CFLAGS as they unconditonnaly add -O2
+: ${CFLAGS=""}
 
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -15 +20 @@
 AC_ARG_PROGRAM
 
+#==============================================================================
 #Trasforming cc1 will break compilation
-if test "${program_transform_name}" = ""; then
-    AC_MSG_ERROR([Program transform not supported.
-                Use --with-cfa-name='[[Desired name here]]' instead])
-fi
-
-AC_ARG_WITH(cfa-name,
-        [  --with-cfa-name=NAME     NAME too which cfa will be installed],
-        cfa_name=$withval, cfa_name="cfa")
-
-#Define the new name of the installed command
-AC_SUBST(CFA_NAME, ${cfa_name})
+M4CFA_PROGRAM_NAME
+
+#==============================================================================
+# version information
 
 rm -f version
@@ -46 +45 @@
 AC_DEFINE_UNQUOTED(CFA_VERSION_FULL, ["${ver_major}.${ver_minor}.${ver_patch}.${ver_build}"], [Major.Minor.Patch.Build])
 
-# Installation paths
-
-AC_ARG_WITH(backend-compiler,
-        [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ],
-        backendcompiler=$withval, backendcompiler="")
-if test "x$backendcompiler" != "x"; then
-        BACKEND_CC=${backendcompiler}
-else
-        AC_PATH_PROG(BACKEND_CC, gcc, [])       # check gcc installed
-        if test "x$BACKEND_CC" = "x"; then
-                AC_MSG_ERROR(some version of gcc is needed. Get it at ftp://ftp.gnu.org)
-                exit 1
-        fi
-fi
-AC_DEFINE_UNQUOTED(CFA_BACKEND_CC, "${BACKEND_CC}", [Location of include files.])
-AC_SUBST(CFA_BACKEND_CC)
-
-
-
-AC_ARG_ENABLE(target-release, AS_HELP_STRING([--enable-target-release], [Build and install the release target]))
-AC_ARG_ENABLE(target-debug, AS_HELP_STRING([--enable-target-debug], [Build and install the debug target]))
-AC_ARG_ENABLE(threading, AS_HELP_STRING([--enable-threading], [Build and install libcfa with threading support (Enabled by default)]),
-[case "${enableval}" in
-  yes) build_threading="yes" ;;
-  no)  build_threading="no" ;;
-  *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
-esac],[build_threading="yes"])
-
-case "$enable_target_release" in
-        yes)
-                case "$enable_target_debug" in
-                        yes)
-                                build_release="yes"
-                                build_debug="yes"
-                                ;;
-                        no)
-                                build_release="yes"
-                                build_debug="no"
-                                ;;
-                        *)
-                                build_release="yes"
-                                build_debug="no"
-                                ;;
-                esac
-                ;;
-        no)
-                case "$enable_target_debug" in
-                        yes)
-                                build_release="no"
-                                build_debug="yes"
-                                ;;
-                        no)
-                                build_release="no"
-                                build_debug="no"
-                                ;;
-                        *)
-                                build_release="no"
-                                build_debug="yes"
-                                ;;
-                esac
-                ;;
-        *)
-                case "$enable_target_debug" in
-                        yes)
-                                build_release="no"
-                                build_debug="yes"
-                                ;;
-                        no)
-                                build_release="yes"
-                                build_debug="no"
-                                ;;
-                        *)
-                                build_release="yes"
-                                build_debug="yes"
-                                ;;
-                esac
-                ;;
-esac
-
-AM_CONDITIONAL([BUILD_RELEASE], [test "x$build_release" = "xyes"])
-AM_CONDITIONAL([BUILD_DEBUG], [test "x$build_debug" = "xyes"])
-AM_CONDITIONAL([BUILD_NO_LIB], [test "x$build_release$build_debug" = "xnono"])
-AM_CONDITIONAL([BUILD_CONCURRENCY], [test "x$build_threading" = "xyes"])
-
+#==============================================================================
+# HACK to be able to use conditionnals inside makefiles
 DOifskipcompile='ifeq ($(skipcompile),yes)
 else'
@@ -139 +56 @@
 AM_SUBST_NOTMAKE([DOendif])
 
-if test "x$prefix" = "xNONE"; then
-        cfa_prefix=${ac_default_prefix}
+#==============================================================================
+# backend compiler implementation
+AC_ARG_WITH(backend-compiler,
+       [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ],
+       backendcompiler=$withval, backendcompiler="")
+if test "x$backendcompiler" != "x"; then
+       BACKEND_CC=${backendcompiler}
 else
-        cfa_prefix=${prefix}
+       AC_PATH_PROG(BACKEND_CC, gcc, [])       # check gcc installed
+       if test "x$BACKEND_CC" = "x"; then
+               AC_MSG_ERROR(some version of gcc is needed. Get it at ftp://ftp.gnu.org)
+               exit 1
+       fi
 fi
-AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.])
-AC_SUBST(CFA_PREFIX, ${cfa_prefix})
-
-if test "$includedir" = '${prefix}/include'; then
-        cfa_incdir="${cfa_prefix}/include/${cfa_name}"
-else
-        cfa_incdir=${includedir}
-fi
-AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
-AC_SUBST(CFA_INCDIR, ${cfa_incdir})
-
-if test "$bindir" = '${exec_prefix}/bin'; then
-        cfa_bindir="${cfa_prefix}/bin"
-else
-        cfa_bindir=${bindir}
-fi
-AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.])
-AC_SUBST(CFA_BINDIR, ${cfa_bindir})
-
-if test "$libdir" = '${exec_prefix}/lib'; then
-        cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
-else
-        cfa_libdir=${libdir}
-fi
-AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
-AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
-
+AC_DEFINE_UNQUOTED(CFA_BACKEND_CC, "${BACKEND_CC}", [Location of include files.])
+AC_SUBST(CFA_BACKEND_CC)
+
+#==============================================================================
+# Installation paths
+M4CFA_PARSE_PREFIX
+
+#==============================================================================
 # Create variables for commonly used targets
-DRIVER_DIR='$(top_builddir)/src/driver'
-CFACC=${DRIVER_DIR}/cfa
-CFACPP=${DRIVER_DIR}/cfa-cpp
+
+TOP_SRCDIR="$(readlink -f $ac_confdir/)/"
+TOP_BUILDDIR="$(readlink -f $ac_pwd/)/"
+
+AC_DEFINE_UNQUOTED(TOP_SRCDIR, "$TOP_SRCDIR", [Top src directory])
+AC_DEFINE_UNQUOTED(TOP_BUILDDIR, "$TOP_BUILDDIR", [Top build directory])
+
+DRIVER_DIR=${TOP_BUILDDIR}driver/
+CFACC=${DRIVER_DIR}cfa
+CFACPP=${DRIVER_DIR}cfa-cpp
 AC_SUBST(DRIVER_DIR)
 AC_SUBST(CFACC)
 AC_SUBST(CFACPP)
 
+#==============================================================================
 # Flag variables needed to build in tree
-LIBCFA_SRC='$(top_srcdir)/src/libcfa'
-LIBCFA_BUILD='$(top_builddir)/src/libcfa'
-BUILD_IN_TREE_FLAGS_NOLIB="-XCFA -t -B${DRIVER_DIR}"
-BUILD_IN_TREE_FLAGS="${BUILD_IN_TREE_FLAGS_NOLIB} -L${LIBCFA_BUILD} -I${LIBCFA_SRC} -I${LIBCFA_SRC}/containers -I${LIBCFA_SRC}/concurrency -I${LIBCFA_SRC}/stdhdr"
-AC_SUBST(BUILD_IN_TREE_FLAGS_NOLIB)
+LIBCFA_SRC='${TOP_SRCDIR}/libcfa/src'
+BUILD_IN_TREE_FLAGS="-XCFA -t -B${DRIVER_DIR}"
 AC_SUBST(BUILD_IN_TREE_FLAGS)
 
+#==============================================================================
+# handle the list of hosts to build for
+for var in $ac_configure_args
+do
+        #strip quotes surrouding values
+        case $var in
+                # skip cross compilation related arguments
+                \'--host=*) ;; \'host_alias=*) ;; \'--build=*) ;; \'build_alias=*) ;; \'--target=*) ;; \'target_alias=*) ;;
+
+                # skip the target hosts
+                \'--with-target-hosts=*) ;;
+
+                # append all other arguments to the sub configure arguments
+                *) LIBCFA_GENERAL_ARGS="${LIBCFA_GENERAL_ARGS} $var";;
+        esac
+done
+
+#==============================================================================
+# handle the list of hosts to build for
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
-AC_SUBST([MACHINE_TYPE],[$host_cpu])
 
 if ! test "$host_cpu" = "$build_cpu"; then
         case $host_cpu in
                 i386)
-                        CFLAGS+=" -m32 "
-                        CXXFLAGS+=" -m32 "
-                        CFAFLAGS+=" -m32 "
-                        LDFLAGS+=" -m32 "
+                        HOST_FLAGS="-m32"
                         ;;
                 i686)
-                        CFLAGS+=" -m32 "
-                  CXXFLAGS+=" -m32 "
-                  CFAFLAGS+=" -m32 "
-                  LDFLAGS+=" -m32 "
+                        HOST_FLAGS="-m32"
                         ;;
                 x86_64)
-                        CFLAGS+=" -m64 "
-                        CXXFLAGS+=" -m64 "
-                        CFAFLAGS+=" -m64 "
-                        LDFLAGS+=" -m64 "
+                        HOST_FLAGS="-m64"
                         ;;
         esac
 fi
-
+AC_SUBST(HOST_FLAGS)
+
+default_target="${host_cpu}:debug, ${host_cpu}:nodebug"
+AC_ARG_WITH(target-hosts,
+        [  --with-target-hosts=HOSTS     HOSTS comma seperated list of hosts to build for, format ARCH:[debug|nodebug|nolib]],
+        target_hosts=$withval, target_hosts=${default_target})
+
+AC_SUBST(TARGET_HOSTS, ${target_hosts})
+
+LIBCFA_PATHS="DRIVER_DIR=${DRIVER_DIR}"
+
+for i in $(echo $target_hosts | sed "s/,/ /g")
+do
+        # call your procedure/other scripts here below
+        arch_name=$(echo $i | sed -r "s/:(.*)//g")
+        lib_config=$(echo $i | sed -r "s/(.*)://g")
+
+        case $lib_config in
+                "nodebug") ;;
+                "debug") ;;
+                "nolib") ;;
+                *)
+                        >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
+                        exit 1
+                ;;
+        esac
+
+        M4CFA_CANNON_CPU([${arch_name}])
+        lib_arch=${cannon_arch_name}
+        lib_dir="libcfa/${lib_arch}-${lib_config}"
+
+        LIBCFA_TARGET_DIRS="${LIBCFA_TARGET_DIRS} ${lib_dir}"
+        LIBCFA_TARGET_MAKEFILES="${LIBCFA_TARGET_MAKEFILES} ${lib_dir}/Makefile"
+
+        mkdir -p ${lib_dir}
+        echo -n "${LIBCFA_GENERAL_ARGS} " > ${lib_dir}/config.data
+        echo -n "${LIBCFA_PATHS} " >> ${lib_dir}/config.data
+        echo -n "ARCHITECTURE=${lib_arch} " >> ${lib_dir}/config.data
+        echo -n "CONFIGURATION=${lib_config}" >> ${lib_dir}/config.data
+done
+
+AC_SUBST(LIBCFA_TARGET_DIRS)
+AC_SUBST(LIBCFA_TARGET_MAKEFILES)
+
+M4CFA_CANNON_CPU([${host_cpu}])
+AC_DEFINE_UNQUOTED(CFA_DEFAULT_CPU, "$cannon_arch_name", [Default cpu to use if neither -m32 or -m64 are defined.])
+AC_DEFINE_UNQUOTED(CFA_64_CPU, "x64", [CPU to use if the -m64 flags is given.])
+AC_DEFINE_UNQUOTED(CFA_32_CPU, "x86", [CPU to use if the -m32 flags is given.])
+
+#==============================================================================
+# CAFLAGS
 AC_DEFINE_UNQUOTED(CFA_FLAGS, "${CFAFLAGS}", [compilation flags for cfa libraries and test programs.])
 AC_SUBST(CFA_FLAGS, ${CFAFLAGS})
 
+#==============================================================================
 # Checks for programs.
 AC_PROG_CXX
@@ -252 +224 @@
 AC_CHECK_FUNCS([memset putenv strchr strtol])
 
+#==============================================================================
 AC_CONFIG_FILES([
         Makefile
-        src/driver/Makefile
+        driver/Makefile
         src/Makefile
-        src/benchmark/Makefile
-        src/examples/Makefile
-        src/tests/Makefile
-        src/tests/preempt_longrun/Makefile
-        src/prelude/Makefile
-        src/libcfa/Makefile
+        benchmark/Makefile
+        tests/Makefile
+        tests/preempt_longrun/Makefile
         tools/Makefile
         tools/prettyprinter/Makefile
         ])
 
-AC_CONFIG_LINKS([src/tests/test.py:src/tests/test.py])
-
-AC_OUTPUT(src/tests/config.py)
-
-AM_COND_IF([BUILD_RELEASE],
-        [AM_COND_IF([BUILD_DEBUG],
-                [AC_MSG_NOTICE(Building libcfa for target: release & debug)],
-                [AC_MSG_NOTICE(Building libcfa for target: release)])],
-        [AM_COND_IF([BUILD_DEBUG],
-                [AC_MSG_NOTICE(Building libcfa for target: debug)],
-                [AC_MSG_NOTICE(Running cfa without libcfa)])])
+AC_CONFIG_LINKS([tests/test.py:tests/test.py])
+
+AC_OUTPUT(tests/config.py)
 
 # Final text