aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/configure_libnss.diff
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/configure_libnss.diff')
-rw-r--r--debian/patches/configure_libnss.diff61
1 files changed, 2 insertions, 59 deletions
diff --git a/debian/patches/configure_libnss.diff b/debian/patches/configure_libnss.diff
index 89abf75..9a23c0a 100644
--- a/debian/patches/configure_libnss.diff
+++ b/debian/patches/configure_libnss.diff
@@ -1,71 +1,14 @@
--- a/src/gns/nss/Makefile.am
+++ b/src/gns/nss/Makefile.am
-@@ -21,20 +21,18 @@
+@@ -21,11 +21,7 @@
AM_LDFLAGS=-avoid-version -module -export-dynamic
-if HAVE_SUDO
--nssdir = /lib/
+ nssdir = /lib/
-else
-nssdir = $(libdir)
-endif
-+nssdir = $(NSS_DIR)
LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool
- if !MINGW
-+if INSTALL_NSS
- nss_LTLIBRARIES = \
- libnss_gns.la \
- libnss_gns4.la \
- libnss_gns6.la
- endif
-+endif
-
- sources = nss_gns_query.h nss_gns_query.c
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -780,6 +780,42 @@
- AC_SUBST(SUDO_BINARY)
- AM_CONDITIONAL([HAVE_SUDO], [test "x$SUDO_BINARY" != "x" -o -w /])
-
-+
-+# test for nssdir
-+AC_MSG_CHECKING(with nssdir)
-+AC_ARG_WITH(nssdir,
-+ [ --with-nssdir=PATH where to install NSS plugins],
-+ [AC_MSG_RESULT("$with_nssdir")
-+ case $with_nssdir in
-+ no)
-+ NSS_DIR=
-+ install_nss=0
-+ ;;
-+ yes)
-+ NSS_DIR="/lib"
-+ install_nss=1
-+ ;;
-+ *)
-+ NSS_DIR=$with_nssdir
-+ install_nss=1
-+ ;;
-+ esac
-+ ],
-+ [
-+ if test "x$SUDO_BINARY" != "x" -o -w /
-+ then
-+ NSS_DIR="/lib"
-+ install_nss=1
-+ AC_MSG_RESULT([yes, to /lib])
-+ else
-+ NSS_DIR=
-+ install_nss=0
-+ AC_MSG_RESULT([no])
-+ fi
-+ ])
-+AC_SUBST(NSS_DIR)
-+AM_CONDITIONAL([INSTALL_NSS], [test "x$install_nss" != "x0"])
-+
- # test for gnunetdns group name
- GNUNETDNS_GROUP=gnunetdns
- AC_MSG_CHECKING(for gnunetdns group name)