From fa54da3aa2a55c2f1427131b51f437dfeeb09616 Mon Sep 17 00:00:00 2001
From: Andrew Stitcher <astitcher@apache.org>
Date: Wed, 24 Jul 2013 20:23:27 +0000
Subject: QPID-5014: Require "--enable-deprecated-autotools" to use autotools

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1506694 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/configure.ac | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'qpid/cpp')

diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac
index 049daf64a0..cadf63e7dc 100644
--- a/qpid/cpp/configure.ac
+++ b/qpid/cpp/configure.ac
@@ -33,6 +33,22 @@ AC_LANG([C++])
 # doesn't exist)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[],[AC_MSG_ERROR([No C++ compiler found])])
 
+AC_ARG_ENABLE(deprecated-autotools,
+ [AS_HELP_STRING([--enable-deprecated-autotools],[Allow use of deprecated autotools build])],
+ [],
+ [enableval=no])
+case "${enableval}" in
+   yes) ;;
+   *)  AC_MSG_ERROR([
+
+The autotools build system is deprecated and will be removed in the
+next release. Please use the cmake build system instead. See INSTALL
+for how to use cmake to build qpid.
+
+If you still want to use the autotools build you must add
+"--enable-deprecated-autotools" to the invocation of configure.
+]) ;;
+esac
 
 # Check for optional use of help2man
 AC_CHECK_PROG([HELP2MAN], [help2man], [help2man])
@@ -559,9 +575,9 @@ cat <<EOF
    The autotools build system is deprecated, use the cmake build system
    instead as described in the INSTALL file.
 
-   You can continue to use the autotools system for now, but it will be
-   removed in a future release. If you encounter any problems with the
-   cmake system send email to dev@qpid.apache.org.
+   You can continue to use the autotools system, but it will be removed
+   in the next release. If you encounter any problems with the cmake
+   system send email to dev@qpid.apache.org.
 
    ========================================================================
 
-- 
cgit v1.2.1