diff options
| author | Diego E. 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2009-01-04 01:16:50 +0100 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-01-06 17:43:42 -0500 |
| commit | 9928648f16afd45078fb93116b6529a7dcca80dc (patch) | |
| tree | c1ac16a13b5412b6c0ddbe394c0f4e694dabb08b | |
| parent | eebad8668d2b56a4b9a269f65513592eb1882b68 (diff) | |
| download | dbus-9928648f16afd45078fb93116b6529a7dcca80dc.tar.gz | |
Fix cross-compiling with autotools.
The AC_CANONICAL_TARGET macro and the $target_os variables are used for the
target of compilers and other code-generation tools, and should not be used
during cross-compile of generic software. Replace them with
AC_CANONICAL_HOST and $host_os instead, as they should have been from the
start.
For a breakdown of what host, build and target machines are, please see
http://blog.flameeyes.eu/s/canonical-target .
| -rw-r--r-- | configure.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in index b649f5ef..f429ce6f 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ m4_define([dbus_version], [dbus_major_version.dbus_minor_version.dbus_micro_version]) AC_INIT(dbus, [dbus_version]) -AC_CANONICAL_TARGET +AC_CANONICAL_HOST AM_INIT_AUTOMAKE([1.9 tar-ustar]) AM_CONFIG_HEADER(config.h) @@ -357,7 +357,7 @@ AC_MSG_RESULT($ac_gcsections) # Add -D_POSIX_PTHREAD_SEMANTICS if on Solaris # -case $target_os in +case $host_os in solaris*) CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS" ;; esac @@ -993,7 +993,7 @@ AM_CONDITIONAL(DBUS_BUS_ENABLE_INOTIFY, test x$have_inotify = xyes) if test x$enable_dnotify = xno ; then have_dnotify=no; else - if test x$have_inotify = xno -a x$target_os = xlinux-gnu -o x$target_os = xlinux; then + if test x$have_inotify = xno -a x$host_os = xlinux-gnu -o x$host_os = xlinux; then have_dnotify=yes; else have_dnotify=no; @@ -1031,7 +1031,7 @@ dnl console owner file if test x$enable_console_owner_file = xno ; then have_console_owner_file=no; else - case $target_os in + case $host_os in solaris*) have_console_owner_file=yes; AC_DEFINE(HAVE_CONSOLE_OWNER_FILE,1,[Have console owner file]) |