mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PCRE_CFLAGS are CPPFLAGS, actually. 

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2012-11-14 10:40:31 +04:00
parent f7bc3e5c21
commit 7b184ddea4
12 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile.am
View File

@ -50,7 +50,7 @@ if CHARSET
libmc_la_SOURCES += charsets.c charsets.h libmc_la_SOURCES += charsets.c charsets.h
endif endif
AM_CFLAGS= $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS) AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CPPFLAGS)
libmc_la_LIBADD = \ libmc_la_LIBADD = \
event/libmcevent.la \ event/libmcevent.la \

2
lib/event/Makefile.am
View File

@ -7,4 +7,4 @@ libmcevent_la_SOURCES = \
manage.c \ manage.c \
raise.c raise.c
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS)

2
lib/filehighlight/Makefile.am
View File

@ -6,4 +6,4 @@ libmcfilehighlight_la_SOURCES = \
ini-file-read.c \ ini-file-read.c \
internal.h internal.h
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS)

2
lib/search/Makefile.am
View File

@ -9,4 +9,4 @@ libsearch_la_SOURCES = \
glob.c \ glob.c \
hex.c hex.c
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS)

2
lib/skin/Makefile.am
View File

@ -9,4 +9,4 @@ libmcskin_la_SOURCES = \
lines.c \ lines.c \
internal.h internal.h
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS)

2
lib/widget/Makefile.am
View File

@ -22,4 +22,4 @@ libmcwidget_la_SOURCES = \
widget-common.c widget-common.h \ widget-common.c widget-common.h \
wtools.c wtools.h wtools.c wtools.h
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS)

14
m4.include/ax_path_lib_pcre.m4
View File

@ -1,6 +1,6 @@
dnl @synopsis AX_PATH_LIB_PCRE [(A/NA)] dnl @synopsis AX_PATH_LIB_PCRE [(A/NA)]
dnl 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
dnl also provide --with-pcre option that may point to the $prefix of dnl also provide --with-pcre option that may point to the $prefix of
dnl the pcre installation - the macro will check $pcre/include and dnl the pcre installation - the macro will check $pcre/include and
@ -29,14 +29,14 @@ else
AC_MSG_RESULT([(testing)]) AC_MSG_RESULT([(testing)])
if test "x$with_pcre" = "xyes" ; then if test "x$with_pcre" = "xyes" ; then
PCRE_CFLAGS="`pcre-config --cflags`" PCRE_CPPFLAGS="`pcre-config --cflags`"
PCRE_LIBS="`pcre-config --libs`" PCRE_LIBS="`pcre-config --libs`"
else else
test_PCRE_LIBS="-L$with_pcre/lib" 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" 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) AC_CHECK_LIB(pcre, pcre_compile)
@ -44,7 +44,7 @@ else
AC_MSG_RESULT(setting PCRE_LIBS -L$with_pcre/lib -lpcre) AC_MSG_RESULT(setting PCRE_LIBS -L$with_pcre/lib -lpcre)
PCRE_LIBS=$test_PCRE_LIBS PCRE_LIBS=$test_PCRE_LIBS
test_PCRE_CFLAGS=$test_PCRE_CFLAGS PCRE_CPPFLAGS=$test_PCRE_CPPFLAGS
AC_MSG_CHECKING([lib pcre]) AC_MSG_CHECKING([lib pcre])
AC_MSG_RESULT([$PCRE_LIBS]) AC_MSG_RESULT([$PCRE_LIBS])
@ -55,13 +55,13 @@ else
m4_ifval($2,$2) m4_ifval($2,$2)
fi fi
CFLAGS="$OLDCFLAGS" CPPFLAGS="$OLDCFPPLAGS"
LDFLAGS="$OLDLDFLAGS" LDFLAGS="$OLDLDFLAGS"
fi fi
fi fi
AC_SUBST([PCRE_LIBS]) AC_SUBST([PCRE_LIBS])
AC_SUBST([PCRE_CFLAGS]) AC_SUBST([PCRE_CPPFLAGS])
]) ])

2
src/Makefile.am
View File

@ -22,7 +22,7 @@ SUBDIRS += consaver
AM_CPPFLAGS += -DSAVERDIR=\""$(pkglibexecdir)"\" AM_CPPFLAGS += -DSAVERDIR=\""$(pkglibexecdir)"\"
endif endif
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) AM_CPPFLAGS += -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS)
localedir = $(datadir)/locale localedir = $(datadir)/locale
pkglibexecdir = $(libexecdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@

2
src/diffviewer/Makefile.am
View File

@ -5,6 +5,6 @@ libdiffviewer_la_SOURCES = \
search.c \ search.c \
ydiff.c ydiff.h 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 libdiffviewer_la_LIBADD = ../../lib/libmc.la

2
src/editor/Makefile.am
View File

@ -21,4 +21,4 @@ libedit_la_SOURCES += \
endif endif
endif endif
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS) AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CPPFLAGS)

2
src/filemanager/Makefile.am
View File

@ -30,6 +30,6 @@ libmcfilemanager_la_SOURCES = \
# Unmaintained, unsupported, etc # Unmaintained, unsupported, etc
# listmode.c listmode.h # 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 libmcfilemanager_la_LIBADD = ../../lib/libmc.la

2
src/viewer/Makefile.am
View File

@ -19,6 +19,6 @@ libmcviewer_la_SOURCES = \
plain.c \ plain.c \
search.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 libmcviewer_la_LIBADD = ../../lib/libmc.la