summary refs log tree commit diff
path: root/libidn
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-10-09 15:48:55 -0700
committerRoland McGrath <roland@hack.frob.com>2012-10-09 15:48:55 -0700
commit7f82e4f470fd74ab3cef53941dc13bc005618759 (patch)
treeb8e1411d735f5cf8744ea4cef053dcdf6ac05790 /libidn
parentb8493de0ec56473c5e6e7738cdaf033c49221826 (diff)
downloadglibc-7f82e4f470fd74ab3cef53941dc13bc005618759.tar.gz
glibc-7f82e4f470fd74ab3cef53941dc13bc005618759.tar.xz
glibc-7f82e4f470fd74ab3cef53941dc13bc005618759.zip
Automatically disable libidn add-on under --disable-shared.
Diffstat (limited to 'libidn')
-rw-r--r--libidn/ChangeLog6
-rw-r--r--libidn/configure14
-rw-r--r--libidn/configure.in9
3 files changed, 23 insertions, 6 deletions
diff --git a/libidn/ChangeLog b/libidn/ChangeLog
index 58a95b1b93..07af658b21 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 c6ba2eebc0..39ed163520 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 38b9ad7fac..16740ffb92 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])])