Mon Oct 26 00:31:53 1998 Norbert Warmuth <nwarmuth@privat.circular.de>

* configure.in, Make.common.in: Split CPPFLAGS into CPPFLAGS and
MCCPPFLAGS. The last one contains references to variables which are
not available in every Makefile.in (namely intl/Makefile.in). Without
the split `-I ' was passed to the compiler (the compiler on DU 4.0
interprets -I as "don't search include files in /usr/include").

Mon Oct 26 00:38:30 1998  Norbert Warmuth  <nwarmuth@privat.circular.de>

* vfs/Make-mc.in: added xdirentry.h to VFSHDRS
This commit is contained in:
Norbert Warmuth 1998-10-26 00:38:32 +00:00
parent 19ecfc2a9c
commit 5bcfa822f9
5 changed files with 18 additions and 4 deletions

View File

@ -52,7 +52,7 @@ AWK_VAR_OPTION = @AWK_VAR_OPTION@
# No way, to make make happy (except GNU), we cannot use := to append
# something to these, so that's why there is a leading _
XCFLAGS = @CFLAGS@
XCPPFLAGS = @CPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\"
XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\"
XLDFLAGS = @LDFLAGS@
XDEFS = @DEFS@
XLIBS = @LIBS@

View File

@ -1033,7 +1033,7 @@ AC_DEFUN(AC_WITH_SLANG,
screen_manager="SLang (using system-installed library)"
AC_MSG_RESULT(Using system installed SLang library)
else
CPPFLAGS="$CPPFLAGS -I\$(slangdir)"
MCCPPFLAGS="$MCCPPFLAGS -I\$(slangdir)"
LIBSLANG="libmcslang.a"
screen_manager="SLang"
LSLANG="-lmcslang"
@ -1091,7 +1091,7 @@ AC_DEFUN(AC_WITH_VFS, [
LIBVFS="libvfs-mc.a"
LVFS="-lvfs-mc"
fastdepvfs=fastdepvfs
CPPFLAGS="$CPPFLAGS -I\$(vfsdir)"
MCCPPFLAGS="$MCCPPFLAGS -I\$(vfsdir)"
AC_MSG_RESULT(Using the VFS switch code)
vfs_type="Midnight Commander Virtual File System"
])
@ -1378,6 +1378,7 @@ LIBS="$LIBS $posix_libs"
CPPFLAGS="-I.. $CPPFLAGS"
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(MCCPPFLAGS)
AC_SUBST(LDFLAGS)
AC_SUBST(LIBS)

View File

@ -1,3 +1,11 @@
Mon Oct 26 00:31:53 1998 Norbert Warmuth <nwarmuth@privat.circular.de>
* configure.in, Make.common.in: Split CPPFLAGS into CPPFLAGS and
MCCPPFLAGS. The last one contains references to variables which are
not available in every Makefile.in (namely intl/Makefile.in). Without
the split `-I ' was passed to the compiler (the compiler on DU 4.0
interprets -I as "don't search include files in /usr/include").
Thu Oct 22 20:41:50 1998 Norbert Warmuth <nwarmuth@privat.circular.de>
* configure.in (subshell): Don't define inline to be empty

View File

@ -1,3 +1,7 @@
Mon Oct 26 00:38:30 1998 Norbert Warmuth <nwarmuth@privat.circular.de>
* Make-mc.in: added xdirentry.h to VFSHDRS
Fri Oct 23 12:29:48 1998 Pavel Machek <pavel@atrey.karlin.mff.cuni.cz>
* tar.c (tar_open_archive): do not double-free memory if you can

View File

@ -60,7 +60,8 @@ VFSHDRS = \
names.h \
tar.h \
tcputil.h \
vfs.h
vfs.h \
xdirentry.h
VFSOBJS = $(NONETFILES) @NETFILES@