diff options
| author | Nick Schermer <nick@xfce.org> | 2013-01-06 12:09:49 +0100 |
|---|---|---|
| committer | Nick Schermer <nick@xfce.org> | 2013-01-06 12:09:49 +0100 |
| commit | d13ceda50e099d1741f3fd1b67b76b4fca4aa5ae (patch) | |
| tree | be9e9249889c20a2fb9f8f422d77f22a3ce26f48 | |
| parent | a809811ec15a6c3c20f9b02464ea73d7b9c4c8a1 (diff) | |
| download | xfce4-dev-tools-d13ceda50e099d1741f3fd1b67b76b4fca4aa5ae.tar.gz | |
Correctly quote macro.
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac.in | 3 | ||||
| -rw-r--r-- | m4macros/xdt-features.m4 | 6 | ||||
| -rw-r--r-- | xdt-csource/Makefile.am | 2 |
4 files changed, 6 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index c04c429..7de5b39 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,11 +11,6 @@ SUBDIRS = \ scripts \ xdt-csource -AUTOMAKE_OPTIONS = \ - 1.8 \ - dist-bzip2 \ - no-dist-gzip - distclean-local: rm -rf *.cache *~ diff --git a/configure.ac.in b/configure.ac.in index 22c3cc5..73be5b4 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -41,8 +41,9 @@ AC_SUBST([VERSION_REVISION]) dnl *************************** dnl *** Initialize automake *** dnl *************************** -AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) +AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip]) AM_MAINTAINER_MODE() +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl ******************************** dnl *** Check for basic programs *** diff --git a/m4macros/xdt-features.m4 b/m4macros/xdt-features.m4 index c0d65ac..0125fcc 100644 --- a/m4macros/xdt-features.m4 +++ b/m4macros/xdt-features.m4 @@ -42,7 +42,7 @@ AC_DEFUN([XDT_SUPPORTED_FLAGS], AC_MSG_CHECKING([if $CC supports $flag]) saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - AC_COMPILE_IFELSE(AC_LANG_SOURCE([ ]), [flag_supported=yes], [flag_supported=no]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ])], [flag_supported=yes], [flag_supported=no]) CFLAGS="$saved_CFLAGS" AC_MSG_RESULT([$flag_supported]) @@ -146,7 +146,7 @@ AC_DEFUN([XDT_FEATURE_VISIBILITY], saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $xdt_vis_test_cflags" 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); @@ -159,7 +159,7 @@ AC_DEFUN([XDT_FEATURE_VISIBILITY], test_hidden (); return 0; } - ]), + ])], [ have_gnuc_visibility=yes AC_MSG_RESULT([yes]) diff --git a/xdt-csource/Makefile.am b/xdt-csource/Makefile.am index 5423c87..5096640 100644 --- a/xdt-csource/Makefile.am +++ b/xdt-csource/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"xdt-csource\" |