Updating branch refs/heads/master to 3a54b0dd14a2fa1cda1ce81135bb79493d4241bf (commit) from e8244292fa3d24314f54883fa1b97c3e2e85cd43 (commit)
commit 3a54b0dd14a2fa1cda1ce81135bb79493d4241bf Author: Nick Schermer <n...@xfce.org> Date: Tue Oct 6 17:05:33 2009 +0200 Use new xdt-autogen macros. autogen.sh | 2 +- configure.in.in | 98 +----------------------------------------------------- 2 files changed, 3 insertions(+), 97 deletions(-) diff --git a/autogen.sh b/autogen.sh index bbe8b47..5aef7d9 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,7 +7,7 @@ # and Brian Tarricone <br...@tarricone.org>. # -export XDT_AUTOGEN_REQUIRED_VERSION="4.7.0" +export XDT_AUTOGEN_REQUIRED_VERSION="4.7.2" (type xdt-autogen) >/dev/null 2>&1 || { cat >&2 <<EOF diff --git a/configure.in.in b/configure.in.in index 92b93e5..f31b9f7 100644 --- a/configure.in.in +++ b/configure.in.in @@ -129,106 +129,12 @@ AM_CONDITIONAL([ENABLE_XML2PO], [test x"$enable_xml2po" = x"yes"]) dnl *********************************** dnl *** Check for debugging support *** dnl *********************************** -AC_ARG_ENABLE([debug], -AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@], [Turn on debugging @<:@default=terminal_debug_default@:>@]), - [], [enable_debug=terminal_debug_default]) -AC_MSG_CHECKING([whether to enable debugging support]) -if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then - dnl Print the result - AC_MSG_RESULT([$enable_debug]) - - dnl Check whether the compiler accepts the -Werror - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror" - AC_MSG_CHECKING([whether $CC accepts -Werror]) - AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ - AC_MSG_RESULT([yes]) - PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Werror" - ], [ - AC_MSG_RESULT([no]) - - dnl Check whether the compiler accepts the -errwarn=%all - CFLAGS="$save_CFLAGS -errwarn=%all" - AC_MSG_CHECKING([whether $CC accepts -errwarn=%all]) - AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ - AC_MSG_RESULT([yes]) - PLATFORM_CFLAGS="$PLATFORM_CFLAGS -errwarn=%all" - ], [ - AC_MSG_RESULT([no]) - ]) - ]) - CFLAGS="$save_CFLAGS" - - dnl Check whether the compiler accepts the -Wall - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Wall" - AC_MSG_CHECKING([whether $CC accepts -Wall]) - AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ - AC_MSG_RESULT([yes]) - PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Wall" - ], [ - AC_MSG_RESULT([no]) - ]) - CFLAGS="$save_CFLAGS" - - dnl Check whether the compiler accepts the -fno-strict-aliasing - dnl switch, as certain packages - like Glib - still do not work - dnl properly with newer compilers. - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fno-strict-aliasing" - AC_MSG_CHECKING([whether $CC accepts -fno-strict-aliasing]) - AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ - AC_MSG_RESULT([yes]) - PLATFORM_CFLAGS="$PLATFORM_CFLAGS -fno-strict-aliasing" - ], [ - AC_MSG_RESULT([no]) - ]) - CFLAGS="$save_CFLAGS" - - dnl Paranoia for --enable-debug=full - if test x"$enable_debug" = x"full"; then - PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3" - PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG" - fi -else - dnl Print the result - AC_MSG_RESULT([$enable_debug]) - - dnl Disable debugging (release build) - PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DNDEBUG" - - dnl Disable object cast checks - PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS" - - dnl Disable all checks for --enable-debug=no - if test x"$enable_debug" = x"no"; then - PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" - fi -fi +XDT_FEATURE_DEBUG([terminal_debug_default]) dnl ************************************** dnl *** Check for linker optimizations *** dnl ************************************** -AC_MSG_CHECKING([whether $LD accepts --as-needed]) -case `$LD --as-needed -v 2>&1 </dev/null` in -*GNU* | *'with BFD'*) - LDFLAGS="$LDFLAGS -Wl,--as-needed" - AC_MSG_RESULT([yes]) - ;; -*) - AC_MSG_RESULT([no]) - ;; -esac -AC_MSG_CHECKING([whether $LD accepts -O1]) -case `$LD -O1 -v 2>&1 </dev/null` in -*GNU* | *'with BFD'*) - PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -Wl,-O1" - AC_MSG_RESULT([yes]) - ;; -*) - AC_MSG_RESULT([no]) - ;; -esac +XDT_FEATURE_LINKER_OPTS() dnl ********************************* dnl *** Substitute platform flags *** _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits