From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Tue, 19 Jun 2012 17:23:37 +0000 (-0400)
Subject: Adjust ld map file support to use an anonymous scope to match the
X-Git-Tag: SUDO_1_8_6^2~127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b567282f861e1e14114d5cca646364e6e497fa89;p=sudo

Adjust ld map file support to use an anonymous scope to match the
updated .map files.
---

diff --git a/configure b/configure
index 3335866f8..b98b3410f 100755
--- a/configure
+++ b/configure
@@ -20232,13 +20232,13 @@ fi
 if test -n "$LT_LDEXPORTS"; then
     if test "$lt_cv_prog_gnu_ld" = "yes"; then
 	cat > conftest.map <<-EOF
-	VERS_1.0 {
+	{
 	    global: foo;
 	    local:  *;
 	};
 	EOF
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ld supports map files" >&5
-$as_echo_n "checking whether ld supports map files... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ld supports anonymous map files" >&5
+$as_echo_n "checking whether ld supports anonymous map files... " >&6; }
 	_LDFLAGS="$LDFLAGS"
 	LDFLAGS="$LDFLAGS -fPIC -shared -Wl,--version-script,./conftest.map"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20264,13 +20264,13 @@ rm -f core conftest.err conftest.$ac_objext \
 	case "$host" in
 	    *-*-solaris2*)
 		cat > conftest.map <<-EOF
-		VERS_1.0 {
+		{
 		    global: foo;
 		    local:  *;
 		};
 		EOF
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ld supports map files" >&5
-$as_echo_n "checking whether ld supports map files... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ld supports anonymous map files" >&5
+$as_echo_n "checking whether ld supports anonymous map files... " >&6; }
 		_LDFLAGS="$LDFLAGS"
 		LDFLAGS="$LDFLAGS -fPIC -shared -Wl,-M,./conftest.map"
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/configure.in b/configure.in
index 6ea479f6a..52d2bf574 100644
--- a/configure.in
+++ b/configure.in
@@ -3207,12 +3207,12 @@ dnl
 if test -n "$LT_LDEXPORTS"; then
     if test "$lt_cv_prog_gnu_ld" = "yes"; then
 	cat > conftest.map <<-EOF
-	VERS_1.0 {
+	{
 	    global: foo;
 	    local:  *;
 	};
 	EOF
-	AC_MSG_CHECKING([whether ld supports map files])
+	AC_MSG_CHECKING([whether ld supports anonymous map files])
 	_LDFLAGS="$LDFLAGS"
 	LDFLAGS="$LDFLAGS -fPIC -shared -Wl,--version-script,./conftest.map"
 	AC_TRY_LINK([int foo;], [], [
@@ -3223,12 +3223,12 @@ if test -n "$LT_LDEXPORTS"; then
 	case "$host" in
 	    *-*-solaris2*)
 		cat > conftest.map <<-EOF
-		VERS_1.0 {
+		{
 		    global: foo;
 		    local:  *;
 		};
 		EOF
-		AC_MSG_CHECKING([whether ld supports map files])
+		AC_MSG_CHECKING([whether ld supports anonymous map files])
 		_LDFLAGS="$LDFLAGS"
 		LDFLAGS="$LDFLAGS -fPIC -shared -Wl,-M,./conftest.map"
 		AC_TRY_LINK([int foo;], [], [