picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Automatically disable libidn add-on under --disable-shared.

Browse source
This commit is contained in:
Roland McGrath 2012-10-09 15:48:55 -07:00
parent b8493de0ec
commit 7f82e4f470
3 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libidn/ChangeLog
View file

@ -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.

14
libidn/configure vendored
View file

@ -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

9
libidn/configure.in
View file

@ -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])])