[GNUnet-SVN] r21665 - in gnunet: . src/gns

[gnunet]

Author: grothoff
Date: 2012-05-31 20:42:31 +0200 (Thu, 31 May 2012)
New Revision: 21665

Modified:
   gnunet/configure.ac
   gnunet/src/gns/Makefile.am
Log:
-test for nss.h

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-05-31 18:20:04 UTC (rev 21664)
+++ gnunet/configure.ac 2012-05-31 18:42:31 UTC (rev 21665)
@@ -339,6 +339,18 @@
 fi
 
 
+
+AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false])
+if test x$nss = xnss
+then
+       AM_CONDITIONAL(HAVE_GLIBCNSS, false)
+       AC_MSG_WARN([No GNU libc nss header, will not build NSS plugin])
+else
+       AM_CONDITIONAL(HAVE_GLIBCNSS, true)
+fi
+
+
+
 # test for kvm and kstat (for CPU stats under BSD/Solaris)
 AC_CHECK_LIB([kvm],[kvm_open])
 AC_CHECK_LIB([kstat],[kstat_open])

Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am  2012-05-31 18:20:04 UTC (rev 21664)
+++ gnunet/src/gns/Makefile.am  2012-05-31 18:42:31 UTC (rev 21665)
@@ -1,7 +1,11 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
-SUBDIRS = . nss
+if HAVE_GLIBCNSS
+NSS_SUBDIR = nss
+endif
 
+SUBDIRS = . $(NSS_SUBDIR)
+
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif