PCRE_CFLAGS are CPPFLAGS, actually.
authorAndrew Borodin <aborodin@vmail.ru>
Wed, 14 Nov 2012 06:40:31 +0000 (14 10:40 +0400)
committerAndrew Borodin <aborodin@vmail.ru>
Tue, 18 Dec 2012 12:27:49 +0000 (18 16:27 +0400)
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
12 files changed:
lib/Makefile.am
lib/event/Makefile.am
lib/filehighlight/Makefile.am
lib/search/Makefile.am
lib/skin/Makefile.am
lib/widget/Makefile.am
m4.include/ax_path_lib_pcre.m4
src/Makefile.am
src/diffviewer/Makefile.am
src/editor/Makefile.am
src/filemanager/Makefile.am
src/viewer/Makefile.am

index 9926a6b..18bf836 100644 (file)
@@ -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 \
index 472c650..e83f712 100644 (file)
@@ -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)
index c0d5eea..57a8d94 100644 (file)
@@ -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)
index f4aedd0..ed9d3aa 100644 (file)
@@ -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)
index c742c29..918cdea 100644 (file)
@@ -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)
index c14b5f2..40058c9 100644 (file)
@@ -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)
index dc4a8be..37dea13 100644 (file)
@@ -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])
 
 ])
index 868e456..09bede5 100644 (file)
@@ -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@
index 3df15d1..58e8e5b 100644 (file)
@@ -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
index 29ace67..abe0ac1 100644 (file)
@@ -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)
index 979c976..ab0077b 100644 (file)
@@ -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
index 9f9add0..53bc7a4 100644 (file)
@@ -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