diff options
| author | Thiago Macieira <thiago@kde.org> | 2009-05-13 15:52:26 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2009-05-13 15:52:26 +0200 |
| commit | f322112b84bef5f6e7c38c08e99a28c4f576c897 (patch) | |
| tree | 83dd4e6a0f3a78d177ee62c187d56bdad6ece9ac | |
| parent | e21d06cba4cb5c5e3e201a54336e9df3c24a1c21 (diff) | |
| parent | 6eddb6e1229b617ad44c8d61107983229dc7d589 (diff) | |
Merge branch 'dbus-1.2'
| -rw-r--r-- | configure.in | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 6992487b..9e047eae 100644 --- a/configure.in +++ b/configure.in @@ -284,7 +284,10 @@ if test "x$GCC" = "xyes"; then esac case " $CFLAGS " in *[\ \ ]-Wno-pointer-sign[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -Wno-pointer-sign" ;; + *) if cc_supports_flag -Wno-pointer-sign; then + CFLAGS="$CFLAGS -Wno-pointer-sign" + fi + ;; esac # http://bugs.freedesktop.org/show_bug.cgi?id=19195 @@ -811,8 +814,9 @@ AC_CHECK_FUNCS(getpeerucred getpeereid) #### Abstract sockets -if ! test x$enable_abstract_sockets = xno; then +if test x$enable_abstract_sockets = xauto; then AC_LANG_PUSH(C) +warn_on_xcompile=no AC_CACHE_CHECK([abstract socket namespace], ac_cv_have_abstract_sockets, [AC_RUN_IFELSE([AC_LANG_PROGRAM( @@ -852,8 +856,15 @@ AC_CACHE_CHECK([abstract socket namespace], exit (0); ]])], [ac_cv_have_abstract_sockets=yes], - [ac_cv_have_abstract_sockets=no] + [ac_cv_have_abstract_sockets=no], + [ + ac_cv_have_abstract_sockets=no + warn_on_xcompile=yes + ] )]) +if test x$warn_on_xcompile = xyes ; then + AC_MSG_WARN([Cannot check for abstract sockets when cross-compiling, please use --enable-abstract-sockets]) +fi AC_LANG_POP(C) fi |