oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

configure.ac: always check for C++ compiler

Browse Source 
Currently, only the sidplay decoder plugin requires C++, and in all
other cases, MPD could build well without a C++ compiler.
Unfortunately, autoconf/automake are confused when we have a
conditional AC_PROG_CXX check.  We could add lots of workarounds for
individual problems, but let's just always require a C++ compiler, and
forget about this autotools limitation.
This commit is contained in:
Max Kellermann
2009-02-12 18:14:14 +01:00
parent 321eb1077a
commit f6c8dd4961
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@@ -13,6 +13,8 @@ dnl programs
dnl dnl
AC_PROG_CC_C99 AC_PROG_CC_C99
AC_PROG_CXX
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
@@ -1020,17 +1022,12 @@ fi
AM_CONDITIONAL(HAVE_FFMPEG, test x$enable_ffmpeg = xyes) AM_CONDITIONAL(HAVE_FFMPEG, test x$enable_ffmpeg = xyes)
if test x$enable_sidplay = xyes; then if test x$enable_sidplay = xyes; then
# libsidplay2 exposes a C++ interface
AC_PROG_CXX
# we have no test yet.. we're not using pkg-config here # we have no test yet.. we're not using pkg-config here
# because libsidplay2's .pc file requires libtool # because libsidplay2's .pc file requires libtool
AC_SUBST(SIDPLAY_LIBS,"-lsidplay2 -lresid-builder") AC_SUBST(SIDPLAY_LIBS,"-lsidplay2 -lresid-builder")
AC_SUBST(SIDPLAY_CFLAGS,) AC_SUBST(SIDPLAY_CFLAGS,)
AC_DEFINE(ENABLE_SIDPLAY, 1, [Define for libsidplay2 support]) AC_DEFINE(ENABLE_SIDPLAY, 1, [Define for libsidplay2 support])
else
AM_CONDITIONAL(am__fastdepCXX, false)
fi fi
AM_CONDITIONAL(ENABLE_SIDPLAY, test x$enable_sidplay = xyes) AM_CONDITIONAL(ENABLE_SIDPLAY, test x$enable_sidplay = xyes)