diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-03-01 06:55:57 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-03-01 06:55:57 +0000 |
| commit | 6a8c1091fdc978b0e369f4ca3f58a07c2f8b9d33 (patch) | |
| tree | 754e2649fcc68e83b3ad749cb5a1a1f7549ffafb /libidn | |
| parent | 378b1353df56387b0706bc42cb661ff2227c8eb9 (diff) | |
Updated to fedora-glibc-20060301T0647
Diffstat (limited to 'libidn')
| -rw-r--r-- | libidn/ChangeLog | 12 | ||||
| -rw-r--r-- | libidn/Makefile | 6 | ||||
| -rw-r--r-- | libidn/configure | 13 | ||||
| -rw-r--r-- | libidn/configure.in | 8 | ||||
| -rwxr-xr-x | libidn/sysdeps/unix/configure | 2 |
5 files changed, 33 insertions, 8 deletions
diff --git a/libidn/ChangeLog b/libidn/ChangeLog index f9303743fc..67d5de1e9e 100644 --- a/libidn/ChangeLog +++ b/libidn/ChangeLog @@ -1,3 +1,15 @@ +2006-02-27 Roland McGrath <roland@redhat.com> + + * Makefile: Use $(..) in place of ../. + * configure.in (libc_add_on_canonical, libc_add_on_subdirs): Set them. + * configure: Regenerated. + +2006-02-25 Roland McGrath <roland@redhat.com> + + * configure.in: New file. + * configure: Replaced with generated file. + * sysdeps/unix/configure: File removed. + 2005-03-08 Paul Eggert <eggert@cs.ucla.edu> * iconvme.c (SIZE_MAX): New macro, if not already defined. diff --git a/libidn/Makefile b/libidn/Makefile index 3d2ef5ef9b..3a4d1b3422 100644 --- a/libidn/Makefile +++ b/libidn/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -31,10 +31,10 @@ libcidn-routines := punycode toutf8 nfkc stringprep rfc3454 profiles idna \ iconvme -include ../Makeconfig +include $(..)Makeconfig libcidn-inhibit-o = $(filter-out .os,$(object-suffixes)) -include ../Rules +include $(..)Rules $(objpfx)libcidn.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a diff --git a/libidn/configure b/libidn/configure index 53d0dcd67e..365e747df2 100644 --- a/libidn/configure +++ b/libidn/configure @@ -1,3 +1,10 @@ -# This is only to keep the GNU C library configure mechanism happy. -# This is a shell script fragment sourced by the main configure script. -# We have nothing we need to add here. +# 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. +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBIDN 1 +_ACEOF + diff --git a/libidn/configure.in b/libidn/configure.in new file mode 100644 index 0000000000..38b9ad7fac --- /dev/null +++ b/libidn/configure.in @@ -0,0 +1,8 @@ +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]) diff --git a/libidn/sysdeps/unix/configure b/libidn/sysdeps/unix/configure deleted file mode 100755 index 2d9fac30e5..0000000000 --- a/libidn/sysdeps/unix/configure +++ /dev/null @@ -1,2 +0,0 @@ -# Signal that libidn is available. -libc_cv_idn=yes |