kwo pushed a commit to branch master.
http://git.enlightenment.org/legacy/imlib2.git/commit/?id=a4dd5bcdc2b7e40b8e18843422ce2ada931c792c
commit a4dd5bcdc2b7e40b8e18843422ce2ada931c792c
Author: Kim Woelders <k...@woelders.dk>
Date: Sat Oct 18 20:16:24 2014 +0200
Autofoo macro cleanups (ac_->ec_).
- Changes names AC_/ac_ to EC_/ec_ to stay out of autoconf namespace.
---
configure.ac | 2 +-
m4/ac_warnflags.m4 | 31 -------------------------------
m4/ec_warnflags.m4 | 31 +++++++++++++++++++++++++++++++
src/lib/Makefile.am | 2 +-
src/modules/filters/Makefile.am | 2 +-
src/modules/loaders/Makefile.am | 2 +-
6 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8fa6534..9626bf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -393,7 +393,7 @@ AM_CONDITIONAL(BUILD_ID3_LOADER, test "$id3_ok" = yes)
AC_SUBST(ID3LIBS)
-AC_C_WARNFLAGS()
+EC_C_WARNINGS()
if test "x$enable_visibility_hiding" = xyes ; then
CPPFLAGS="$CPPFLAGS -fvisibility=hidden"
diff --git a/m4/ac_warnflags.m4 b/m4/ac_warnflags.m4
deleted file mode 100644
index 84128c0..0000000
--- a/m4/ac_warnflags.m4
+++ /dev/null
@@ -1,31 +0,0 @@
-dnl Copyright (C) 2008 Kim Woelders
-dnl This code is public domain and can be freely used or copied.
-
-dnl Macro to set compiler warning flags
-
-dnl Provides configure argument --enable-werror to stop compilation on warnings
-
-dnl Usage: AC_C_WARNFLAGS([LANG])
-dnl Set LANG to 'cpp' when compiling for C++
-
-AC_DEFUN([AC_C_WARNFLAGS], [
- define(ac_c_compile_cpp, ifelse([$1], [cpp], [yes], [no]))
-
- AC_ARG_ENABLE(werror,
- [ --enable-werror treat compiler warnings as errors
@<:@default=no@:>@],,
- enable_werror=no)
-
- if test "x$GCC" = "xyes"; then
- CWARNFLAGS="-W -Wall -Waggregate-return -Wcast-align -Wpointer-arith
-Wshadow -Wwrite-strings"
-dnl # ignore some warnings for now...
- CWARNFLAGS="$CWARNFLAGS -Wno-unused-parameter"
- ifelse(ac_c_compile_cpp, no, [
- CWARNFLAGS="$CWARNFLAGS -Wmissing-prototypes -Wmissing-declarations
-Wstrict-prototypes"
- ],)
-
- if test "x$enable_werror" = "xyes"; then
- CWARNFLAGS="$CWARNFLAGS -Werror"
- fi
- fi
- AC_SUBST(CWARNFLAGS)
-])
diff --git a/m4/ec_warnflags.m4 b/m4/ec_warnflags.m4
new file mode 100644
index 0000000..74a03bc
--- /dev/null
+++ b/m4/ec_warnflags.m4
@@ -0,0 +1,31 @@
+dnl Copyright (C) 2008 Kim Woelders
+dnl This code is public domain and can be freely used or copied.
+
+dnl Macro to set compiler warning flags in CFLAGS_WARNINGS
+
+dnl Provides configure argument --enable-werror to stop compilation on warnings
+
+dnl Usage: EC_C_WARNINGS([LANG])
+dnl Set LANG to 'cpp' when compiling for C++
+
+AC_DEFUN([EC_C_WARNINGS], [
+ define(ec_c_compile_cpp, ifelse([$1], [cpp], [yes], [no]))
+
+ AC_ARG_ENABLE(werror,
+ [ --enable-werror treat compiler warnings as errors
@<:@default=no@:>@],,
+ enable_werror=no)
+
+ if test "x$GCC" = "xyes"; then
+ CFLAGS_WARNINGS="-W -Wall -Waggregate-return -Wcast-align -Wpointer-arith
-Wshadow -Wwrite-strings"
+dnl # ignore some warnings for now...
+ CFLAGS_WARNINGS="$CFLAGS_WARNINGS -Wno-unused-parameter"
+ ifelse(ec_c_compile_cpp, no, [
+ CFLAGS_WARNINGS="$CFLAGS_WARNINGS -Wmissing-prototypes
-Wmissing-declarations -Wstrict-prototypes"
+ ],)
+
+ if test "x$enable_werror" = "xyes"; then
+ CFLAGS_WARNINGS="$CFLAGS_WARNINGS -Werror"
+ fi
+ fi
+ AC_SUBST(CFLAGS_WARNINGS)
+])
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 93c708f..82e3c0d 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = 1.4 foreign
MAINTAINERCLEANFILES = Makefile.in
-AM_CFLAGS = $(CWARNFLAGS)
+AM_CFLAGS = $(CFLAGS_WARNINGS)
AM_CPPFLAGS = -DPACKAGE_LIB_DIR=\"$(libdir)\" \
-I$(top_builddir) \
$(X_CFLAGS) \
diff --git a/src/modules/filters/Makefile.am b/src/modules/filters/Makefile.am
index 6f6edd4..cb103a3 100644
--- a/src/modules/filters/Makefile.am
+++ b/src/modules/filters/Makefile.am
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
-AM_CFLAGS = $(CWARNFLAGS)
+AM_CFLAGS = $(CFLAGS_WARNINGS)
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src/lib
pkgdir = $(libdir)/imlib2/filters
diff --git a/src/modules/loaders/Makefile.am b/src/modules/loaders/Makefile.am
index ee17801..b49a7ac 100644
--- a/src/modules/loaders/Makefile.am
+++ b/src/modules/loaders/Makefile.am
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
-AM_CFLAGS = $(CWARNFLAGS)
+AM_CFLAGS = $(CFLAGS_WARNINGS)
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src/lib
pkgdir = $(libdir)/imlib2/loaders
--
