aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ali Polatel <polatel@gmail.com> 2009-05-04 23:26:07 +0300
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-05-04 21:29:43 +0100
commit590938b54a2e0e98a51ba35191fa2ee3771f78a0 (patch)
tree8c9d5a06986ca9f0184584e5dc89c0d178482957
parentd8fcec6c72228918433510c1e72d6f9852c5ffce (diff)
downloadpaludis-590938b54a2e0e98a51ba35191fa2ee3771f78a0.tar.gz
paludis-590938b54a2e0e98a51ba35191fa2ee3771f78a0.tar.xz
Use AC_PREPROC_IF_ELSE where it makes sense
-rw-r--r--configure.ac18
1 files changed, 5 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index 91d4b98..54c85ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,7 +328,7 @@ PALUDIS_CXXFLAGS_WITHOUT_PEDANTIC=
PALUDIS_CXXFLAGS_NO_STRICT_ALIASING=
PALUDIS_CXXFLAGS_VISIBILITY=
AC_MSG_CHECKING([whether our compiler is iccy])
-AC_COMPILE_IFELSE([
+AC_PREPROC_IFELSE([
#ifndef __ICC
#error nope
#endif
@@ -418,7 +418,7 @@ fi
AC_MSG_RESULT([${cxxflags_message}])
AC_MSG_CHECKING([whether we want -Wno-non-virtual-dtor to work around compiler silliness])
-AC_COMPILE_IFELSE([
+AC_PREPROC_IFELSE([
#ifndef __GNUC__
# error not gcc
#endif
@@ -430,10 +430,6 @@ AC_COMPILE_IFELSE([
#if __GNUC_MINOR__ != 1
# error not gcc 4.1
#endif
-
-int main(int, char **)
-{
-}
],
[AC_MSG_RESULT([yes])
PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -Wno-non-virtual-dtor"
@@ -441,7 +437,7 @@ int main(int, char **)
[AC_MSG_RESULT([no])])
AC_MSG_CHECKING([whether we want -std=gnu++0x])
-AC_COMPILE_IFELSE([
+AC_PREPROC_IFELSE([
#ifndef __GNUC__
# error not gcc
#endif
@@ -453,10 +449,6 @@ AC_COMPILE_IFELSE([
#if __GNUC_MINOR__ != 4
# error not gcc 4.4
#endif
-
-int main(int, char **)
-{
-}
],
[AC_MSG_RESULT([yes])
PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -std=gnu++0x"
@@ -1133,7 +1125,7 @@ if test "x$enable_python" = "xyes" ; then
AC_SUBST([PYTHON_INSTALL_DIR])
AC_MSG_CHECKING([whether your gcc is new enough to enable Python])
- AC_COMPILE_IFELSE([
+ AC_PREPROC_IFELSE([
#ifdef __GNUC__
# if __GNUC__ < 4
# error too old
@@ -1461,7 +1453,7 @@ dnl }}}
dnl {{{ syck check
if test "x$need_syck_check" = "xyes" ; then
AC_MSG_CHECKING([for syck])
- AC_COMPILE_IFELSE([
+ AC_PREPROC_IFELSE([
#include <syck.h>
],
[AC_MSG_RESULT([yes])],