CVS libidn

[libidn-commit]

Update of /home/cvs/libidn
In directory dopio:/tmp/cvs-serv24161

Modified Files:
        Makefile.am NEWS configure.ac 
Log Message:
Use Lesser GNULib.

--- /home/cvs/libidn/Makefile.am        2004/09/13 16:56:22     1.113
+++ /home/cvs/libidn/Makefile.am        2004/09/26 07:04:32     1.114
@@ -17,9 +17,9 @@
 # License along with GNU Libidn; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-SUBDIRS = lib po src doc tests examples java
+SUBDIRS = gl lib po src doc tests examples java
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 
 EXTRA_DIST = FAQ libidn.pc.in \
        libc/README libc/getaddrinfo-idn.txt libc/example.c \
--- /home/cvs/libidn/NEWS       2004/09/13 17:07:21     1.206
+++ /home/cvs/libidn/NEWS       2004/09/26 07:04:32     1.207
@@ -2,6 +2,11 @@
 Copyright (C) 2002, 2003, 2004 Simon Josefsson
 See the end for copying conditions.
 
+* Version 0.5.6 (unreleased)
+
+** Now using Lesser GNULib for portability code.
+This means the code now use strdup, which improve readability.
+
 * Version 0.5.5 (released 2004-09-13)
 
 ** Hide accidentally exported variable g_utf8_skip, by marking it as static.
--- /home/cvs/libidn/configure.ac       2004/08/17 19:14:12     1.116
+++ /home/cvs/libidn/configure.ac       2004/09/26 07:04:32     1.117
@@ -41,6 +41,7 @@
 AM_GNU_GETTEXT_VERSION(0.14.1)
 AC_PROG_LIBTOOL
 AC_PROG_CC
+gl_EARLY
 AM_MISSING_PROG(PERL, perl, $missing_dir)
 AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
 AM_ICONV
@@ -53,26 +54,11 @@
 # Checks for typedefs, structures, and compiler characteristics.
 AX_CREATE_STDINT_H(lib/idn-int.h, sys/types.h)
 
-# Need getopt.
-GETOPT_H=
-AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h])
-AC_CHECK_FUNCS([getopt_long_only], [],
-  [GETOPT_H=getopt.h
-   AC_LIBOBJ([getopt])
-   AC_LIBOBJ([getopt1])
-   AC_DEFINE([optarg], [rpl_optarg],
-     [Define to rpl_optarg if the replacement variable should be used.])
-   AC_DEFINE([optind], [rpl_optind],
-     [Define to rpl_optind if the replacement variable should be used.])
-   AC_DEFINE([optopt], [rpl_optopt],
-     [Define to rpl_optopt if the replacement variable should be used.])
-   AC_DEFINE([getopt], [rpl_getopt],
-     [Define to rpl_getopt if the replacement function should be used.])
-   AC_DEFINE([getopt_long], [rpl_getopt_long],
-     [Define to rpl_getopt_long if the replacement function should be used.])
-   AC_DEFINE([getopt_long_only], [rpl_getopt_long_only],
-     [Define to rpl_getopt_long_only if the replacement function should be 
used.])])
-AC_SUBST([GETOPT_H])
+# For gnulib stuff in gl/.
+gl_SOURCE_BASE(gl)
+gl_M4_BASE(gl/m4)
+gl_MODULES(strdup dummy getopt)
+gl_INIT
 
 # Check if locale stuff works
 AC_CACHE_CHECK([if setlocale() and nl_langinfo() works],
@@ -119,7 +105,7 @@
 AC_MSG_RESULT($enable_java)
 
 AC_CONFIG_FILES([Makefile libidn.pc doc/reference/Makefile doc/java/Makefile \
-               lib/stringprep.h contrib/doxygen/Doxyfile \
+               gl/Makefile lib/stringprep.h contrib/doxygen/Doxyfile \
                doc/Makefile doc/specifications/Makefile doc/tld/Makefile \
                lib/Makefile src/Makefile tests/Makefile examples/Makefile \
                java/Makefile java/gnu/Makefile java/gnu/inet/Makefile \