[tor-commits] [tlsdate/master] Fix Linux builds

[ioerror@xxxxxxxxxxxxxx]

commit d691835f2225d1156826634507e654eb96aa3825
Author: Jacob Appelbaum <jacob@xxxxxxxxxxxxx>
Date:   Wed Apr 24 19:32:09 2013 -0700

    Fix Linux builds
---
 configure.ac      |   16 ++++++++--------
 m4/ax_platform.m4 |    4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 56f7e27..182bf08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,6 +273,14 @@ case "$host" in
             [""|yes|no], [UNPRIV_GROUP="nogroup"],
             [*], [UNPRIV_GROUP=$with_unpriv_group])
     AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group])
+    case "$host" in
+      *-linux-androideabi)
+        dnl This is for Android NDK as it is a special case of linux
+        AC_DEFINE(HAVE_ANDROID,1, [Defined if we are to build for an Android system])
+        AC_SUBST(HAVE_ANDROID, [1])
+        HAVE_ANDROID="yes"
+        ;;
+    esac
     ;;
   *-cygwin*)
     dnl This is for Cygwin
@@ -327,14 +335,6 @@ case "$host" in
     AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group])
     LDFLAGS="$LDFLAGS -lbsd"
     CC="/boot/develop/abi/x86/gcc4/tools/gcc-4.6.3-haiku-121101/bin/gcc"
-    case "$host" in
-      *-linux-androideabi)
-        dnl This is for Android NDK as it is a special case of linux
-        AC_DEFINE(HAVE_ANDROID,1, [Defined if we are to build for an Android system])
-        AC_SUBST(HAVE_ANDROID, [1])
-        HAVE_ANDROID="yes"
-        ;;
-    esac
     ;;
 esac
 
diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4
index 76031d4..2d4285c 100644
--- a/m4/ax_platform.m4
+++ b/m4/ax_platform.m4
@@ -73,10 +73,10 @@
         AC_DEFINE([TARGET_OS_BSD],[1],[Whether we are building for some other *BSD])],
         [*solaris*],[AC_DEFINE([TARGET_OS_SOLARIS],[1],[Whether we are building for Solaris])],
         [*darwin*],
-        [TARGET_OSX="true"
+        [TARGET_OS_OSX="true"
         AC_DEFINE([TARGET_OS_OSX],[1],[Whether we build for OSX])],
         [*linux*],
-        [TARGET_LINUX="true"
+        [TARGET_OS_LINUX="true"
         AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])])
 
   AM_CONDITIONAL([TARGET_WIN32],[test "x${TARGET_OS_WINDOWS}" = "xtrue"])



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits