3889. [port] hurd: configure fixes as per:

                        https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746540

diff --git a/CHANGES b/CHANGES
index 594b826710a6884a90ad48f7786fddb7d130d6f4..b9ae747a11b42d382e5fd437ea7cd0854b5e7ca1 100644 (file)
--- 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 3693a21ec76302010b66716519a2921d6439e006..5b22bbe70c156b965fc73630def467e48a5a7d04 100755 (executable)
--- 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 951853f2b894acf1dcfe9df1c4f8d7a44ee0ab4a..da4f4db328794dad8bd1f5d6db2e98f3ced8f87e 100644 (file)
--- 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"