projects
/
awesomized
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
a60c98b
)
Fix AM_CONDITIONAL for non-linux
author
Brian Aker
<brian@tangent.org>
Mon, 26 Sep 2011 21:41:48 +0000
(14:41 -0700)
committer
Brian Aker
<brian@tangent.org>
Mon, 26 Sep 2011 21:41:48 +0000
(14:41 -0700)
m4/pandora_platform.m4
patch
|
blob
|
history
diff --git
a/m4/pandora_platform.m4
b/m4/pandora_platform.m4
index d355e1f3f1fda201f7b72be0afce53f12effdf36..4d51d2b5d1865a203af87bdd0776a255b6831aeb 100644
(file)
--- a/
m4/pandora_platform.m4
+++ b/
m4/pandora_platform.m4
@@
-45,13
+45,11
@@
AC_DEFUN([PANDORA_PLATFORM],[
PANDORA_OPTIMIZE_BITFIELD=1
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])
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"
;;
*darwin*)
TARGET_OSX="true"
@@
-90,6
+88,7
@@
AC_DEFUN([PANDORA_PLATFORM],[
AM_CFLAGS="${AM_CFLAGS} -I\${top_srcdir}/win32/mingw -I\${top_builddir}/win32/mingw -I\${top_srcdir}/win32 -I\${top_builddir}/win32"
;;
esac
AM_CFLAGS="${AM_CFLAGS} -I\${top_srcdir}/win32/mingw -I\${top_builddir}/win32/mingw -I\${top_srcdir}/win32 -I\${top_builddir}/win32"
;;
esac
+ AM_CONDITIONAL(TARGET_LINUX, [test "x${TARGET_LINUX}" = "xtrue"])
AM_CONDITIONAL(BUILD_WIN32, [test "x${TARGET_WINDOWS}" = "xtrue"])
AC_SUBST(PANDORA_OPTIMIZE_BITFIELD)
AM_CONDITIONAL(BUILD_WIN32, [test "x${TARGET_WINDOWS}" = "xtrue"])
AC_SUBST(PANDORA_OPTIMIZE_BITFIELD)