From: Mark Andrews <marka@isc.org>
Date: Thu, 26 Jun 2014 01:46:31 +0000 (+1000)
Subject: 3889.   [port]          hurd: configure fixes as per:
X-Git-Tag: v9.11.0a1~1491
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89119e3cafff373426858f6cec7c09539f53e209;p=thirdparty%2Fbind9.git

3889.   [port]          hurd: configure fixes as per:
                        https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746540
---

diff --git a/CHANGES b/CHANGES
index 594b826710a..b9ae747a11b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3889.	[port]		hurd: configure fixes as per:
+			https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746540
+
 3888.	[func]		'rndc status' now reports the number of automatic
 			zones. [RT #36015]
 
diff --git a/configure b/configure
index 3693a21ec76..5b22bbe70c1 100755
--- a/configure
+++ b/configure
@@ -12591,7 +12591,7 @@ case "$host" in
 	# as it breaks how the two halves (Basic and Advanced) of the IPv6
 	# Socket API were designed to be used but we have to live with it.
 	# Define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
-	*-linux* | *-kfreebsd*-gnu)
+	*-linux* | *-kfreebsd*-gnu*)
 		STD_CDEFINES="$STD_CDEFINES -D_GNU_SOURCE"
 		CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 		;;
@@ -20428,7 +20428,7 @@ if test -f "${srcdir}/srcid"; then
 	. "${srcdir}/srcid"
 	BIND9_SRCID="SRCID=$SRCID"
 elif test -d "${srcdir}/.git"; then
-	BIND9_SRCID="SRCID="`(cd "${srcdir}";git log -n 1 --format=%h)`
+	BIND9_SRCID="SRCID="`(cd "${srcdir}";git rev-parse --short HEAD)`
 fi
 
 
@@ -20579,7 +20579,7 @@ fi
 
 if test "$dlopen" = "yes"; then
 	case $host in
-		*-linux*)
+		*-linux*|*-gnu*)
 			SO_CFLAGS="-fPIC"
 			SO_LDFLAGS=""
 			if test "$have_dl" = "yes"
diff --git a/configure.in b/configure.in
index 951853f2b89..da4f4db3287 100644
--- a/configure.in
+++ b/configure.in
@@ -420,7 +420,7 @@ case "$host" in
 	# as it breaks how the two halves (Basic and Advanced) of the IPv6
 	# Socket API were designed to be used but we have to live with it.
 	# Define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
-	*-linux* | *-kfreebsd*-gnu)
+	*-linux* | *-kfreebsd*-gnu*)
 		STD_CDEFINES="$STD_CDEFINES -D_GNU_SOURCE"
 		CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 		;;
@@ -4180,7 +4180,7 @@ fi
 
 if test "$dlopen" = "yes"; then
 	case $host in
-		*-linux*)
+		*-linux*|*-gnu*)
 			SO_CFLAGS="-fPIC"
 			SO_LDFLAGS=""
 			if test "$have_dl" = "yes"