Merge upstream/1.23 into tizen_base

Change-Id: I8825a0a6bf62b589e316cca2c4343e515fbc3dfc

diff --cc Makefile.am
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc configure.ac
index 4987c61bbbc675e3a3d9ec5b526cab24b31b5e28,834f6d9d5a08153141226535e62eb141901dea82..3185f92bfc3298697caad2f89e3b3c4eac6d67a7
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -170,7 -180,10 +180,8 @@@ AC_CONFIG_FILES(
    lib/Makefile
    lib/gl/Makefile
    lib/gltests/Makefile
+   libidn.pc
    po/Makefile.in
 -  pom.xml
 -  src/Makefile
    tests/Makefile
  ])
  AC_OUTPUT

diff --cc packaging/libidn.spec
index 54b8f3010fbcb2af8d24ec72002a8c2b972108a2,0000000000000000000000000000000000000000..8d433d0614bc18b1aaafc094d41caa1568a3487d
mode 100755,000000..100755
--- 1/packaging/libidn.spec
--- /dev/null
+++ b/packaging/libidn.spec
@@@ -1,73 -1,0 +1,73 @@@
- Version:    1.15
 +Name:       libidn
 +Summary:    Internationalized Domain Name support library
++Version:    1.23
 +Release:    0
 +Group:      System/Libraries
 +License:    LGPL-2.1+
 +URL:        http://www.gnu.org/software/libidn/
 +Source0:    http://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz
 +Source1:    baselibs.conf
 +Source1001: libidn.manifest
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
 +BuildRequires:  pkgconfig
 +BuildRequires:  gettext-tools
 +BuildRequires:  libtool
 +BuildRequires:  autoconf
 +
 +%description
 +GNU Libidn is an implementation of the Stringprep, Punycode and
 +IDNA specifications defined by the IETF Internationalized Domain
 +Names (IDN) working group, used for internationalized domain
 +names.
 +
 +
 +%package devel
 +Summary:    Development files for the libidn library
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +Requires:   glibc-devel
 +
 +%description devel
 +This package includes header files and libraries necessary for
 +developing programs which use the GNU libidn library.
 +
 +
 +%prep
 +%setup -q
 +
 +
 +%build
 +
 +%configure --disable-static \
 +    --disable-csharp \
 +    --disable-java \
 +    --with-pic
 +
 +make "%{?_smp_mflags}"
 +
 +%install
 +%make_install
 +
 +rm -f %{buildroot}/%_infodir/dir
 +rm -f %{buildroot}%{_libdir}/libidn.la
 +rm -f %{buildroot}%_infodir/libidn-components.png
 +rm -f %{buildroot}%{_bindir}/idn
 +%find_lang libidn
 +
 +%remove_docs
 +
 +%post -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%files -f libidn.lang
 +%defattr(-,root,root,-)
 +%{_libdir}/libidn.so.*
 +%license COPYING.LIB
 +
 +%files devel
 +%defattr(-,root,root,-)
 +%{_libdir}/libidn.so
 +%{_includedir}/*.h
 +%{_libdir}/pkgconfig/libidn.pc

diff --cc src/Makefile.am
index d7dd83dfbafd248e2a909f3ce982d3e7d340e6a1,4c8fe502f149a0f0d20673d79555929083ef3a97..5d3ef399b497c1ac3022d51b2cdf6c0fd56e22ec
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -18,8 -19,9 +19,9 @@@
  
  AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
  AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/gl -I../gl
+ AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\"
  
 -dist_lisp_DATA = punycode.el idna.el
 +#dist_lisp_DATA = punycode.el idna.el
  
  bin_PROGRAMS = idn
  idn_SOURCES = idn.c

diff --cc src/Makefile.in
index 7d24642db9b7b94bad6cc86a45759140fb0b4124,07c735415b6c96bb138b63353d7f76c7286a2ae3..b41b1812f4ef8f21d991e9224989b956aeef7da9
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -532,8 -1027,9 +1027,9 @@@ top_build_prefix = @top_build_prefix
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
- AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/gl -I../gl
+ AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/gl -I../gl \
+       -DLOCALEDIR=\"$(localedir)\"
 -dist_lisp_DATA = punycode.el idna.el
 +#dist_lisp_DATA = punycode.el idna.el
  idn_SOURCES = idn.c
  idn_LDADD = libidn_cmd.la ../lib/libidn.la ../gl/libgnu.la $(LTLIBINTL)
  noinst_LTLIBRARIES = libidn_cmd.la