dbus ChangeLog,1.1099,1.1100 configure.in,1.173,1.174

[John Palmieri]

Update of /cvs/dbus/dbus
In directory kemper:/tmp/cvs-serv14504

Modified Files:
	ChangeLog configure.in 
Log Message:
* configure.in: Fix for OS-X compile time endian issues (patch from
  Benjamin Reed <ranger at befunk dot com>)


Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.1099
retrieving revision 1.1100
diff -u -d -r1.1099 -r1.1100
--- ChangeLog	5 Sep 2006 21:51:58 -0000	1.1099
+++ ChangeLog	5 Sep 2006 21:56:20 -0000	1.1100
@@ -1,5 +1,10 @@
 2006-09-05  John (J5) Palmieri  <johnp at redhat.com>
 
+	* configure.in: Fix for OS-X compile time endian issues (patch from
+	Benjamin Reed <ranger at befunk dot com>)
+
+2006-09-05  John (J5) Palmieri  <johnp at redhat.com>
+
 	* configure.in: Check for no-common compiler flag (OS-X fix from
 	Benjamin Reed <ranger at befunk dot com>)
 

Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- configure.in	5 Sep 2006 21:51:58 -0000	1.173
+++ configure.in	5 Sep 2006 21:56:20 -0000	1.174
@@ -343,8 +343,21 @@
 AC_SUBST(DBUS_INT16_TYPE)
 
 ## byte order
-AC_C_BIGENDIAN
-
+case $host_os in
+	darwin*)
+		# check at compile-time, so that it is possible to build universal
+		# (with multiple architectures at once on the compile line)
+		AH_VERBATIM([WORDS_BIGENDIAN_DARWIN], [
+			/* Use the compiler-provided endianness defines to allow universal compiling. */
+			#if defined(__BIG_ENDIAN__)
+			#define WORDS_BIGENDIAN 1
+			#endif
+		])
+		;;
+	*)
+		AC_C_BIGENDIAN
+		;;
+esac
 
 dnl **********************************
 dnl *** va_copy checks (from GLib) ***
@@ -433,8 +446,22 @@
         AC_MSG_RESULT([no])
         ;;
       i?86)
-        AC_MSG_RESULT([i486])
-        AC_DEFINE_UNQUOTED(DBUS_USE_ATOMIC_INT_486, 1, [Use atomic integer implementation for 486])
+        case $host_os in
+          darwin*)
+            AC_MSG_RESULT([darwin])
+            # check at compile-time, so that it is possible to build universal
+            # (with multiple architectures at once on the compile line)
+            AH_VERBATIM([DBUS_USE_ATOMIC_INT_486_DARWIN], [
+              #if (defined(__i386__) || defined(__x86_64__))
+              # define DBUS_USE_ATOMIC_INT_486 1
+              #endif
+            ])
+            ;;
+          *)
+            AC_MSG_RESULT([i486])
+            AC_DEFINE_UNQUOTED(DBUS_USE_ATOMIC_INT_486, 1, [Use atomic integer implementation for 486])
+            ;;
+        esac
         have_atomic_inc=yes
         ;;
       *)
@@ -444,7 +471,18 @@
   fi
 fi
 if test x$have_atomic_inc = xyes ; then
-  AC_DEFINE_UNQUOTED(DBUS_HAVE_ATOMIC_INT, 1, [Some atomic integer implementation present])
+  case $host_os in
+    darwin*)
+      AH_VERBATIM([DBUS_HAVE_ATOMIC_INT_DARWIN], [
+        #if (defined(__i386__) || defined(__x86_64__))
+        # define DBUS_HAVE_ATOMIC_INT 1
+        #endif
+      ])
+      ;;
+    *)
+      AC_DEFINE_UNQUOTED(DBUS_HAVE_ATOMIC_INT, 1, [Some atomic integer implementation present])
+      ;;
+  esac
 fi
 
 #### Various functions