This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-454-g7f82e4f
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 9 Oct 2012 22:50:37 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-454-g7f82e4f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 7f82e4f470fd74ab3cef53941dc13bc005618759 (commit)
from b8493de0ec56473c5e6e7738cdaf033c49221826 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7f82e4f470fd74ab3cef53941dc13bc005618759
commit 7f82e4f470fd74ab3cef53941dc13bc005618759
Author: Roland McGrath <roland@hack.frob.com>
Date: Tue Oct 9 15:48:55 2012 -0700
Automatically disable libidn add-on under --disable-shared.
diff --git a/libidn/ChangeLog b/libidn/ChangeLog
index 58a95b1..07af658 100644
--- a/libidn/ChangeLog
+++ b/libidn/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-09 Roland McGrath <roland@hack.frob.com>
+
+ * configure.in: If $shared != yes, just disable the add-on entirely
+ and issue a warning.
+ * configure: Regenerated.
+
2012-03-07 Ulrich Drepper <drepper@gmail.com>
* Makefile (distribute): Remove variable.
diff --git a/libidn/configure b/libidn/configure
index c6ba2ee..39ed163 100644
--- a/libidn/configure
+++ b/libidn/configure
@@ -1,8 +1,16 @@
# This file is generated from configure.in by Autoconf. DO NOT EDIT!
libc_add_on_canonical=
-libc_add_on_subdirs=.
-# Get this defined in config.h for main source code to test.
-$as_echo "#define HAVE_LIBIDN 1" >>confdefs.h
+if test "$shared" = yes; then :
+ libc_add_on_subdirs=.
+
+ # Get this defined in config.h for main source code to test.
+ $as_echo "#define HAVE_LIBIDN 1" >>confdefs.h
+
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libidn add-on ignored with --disable-shared" >&5
+$as_echo "$as_me: WARNING: libidn add-on ignored with --disable-shared" >&2;}
+fi
diff --git a/libidn/configure.in b/libidn/configure.in
index 38b9ad7..16740ff 100644
--- a/libidn/configure.in
+++ b/libidn/configure.in
@@ -2,7 +2,10 @@ dnl glibc configure fragment for libidn add-on
GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
libc_add_on_canonical=
-libc_add_on_subdirs=.
-# Get this defined in config.h for main source code to test.
-AC_DEFINE([HAVE_LIBIDN])
+AS_IF([test "$shared" = yes], [
+ libc_add_on_subdirs=.
+
+ # Get this defined in config.h for main source code to test.
+ AC_DEFINE([HAVE_LIBIDN])
+], [AC_MSG_WARN([libidn add-on ignored with --disable-shared])])
-----------------------------------------------------------------------
Summary of changes:
libidn/ChangeLog | 6 ++++++
libidn/configure | 14 +++++++++++---
libidn/configure.in | 9 ++++++---
3 files changed, 23 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources