From 45c8dee74c261b0b0a768a2cad1b151e6380ddd0 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 25 Apr 2011 10:09:44 -0500 Subject: [PATCH] build: fix subsequent builds when reconfigured (bgo #648451) AC_PROG_CXX should be unconditionally run, as it doesn't fail out if a C++ compiler is not found, which is fine. It'll check for one, but we only use it if --enable-qt=yes is given at configure time. If --enable-qt=no is set, we do not want to do anything C++ related, which is why it was conditionalized (incorrectly) the first time around. --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55c8dfa464..427029cf8b 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,9 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_INSTALL +# C++ only required if --enable-qt=yes +AC_PROG_CXX + dnl Initialize libtool LT_PREREQ([2.2]) LT_INIT([disable-static]) @@ -272,7 +275,6 @@ if (test "${enable_qt}" = "yes"); then if test x"$have_qt" = x"no"; then AC_MSG_ERROR(Qt development headers are required) fi - AC_PROG_CXX AC_SUBST(QT_CFLAGS) AC_SUBST(QT_LIBS) fi