[PATCH libXaw3d 4/5] Rename XAW3D_CFLAGS to XAW3D_CPPFLAGS as it contains preprocessor options only
Gaetan Nadon
memsize at videotron.ca
Tue Aug 30 19:00:31 PDT 2011
This will also prevent confusion as it is not obtained from PKG_CHECK_MODULES
but follows its naming convention.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
configure.ac | 12 ++++++------
src/Makefile.am | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index 28decd4..db38535 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,11 +33,11 @@ PKG_CHECK_MODULES(X11, [x11 xt xmu])
AC_CHECK_HEADERS([wctype.h wchar.h widec.h])
AC_CHECK_FUNCS([iswspace])
-XAW3D_CFLAGS=
+XAW3D_CPPFLAGS=
AC_ARG_ENABLE([internationalization],
[AS_HELP_STRING([--enable-internationalization], dnl
- [enable utf8 strings])], [XAW3D_CFLAGS="${XAW3D_CFLAGS} -DXAW_INTERNATIONALIZATION"])
+ [enable utf8 strings])], [XAW3D_CPPFLAGS="${XAW3D_CPPFLAGS} -DXAW_INTERNATIONALIZATION"])
AM_CONDITIONAL(XAW_INTERNATIONALIZATION,
[test x${enable_internationalization} = xyes])
@@ -45,18 +45,18 @@ AM_CONDITIONAL(XAW_INTERNATIONALIZATION,
AC_ARG_ENABLE([multiplane-bitmaps],
[AS_HELP_STRING([--enable-multiplane-bitmaps], dnl
[enable XPM support])],
- [XAW3D_CFLAGS="${XAW3D_CFLAGS} -DXAW_MULTIPLANE_PIXMAPS" dnl
+ [XAW3D_CPPFLAGS="${XAW3D_CPPFLAGS} -DXAW_MULTIPLANE_PIXMAPS" dnl
PKG_CHECK_MODULES(XPM, xpm)])
AC_ARG_ENABLE([gray-stipples],
[AS_HELP_STRING([--enable-gray-stipples], dnl
- [enable gray stipples])], [XAW3D_CFLAGS="${XAW3D_CFLAGS} -DXAW_GRAY_BLKWHT_STIPPLES"])
+ [enable gray stipples])], [XAW3D_CPPFLAGS="${XAW3D_CPPFLAGS} -DXAW_GRAY_BLKWHT_STIPPLES"])
AC_ARG_ENABLE([arrow-scrollbars],
[AS_HELP_STRING([--enable-arrow-scrollbars], dnl
- [enable arrow scrollbars])], [XAW3D_CFLAGS="${XAW3D_CFLAGS} -DXAW_ARROW_SCROLLBARS"])
+ [enable arrow scrollbars])], [XAW3D_CPPFLAGS="${XAW3D_CPPFLAGS} -DXAW_ARROW_SCROLLBARS"])
-AC_SUBST(XAW3D_CFLAGS)
+AC_SUBST(XAW3D_CPPFLAGS)
AC_CONFIG_FILES([Makefile
include/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 05962d1..f2a8267 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,15 @@
lib_LTLIBRARIES = libXaw3d.la
AM_YFLAGS = -d
-AM_CFLAGS = \
- $(CWARNFLAGS) \
- $(XAW3D_CFLAGS) \
- $(X11_CFLAGS) \
+AM_CFLAGS = \
+ $(CWARNFLAGS) \
+ $(X11_CFLAGS) \
$(XPM_CFLAGS)
AM_CPPFLAGS = \
- -I${top_srcdir}/include \
- -I${top_srcdir}/include/X11/Xaw3d
+ -I${top_srcdir}/include \
+ -I${top_srcdir}/include/X11/Xaw3d \
+ $(XAW3D_CPPFLAGS)
#
# This doesn't appear to be used on any
--
1.7.4.1
More information about the xorg-devel
mailing list