mirrors/ntfs-3g
0
0
Fork 0
mirror of https://git.code.sf.net/p/ntfs-3g/ntfs-3g.git synced 2024-11-23 10:04:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Made compilation with --enable-really-static option to ./configure work

Browse Source 
Author: Anton Altaparmakov
Date:   Wed Feb 13 02:29:47 2013 +0000

This is a fix to the use of hd library to get the legacy BIOS geometry.
This commit is contained in:
Jean-Pierre André 2013-02-13 08:51:47 +01:00
parent 9442db0d8b
commit 0e91e1a9ae
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -447,7 +447,8 @@ if test "x$extrapath2" != "x"; then
AC_DEFINE([ENABLE_HD], 1,
[Define this to 1 if you want to enable use of Windows
compliant disk geometry.])
LIBNTFS_LIBS="$LIBNTFS_LIBS -lhd",
LIBNTFS_LIBS="$LIBNTFS_LIBS -lhd"
NTFSPROGS_STATIC_LIBS="$NTFSPROGS_STATIC_LIBS -lhd",
AC_MSG_WARN([ntfsprogs Windows compliant geometry code requires the hd library.]),
),
AC_MSG_WARN([ntfsprogs Windows compliant geometry code requires the hd library.]),
@ -593,6 +594,7 @@ AC_SUBST([MKNTFS_CPPFLAGS])
AC_SUBST([MKNTFS_LIBS])
AC_SUBST([LIBNTFS_CPPFLAGS])
AC_SUBST([LIBNTFS_LIBS])
AC_SUBST([NTFSPROGS_STATIC_LIBS])
AC_SUBST([OUTPUT_FORMAT])
AM_CONDITIONAL([FUSE_INTERNAL], [test "${with_fuse}" = "internal"])
AM_CONDITIONAL([GENERATE_LDSCRIPT], [test "${enable_ldscript}" = "yes"])

3
ntfsprogs/Makefile.am
View File

@ -1,5 +1,6 @@
if REALLYSTATIC
AM_LIBS = $(top_builddir)/libntfs-3g/.libs/libntfs-3g.a
AM_LIBS = $(top_builddir)/libntfs-3g/.libs/libntfs-3g.a $(NTFSPROGS_STATIC_LIBS)
# older builds may need -static instead of newer -all-static
AM_LFLAGS = -static
STATIC_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
else