proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

6 files changed, 435 insertions, 0 deletions

diff --git a/dev-libs/mozldap/files/configure.in.patch b/dev-libs/mozldap/files/configure.in.patch
new file mode 100644
index 000000000000..6254ef04eb45
--- /dev/null
+++ b/dev-libs/mozldap/files/configure.in.patch
@@ -0,0 +1,185 @@
+--- a/configure.in
++++ b/configure.in
+@@ -42,7 +42,7 @@
+ AC_PREREQ(2.12)
+ AC_INIT(ldap/include/ldap.h)
+ 
+-AC_CONFIG_AUX_DIR(${srcdir}/config/autoconf)
++AC_CONFIG_AUX_DIR(./config/autoconf)
+ AC_CANONICAL_SYSTEM
+ 
+ dnl ========================================================
+@@ -85,24 +85,6 @@
+ HOST_CFLAGS="${HOST_CFLAGS=}"
+ HOST_LDFLAGS="${HOST_LDFLAGS=}"
+ 
+-case "$target" in
+-*-cygwin*|*-mingw*|*-msvc*|*-mks*)
+-    # Check to see if we are really running in a msvc environemnt
+-    _WIN32_MSVC=
+-    AC_CHECK_PROGS(CC, cl)
+-    if test "$CC" = "cl"; then
+-        echo 'main() { return 0; }' > dummy.c
+-        ${CC} -o dummy dummy.c >/dev/null 2>&1
+-        if test $? = 0; then
+-            _WIN32_MSVC=1
+-            CXX=$CC
+-        else
+-            AC_MSG_WARN([$(CC) test failed.  Using normal feature tests])
+-        fi
+-        rm -f dummy dummy.o dummy.obj dummy.exe dummy.c
+-    fi
+-    ;;
+-esac
+ 
+ if test -n "$_WIN32_MSVC"; then
+     SKIP_PATH_CHECKS=1
+@@ -151,18 +133,6 @@
+ 	        AC_DEFINE(MOZILLA_CLIENT)
+ 	    fi])
+ 
+-AC_ARG_ENABLE(optimize,
+-    [  --enable-optimize(=val) Enable code optimizations (val, ie. -O2) ],
+-    [ if test "$enableval" != "no"; then
+-        MOZ_OPTIMIZE=1
+-        if test -n "$enableval" && test "$enableval" != "yes"; then
+-    	    _OPTIMIZE_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
+-            _SAVE_OPTIMIZE_FLAGS=$_OPTIMIZE_FLAGS
+-        fi
+-      else
+-        MOZ_OPTIMIZE=
+-    fi ])
+-
+ AC_ARG_ENABLE(debug,
+     [  --disable-debug         Do not compile in debugging symbols
+   --enable-debug(=val)    Enable debugging (debug flags val)],
+@@ -176,26 +146,6 @@
+             fi
+ 	    fi])
+ 
+-AC_ARG_ENABLE(win32-target,
+-    [  --enable-win32-target=\$t
+-                          Specify win32 flavor. (WIN95 or WINNT)],
+-    OS_TARGET=`echo $enableval | tr a-z A-Z`,
+-    OS_TARGET=)
+-
+-AC_ARG_ENABLE(debug-rtl,
+-    [  --enable-debug-rtl      Use the MSVC debug runtime library],
+-    [ if test "$enableval" = "yes"; then
+-	    USE_DEBUG_RTL=1
+-      fi ])
+-
+-AC_ARG_ENABLE(n32,
+-    [  --enable-n32            Enable n32 ABI support (IRIX only)],
+-    [ if test "$enableval" = "yes"; then
+-	USE_N32=1
+-      else if test "$enableval" = "no"; then
+-	USE_N32=
+-      fi
+-    fi ])
+ 
+ AC_ARG_ENABLE(64bit,
+     [  --enable-64bit          Enable 64-bit support (on certain platforms)],
+@@ -261,10 +211,6 @@
+        if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS" ; then
+            if test -n "$_SYSTEM_SVRCORE"; then
+                AM_PATH_SVRCORE(4.0.1, [MOZ_NATIVE_SVRCORE=1], [MOZ_NATIVE_SVRCORE=])
+-           else
+-       	       dnl see if we are being built in the same build tree as svrcore
+-               AM_PATH_INTREE_SVRCORE(../../dist)
+-               dnl failing that, see if we can find svrcore-config or pkg-config svrcore
+                if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS"; then
+                    AM_PATH_SVRCORE(4.0.1, [MOZ_NATIVE_SVRCORE=1], [MOZ_NATIVE_SVRCORE=])
+                fi
+@@ -294,9 +240,6 @@
+             _SYSTEM_NSS=no
+ 	    fi], _SYSTEM_NSS= )
+ 
+-if test "$_WIN32_MSVC"; then
+-    _SYSTEM_NSS=
+-fi
+ 
+ dnl first, see if user has specified explicit NSPR include and lib paths,
+ dnl of if the user has explicitly disabled the use of nss
+@@ -308,10 +251,6 @@
+ if test -n "$USE_NSS" -a -z "$NSS_CFLAGS" -a -z "$NSS_LIBS" ; then
+ dnl nss requires nspr
+    no_nspr=no
+-   if test -z "$_SYSTEM_NSS" -o "$_SYSTEM_NSS" = "no" ; then
+-dnl see if we are being built in the same build tree as nss
+-      AM_PATH_INTREE_NSS(../../dist)
+-   fi
+ dnl failing that, see if we can find nss-config or pkg-config nss
+    if test -z "$NSS_CFLAGS" -a "$_SYSTEM_NSS" != "no" ; then
+       AM_PATH_NSS(3.9.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
+@@ -348,10 +287,6 @@
+ 
+ dnl next, look for in-tree nspr if user did not specify explicit system nspr
+ if test "$no_nspr" = "no" -a -z "$NSPR_CFLAGS" -a -z "$NSPR_LIBS" ; then
+-   if test -z "$_SYSTEM_NSPR" -o "$_SYSTEM_NSPR" = "no" ; then
+-dnl see if we are being built in the same build tree as nspr
+-      AM_PATH_INTREE_NSPR(../../dist)
+-   fi
+ dnl failing that, see if we can find nspr-config or pkg-config nspr
+    if test -z "$NSPR_CFLAGS" -a "$_SYSTEM_NSPR" != "no" ; then
+       AM_PATH_NSPR(4.0.0, [MOZ_NATIVE_NSPR=1], [MOZ_NATIVE_NSPR=])
+@@ -390,48 +325,6 @@
+ dnl than in cygwin-wrapper
+ dnl ========================================================
+ 
+-dnl add other runtime environments that use unix style paths
+-dnl *-cygwin*|*-mingw*|*-msvc*|*-mks*)
+-case "$target" in
+-*-cygwin*) USE_WINDOWS_PATHS=1 ;;
+-esac
+-
+-if test -n "$_WIN32_MSVC" -a -n "$USE_WINDOWS_PATHS" ; then
+-    if test -n "$NSPR_CFLAGS" -a -z "$SKIP_CYGWIN_FIXUP" ; then
+-        path=`echo $NSPR_CFLAGS | sed -e 's/^-I//'`
+-        path=`cygpath -m $path`
+-        NSPR_CFLAGS="/I$path"
+-    fi
+-    if test -n "$NSPR_LIBS" -a -z "$SKIP_CYGWIN_FIXUP" ; then
+-        path=`echo $NSPR_LIBS | sed -e 's/^-L//'`
+-        path=`cygpath -m $path`
+-        NSPR_LIBS="/LIBPATH:$path"
+-    fi
+-
+-    if test -n "$NSS_CFLAGS" ; then
+-        path=`echo $NSS_CFLAGS | sed -e 's/^-I//'`
+-        path=`cygpath -m $path`
+-        NSS_CFLAGS="/I$path"
+-    fi
+-
+-    if test -n "$NSS_LIBS" ; then
+-        path=`echo $NSS_LIBS | sed -e 's/^-L//'`
+-        path=`cygpath -m $path`
+-        NSS_LIBS="/LIBPATH:$path"
+-    fi
+-
+-    if test -n "$SVRCORE_CFLAGS" ; then
+-        path=`echo $SVRCORE_CFLAGS | sed -e 's/^-I//'`
+-        path=`cygpath -m $path`
+-        SVRCORE_CFLAGS="/I$path"
+-    fi
+-
+-    if test -n "$SVRCORE_LIBS" ; then
+-        path=`echo $SVRCORE_LIBS | sed -e 's/^-L//'`
+-        path=`cygpath -m $path`
+-        SVRCORE_LIBS="/LIBPATH:$path"
+-    fi
+-fi
+ 
+ dnl ========================================================
+ dnl =
+@@ -1489,9 +1382,7 @@
+     ;;
+ 
+ *-linux*)
+-    if test -z "$USE_NSPR_THREADS"; then
+-        USE_PTHREADS=1
+-    fi
++    USE_PTHREADS=1
+     AC_DEFINE(XP_UNIX)
+     AC_DEFINE(_POSIX_SOURCE)
+     AC_DEFINE(_BSD_SOURCE)
diff --git a/dev-libs/mozldap/files/mozldap-6.0.4-pkgconfig.patch b/dev-libs/mozldap/files/mozldap-6.0.4-pkgconfig.patch
new file mode 100644
index 000000000000..51bc34048b87
--- /dev/null
+++ b/dev-libs/mozldap/files/mozldap-6.0.4-pkgconfig.patch
@@ -0,0 +1,11 @@
+--- a/mozldap.pc.in
++++ b/mozldap.pc.in
+@@ -11,6 +11,6 @@
+ Name: mozldap
+ Description: Mozilla LDAP C SDK
+ Version: %MOZLDAP_VERSION%
+-Requires: nspr >= %NSPR_VERSION% , nss >= %NSS_VERSION%
+-Libs: -lssldap%libsuffix% -lprldap%libsuffix% -lldap%libsuffix%
++Requires: nspr >= %NSPR_VERSION% , nss >= %NSS_VERSION% , svrcore >= %SVRCORE_VERSION%
++Libs: -L${libdir} -lssldap%libsuffix% -lprldap%libsuffix% -lldap%libsuffix%
+ Cflags: -I${includedir}
diff --git a/dev-libs/mozldap/files/mozldap-6.0.6-ldflags.patch b/dev-libs/mozldap/files/mozldap-6.0.6-ldflags.patch
new file mode 100644
index 000000000000..60593c683e5c
--- /dev/null
+++ b/dev-libs/mozldap/files/mozldap-6.0.6-ldflags.patch
@@ -0,0 +1,15 @@
+Respect LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=327335
+
+--- config/autoconf.mk.in
++++ config/autoconf.mk.in
+@@ -117,7 +117,7 @@
+ 
+ MKSHLIB		= @MKSHLIB@
+ DSO_CFLAGS	= @DSO_CFLAGS@
+-DSO_LDOPTS	= @DSO_LDOPTS@
++DSO_LDOPTS	= @LDFLAGS@ @DSO_LDOPTS@
+ 
+ RESOLVE_LINK_SYMBOLS = @RESOLVE_LINK_SYMBOLS@
+ 
diff --git a/dev-libs/mozldap/files/mozldap-6.0.7-configure.in.patch b/dev-libs/mozldap/files/mozldap-6.0.7-configure.in.patch
new file mode 100644
index 000000000000..525d7259af54
--- /dev/null
+++ b/dev-libs/mozldap/files/mozldap-6.0.7-configure.in.patch
@@ -0,0 +1,137 @@
+diff -Nurp c-sdk.orig/configure.in c-sdk/configure.in
+--- c-sdk.orig/configure.in	2011-01-06 12:05:39.000000000 +0000
++++ c-sdk/configure.in	2013-03-14 18:01:19.647224070 +0000
+@@ -42,7 +42,7 @@ dnl ***** END LICENSE BLOCK *****
+ AC_PREREQ(2.12)
+ AC_INIT(ldap/include/ldap.h)
+ 
+-AC_CONFIG_AUX_DIR(${srcdir}/config/autoconf)
++AC_CONFIG_AUX_DIR(./config/autoconf)
+ AC_CANONICAL_SYSTEM
+ 
+ dnl ========================================================
+@@ -86,24 +86,6 @@ DLLFLAGS="${DLLFLAGS=}"
+ HOST_CFLAGS="${HOST_CFLAGS=}"
+ HOST_LDFLAGS="${HOST_LDFLAGS=}"
+ 
+-case "$target" in
+-*-cygwin*|*-mingw*|*-msvc*|*-mks*)
+-    # Check to see if we are really running in a msvc environemnt
+-    _WIN32_MSVC=
+-    AC_CHECK_PROGS(CC, cl)
+-    if test "$CC" = "cl"; then
+-        echo 'main() { return 0; }' > dummy.c
+-        ${CC} -o dummy dummy.c >/dev/null 2>&1
+-        if test $? = 0; then
+-            _WIN32_MSVC=1
+-            CXX=$CC
+-        else
+-            AC_MSG_WARN([$(CC) test failed.  Using normal feature tests])
+-        fi
+-        rm -f dummy dummy.o dummy.obj dummy.exe dummy.c
+-    fi
+-    ;;
+-esac
+ 
+ if test -n "$_WIN32_MSVC"; then
+     SKIP_PATH_CHECKS=1
+@@ -152,18 +134,6 @@ AC_ARG_WITH(mozilla,
+ 	        AC_DEFINE(MOZILLA_CLIENT)
+ 	    fi])
+ 
+-AC_ARG_ENABLE(optimize,
+-    [  --enable-optimize(=val) Enable code optimizations (val, ie. -O2) ],
+-    [ if test "$enableval" != "no"; then
+-        MOZ_OPTIMIZE=1
+-        if test -n "$enableval" && test "$enableval" != "yes"; then
+-    	    _OPTIMIZE_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
+-            _SAVE_OPTIMIZE_FLAGS=$_OPTIMIZE_FLAGS
+-        fi
+-      else
+-        MOZ_OPTIMIZE=
+-    fi ])
+-
+ AC_ARG_ENABLE(debug,
+     [  --enable-debug(=val)    Enable debugging (debug flags val)],
+     [ if test "$enableval" != "no"; then
+@@ -176,26 +146,6 @@ AC_ARG_ENABLE(debug,
+             MOZ_DEBUG=
+     fi])
+ 
+-AC_ARG_ENABLE(win32-target,
+-    [  --enable-win32-target=\$t
+-                          Specify win32 flavor. (WIN95 or WINNT)],
+-    OS_TARGET=`echo $enableval | tr a-z A-Z`,
+-    OS_TARGET=)
+-
+-AC_ARG_ENABLE(debug-rtl,
+-    [  --enable-debug-rtl      Use the MSVC debug runtime library],
+-    [ if test "$enableval" = "yes"; then
+-	    USE_DEBUG_RTL=1
+-      fi ])
+-
+-AC_ARG_ENABLE(n32,
+-    [  --enable-n32            Enable n32 ABI support (IRIX only)],
+-    [ if test "$enableval" = "yes"; then
+-	USE_N32=1
+-      else if test "$enableval" = "no"; then
+-	USE_N32=
+-      fi
+-    fi ])
+ 
+ AC_ARG_ENABLE(64bit,
+     [  --enable-64bit          Enable 64-bit support (on certain platforms)],
+@@ -261,10 +211,6 @@ dnl svrcore implies both nspr and nss
+        if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS" ; then
+            if test -n "$_SYSTEM_SVRCORE"; then
+                AM_PATH_SVRCORE(4.0.1, [MOZ_NATIVE_SVRCORE=1], [MOZ_NATIVE_SVRCORE=])
+-           else
+-       	       dnl see if we are being built in the same build tree as svrcore
+-               AM_PATH_INTREE_SVRCORE(../../dist)
+-               dnl failing that, see if we can find svrcore-config or pkg-config svrcore
+                if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS"; then
+                    AM_PATH_SVRCORE(4.0.1, [MOZ_NATIVE_SVRCORE=1], [MOZ_NATIVE_SVRCORE=])
+                fi
+@@ -294,9 +240,6 @@ dnl nss requires nspr
+             _SYSTEM_NSS=no
+ 	    fi], _SYSTEM_NSS= )
+ 
+-if test "$_WIN32_MSVC"; then
+-    _SYSTEM_NSS=
+-fi
+ 
+ dnl first, see if user has specified explicit NSPR include and lib paths,
+ dnl of if the user has explicitly disabled the use of nss
+@@ -308,10 +251,6 @@ dnl next, see if user explicitly said to
+ if test -n "$USE_NSS" -a -z "$NSS_CFLAGS" -a -z "$NSS_LIBS" ; then
+ dnl nss requires nspr
+    no_nspr=no
+-   if test -z "$_SYSTEM_NSS" -o "$_SYSTEM_NSS" = "no" ; then
+-dnl see if we are being built in the same build tree as nss
+-      AM_PATH_INTREE_NSS(../../dist)
+-   fi
+ dnl failing that, see if we can find nss-config or pkg-config nss
+    if test -z "$NSS_CFLAGS" -a "$_SYSTEM_NSS" != "no" ; then
+       AM_PATH_NSS(3.9.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
+@@ -348,10 +287,6 @@ fi
+ 
+ dnl next, look for in-tree nspr if user did not specify explicit system nspr
+ if test "$no_nspr" = "no" -a -z "$NSPR_CFLAGS" -a -z "$NSPR_LIBS" ; then
+-   if test -z "$_SYSTEM_NSPR" -o "$_SYSTEM_NSPR" = "no" ; then
+-dnl see if we are being built in the same build tree as nspr
+-      AM_PATH_INTREE_NSPR(../../dist)
+-   fi
+ dnl failing that, see if we can find nspr-config or pkg-config nspr
+    if test -z "$NSPR_CFLAGS" -a "$_SYSTEM_NSPR" != "no" ; then
+       AM_PATH_NSPR(4.0.0, [MOZ_NATIVE_NSPR=1], [MOZ_NATIVE_NSPR=])
+@@ -1520,9 +1455,7 @@ tools are selected during the Xcode/Deve
+     ;;
+ 
+ *-linux*)
+-    if test -z "$USE_NSPR_THREADS"; then
+-        USE_PTHREADS=1
+-    fi
++    USE_PTHREADS=1
+     AC_DEFINE(XP_UNIX)
+     AC_DEFINE(_POSIX_SOURCE)
+     AC_DEFINE(_BSD_SOURCE)
diff --git a/dev-libs/mozldap/files/nspr-m4.patch b/dev-libs/mozldap/files/nspr-m4.patch
new file mode 100644
index 000000000000..7a9b969ce056
--- /dev/null
+++ b/dev-libs/mozldap/files/nspr-m4.patch
@@ -0,0 +1,42 @@
+--- config.orig/autoconf/nspr.m4	2009-10-06 11:21:10.898930843 +0300
++++ config/autoconf/nspr.m4	2009-10-06 11:27:43.638925618 +0300
+@@ -86,39 +86,6 @@
+ 
+ ])
+ 
+-dnl AM_PATH_INTREE_NSPR([ROOTPATH, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-dnl Test for in-tree NSPR, and define NSPR_CFLAGS and NSPR_LIBS
+-dnl First look for path/*.OBJ/include, then look for path/include
+-dnl Use the cut in case there is more than one path that matches *.OBJ - just
+-dnl take the first one
+-AC_DEFUN(AM_PATH_INTREE_NSPR,
+-[
+-    AC_MSG_CHECKING(checking for in-tree NSPR from $1)
+-    for nsprpath in "$1" "$1"/*.OBJ ; do    
+-        savedir=`pwd`
+-        cd $nsprpath
+-        abs_nsprpath=`pwd`
+-        cd $savedir
+-        if test -f "$abs_nsprpath/include/nspr/nspr.h" ; then
+-            NSPR_CFLAGS="-I$abs_nsprpath/include/nspr"
+-        elif test -f "$abs_nsprpath/include/nspr.h" ; then
+-            NSPR_CFLAGS="-I$abs_nsprpath/include"
+-        fi
+-        if test -d "$abs_nsprpath/lib" ; then
+-            NSPR_LIBS="-L$abs_nsprpath/lib"
+-        fi
+-        if test -n "$NSPR_CFLAGS" -a -n "$NSPR_LIBS" ; then
+-            break
+-        fi
+-    done
+-    if test -n "$NSPR_CFLAGS" -a -n "$NSPR_LIBS" ; then
+-	    AC_SUBST(NSPR_CFLAGS)
+-	    AC_SUBST(NSPR_LIBS)
+-		AC_MSG_RESULT(yes)
+-    else
+-		AC_MSG_RESULT(no)
+-    fi    
+-])
+ 
+ dnl AM_PATH_GIVEN_NSPR(no args)
+ dnl Test for --with-nspr=path, --with-nspr-inc=path, and --with-nspr-lib=path
diff --git a/dev-libs/mozldap/files/nss-m4.patch b/dev-libs/mozldap/files/nss-m4.patch
new file mode 100644
index 000000000000..6a855e28eac1
--- /dev/null
+++ b/dev-libs/mozldap/files/nss-m4.patch
@@ -0,0 +1,45 @@
+diff -uNr config.orig/autoconf/nss.m4 config/autoconf/nss.m4
+--- config.orig/autoconf/nss.m4	2009-10-06 11:21:10.898930843 +0300
++++ config/autoconf/nss.m4	2009-10-06 11:23:37.754923372 +0300
+@@ -86,41 +86,6 @@
+ 
+ ])
+ 
+-dnl AM_PATH_INTREE_NSS([ROOTPATH, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-dnl Test for in-tree NSS, and define NSS_CFLAGS and NSS_LIBS
+-AC_DEFUN(AM_PATH_INTREE_NSS,
+-[
+-    nsslibpath=`echo $1/*.OBJ/lib | cut -f1 -d' '`
+-    savedir=`pwd`
+-    cd $nsslibpath
+-    abs_nsslibpath=`pwd`
+-    cd $savedir
+-    nssincpath=$1/public/nss
+-    savedir=`pwd`
+-    cd $nssincpath
+-    abs_nssincpath=`pwd`
+-    cd $savedir
+-    if test -f "$abs_nssincpath/nss.h" ; then
+-        NSS_CFLAGS="-I$abs_nssincpath"
+-    fi
+-    if test -d "$abs_nsslibpath" ; then
+-        NSS_LIBS="-L$abs_nsslibpath"
+-    fi
+-    if test -n "$NSS_CFLAGS" -a -n "$NSS_LIBS" ; then
+-        AC_MSG_CHECKING(using in-tree NSS from $nssincpath $nsslibpath)
+-	    AC_SUBST(NSS_CFLAGS)
+-	    AC_SUBST(NSS_LIBS)
+-		AC_MSG_RESULT(yes)
+-    else
+-        AC_MSG_CHECKING(could not find in-tree NSS in $1)
+-		AC_MSG_RESULT(no)
+-    fi
+-])
+-
+-dnl AM_PATH_GIVEN_NSS(no args)
+-dnl Test for --with-nss=path, --with-nss-inc=path, and --with-nss-lib=path
+-dnl Makes sure the right files/dirs are in the given paths, and sets
+-dnl NSS_CFLAGS and NSS_LIBS if successful
+ AC_DEFUN(AM_PATH_GIVEN_NSS,
+ [
+     dnl ========================================================