From 7b184ddea4e0480da2afc39003fdf3345f95f4d3 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Wed, 14 Nov 2012 10:40:31 +0400 Subject: [PATCH] PCRE_CFLAGS are CPPFLAGS, actually. Signed-off-by: Andrew Borodin --- lib/Makefile.am | 2 +- lib/event/Makefile.am | 2 +- lib/filehighlight/Makefile.am | 2 +- lib/search/Makefile.am | 2 +- lib/skin/Makefile.am | 2 +- lib/widget/Makefile.am | 2 +- m4.include/ax_path_lib_pcre.m4 | 14 +++++++------- src/Makefile.am | 2 +- src/diffviewer/Makefile.am | 2 +- src/editor/Makefile.am | 2 +- src/filemanager/Makefile.am | 2 +- src/viewer/Makefile.am | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 9926a6ba4..18bf8362b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -50,7 +50,7 @@ if CHARSET libmc_la_SOURCES += charsets.c charsets.h endif -AM_CFLAGS= $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS) +AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CPPFLAGS) libmc_la_LIBADD = \ event/libmcevent.la \ diff --git a/lib/event/Makefile.am b/lib/event/Makefile.am index 472c6502c..e83f712ae 100644 --- a/lib/event/Makefile.am +++ b/lib/event/Makefile.am @@ -7,4 +7,4 @@ libmcevent_la_SOURCES = \ manage.c \ raise.c -AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS) diff --git a/lib/filehighlight/Makefile.am b/lib/filehighlight/Makefile.am index c0d5eea28..57a8d949f 100644 --- a/lib/filehighlight/Makefile.am +++ b/lib/filehighlight/Makefile.am @@ -6,4 +6,4 @@ libmcfilehighlight_la_SOURCES = \ ini-file-read.c \ internal.h -AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS) diff --git a/lib/search/Makefile.am b/lib/search/Makefile.am index f4aedd0af..ed9d3aadb 100644 --- a/lib/search/Makefile.am +++ b/lib/search/Makefile.am @@ -9,4 +9,4 @@ libsearch_la_SOURCES = \ glob.c \ hex.c -AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS) diff --git a/lib/skin/Makefile.am b/lib/skin/Makefile.am index c742c29c0..918cdeadd 100644 --- a/lib/skin/Makefile.am +++ b/lib/skin/Makefile.am @@ -9,4 +9,4 @@ libmcskin_la_SOURCES = \ lines.c \ internal.h -AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS) diff --git a/lib/widget/Makefile.am b/lib/widget/Makefile.am index c14b5f292..40058c9de 100644 --- a/lib/widget/Makefile.am +++ b/lib/widget/Makefile.am @@ -22,4 +22,4 @@ libmcwidget_la_SOURCES = \ widget-common.c widget-common.h \ wtools.c wtools.h -AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS) diff --git a/m4.include/ax_path_lib_pcre.m4 b/m4.include/ax_path_lib_pcre.m4 index dc4a8be25..37dea1372 100644 --- a/m4.include/ax_path_lib_pcre.m4 +++ b/m4.include/ax_path_lib_pcre.m4 @@ -1,6 +1,6 @@ dnl @synopsis AX_PATH_LIB_PCRE [(A/NA)] dnl -dnl check for pcre lib and set PCRE_LIBS and PCRE_CFLAGS accordingly. +dnl check for pcre lib and set PCRE_LIBS and PCRE_CPPFLAGS accordingly. dnl dnl also provide --with-pcre option that may point to the $prefix of dnl the pcre installation - the macro will check $pcre/include and @@ -29,14 +29,14 @@ else AC_MSG_RESULT([(testing)]) if test "x$with_pcre" = "xyes" ; then - PCRE_CFLAGS="`pcre-config --cflags`" + PCRE_CPPFLAGS="`pcre-config --cflags`" PCRE_LIBS="`pcre-config --libs`" else test_PCRE_LIBS="-L$with_pcre/lib" - test_PCRE_CFLAGS="-I$with_pcre/include" + test_PCRE_CPPFLAGS="-I$with_pcre/include" OLDLDFLAGS="$LDFLAGS" ; LDFLAGS="$LDFLAGS $test_PCRE_LIBS" - OLDCFLAGS="$CFLAGS" ; CFLAGS="$CFLAGS $test_PCRE_CFLAGS" + OLDCPPFLAGS="$CPPFLAGS" ; CPPFLAGS="$CPPFLAGS $test_PCRE_CPPFLAGS" AC_CHECK_LIB(pcre, pcre_compile) @@ -44,7 +44,7 @@ else AC_MSG_RESULT(setting PCRE_LIBS -L$with_pcre/lib -lpcre) PCRE_LIBS=$test_PCRE_LIBS - test_PCRE_CFLAGS=$test_PCRE_CFLAGS + PCRE_CPPFLAGS=$test_PCRE_CPPFLAGS AC_MSG_CHECKING([lib pcre]) AC_MSG_RESULT([$PCRE_LIBS]) @@ -55,13 +55,13 @@ else m4_ifval($2,$2) fi - CFLAGS="$OLDCFLAGS" + CPPFLAGS="$OLDCFPPLAGS" LDFLAGS="$OLDLDFLAGS" fi fi AC_SUBST([PCRE_LIBS]) -AC_SUBST([PCRE_CFLAGS]) +AC_SUBST([PCRE_CPPFLAGS]) ]) diff --git a/src/Makefile.am b/src/Makefile.am index 868e456a5..09bede5ad 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,7 @@ SUBDIRS += consaver AM_CPPFLAGS += -DSAVERDIR=\""$(pkglibexecdir)"\" endif -AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) +AM_CPPFLAGS += -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS) localedir = $(datadir)/locale pkglibexecdir = $(libexecdir)/@PACKAGE@ diff --git a/src/diffviewer/Makefile.am b/src/diffviewer/Makefile.am index 3df15d1bc..58e8e5b04 100644 --- a/src/diffviewer/Makefile.am +++ b/src/diffviewer/Makefile.am @@ -5,6 +5,6 @@ libdiffviewer_la_SOURCES = \ search.c \ ydiff.c ydiff.h -AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS) libdiffviewer_la_LIBADD = ../../lib/libmc.la diff --git a/src/editor/Makefile.am b/src/editor/Makefile.am index 29ace6709..abe0ac12b 100644 --- a/src/editor/Makefile.am +++ b/src/editor/Makefile.am @@ -21,4 +21,4 @@ libedit_la_SOURCES += \ endif endif -AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS) +AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CPPFLAGS) diff --git a/src/filemanager/Makefile.am b/src/filemanager/Makefile.am index 979c97698..ab0077ba7 100644 --- a/src/filemanager/Makefile.am +++ b/src/filemanager/Makefile.am @@ -30,6 +30,6 @@ libmcfilemanager_la_SOURCES = \ # Unmaintained, unsupported, etc # listmode.c listmode.h -AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS) libmcfilemanager_la_LIBADD = ../../lib/libmc.la diff --git a/src/viewer/Makefile.am b/src/viewer/Makefile.am index 9f9add0a4..53bc7a452 100644 --- a/src/viewer/Makefile.am +++ b/src/viewer/Makefile.am @@ -19,6 +19,6 @@ libmcviewer_la_SOURCES = \ plain.c \ search.c -AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS) libmcviewer_la_LIBADD = ../../lib/libmc.la