Changes in configure.ac [375a068:65c61ec]

File:

• configure.ac (modified) (4 diffs)

configure.ac

@@ -53 +53 @@
 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]))
-
-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"])
-
 if test "x$prefix" = "xNONE"; then
         cfa_prefix=${ac_default_prefix}
@@ -148 +88 @@
 AC_SUBST(CFA_FLAGS, ${CFAFLAGS})
 
-AC_CANONICAL_HOST
-AC_SUBST([MACHINE_TYPE],[$host_cpu])
-
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
-AM_PROG_AS
 AM_PROG_CC_C_O  # deprecated
 # These are often not installed and people miss seeing the "no", so stop the configure.
@@ -192 +128 @@
         src/examples/Makefile
         src/tests/Makefile
-        src/prelude/Makefile
         src/libcfa/Makefile
         ])
@@ -198 +133 @@
 AC_OUTPUT
 
-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)])])
-
 # Final text
 AC_MSG_RESULT(Cforall configuraton completed. Type "make -j 8 install".)