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

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.

diff --git a/configure.ac b/configure.ac
index a2bb693..bbbf819 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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"])

diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am
index e075838..247912a 100644 (file)
--- a/ntfsprogs/Makefile.am
+++ b/ntfsprogs/Makefile.am
@@ -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