utils/ntfsprogs/patches/001-autoconf_fixes.patch

   1 --- a/libntfs/Makefile.am
   2 +++ b/libntfs/Makefile.am
   3 @@ -38,8 +38,8 @@ libntfs_la_CFLAGS = $(LIBNTFS_CFLAGS) \
   4         -DLTVERSION_LIBNTFS=\"$(LTVERSION_LIBNTFS)\"
   5
   6  if ENABLE_CRYPTO
   7 -libntfs_la_LDFLAGS += `libgnutls-config --libs` `pkg-config --libs libconfig`
   8 -libntfs_la_CFLAGS += `libgnutls-config --cflags` `pkg-config --cflags libconfig`
   9 +libntfs_la_LDFLAGS += $(GNUTLS_LIBS) $(libconfig_LIBS)
  10 +libntfs_la_CFLAGS += $(GNUTLS_CFLAGS) $(libconfig_CFLAGS)
  11  endif
  12
  13  libntfs_la_SOURCES =   \
  14 --- a/libntfs/Makefile.in
  15 +++ b/libntfs/Makefile.in
  16 @@ -61,8 +61,8 @@ POST_UNINSTALL = :
  17  build_triplet = @build@
  18  host_triplet = @host@
  19  target_triplet = @target@
  20 -@ENABLE_CRYPTO_TRUE@am__append_1 = `libgnutls-config --libs` `pkg-config --libs libconfig`
  21 -@ENABLE_CRYPTO_TRUE@am__append_2 = `libgnutls-config --cflags` `pkg-config --cflags libconfig`
  22 +@ENABLE_CRYPTO_TRUE@am__append_1 = $(GNUTLS_LIBS) $(libconfig_LIBS)
  23 +@ENABLE_CRYPTO_TRUE@am__append_2 = $(GNUTLS_CFLAGS) $(libconfig_CFLAGS)
  24  subdir = libntfs
  25  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  26         $(srcdir)/libntfs-gnomevfs.8.in $(srcdir)/libntfs.8.in \
  27 --- a/ntfsprogs/Makefile.am
  28 +++ b/ntfsprogs/Makefile.am
  29 @@ -125,8 +125,8 @@ ntfsdump_logfile_LDFLAGS= $(AM_LFLAGS)
  30  if ENABLE_CRYPTO
  31  ntfsdecrypt_SOURCES    = ntfsdecrypt.c utils.c utils.h
  32  ntfsdecrypt_LDADD      = $(AM_LIBS)
  33 -ntfsdecrypt_LDFLAGS    = $(AM_LFLAGS) `libgnutls-config --libs`
  34 -ntfsdecrypt_CFLAGS     = `libgnutls-config --cflags`
  35 +ntfsdecrypt_LDFLAGS    = $(AM_LFLAGS) $(GNUTLS_LIBS)
  36 +ntfsdecrypt_CFLAGS     = $(GNUTLS_CFLAGS)
  37  endif
  38
  39  # Extra targets
  40 --- a/ntfsprogs/Makefile.in
  41 +++ b/ntfsprogs/Makefile.in
  42 @@ -449,8 +449,8 @@ ntfsdump_logfile_LDADD = $(AM_LIBS)
  43  ntfsdump_logfile_LDFLAGS = $(AM_LFLAGS)
  44  @ENABLE_CRYPTO_TRUE@ntfsdecrypt_SOURCES = ntfsdecrypt.c utils.c utils.h
  45  @ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDADD = $(AM_LIBS)
  46 -@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `libgnutls-config --libs`
  47 -@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = `libgnutls-config --cflags`
  48 +@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) $(GNUTLS_LIBS)
  49 +@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = $(GNUTLS_CFLAGS)
  50  all: all-am
  51
  52  .SUFFIXES: