diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-10-12 15:32:08 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-10-12 15:32:08 +0000 |
commit | 4f7742c31bcf64550dae6a14d6b6da54d6d57e59 (patch) | |
tree | 3eaf2f4c2f1272e817a4d23d1b642a16ae0bce05 | |
parent | f6bdc4c133a26084e3a4457ad8dcc27c56344bb5 (diff) | |
download | gnunet-4f7742c31bcf64550dae6a14d6b6da54d6d57e59.tar.gz gnunet-4f7742c31bcf64550dae6a14d6b6da54d6d57e59.zip |
-fix for #688590: allow user to specify how to install nsslibs
-rw-r--r-- | configure.ac | 36 | ||||
-rw-r--r-- | src/gns/nss/Makefile.am | 8 | ||||
-rw-r--r-- | src/transport/Makefile.am | 33 |
3 files changed, 52 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index c1d463a26..0bedbaca9 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -812,6 +812,42 @@ AC_ARG_WITH(sudo, | |||
812 | AC_SUBST(SUDO_BINARY) | 812 | AC_SUBST(SUDO_BINARY) |
813 | AM_CONDITIONAL([HAVE_SUDO], [test "x$SUDO_BINARY" != "x" -o -w /]) | 813 | AM_CONDITIONAL([HAVE_SUDO], [test "x$SUDO_BINARY" != "x" -o -w /]) |
814 | 814 | ||
815 | |||
816 | # test for nssdir | ||
817 | AC_MSG_CHECKING(with nssdir) | ||
818 | AC_ARG_WITH(nssdir, | ||
819 | [ --with-nssdir=PATH where to install NSS plugins], | ||
820 | [AC_MSG_RESULT("$with_nssdir") | ||
821 | case $with_nssdir in | ||
822 | no) | ||
823 | NSS_DIR= | ||
824 | install_nss=0 | ||
825 | ;; | ||
826 | yes) | ||
827 | NSS_DIR="/lib" | ||
828 | install_nss=1 | ||
829 | ;; | ||
830 | *) | ||
831 | NSS_DIR=$with_nssdir | ||
832 | install_nss=1 | ||
833 | ;; | ||
834 | esac | ||
835 | ], | ||
836 | [ | ||
837 | if test "x$SUDO_BINARY" != "x" -o -w / | ||
838 | then | ||
839 | NSS_DIR="/lib" | ||
840 | install_nss=1 | ||
841 | AC_MSG_RESULT([yes, to /lib]) | ||
842 | else | ||
843 | NSS_DIR= | ||
844 | install_nss=0 | ||
845 | AC_MSG_RESULT([no]) | ||
846 | fi | ||
847 | ]) | ||
848 | AC_SUBST(NSS_DIR) | ||
849 | AM_CONDITIONAL([INSTALL_NSS], [test "x$install_nss" != "x0"]) | ||
850 | |||
815 | # test for gnunetdns group name | 851 | # test for gnunetdns group name |
816 | GNUNETDNS_GROUP=gnunetdns | 852 | GNUNETDNS_GROUP=gnunetdns |
817 | AC_MSG_CHECKING(for gnunetdns group name) | 853 | AC_MSG_CHECKING(for gnunetdns group name) |
diff --git a/src/gns/nss/Makefile.am b/src/gns/nss/Makefile.am index 0569fce7d..f2a6daac2 100644 --- a/src/gns/nss/Makefile.am +++ b/src/gns/nss/Makefile.am | |||
@@ -21,20 +21,18 @@ EXTRA_DIST = map-file | |||
21 | 21 | ||
22 | AM_LDFLAGS=-avoid-version -module -export-dynamic | 22 | AM_LDFLAGS=-avoid-version -module -export-dynamic |
23 | 23 | ||
24 | if HAVE_SUDO | 24 | nssdir = $(NSS_DIR) |
25 | nssdir = /lib/ | ||
26 | else | ||
27 | nssdir = $(libdir) | ||
28 | endif | ||
29 | 25 | ||
30 | LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool | 26 | LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool |
31 | 27 | ||
32 | if !MINGW | 28 | if !MINGW |
29 | if INSTALL_NSS | ||
33 | nss_LTLIBRARIES = \ | 30 | nss_LTLIBRARIES = \ |
34 | libnss_gns.la \ | 31 | libnss_gns.la \ |
35 | libnss_gns4.la \ | 32 | libnss_gns4.la \ |
36 | libnss_gns6.la | 33 | libnss_gns6.la |
37 | endif | 34 | endif |
35 | endif | ||
38 | 36 | ||
39 | sources = nss_gns_query.h nss_gns_query.c | 37 | sources = nss_gns_query.h nss_gns_query.c |
40 | 38 | ||
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 54d6a1a35..df238d338 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -12,7 +12,6 @@ if HAVE_MHD | |||
12 | GN_LIBMHD = -lmicrohttpd | 12 | GN_LIBMHD = -lmicrohttpd |
13 | HTTP_SERVER_PLUGIN_LA = libgnunet_plugin_transport_http_server.la | 13 | HTTP_SERVER_PLUGIN_LA = libgnunet_plugin_transport_http_server.la |
14 | HTTPS_SERVER_PLUGIN_LA = libgnunet_plugin_transport_https_server.la | 14 | HTTPS_SERVER_PLUGIN_LA = libgnunet_plugin_transport_https_server.la |
15 | |||
16 | HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server | 15 | HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server |
17 | HTTPS_SERVER_PLUGIN_TEST = test_plugin_https_server | 16 | HTTPS_SERVER_PLUGIN_TEST = test_plugin_https_server |
18 | endif | 17 | endif |
@@ -32,8 +31,6 @@ if HAVE_LIBCURL | |||
32 | HTTP_REL_TEST = test_transport_api_reliability_http | 31 | HTTP_REL_TEST = test_transport_api_reliability_http |
33 | HTTP_QUOTA_TEST = test_quota_compliance_http \ | 32 | HTTP_QUOTA_TEST = test_quota_compliance_http \ |
34 | test_quota_compliance_http_asymmetric | 33 | test_quota_compliance_http_asymmetric |
35 | |||
36 | |||
37 | HTTPS_API_TEST = test_transport_api_https | 34 | HTTPS_API_TEST = test_transport_api_https |
38 | HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https | 35 | HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https |
39 | HTTPS_REL_TEST = test_transport_api_reliability_https | 36 | HTTPS_REL_TEST = test_transport_api_reliability_https |
@@ -42,10 +39,6 @@ if HAVE_LIBCURL | |||
42 | endif | 39 | endif |
43 | endif | 40 | endif |
44 | 41 | ||
45 | #if FALSE | ||
46 | |||
47 | #endif | ||
48 | |||
49 | if USE_COVERAGE | 42 | if USE_COVERAGE |
50 | AM_CFLAGS = --coverage -O0 | 43 | AM_CFLAGS = --coverage -O0 |
51 | endif | 44 | endif |
@@ -239,8 +232,8 @@ libgnunet_plugin_transport_unix_la_LIBADD = \ | |||
239 | $(LTLIBINTL) | 232 | $(LTLIBINTL) |
240 | libgnunet_plugin_transport_unix_la_LDFLAGS = \ | 233 | libgnunet_plugin_transport_unix_la_LDFLAGS = \ |
241 | $(GN_PLUGIN_LDFLAGS) | 234 | $(GN_PLUGIN_LDFLAGS) |
242 | 235 | ||
243 | 236 | ||
244 | libgnunet_plugin_transport_http_client_la_SOURCES = \ | 237 | libgnunet_plugin_transport_http_client_la_SOURCES = \ |
245 | plugin_transport_http_client.c plugin_transport_http_common.c | 238 | plugin_transport_http_client.c plugin_transport_http_common.c |
246 | libgnunet_plugin_transport_http_client_la_LIBADD = \ | 239 | libgnunet_plugin_transport_http_client_la_LIBADD = \ |
@@ -256,8 +249,8 @@ libgnunet_plugin_transport_http_client_la_CFLAGS = \ | |||
256 | $(CFLAGS) | 249 | $(CFLAGS) |
257 | libgnunet_plugin_transport_http_client_la_CPPFLAGS = \ | 250 | libgnunet_plugin_transport_http_client_la_CPPFLAGS = \ |
258 | @LIBCURL_CPPFLAGS@ | 251 | @LIBCURL_CPPFLAGS@ |
259 | 252 | ||
260 | 253 | ||
261 | libgnunet_plugin_transport_http_server_la_SOURCES = \ | 254 | libgnunet_plugin_transport_http_server_la_SOURCES = \ |
262 | plugin_transport_http_server.c plugin_transport_http_common.c | 255 | plugin_transport_http_server.c plugin_transport_http_common.c |
263 | libgnunet_plugin_transport_http_server_la_LIBADD = \ | 256 | libgnunet_plugin_transport_http_server_la_LIBADD = \ |
@@ -287,8 +280,8 @@ libgnunet_plugin_transport_https_client_la_CFLAGS = \ | |||
287 | $(CFLAGS) -DBUILD_HTTPS | 280 | $(CFLAGS) -DBUILD_HTTPS |
288 | libgnunet_plugin_transport_https_client_la_CPPFLAGS = \ | 281 | libgnunet_plugin_transport_https_client_la_CPPFLAGS = \ |
289 | @LIBCURL_CPPFLAGS@ | 282 | @LIBCURL_CPPFLAGS@ |
290 | 283 | ||
291 | 284 | ||
292 | libgnunet_plugin_transport_https_server_la_SOURCES = \ | 285 | libgnunet_plugin_transport_https_server_la_SOURCES = \ |
293 | plugin_transport_http_server.c plugin_transport_http_common.c | 286 | plugin_transport_http_server.c plugin_transport_http_common.c |
294 | libgnunet_plugin_transport_https_server_la_LIBADD = \ | 287 | libgnunet_plugin_transport_https_server_la_LIBADD = \ |
@@ -497,7 +490,7 @@ test_plugin_http_server_LDADD = \ | |||
497 | $(top_builddir)/src/hello/libgnunethello.la \ | 490 | $(top_builddir)/src/hello/libgnunethello.la \ |
498 | $(top_builddir)/src/util/libgnunetutil.la \ | 491 | $(top_builddir)/src/util/libgnunetutil.la \ |
499 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 492 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
500 | 493 | ||
501 | test_plugin_https_server_SOURCES = \ | 494 | test_plugin_https_server_SOURCES = \ |
502 | test_plugin_transport.c | 495 | test_plugin_transport.c |
503 | test_plugin_https_server_LDADD = \ | 496 | test_plugin_https_server_LDADD = \ |
@@ -506,7 +499,7 @@ test_plugin_https_server_LDADD = \ | |||
506 | $(top_builddir)/src/hello/libgnunethello.la \ | 499 | $(top_builddir)/src/hello/libgnunethello.la \ |
507 | $(top_builddir)/src/util/libgnunetutil.la \ | 500 | $(top_builddir)/src/util/libgnunetutil.la \ |
508 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 501 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
509 | 502 | ||
510 | test_plugin_http_client_SOURCES = \ | 503 | test_plugin_http_client_SOURCES = \ |
511 | test_plugin_transport.c | 504 | test_plugin_transport.c |
512 | test_plugin_http_client_LDADD = \ | 505 | test_plugin_http_client_LDADD = \ |
@@ -515,7 +508,7 @@ test_plugin_http_client_LDADD = \ | |||
515 | $(top_builddir)/src/hello/libgnunethello.la \ | 508 | $(top_builddir)/src/hello/libgnunethello.la \ |
516 | $(top_builddir)/src/util/libgnunetutil.la \ | 509 | $(top_builddir)/src/util/libgnunetutil.la \ |
517 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 510 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
518 | 511 | ||
519 | test_plugin_https_client_SOURCES = \ | 512 | test_plugin_https_client_SOURCES = \ |
520 | test_plugin_transport.c | 513 | test_plugin_transport.c |
521 | test_plugin_https_client_LDADD = \ | 514 | test_plugin_https_client_LDADD = \ |
@@ -663,7 +656,7 @@ test_transport_api_http_LDADD = \ | |||
663 | $(top_builddir)/src/hello/libgnunethello.la \ | 656 | $(top_builddir)/src/hello/libgnunethello.la \ |
664 | $(top_builddir)/src/util/libgnunetutil.la \ | 657 | $(top_builddir)/src/util/libgnunetutil.la \ |
665 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 658 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
666 | 659 | ||
667 | test_transport_api_http_reverse_SOURCES = \ | 660 | test_transport_api_http_reverse_SOURCES = \ |
668 | test_transport_api.c | 661 | test_transport_api.c |
669 | test_transport_api_http_reverse_LDADD = \ | 662 | test_transport_api_http_reverse_LDADD = \ |
@@ -671,7 +664,7 @@ test_transport_api_http_reverse_LDADD = \ | |||
671 | $(top_builddir)/src/hello/libgnunethello.la \ | 664 | $(top_builddir)/src/hello/libgnunethello.la \ |
672 | $(top_builddir)/src/util/libgnunetutil.la \ | 665 | $(top_builddir)/src/util/libgnunetutil.la \ |
673 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 666 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
674 | 667 | ||
675 | test_transport_api_timeout_http_SOURCES = \ | 668 | test_transport_api_timeout_http_SOURCES = \ |
676 | test_transport_api_timeout.c | 669 | test_transport_api_timeout.c |
677 | test_transport_api_timeout_http_LDADD = \ | 670 | test_transport_api_timeout_http_LDADD = \ |
@@ -728,7 +721,7 @@ test_transport_api_https_LDADD = \ | |||
728 | $(top_builddir)/src/hello/libgnunethello.la \ | 721 | $(top_builddir)/src/hello/libgnunethello.la \ |
729 | $(top_builddir)/src/util/libgnunetutil.la \ | 722 | $(top_builddir)/src/util/libgnunetutil.la \ |
730 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 723 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
731 | 724 | ||
732 | test_transport_api_timeout_https_SOURCES = \ | 725 | test_transport_api_timeout_https_SOURCES = \ |
733 | test_transport_api_timeout.c | 726 | test_transport_api_timeout.c |
734 | test_transport_api_timeout_https_LDADD = \ | 727 | test_transport_api_timeout_https_LDADD = \ |
@@ -736,7 +729,7 @@ test_transport_api_timeout_https_LDADD = \ | |||
736 | $(top_builddir)/src/hello/libgnunethello.la \ | 729 | $(top_builddir)/src/hello/libgnunethello.la \ |
737 | $(top_builddir)/src/util/libgnunetutil.la \ | 730 | $(top_builddir)/src/util/libgnunetutil.la \ |
738 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 731 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
739 | 732 | ||
740 | 733 | ||
741 | test_transport_api_reliability_https_SOURCES = \ | 734 | test_transport_api_reliability_https_SOURCES = \ |
742 | test_transport_api_reliability.c | 735 | test_transport_api_reliability.c |