Magellan Linux

Annotation of /trunk/ntfsprogs/patches/ntfsprogs-2.0.0-gnutls-2.8.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 954 - (hide annotations) (download)
Thu Dec 24 09:44:41 2009 UTC (14 years, 5 months ago) by niro
File size: 2061 byte(s)
ntfsprogs fixes

1 niro 954 --- libntfs/Makefile.am
2     +++ libntfs/Makefile.am
3     @@ -38,8 +38,8 @@
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 += `pkg-config --libs gnutls libconfig`
10     +libntfs_la_CFLAGS += `pkg-config --cflags gnutls libconfig`
11     endif
12    
13     libntfs_la_SOURCES = \
14     --- libntfs/Makefile.in
15     +++ libntfs/Makefile.in
16     @@ -61,8 +61,8 @@
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 = `pkg-config --libs gnutls libconfig`
23     +@ENABLE_CRYPTO_TRUE@am__append_2 = `pkg-config --cflags gnutls libconfig`
24     subdir = libntfs
25     DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
26     $(srcdir)/libntfs-gnomevfs.8.in $(srcdir)/libntfs.8.in \
27     --- ntfsprogs/Makefile.am
28     +++ ntfsprogs/Makefile.am
29     @@ -125,8 +125,8 @@
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) `pkg-config --libs gnutls`
36     +ntfsdecrypt_CFLAGS = `pkg-config --cflags gnutls`
37     endif
38    
39     # Extra targets
40     --- ntfsprogs/Makefile.in
41     +++ ntfsprogs/Makefile.in
42     @@ -449,8 +449,8 @@
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) `pkg-config --libs gnutls`
49     +@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = `pkg-config --cflags gnutls`
50     all: all-am
51    
52     .SUFFIXES: