X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_platform.m4;h=2372e0d6556c303547c7d40ec34e1e4ccb4489b1;hb=2e52a0a4fe2f17ea724a97409047874c341317ab;hp=d355e1f3f1fda201f7b72be0afce53f12effdf36;hpb=2cc368abe76d52e8c26f883eaa0090f98fcc0a3c;p=awesomized%2Flibmemcached

diff --git a/m4/pandora_platform.m4 b/m4/pandora_platform.m4
index d355e1f3..2372e0d6 100644
--- a/m4/pandora_platform.m4
+++ b/m4/pandora_platform.m4
@@ -10,6 +10,8 @@ dnl
 dnl From Monty Taylor
 
 AC_DEFUN([PANDORA_PLATFORM],[
+         AC_REQUIRE([AC_CANONICAL_HOST])
+         AC_REQUIRE([AC_CANONICAL_TARGET])
 
   dnl Canonicalize the configuration name.
 
@@ -45,13 +47,11 @@ AC_DEFUN([PANDORA_PLATFORM],[
 
   PANDORA_OPTIMIZE_BITFIELD=1
 
-  TARGET_LINUX="false"
   case "$target_os" in
     *linux*)
     TARGET_LINUX="true"
     AC_SUBST(TARGET_LINUX)
     AC_DEFINE([TARGET_OS_LINUX], [1], [Whether we build for Linux])
-    AM_CONDITIONAL(TARGET_LINUX, [test "x${TARGET_LINUX}" = "xtrue"])
       ;;
     *darwin*)
       TARGET_OSX="true"
@@ -91,9 +91,12 @@ AC_DEFUN([PANDORA_PLATFORM],[
       ;;
   esac
   AM_CONDITIONAL(BUILD_WIN32, [test "x${TARGET_WINDOWS}" = "xtrue"])
+  AM_CONDITIONAL(TARGET_OSX, [test "x${TARGET_OSX}" = "xtrue"])
+  AM_CONDITIONAL(TARGET_LINUX, [test "x${TARGET_LINUX}" = "xtrue"])
 
   AC_SUBST(PANDORA_OPTIMIZE_BITFIELD)
 
+  AC_CHECK_DECL([__clang__], [CLANG="yes"], [CLANG="no"])
   AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
   AC_CHECK_DECL([__ICC], [INTELCC="yes"], [INTELCC="no"])