diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-08-03 19:21:28 +0900 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-08-03 19:21:28 +0900 |
commit | 02c92c69ab4193b81ac6f90b52fecb40b94b9208 (patch) | |
tree | 0cbbfc249451abd23b238a811f42015df95bbe2a /src/gns | |
parent | b6755fe23d258a4dc971d8fabc3fae1873e31271 (diff) | |
parent | 6bcc73a1cbb1d4a609884762eab1b6de761ad1d9 (diff) | |
download | gnunet-02c92c69ab4193b81ac6f90b52fecb40b94b9208.tar.gz gnunet-02c92c69ab4193b81ac6f90b52fecb40b94b9208.zip |
Merge remote-tracking branch 'origin/master' into identity_abe
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/Makefile.am | 2 | ||||
-rw-r--r-- | src/gns/nss/Makefile.am | 26 | ||||
-rwxr-xr-x | src/gns/nss/install-nss-plugin.sh | 8 | ||||
-rwxr-xr-x | src/gns/nss/uninstall-nss-plugin.sh | 8 |
4 files changed, 2 insertions, 42 deletions
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 464bbbca1..977eb87e3 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -2,10 +2,8 @@ | |||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | 2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include |
3 | 3 | ||
4 | if HAVE_GLIBCNSS | 4 | if HAVE_GLIBCNSS |
5 | if INSTALL_NSS | ||
6 | NSS_SUBDIR = nss | 5 | NSS_SUBDIR = nss |
7 | endif | 6 | endif |
8 | endif | ||
9 | 7 | ||
10 | SUBDIRS = . $(NSS_SUBDIR) | 8 | SUBDIRS = . $(NSS_SUBDIR) |
11 | 9 | ||
diff --git a/src/gns/nss/Makefile.am b/src/gns/nss/Makefile.am index 2551b9562..5d42f777f 100644 --- a/src/gns/nss/Makefile.am +++ b/src/gns/nss/Makefile.am | |||
@@ -18,28 +18,17 @@ | |||
18 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 | 18 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 |
19 | # USA. | 19 | # USA. |
20 | 20 | ||
21 | EXTRA_DIST = map-file \ | 21 | EXTRA_DIST = map-file |
22 | install-nss-plugin.sh \ | ||
23 | uninstall-nss-plugin.sh | ||
24 | 22 | ||
25 | AM_LDFLAGS=-avoid-version -module -export-dynamic | 23 | AM_LDFLAGS=-avoid-version -module -export-dynamic |
26 | 24 | ||
27 | nssdir = $(NSS_DIR) | 25 | nssdir = $(libdir)/gnunet/nss |
28 | |||
29 | LIBTOOL = $(LIBTOOL_SUDO_BINARY) $(SHELL) $(top_builddir)/libtool | ||
30 | 26 | ||
31 | if !MINGW | 27 | if !MINGW |
32 | if INSTALL_NSS | ||
33 | nss_LTLIBRARIES = \ | 28 | nss_LTLIBRARIES = \ |
34 | libnss_gns.la \ | 29 | libnss_gns.la \ |
35 | libnss_gns4.la \ | 30 | libnss_gns4.la \ |
36 | libnss_gns6.la | 31 | libnss_gns6.la |
37 | |||
38 | install-nssLTLIBRARIES: | ||
39 | LIBTOOL_SUDO_BINARY=$(SUDO_BINARY) | ||
40 | uninstall-nssLTLIBRARIES: | ||
41 | LIBTOOL_SUDO_BINARY=$(SUDO_BINARY) | ||
42 | endif | ||
43 | endif | 32 | endif |
44 | 33 | ||
45 | sources = nss_gns_query.h nss_gns_query.c | 34 | sources = nss_gns_query.h nss_gns_query.c |
@@ -57,14 +46,3 @@ libnss_gns6_la_SOURCES=$(libnss_gns_la_SOURCES) | |||
57 | libnss_gns6_la_CFLAGS=$(libnss_gns_la_CFLAGS) -DNSS_IPV6_ONLY=1 | 46 | libnss_gns6_la_CFLAGS=$(libnss_gns_la_CFLAGS) -DNSS_IPV6_ONLY=1 |
58 | libnss_gns6_la_LDFLAGS=$(libnss_gns_la_LDFLAGS) | 47 | libnss_gns6_la_LDFLAGS=$(libnss_gns_la_LDFLAGS) |
59 | 48 | ||
60 | if INSTALL_NSS | ||
61 | if !MINGW | ||
62 | install-data-hook: | ||
63 | $(top_srcdir)/src/gns/nss/install-nss-plugin.sh $(SHELL) $(top_builddir) $(DESTDIR)$(nssdir) $(SUDO_BINARY) | ||
64 | |||
65 | uninstall-hook: | ||
66 | $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) $(top_builddir) "rm -f $(nssdir)/libnss_gns.so.2" $(SUDO_BINARY) | ||
67 | $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) $(top_builddir) "rm -f $(nssdir)/libnss_gns4.so.2" $(SUDO_BINARY) | ||
68 | $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) $(top_builddir) "rm -f $(nssdir)/libnss_gns6.so.2" $(SUDO_BINARY) | ||
69 | endif | ||
70 | endif | ||
diff --git a/src/gns/nss/install-nss-plugin.sh b/src/gns/nss/install-nss-plugin.sh deleted file mode 100755 index 1aab8ca69..000000000 --- a/src/gns/nss/install-nss-plugin.sh +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # $1 - shell | ||
3 | # $2 - top_builddir | ||
4 | # $3 - nssdir | ||
5 | # $4 - sudo binary (empty if root) | ||
6 | $4 $1 $2/libtool --mode=finish $3 | ||
7 | echo LTINST: $4 $1 $2/libtool --mode=finish $3 | ||
8 | $4 rm -f $3/libnss_gns.la $3/libnss_gns4.la $3/libnss_gns6.la | ||
diff --git a/src/gns/nss/uninstall-nss-plugin.sh b/src/gns/nss/uninstall-nss-plugin.sh deleted file mode 100755 index 3d8cec110..000000000 --- a/src/gns/nss/uninstall-nss-plugin.sh +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # $1 - shell | ||
3 | # $2 - top_builddir | ||
4 | # $3 - nssdir+path of library to remove | ||
5 | # $4 - sudo binary (empty if root) | ||
6 | $4 $1 $2/libtool --mode=uninstall $3 | ||
7 | |||
8 | |||