From f9ea43d80fd5e0efc722a706645839079bbc4afd Mon Sep 17 00:00:00 2001 From: Romain B Date: Fri, 16 Jun 2017 14:30:11 +0200 Subject: [PATCH 1/2] Fix some autotools warnings, default debug to yes - Use AC_LANG_SOURCE with correct syntax to remove no AC_LANG_SOURCE call detected in body warning ( https://autotools.io/forwardporting/autoconf.html ) - Fix IT_PROG_INTLTOOL([0.35.0]) warning - Default to enable-debug=yes instead of full to avoid deprecation errors in make distcheck --- configure.ac.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 8d5e135..750c265 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -32,7 +32,7 @@ dnl # YOU ARE DOING. dnl ******************************************** dnl *** Full debug support for GIT snapshots *** dnl ******************************************** -m4_define([libxfce4util_debug_default], [ifelse(libxfce4util_version_tag(), [git], [full], [minimum])]) +m4_define([libxfce4util_debug_default], [ifelse(libxfce4util_version_tag(), [git], [yes], [minimum])]) dnl *************************** dnl *** Initialize autoconf *** @@ -49,7 +49,7 @@ dnl *************************** LIBXFCE4UTIL_VERSION=libxfce4util_version() AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip]) AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIRS([m4]) AM_MAINTAINER_MODE() m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -89,7 +89,7 @@ dnl ******************************** AC_PROG_CC() AM_PROG_CC_C_O() AC_PROG_INSTALL() -AC_PROG_INTLTOOL([0.31], [no-xml]) +IT_PROG_INTLTOOL([0.35.0]) AC_CHECK_PROGS([PERL], [perl5 perl]) dnl ************************** @@ -143,7 +143,7 @@ AC_MSG_CHECKING([whether putenv() implementation is broken]) AC_ARG_WITH([broken-putenv], [ --with-broken-putenv=[[auto/yes/no]] broken putenv(3) [default=auto]]) if test x"$with_broken_putenv" != x"yes" -a x"$with_broken_putenv" != x"no"; then - AC_RUN_IFELSE([ + AC_RUN_IFELSE([AC_LANG_SOURCE( #include #include int main(int argc, char *argv[]) @@ -153,7 +153,7 @@ if test x"$with_broken_putenv" != x"yes" -a x"$with_broken_putenv" != x"no"; the putenv(buffer); strcpy(buffer, "foo=rab"); return(strcmp(getenv("foo"), "bar") == 0 ? 0 : 1); - }], + })], [with_broken_putenv=no], [with_broken_putenv=yes], [with_broken_putenv=cross]) @@ -187,7 +187,7 @@ if test x"$enable_visibility" != x"no"; then save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Werror" AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute]) - AC_COMPILE_IFELSE(AC_LANG_SOURCE( + AC_COMPILE_IFELSE([AC_LANG_SOURCE( [ void test_default (void); void test_hidden (void); @@ -196,7 +196,7 @@ if test x"$enable_visibility" != x"no"; then void __attribute__ ((visibility("hidden"))) test_hidden (void) {} int main (int argc, char **argv) { test_default (); test_hidden (); return 0; } - ]), + ])], [ have_gnuc_visibility=yes AC_MSG_RESULT([yes]) -- 2.13.1