patch 9.1.1644: configure: doesn't separate CPPFLAGS and CFLAGS
Commit:
https://github.com/vim/vim/commit/ce288c7fb05d91fa4bb434485471d65d2045aece
Author: Damien Lejay <dam...@lejay.be>
Date: Sun Aug 17 21:25:07 2025 +0200
patch 9.1.1644: configure: doesn't separate CPPFLAGS and CFLAGS
Problem: configure: doesn't separate CPPFLAGS and CFLAGS
Solution: Split CPPFLAGS and CFLAGS for pkg-config
(Damien Lejay)
Previously, all flags returned by pkg-config --cflags were dumped into
CFLAGS, mixing include paths with compiler options. This commit uses
--cflags-only-I and --cflags-only-other to properly separate include
flags into CPPFLAGS and keep compiler flags in CFLAGS.
closes: #18019
Signed-off-by: Damien Lejay <dam...@lejay.be>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/auto/configure b/src/auto/configure
index d3d72cd16..06c3ca3a0 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -668,6 +668,7 @@ GNOME_LIBS
GTK_LIBNAME
GTK_LIBS
GTK_CFLAGS
+GTK_CPPFLAGS
X_LIB
X_EXTRA_LIBS
X_LIBS
@@ -679,6 +680,7 @@ WAYLAND_OBJ
WAYLAND_SRC
WAYLAND_LIBS
WAYLAND_CFLAGS
+WAYLAND_CPPFLAGS
TERM_TEST
TERM_OBJ
TERM_SRC
@@ -9232,6 +9234,7 @@ fi
if test "$with_wayland" = yes; then
+cppflags_save=$CPPFLAGS
cflags_save=$CFLAGS
{ printf "%s
" "$as_me:${as_lineno-$LINENO}: checking for wayland" >&5
printf %s "checking for wayland... " >&6; }
@@ -9240,7 +9243,9 @@ printf %s "checking for wayland... " >&6; }
printf "%s
" "yes" >&6; }
printf "%s
" "#define HAVE_WAYLAND 1" >>confdefs.h
- WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client`
+ WAYLAND_CPPFLAGS=`$PKG_CONFIG --cflags-only-I wayland-client`
+ WAYLAND_CFLAGS=`$PKG_CONFIG --cflags-only-other wayland-client`
+ CPPFLAGS="$CPPFLAGS $WAYLAND_CPPFLAGS"
CFLAGS="$CFLAGS $WAYLAND_CFLAGS"
WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client`
WAYLAND_SRC=" \
@@ -9259,11 +9264,13 @@ printf "%s
" "yes" >&6; }
+
else
{ printf "%s
" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s
" "no" >&6; }
with_wayland=no
fi
+CPPFLAGS=$cppflags_save
CFLAGS=$cflags_save
fi
@@ -10670,7 +10677,8 @@ then :
printf "%s
" "found" >&6; }
{ printf "%s
" "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version"
>&5
printf %s "checking for GTK - version >= $min_gtk_version... " >&6; }
- GTK_CFLAGS=`$PKG_CONFIG --cflags
$gtk_pkg_name`
+ GTK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I
$gtk_pkg_name`
+ GTK_CFLAGS=`$PKG_CONFIG --cflags-only-other $gtk_pkg_name`
GTK_LIBDIR=`$PKG_CONFIG --libs-only-L $gtk_pkg_name`
GTK_LIBS=`$PKG_CONFIG --libs $gtk_pkg_name`
gtk_major_version=`$PKG_CONFIG --modversion $gtk_pkg_name | \
@@ -10684,6 +10692,7 @@ printf "%s
" "yes; found version $gtk_major_version.$gtk_minor_version.$gtk_mic
else case e in #(
e)
+ GTK_CPPFLAGS=""
GTK_CFLAGS=""
GTK_LIBDIR=""
GTK_LIBS=""
@@ -10700,8 +10709,10 @@ fi
gtktest_success="yes"
if test "$enable_gtktest" = "yes"; then
{
+ ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $GTK_CPPFLAGS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
@@ -10764,6 +10775,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out
conftest$ac_exeext \
esac
fi
+ CPPFLAGS="$ac_save_CPPFLAGS"
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
}
@@ -10772,9 +10784,10 @@ fi
if test "$gtktest_success" = "yes"; then
GUI_LIB_LOC="$GTK_LIBDIR"
GTK_LIBNAME="$GTK_LIBS"
- GUI_INC_LOC="$GTK_CFLAGS"
+ GUI_INC_LOC="$GTK_CPPFLAGS"
else
- GTK_CFLAGS=""
+ GTK_CPPFLAGS=""
+ GTK_CFLAGS=""
GTK_LIBDIR=""
GTK_LIBS=""
if test "$fail_if_missing" = "yes" -a "$gui_auto" != "yes"; then
@@ -10785,7 +10798,8 @@ fi
- if test -n "$GTK_CFLAGS"; then
+
+ if test -n "$GTK_CPPFLAGS"; then
SKIP_GTK2=YES
SKIP_GNOME=YES
SKIP_MOTIF=YES
@@ -10843,7 +10857,8 @@ then :
printf "%s
" "found" >&6; }
{ printf "%s
" "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version"
>&5
printf %s "checking for GTK - version >= $min_gtk_version... " >&6; }
- GTK_CFLAGS=`$PKG_CONFIG --cflags
$gtk_pkg_name`
+ GTK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I
$gtk_pkg_name`
+ GTK_CFLAGS=`$PKG_CONFIG --cflags-only-other $gtk_pkg_name`
GTK_LIBDIR=`$PKG_CONFIG --libs-only-L $gtk_pkg_name`
GTK_LIBS=`$PKG_CONFIG --libs $gtk_pkg_name`
gtk_major_version=`$PKG_CONFIG --modversion $gtk_pkg_name | \
@@ -10857,6 +10872,7 @@ printf "%s
" "yes; found version $gtk_major_version.$gtk_minor_version.$gtk_mic
else case e in #(
e)
+ GTK_CPPFLAGS=""
GTK_CFLAGS=""
GTK_LIBDIR=""
GTK_LIBS=""
@@ -10873,8 +10889,10 @@ fi
gtktest_success="yes"
if test "$enable_gtktest" = "yes"; then
{
+ ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $GTK_CPPFLAGS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
@@ -10937,6 +10955,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out
conftest$ac_exeext \
esac
fi
+ CPPFLAGS="$ac_save_CPPFLAGS"
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
}
@@ -10945,9 +10964,10 @@ fi
if test "$gtktest_success" = "yes"; then
GUI_LIB_LOC="$GTK_LIBDIR"
GTK_LIBNAME="$GTK_LIBS"
- GUI_INC_LOC="$GTK_CFLAGS"
+ GUI_INC_LOC="$GTK_CPPFLAGS"
else
- GTK_CFLAGS=""
+ GTK_CPPFLAGS=""
+ GTK_CFLAGS=""
GTK_LIBDIR=""
GTK_LIBS=""
if test "$fail_if_missing" = "yes" -a "$gui_auto" != "yes"; then
@@ -10958,7 +10978,8 @@ fi
- if test -n "$GTK_CFLAGS"; then
+
+ if test -n "$GTK_CPPFLAGS"; then
SKIP_MOTIF=YES
GUITYPE=GTK
@@ -11022,7 +11043,7 @@ printf %s "checking for libgnomeui-2.0... " >&6; }
printf "%s
" "yes" >&6; }
GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0`
GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0`
- GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0`
+ GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags-only-I libgnomeui-2.0`
{ printf "%s
" "$as_me:${as_lineno-$LINENO}: checking for FreeBSD" >&5
printf %s "checking for FreeBSD... " >&6; }
@@ -14654,16 +14675,22 @@ fi
if test "$enable_canberra" = "yes"; then
if test "x$PKG_CONFIG" != "xno"; then
canberra_lib=`$PKG_CONFIG --libs libcanberra 2>/dev/null`
- canberra_cflags=`$PKG_CONFIG --cflags libcanberra 2>/dev/null`
+ canberra_cppflags=`$PKG_CONFIG --cflags-only-I libcanberra 2>/dev/null`
+ canberra_cflags=`$PKG_CONFIG --cflags-only-other libcanberra 2>/dev/null`
fi
if test "x$canberra_lib" = "x"; then
canberra_lib=-lcanberra
+ canberra_cppflags=-D_REENTRANT
canberra_cflags=-D_REENTRANT
fi
{ printf "%s
" "$as_me:${as_lineno-$LINENO}: checking for libcanberra" >&5
printf %s "checking for libcanberra... " >&6; }
+ ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
+ if `echo "$CPPFLAGS" | grep -v "$canberra_cppflags" 2>/dev/null`; then
+ CPPFLAGS="$CPPFLAGS $canberra_cflags"
+ fi
if `echo "$CFLAGS" | grep -v "$canberra_cflags" 2>/dev/null`; then
CFLAGS="$CFLAGS $canberra_cflags"
fi
@@ -14726,16 +14753,20 @@ fi
if test "$enable_libsodium" = "yes"; then
if test "x$PKG_CONFIG" != "xno"; then
libsodium_lib=`$PKG_CONFIG --libs libsodium 2>/dev/null`
- libsodium_cflags=`$PKG_CONFIG --cflags libsodium 2>/dev/null`
+ libsodium_cppflags=`$PKG_CONFIG --cflags-only-I libsodium 2>/dev/null`
+ libsodium_cflags=`$PKG_CONFIG --cflags-only-other libsodium 2>/dev/null`
fi
if test "x$libsodium_lib" = "x"; then
libsodium_lib=-lsodium
+ libsodium_cppflags=
libsodium_cflags=
fi
{ printf "%s
" "$as_me:${as_lineno-$LINENO}: checking for libsodium" >&5
printf %s "checking for libsodium... " >&6; }
+ ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $libsodium_cppflags"
CFLAGS="$CFLAGS $libsodium_cflags"
LIBS="$LIBS $libsodium_lib"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14759,7 +14790,7 @@ printf "%s
" "yes" >&6; }; printf "%s
" "#define HAVE_SODIUM 1" >>confdefs.h
else case e in #(
e) { printf "%s
" "$as_me:${as_lineno-$LINENO}: result: no; try installing libsodium-dev" >&5
-printf "%s
" "no; try installing libsodium-dev" >&6; }; CFLAGS="$ac_save_CFLAGS";
LIBS="$ac_save_LIBS" ;;
+printf "%s
" "no; try installing libsodium-dev" >&6; }; CFLAGS="$ac_save_CFLAGS";
LIBS="$ac_save_LIBS"; CPPFLAGS="$ac_save_CPPFLAGS" ;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
@@ -15584,11 +15615,13 @@ else
printf "%s
" "yes" >&6; }
fi
-if test "x$GTK_CFLAGS" != "x"; then
+if test "x$GTK_CPPFLAGS" != "x"; then
{ printf "%s
" "$as_me:${as_lineno-$LINENO}: checking for pango_shape_full" >&5
printf %s "checking for pango_shape_full... " >&6; }
+ ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $GTK_CPPFLAGS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15614,6 +15647,7 @@ esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
+ CPPFLAGS="$ac_save_CPPFLAGS"
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
@@ -17085,7 +17119,7 @@ fi
{ printf "%s
" "$as_me:${as_lineno-$LINENO}: checking whether we need to force
-D_FILE_OFFSET_BITS=64" >&5
printf %s "checking whether we need to force -D_FILE_OFFSET_BITS=64... " >&6; }
-if echo "$CFLAGS $LUA_CFLAGS $MZSCHEME_CFLAGS $PERL_CFLAGS $PYTHON_CFLAGS
$PYTHON3_CFLAGS $TCL_CFLAGS $RUBY_CFLAGS $GTK_CFLAGS" | grep -q
D_FILE_OFFSET_BITS 2>/dev/null; then
+if echo "$CPPFLAGS $CFLAGS $LUA_CFLAGS $MZSCHEME_CFLAGS $PERL_CFLAGS
$PYTHON_CFLAGS $PYTHON3_CFLAGS $TCL_CFLAGS $RUBY_CFLAGS $GTK_CPPFLAGS" | grep
-q D_FILE_OFFSET_BITS 2>/dev/null; then
{ printf "%s
" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s
" "yes" >&6; }
printf "%s
" "#define _FILE_OFFSET_BITS 64" >>confdefs.h
diff --git a/src/configure.ac b/src/configure.ac
index 4544f46f5..4d91a074f 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2415,12 +2415,15 @@ AC_ARG_WITH(wayland,
AC_MSG_RESULT([yes])]))
if test "$with_wayland" = yes; then
+cppflags_save=$CPPFLAGS
cflags_save=$CFLAGS
AC_MSG_CHECKING(for wayland)
if "$PKG_CONFIG" --exists 'wayland-client'; then
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_WAYLAND)
- WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client`
+ WAYLAND_CPPFLAGS=`$PKG_CONFIG --cflags-only-I wayland-client`
+ WAYLAND_CFLAGS=`$PKG_CONFIG --cflags-only-other wayland-client`
+ CPPFLAGS="$CPPFLAGS $WAYLAND_CPPFLAGS"
CFLAGS="$CFLAGS $WAYLAND_CFLAGS"
WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client`
WAYLAND_SRC=" \
@@ -2435,6 +2438,7 @@ cflags_save=$CFLAGS
objects/xdg-shell.o \
objects/primary-selection-unstable-v1.o \
objects/wayland.o"
+ AC_SUBST(WAYLAND_CPPFLAGS)
AC_SUBST(WAYLAND_CFLAGS)
AC_SUBST(WAYLAND_LIBS)
AC_SUBST(WAYLAND_SRC)
@@ -2443,6 +2447,7 @@ cflags_save=$CFLAGS
AC_MSG_RESULT(no)
with_wayland=no
fi
+CPPFLAGS=$cppflags_save
CFLAGS=$cflags_save
fi
@@ -2714,7 +2719,8 @@ AC_DEFUN(AM_PATH_GTK,
dnl We should be using PKG_CHECK_MODULES() instead of this hack.
dnl But I guess the dependency on pkgconfig.m4 is not wanted or
dnl something like that.
- GTK_CFLAGS=`$PKG_CONFIG --cflags $gtk_pkg_name`
+ GTK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $gtk_pkg_name`
+ GTK_CFLAGS=`$PKG_CONFIG --cflags-only-other $gtk_pkg_name`
GTK_LIBDIR=`$PKG_CONFIG --libs-only-L $gtk_pkg_name`
GTK_LIBS=`$PKG_CONFIG --libs $gtk_pkg_name`
gtk_major_version=`$PKG_CONFIG --modversion $gtk_pkg_name | \
@@ -2726,6 +2732,7 @@ AC_DEFUN(AM_PATH_GTK,
AC_MSG_RESULT([yes; found version
$gtk_major_version.$gtk_minor_version.$gtk_micro_version])
],
[
+ GTK_CPPFLAGS=""
GTK_CFLAGS=""
GTK_LIBDIR=""
GTK_LIBS=""
@@ -2745,8 +2752,10 @@ AC_DEFUN(AM_PATH_GTK,
gtktest_success="yes"
if test "$enable_gtktest" = "yes"; then
{
+ ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $GTK_CPPFLAGS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
@@ -2793,6 +2802,7 @@ main ()
[gtktest_success="yes"; AC_MSG_RESULT(yes)],
[gtktest_success="no"; AC_MSG_RESULT(no)],
[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ CPPFLAGS="$ac_save_CPPFLAGS"
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
}
@@ -2802,6 +2812,7 @@ main ()
ifelse([$2], , :, [$2])
else
dnl Reset flags sourced from pkg-config if the compilation test failed.
+ GTK_CPPFLAGS=""
GTK_CFLAGS=""
GTK_LIBDIR=""
GTK_LIBS=""
@@ -2810,6 +2821,7 @@ main ()
fi
fi
+ AC_SUBST(GTK_CPPFLAGS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
])
@@ -2857,7 +2869,7 @@ AC_DEFUN([GNOME_INIT_HOOK],
AC_MSG_RESULT(yes)
GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0`
GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0`
- GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0`
+ GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags-only-I libgnomeui-2.0`
dnl On FreeBSD we need -pthread but pkg-config doesn't include it.
dnl This might not be the right way but it works for me...
@@ -2901,8 +2913,8 @@ if test -z "$SKIP_GTK3"; then
AM_PATH_GTK(3.0.0,
[GUI_LIB_LOC="$GTK_LIBDIR"
GTK_LIBNAME="$GTK_LIBS"
- GUI_INC_LOC="$GTK_CFLAGS"])
- if test -n "$GTK_CFLAGS"; then
+ GUI_INC_LOC="$GTK_CPPFLAGS"])
+ if test -n "$GTK_CPPFLAGS"; then
SKIP_GTK2=YES
SKIP_GNOME=YES
SKIP_MOTIF=YES
@@ -2932,8 +2944,8 @@ if test -z "$SKIP_GTK2"; then
AM_PATH_GTK(2.2.0,
[GUI_LIB_LOC="$GTK_LIBDIR"
GTK_LIBNAME="$GTK_LIBS"
- GUI_INC_LOC="$GTK_CFLAGS"])
- if test -n "$GTK_CFLAGS"; then
+ GUI_INC_LOC="$GTK_CPPFLAGS"])
+ if test -n "$GTK_CPPFLAGS"; then
SKIP_MOTIF=YES
GUITYPE=GTK
AC_SUBST(GTK_LIBNAME)
@@ -3833,15 +3845,21 @@ fi
if test "$enable_canberra" = "yes"; then
if test "x$PKG_CONFIG" != "xno"; then
canberra_lib=`$PKG_CONFIG --libs libcanberra 2>/dev/null`
- canberra_cflags=`$PKG_CONFIG --cflags libcanberra 2>/dev/null`
+ canberra_cppflags=`$PKG_CONFIG --cflags-only-I libcanberra 2>/dev/null`
+ canberra_cflags=`$PKG_CONFIG --cflags-only-other libcanberra 2>/dev/null`
fi
if test "x$canberra_lib" = "x"; then
canberra_lib=-lcanberra
+ canberra_cppflags=-D_REENTRANT
canberra_cflags=-D_REENTRANT
fi
AC_MSG_CHECKING(for libcanberra)
+ ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
+ if `echo "$CPPFLAGS" | grep -v "$canberra_cppflags" 2>/dev/null`; then
+ CPPFLAGS="$CPPFLAGS $canberra_cflags"
+ fi
if `echo "$CFLAGS" | grep -v "$canberra_cflags" 2>/dev/null`; then
CFLAGS="$CFLAGS $canberra_cflags"
fi
@@ -3852,7 +3870,7 @@ if test "$enable_canberra" = "yes"; then
ca_context *hello;
ca_context_create(&hello);])],
AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CANBERRA),
- AC_MSG_RESULT(no; try installing libcanberra-dev);
CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS")
+ AC_MSG_RESULT(no; try installing libcanberra-dev);
CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS", CPPFLAGS="ac_save_CPPFLAGS")
fi
AC_MSG_CHECKING(--enable-libsodium argument)
@@ -3874,15 +3892,19 @@ fi
if test "$enable_libsodium" = "yes"; then
if test "x$PKG_CONFIG" != "xno"; then
libsodium_lib=`$PKG_CONFIG --libs libsodium 2>/dev/null`
- libsodium_cflags=`$PKG_CONFIG --cflags libsodium 2>/dev/null`
+ libsodium_cppflags=`$PKG_CONFIG --cflags-only-I libsodium 2>/dev/null`
+ libsodium_cflags=`$PKG_CONFIG --cflags-only-other libsodium 2>/dev/null`
fi
if test "x$libsodium_lib" = "x"; then
libsodium_lib=-lsodium
+ libsodium_cppflags=
libsodium_cflags=
fi
AC_MSG_CHECKING(for libsodium)
+ ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $libsodium_cppflags"
CFLAGS="$CFLAGS $libsodium_cflags"
LIBS="$LIBS $libsodium_lib"
AC_LINK_IFELSE([AC_LANG_PROGRAM([
@@ -3890,7 +3912,7 @@ if test "$enable_libsodium" = "yes"; then
], [
printf("%d", sodium_init()); ])],
AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SODIUM),
- AC_MSG_RESULT(no; try installing libsodium-dev);
CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS")
+ AC_MSG_RESULT(no; try installing libsodium-dev);
CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS"; CPPFLAGS="$ac_save_CPPFLAGS")
fi
dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible
@@ -4150,11 +4172,13 @@ else
AC_MSG_RESULT(yes)
fi
-if test "x$GTK_CFLAGS" != "x"; then
+if test "x$GTK_CPPFLAGS" != "x"; then
dnl pango_shape_full() is new, fall back to pango_shape().
AC_MSG_CHECKING(for pango_shape_full)
+ ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $GTK_CPPFLAGS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
AC_LINK_IFELSE([AC_LANG_PROGRAM(
@@ -4162,6 +4186,7 @@ if test "x$GTK_CFLAGS" != "x"; then
[ pango_shape_full(NULL, 0, NULL, 0, NULL, NULL); ])],
AC_MSG_RESULT(yes); AC_DEFINE(HAVE_PANGO_SHAPE_FULL),
AC_MSG_RESULT(no))
+ CPPFLAGS="$ac_save_CPPFLAGS"
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
@@ -4736,7 +4761,7 @@ dnl (e.g. ino_t and off_t), all of Vim's modules must be
compiled with a
dnl consistent value. It's therefore safest to force the use of the define
dnl if it's present in any of the *_CFLAGS variables.
AC_MSG_CHECKING(whether we need to force -D_FILE_OFFSET_BITS=64)
-if echo "$CFLAGS $LUA_CFLAGS $MZSCHEME_CFLAGS $PERL_CFLAGS $PYTHON_CFLAGS
$PYTHON3_CFLAGS $TCL_CFLAGS $RUBY_CFLAGS $GTK_CFLAGS" | grep -q
D_FILE_OFFSET_BITS 2>/dev/null; then
+if echo "$CPPFLAGS $CFLAGS $LUA_CFLAGS $MZSCHEME_CFLAGS $PERL_CFLAGS
$PYTHON_CFLAGS $PYTHON3_CFLAGS $TCL_CFLAGS $RUBY_CFLAGS $GTK_CPPFLAGS" | grep
-q D_FILE_OFFSET_BITS 2>/dev/null; then
AC_MSG_RESULT(yes)
AC_DEFINE(_FILE_OFFSET_BITS, 64)
else
diff --git a/src/version.c b/src/version.c
index 77daa40b8..71f390b9c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1644,
/**/
1643,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1unj4t-003Odf-UU%40256bit.org.
