From 9688e7d015d1744e3d22d2ec64ae56222eb9259d Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sat, 19 Aug 2023 20:51:07 +0300 Subject: [PATCH] Ticket #4439: FTBFS on FreeBSD with ext2fs attribute support: local.c:35:10: fatal error: 'e2p/e2p.h' file not found ^~~~~~~~~~~ * m4.include/mc-ext2fs-attr.m4: add EXT2FS_CFLAGS E2P_CFLAGS to CPPFLAGS here... * src/filemanager/Makefile.am: ...not here. Signed-off-by: Andrew Borodin --- m4.include/mc-ext2fs-attr.m4 | 3 +-- src/filemanager/Makefile.am | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/m4.include/mc-ext2fs-attr.m4 b/m4.include/mc-ext2fs-attr.m4 index 6a57cd5ef..42e4a292e 100644 --- a/m4.include/mc-ext2fs-attr.m4 +++ b/m4.include/mc-ext2fs-attr.m4 @@ -12,9 +12,8 @@ AC_DEFUN([mc_EXT2FS_ATTR], if test x"$found_e2p" = "xyes"; then AC_DEFINE(ENABLE_EXT2FS_ATTR, 1, [Define to enable support for ext2fs attributes]) - AC_SUBST(EXT2FS_CFLAGS) - AC_SUBST(E2P_CFLAGS) MCLIBS="$MCLIBS $E2P_LIBS" + CPPFLAGS="$CPPFLAGS $EXT2FS_CFLAGS $E2P_CFLAGS" ext2fs_attr_msg="yes" else AC_MSG_WARN([e2p library not found or version too old (must be >= 1.42.4)]) diff --git a/src/filemanager/Makefile.am b/src/filemanager/Makefile.am index 534d8dcf3..0b3c36556 100644 --- a/src/filemanager/Makefile.am +++ b/src/filemanager/Makefile.am @@ -35,6 +35,4 @@ AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) if ENABLE_EXT2FS_ATTR libmcfilemanager_la_SOURCES += \ chattr.c - -AM_CPPFLAGS += @EXT2FS_CFLAGS@ @E2P_CFLAGS@ endif