fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 12:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: fix subsequent builds when reconfigured (bgo #648451)

Browse source 
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.
This commit is contained in:
Dan Williams 2011-04-25 10:09:44 -05:00
parent 67e092abcb
commit 45c8dee74c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -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