X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_platform.m4;h=ba46a5402dd0860bb7a9579729bebf202c49f321;hb=398f48445cacf12679248142f0c86d3a0d6caab6;hp=c1403b8c2e58b55d4e9ef7e6200bda2b54b37736;hpb=f1ed1535de64141a6a911cc18a9109f0f9c55c80;p=awesomized%2Flibmemcached

diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4
index c1403b8c..ba46a540 100644
--- a/m4/ax_platform.m4
+++ b/m4/ax_platform.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_count_cpus.html
+#       http://
 # ===========================================================================
 #
 # SYNOPSIS
@@ -12,31 +12,26 @@
 #
 # LICENSE
 #
-#   Copyright (c) 2012 Brian Aker <brian@tangent.org>
+#   Copyright (c) 2012-2013 Brian Aker <brian@tangent.org>
 #
 #   Copying and distribution of this file, with or without modification, are
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 1
-  AC_DEFUN([AX_PLATFORM],[
-      AC_REQUIRE([AC_CANONICAL_HOST])
-      AC_REQUIRE([AC_CANONICAL_TARGET])
-
-      AC_DEFINE_UNQUOTED([HOST_VENDOR], ["$host_vendor"],[Vendor of Build System])
-      AC_DEFINE_UNQUOTED([HOST_OS], ["$host_os"], [OS of Build System])
-      AC_DEFINE_UNQUOTED([HOST_CPU], ["$host_cpu"], [CPU of Build System])
+#serial 4
+#
+  AC_DEFUN([AX_PLATFORM],
+      [AC_REQUIRE([AC_CANONICAL_HOST])
 
-      AC_DEFINE_UNQUOTED([TARGET_VENDOR], ["$target_vendor"],[Vendor of Target System])
-      AC_DEFINE_UNQUOTED([TARGET_OS], ["$target_os"], [OS of Target System])
-      AC_DEFINE_UNQUOTED([TARGET_CPU], ["$target_cpu"], [CPU of Target System])
+      AC_DEFINE_UNQUOTED([HOST_VENDOR],["$host_vendor"],[Vendor of Build System])
+      AC_DEFINE_UNQUOTED([HOST_OS],["$host_os"], [OS of Build System])
+      AC_DEFINE_UNQUOTED([HOST_CPU],["$host_cpu"], [CPU of Build System])
 
-      AS_CASE([$target_os],[
-        *mingw32*],[
-        AC_DEFINE([TARGET_OS_WINDOWS], [1], [Whether we are building for Windows])
-        AC_DEFINE([WINVER], [WindowsXP], [Version of Windows])
-        AC_DEFINE([_WIN32_WINNT], [0x0501], [Magical number to make things work])
+      AS_CASE([$host_os],
+        [*mingw*],
+        [HOST_WINDOWS="true"
+        AC_DEFINE([HOST_OS_WINDOWS], [1], [Whether we are building for Windows])
         AC_DEFINE([EAI_SYSTEM], [11], [Another magical number])
         AH_BOTTOM([
 #ifndef HAVE_SYS_SOCKET_H
@@ -44,23 +39,18 @@
 # define SHUT_WR SD_SEND
 # define SHUT_RDWR SD_BOTH
 #endif
-          ])
-          ],[
-        *freebsd*],[
-        AC_DEFINE([TARGET_OS_FREEBSD], [1], [Whether we are building for FreeBSD])
-        AC_DEFINE([__APPLE_CC__],[1],[Workaround for bug in FreeBSD headers])
-          ],[
-        *solaris*],[
-        AC_DEFINE([TARGET_OS_SOLARIS], [1], [Whether we are building for Solaris])
-          ],[
-        *darwin*],[
-        AC_DEFINE([TARGET_OS_OSX], [1], [Whether we build for OSX])
-          ],[
-        *linux*],[
-        AC_DEFINE([TARGET_OS_LINUX], [1], [Whether we build for Linux])
-        ])
+          ])],
+        [*freebsd*],[AC_DEFINE([HOST_OS_FREEBSD],[1],[Whether we are building for FreeBSD])
+        AC_DEFINE([__APPLE_CC__],[1],[Workaround for bug in FreeBSD headers])],
+        [*solaris*],[AC_DEFINE([HOST_OS_SOLARIS],[1],[Whether we are building for Solaris])],
+        [*darwin*],
+        [HOST_OSX="true"],
+        [*linux*],
+        [HOST_LINUX="true"
+        AC_DEFINE([HOST_OS_LINUX],[1],[Whether we build for Linux])])
 
-        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"])
-        ])
+  AM_CONDITIONAL([BUILD_WIN32],[test "x${HOST_WINDOWS}" = "xtrue"])
+  AM_CONDITIONAL([HOST_OSX],[test "x${HOST_OSX}" = "xtrue"])
+  AM_CONDITIONAL([HOST_LINUX],[test "x${HOST_LINUX}" = "xtrue"])
+  AM_CONDITIONAL([HOST_FREEBSD],[test "x${HOST_OS_FREEBSD}" = "xtrue"])
+  ])