1 diff -urN --exclude CVS popt/autogen.sh popt.win/autogen.sh
2 --- popt/autogen.sh 2008-02-11 16:48:11.000000000 +0000
3 +++ popt.win/autogen.sh 2008-10-25 14:54:06.000000000 +0100
8 +../gnulib/gnulib-tool --update
10 libtoolize=`which glibtoolize 2>/dev/null`
13 diff -urN --exclude CVS popt/configure.ac popt.win/configure.ac
14 --- popt/configure.ac 2008-10-04 20:23:50.000000000 +0100
15 +++ popt.win/configure.ac 2008-10-25 14:57:59.000000000 +0100
19 AC_INIT(popt, 1.15, popt-devel@rpm5.org)
21 AC_CONFIG_SRCDIR([popt.h])
23 ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
34 -AC_CHECK_HEADERS(float.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
38 +AC_CHECK_HEADERS(float.h glob.h langinfo.h libintl.h mcheck.h unistd.h sys/ioctl.h)
40 # For some systems we know that we have ld_version scripts.
41 # Use it then as default.
43 AC_CHECK_FUNC(setreuid, [], [
44 AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
46 -AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf)
47 +AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf random srandom)
49 AM_GNU_GETTEXT([external])
52 [Full path to popt top_srcdir.])
53 AC_SUBST(POPT_SOURCE_PATH)
55 -AC_OUTPUT([Doxyfile Makefile po/Makefile.in])
56 +AC_OUTPUT([Doxyfile Makefile lib/Makefile])
57 diff -urN --exclude CVS popt/.cvsignore popt.win/.cvsignore
58 --- popt/.cvsignore 2008-05-05 20:27:31.000000000 +0100
59 +++ popt.win/.cvsignore 2008-10-25 14:27:02.000000000 +0100
65 diff -urN --exclude CVS popt/m4/gnulib-cache.m4 popt.win/m4/gnulib-cache.m4
66 --- popt/m4/gnulib-cache.m4 1970-01-01 01:00:00.000000000 +0100
67 +++ popt.win/m4/gnulib-cache.m4 2008-10-25 14:27:02.000000000 +0100
69 +# Copyright (C) 2002-2008 Free Software Foundation, Inc.
71 +# This file is free software, distributed under the terms of the GNU
72 +# General Public License. As a special exception to the GNU General
73 +# Public License, this file may be distributed as part of a program
74 +# that contains a configuration script generated by Autoconf, under
75 +# the same distribution terms as the rest of that program.
77 +# Generated by gnulib-tool.
79 +# This file represents the specification of how gnulib-tool is used.
80 +# It acts as a cache: It is written and read by gnulib-tool.
81 +# In projects using CVS, this file is meant to be stored in CVS,
82 +# like the configure.ac and various Makefile.am files.
85 +# Specification in the form of a command-line invocation:
86 +# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --libtool --macro-prefix=gl glob
88 +# Specification in the form of a few gnulib-tool.m4 macro invocations:
94 +gl_SOURCE_BASE([lib])
98 +gl_TESTS_BASE([tests])
100 +gl_MAKEFILE_NAME([])
102 +gl_MACRO_PREFIX([gl])
104 diff -urN --exclude CVS popt/Makefile.am popt.win/Makefile.am
105 --- popt/Makefile.am 2008-09-18 19:08:58.000000000 +0100
106 +++ popt.win/Makefile.am 2008-10-25 14:56:28.000000000 +0100
108 footer_no_timestamp.html libpopt.vers \
109 testit.sh test-poptrc test3-data/0* \
110 po/*.in po/*.po po/popt.pot \
118 INCLUDES = -I. -I$(top_srcdir)
120 diff -urN --exclude CVS popt/popt.c popt.win/popt.c
121 --- popt/popt.c 2008-05-05 18:38:33.000000000 +0100
122 +++ popt.win/popt.c 2008-10-25 14:38:29.000000000 +0100
124 /*@=unqualifiedtrans =nullstate@*/
127 +/* Win32 typically lacks random/srandom, but has rand/srand which
128 + * produces frankly rubbish random numbers and has RAND_MAX = 0x7FFF.
134 + return rand () << 15 | rand ();
138 +#ifndef HAVE_SRANDOM
139 +#define srandom srand
143 static unsigned int seed = 0;
145 diff -urN --exclude CVS popt/popthelp.c popt.win/popthelp.c
146 --- popt/popthelp.c 2008-04-26 22:57:32.000000000 +0100
147 +++ popt.win/popthelp.c 2008-10-25 14:35:01.000000000 +0100
150 #define POPT_USE_TIOCGWINSZ
151 #ifdef POPT_USE_TIOCGWINSZ
152 +#ifdef HAVE_SYS_IOCTL_H
153 #include <sys/ioctl.h>
157 #define POPT_WCHAR_HACK
158 #ifdef POPT_WCHAR_HACK