projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update with job builder.
[awesomized/libmemcached]
/
m4
/
pandora_platform.m4
diff --git
a/m4/pandora_platform.m4
b/m4/pandora_platform.m4
index c8e31197e9c44abc9d01acf8771b16bb7badbe08..2372e0d6556c303547c7d40ec34e1e4ccb4489b1 100644
(file)
--- a/
m4/pandora_platform.m4
+++ b/
m4/pandora_platform.m4
@@
-10,6
+10,8
@@
dnl
dnl From Monty Taylor
AC_DEFUN([PANDORA_PLATFORM],[
dnl From Monty Taylor
AC_DEFUN([PANDORA_PLATFORM],[
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_CANONICAL_TARGET])
dnl Canonicalize the configuration name.
dnl Canonicalize the configuration name.
@@
-50,7
+52,6
@@
AC_DEFUN([PANDORA_PLATFORM],[
TARGET_LINUX="true"
AC_SUBST(TARGET_LINUX)
AC_DEFINE([TARGET_OS_LINUX], [1], [Whether we build for 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"
;;
*darwin*)
TARGET_OSX="true"
@@
-90,9
+91,12
@@
AC_DEFUN([PANDORA_PLATFORM],[
;;
esac
AM_CONDITIONAL(BUILD_WIN32, [test "x${TARGET_WINDOWS}" = "xtrue"])
;;
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_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"])
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
AC_CHECK_DECL([__ICC], [INTELCC="yes"], [INTELCC="no"])