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 <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2023-08-19 20:51:07 +03:00
parent a18c8f2850
commit 9688e7d015
2 changed files with 1 additions and 4 deletions

View File

@ -12,9 +12,8 @@ AC_DEFUN([mc_EXT2FS_ATTR],
if test x"$found_e2p" = "xyes"; then if test x"$found_e2p" = "xyes"; then
AC_DEFINE(ENABLE_EXT2FS_ATTR, 1, [Define to enable support for ext2fs attributes]) 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" MCLIBS="$MCLIBS $E2P_LIBS"
CPPFLAGS="$CPPFLAGS $EXT2FS_CFLAGS $E2P_CFLAGS"
ext2fs_attr_msg="yes" ext2fs_attr_msg="yes"
else else
AC_MSG_WARN([e2p library not found or version too old (must be >= 1.42.4)]) AC_MSG_WARN([e2p library not found or version too old (must be >= 1.42.4)])

View File

@ -35,6 +35,4 @@ AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS)
if ENABLE_EXT2FS_ATTR if ENABLE_EXT2FS_ATTR
libmcfilemanager_la_SOURCES += \ libmcfilemanager_la_SOURCES += \
chattr.c chattr.c
AM_CPPFLAGS += @EXT2FS_CFLAGS@ @E2P_CFLAGS@
endif endif