diff --exclude-from=exclude-from -ruN authforce-0.9.8/Makefile.am ../authforce-0.9.8/Makefile.am --- authforce-0.9.8/Makefile.am 2007-02-13 11:35:34.000000000 +1100 +++ ../authforce-0.9.8/Makefile.am 2007-04-17 06:22:05.000000000 +1000 @@ -2,14 +2,11 @@ # $Date: 2007/04/17 11:19:59 $ # $Revision: 1.1 $ -EXTRA_DIST = BUGS TODO THANKS ChangeLog \ +EXTRA_DIST = config.rpath m4/ChangeLog BUGS TODO THANKS ChangeLog \ authforce.spec.in authforce.spec \ authforcerc.sample -SUBDIRS = intl data src doc po +SUBDIRS = data src doc po -distbz2: distdir - -chmod -R a+r $(distdir) - $(TAR) choyf $(distdir).tar.bz2 $(distdir) - -rm -rf $(distdir) +ACLOCAL_AMFLAGS = -I m4 diff --exclude-from=exclude-from -ruN authforce-0.9.8/acconfig.h ../authforce-0.9.8/acconfig.h --- authforce-0.9.8/acconfig.h 2007-02-13 11:35:34.000000000 +1100 +++ ../authforce-0.9.8/acconfig.h 1970-01-01 10:00:00.000000000 +1000 @@ -1,11 +0,0 @@ -#undef ENABLE_NLS -#undef HAVE_CATGETS -#undef HAVE_GETTEXT -#undef HAVE_LC_MESSAGES -#undef HAVE_STPCPY -#undef HAVE_LIBSM -#undef PACKAGE_LOCALE_DIR -#undef PACKAGE_DATA_DIR -#undef PACKAGE_SOURCE_DIR -#undef DEFAULT_PATH -#undef DEFAULT_CONFIG diff --exclude-from=exclude-from -ruN authforce-0.9.8/configure.in ../authforce-0.9.8/configure.in --- authforce-0.9.8/configure.in 2007-02-13 11:35:34.000000000 +1100 +++ ../authforce-0.9.8/configure.in 2007-04-17 06:13:35.000000000 +1000 @@ -1,20 +1,13 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(src/main.c) -MAJOR_VERSION=0 -MINOR_VERSION=9 -MICRO_VERSION=6 -VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION -AC_SUBST(MAJOR_VERSION) -AC_SUBST(MINOR_VERSION) -AC_SUBST(MICRO_VERSION) -AC_SUBST(VERSION) +AC_INIT([authforce],[0.9.6],[kapheine@divineinvasion.net]) +AC_CANONICAL_TARGET +AM_INIT_AUTOMAKE([1.9 gnits dist-bzip2]) -AM_INIT_AUTOMAKE(authforce, $VERSION) - -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) AM_WITH_DMALLOC +AM_GNU_GETTEXT([external]) dnl Add the languages which your application supports here. ALL_LINGUAS="nl" @@ -22,10 +15,8 @@ dnl Checks for programs. AC_PROG_CC -AC_ARG_PROGRAM AC_PROG_INSTALL -AM_GNU_GETTEXT curl=yes AC_ARG_WITH(curl, @@ -76,7 +67,7 @@ AUTHFORCE_PATH=".:/usr/local/share/authforce/data:../data" AUTHFORCE_CONFIG="/usr/local/etc/authforcerc:~/.authforcerc" dnl AC_DEFINE_UNQUOTED(DEFAULT_PATH, "${AUTHFORCE_PATH}") -AC_DEFINE_UNQUOTED(DEFAULT_CONFIG,"${AUTHFORCE_CONFIG}") +AC_DEFINE_UNQUOTED(DEFAULT_CONFIG,"${AUTHFORCE_CONFIG}", [Authforce config files]) AC_ARG_WITH(path, [ --with-path=PATH change default path]) @@ -84,7 +75,7 @@ if test "x$with_path" != "x" then - AC_DEFINE_UNQUOTED(DEFAULT_PATH, "$with_path") + AC_DEFINE_UNQUOTED(DEFAULT_PATH, "$with_path", [Authforce path]) else AC_DEFINE_UNQUOTED(DEFAULT_PATH, "${AUTHFORCE_PATH}") fi @@ -93,7 +84,6 @@ Makefile src/Makefile doc/Makefile -intl/Makefile po/Makefile.in data/Makefile authforce.spec diff --exclude-from=exclude-from -ruN authforce-0.9.8/src/Makefile.am ../authforce-0.9.8/src/Makefile.am --- authforce-0.9.8/src/Makefile.am 2007-02-13 11:35:34.000000000 +1100 +++ ../authforce-0.9.8/src/Makefile.am 2007-04-17 06:13:54.000000000 +1000 @@ -23,4 +23,4 @@ signal.c \ extern.h -authforce_LDADD = @INTLLIBS@ +authforce_LDADD = @LIBINTL@ diff --exclude-from=exclude-from -ruN authforce-0.9.8/src/debug.c ../authforce-0.9.8/src/debug.c --- authforce-0.9.8/src/debug.c 2007-02-13 11:35:34.000000000 +1100 +++ ../authforce-0.9.8/src/debug.c 2007-04-17 06:41:06.000000000 +1000 @@ -7,7 +7,6 @@ #include "memwatch.h" #endif /* MEMWATCH*/ #include "extern.h" -#include /* debug_level: print debugging messages of this level and lower, based on diff --exclude-from=exclude-from -ruN authforce-0.9.8/src/extern.h ../authforce-0.9.8/src/extern.h --- authforce-0.9.8/src/extern.h 2007-02-13 11:35:34.000000000 +1100 +++ ../authforce-0.9.8/src/extern.h 2007-04-17 06:29:30.000000000 +1000 @@ -2,13 +2,7 @@ /* main.c */ #include -#include -#ifdef ENABLE_NLS -#include -#define _(String) gettext (String) -#else -#define _(String) (String) -#endif +#include "gettext.h" /* command line configurable variables */ extern char datafile_path[60]; /* location of data files */ diff --exclude-from=exclude-from -ruN authforce-0.9.8/src/gettext.h ../authforce-0.9.8/src/gettext.h --- authforce-0.9.8/src/gettext.h 1970-01-01 10:00:00.000000000 +1000 +++ ../authforce-0.9.8/src/gettext.h 2007-04-17 06:18:50.000000000 +1000 @@ -0,0 +1,265 @@ +/* Convenience header for conditional use of GNU . + Copyright (C) 1995-1998, 2000-2002, 2004-2006 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. */ + +#ifndef _LIBGETTEXT_H +#define _LIBGETTEXT_H 1 + +/* NLS can be disabled through the configure --disable-nls option. */ +#if ENABLE_NLS + +/* Get declarations of GNU message catalog functions. */ +# include + +/* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by + the gettext() and ngettext() macros. This is an alternative to calling + textdomain(), and is useful for libraries. */ +# ifdef DEFAULT_TEXT_DOMAIN +# undef gettext +# define gettext(Msgid) \ + dgettext (DEFAULT_TEXT_DOMAIN, Msgid) +# undef ngettext +# define ngettext(Msgid1, Msgid2, N) \ + dngettext (DEFAULT_TEXT_DOMAIN, Msgid1, Msgid2, N) +# endif + +#else + +/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which + chokes if dcgettext is defined as a macro. So include it now, to make + later inclusions of a NOP. We don't include + as well because people using "gettext.h" will not include , + and also including would fail on SunOS 4, whereas + is OK. */ +#if defined(__sun) +# include +#endif + +/* Many header files from the libstdc++ coming with g++ 3.3 or newer include + , which chokes if dcgettext is defined as a macro. So include + it now, to make later inclusions of a NOP. */ +#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) +# include +# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H +# include +# endif +#endif + +/* Disabled NLS. + The casts to 'const char *' serve the purpose of producing warnings + for invalid uses of the value returned from these functions. + On pre-ANSI systems without 'const', the config.h file is supposed to + contain "#define const". */ +# define gettext(Msgid) ((const char *) (Msgid)) +# define dgettext(Domainname, Msgid) ((const char *) (Msgid)) +# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) +# define ngettext(Msgid1, Msgid2, N) \ + ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) +# define dngettext(Domainname, Msgid1, Msgid2, N) \ + ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) +# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ + ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) +# define textdomain(Domainname) ((const char *) (Domainname)) +# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) +# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset)) + +#endif + +/* A pseudo function call that serves as a marker for the automated + extraction of messages, but does not call gettext(). The run-time + translation is done at a different place in the code. + The argument, String, should be a literal string. Concatenated strings + and other string expressions won't work. + The macro's expansion is not parenthesized, so that it is suitable as + initializer for static 'char[]' or 'const char[]' variables. */ +#define gettext_noop(String) String + +/* The separator between msgctxt and msgid in a .mo file. */ +#define GETTEXT_CONTEXT_GLUE "\004" + +/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a + MSGID. MSGCTXT and MSGID must be string literals. MSGCTXT should be + short and rarely need to change. + The letter 'p' stands for 'particular' or 'special'. */ +#ifdef DEFAULT_TEXT_DOMAIN +# define pgettext(Msgctxt, Msgid) \ + pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) +#else +# define pgettext(Msgctxt, Msgid) \ + pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) +#endif +#define dpgettext(Domainname, Msgctxt, Msgid) \ + pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) +#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \ + pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category) +#ifdef DEFAULT_TEXT_DOMAIN +# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \ + npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES) +#else +# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \ + npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES) +#endif +#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \ + npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES) +#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \ + npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category) + +#ifdef __GNUC__ +__inline +#else +#ifdef __cplusplus +inline +#endif +#endif +static const char * +pgettext_aux (const char *domain, + const char *msg_ctxt_id, const char *msgid, + int category) +{ + const char *translation = dcgettext (domain, msg_ctxt_id, category); + if (translation == msg_ctxt_id) + return msgid; + else + return translation; +} + +#ifdef __GNUC__ +__inline +#else +#ifdef __cplusplus +inline +#endif +#endif +static const char * +npgettext_aux (const char *domain, + const char *msg_ctxt_id, const char *msgid, + const char *msgid_plural, unsigned long int n, + int category) +{ + const char *translation = + dcngettext (domain, msg_ctxt_id, msgid_plural, n, category); + if (translation == msg_ctxt_id || translation == msgid_plural) + return (n == 1 ? msgid : msgid_plural); + else + return translation; +} + +/* The same thing extended for non-constant arguments. Here MSGCTXT and MSGID + can be arbitrary expressions. But for string literals these macros are + less efficient than those above. */ + +#include + +#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \ + (__GNUC__ >= 3 || __GNUG__ >= 2 /* || __STDC_VERSION__ >= 199901L */ ) + +#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS +#include +#endif + +#define pgettext_expr(Msgctxt, Msgid) \ + dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES) +#define dpgettext_expr(Domainname, Msgctxt, Msgid) \ + dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES) + +#ifdef __GNUC__ +__inline +#else +#ifdef __cplusplus +inline +#endif +#endif +static const char * +dcpgettext_expr (const char *domain, + const char *msgctxt, const char *msgid, + int category) +{ + size_t msgctxt_len = strlen (msgctxt) + 1; + size_t msgid_len = strlen (msgid) + 1; + const char *translation; +#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS + char msg_ctxt_id[msgctxt_len + msgid_len]; +#else + char buf[1024]; + char *msg_ctxt_id = + (msgctxt_len + msgid_len <= sizeof (buf) + ? buf + : (char *) malloc (msgctxt_len + msgid_len)); + if (msg_ctxt_id != NULL) +#endif + { + memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); + msg_ctxt_id[msgctxt_len - 1] = '\004'; + memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); + translation = dcgettext (domain, msg_ctxt_id, category); +#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS + if (msg_ctxt_id != buf) + free (msg_ctxt_id); +#endif + if (translation != msg_ctxt_id) + return translation; + } + return msgid; +} + +#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \ + dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES) +#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \ + dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES) + +#ifdef __GNUC__ +__inline +#else +#ifdef __cplusplus +inline +#endif +#endif +static const char * +dcnpgettext_expr (const char *domain, + const char *msgctxt, const char *msgid, + const char *msgid_plural, unsigned long int n, + int category) +{ + size_t msgctxt_len = strlen (msgctxt) + 1; + size_t msgid_len = strlen (msgid) + 1; + const char *translation; +#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS + char msg_ctxt_id[msgctxt_len + msgid_len]; +#else + char buf[1024]; + char *msg_ctxt_id = + (msgctxt_len + msgid_len <= sizeof (buf) + ? buf + : (char *) malloc (msgctxt_len + msgid_len)); + if (msg_ctxt_id != NULL) +#endif + { + memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); + msg_ctxt_id[msgctxt_len - 1] = '\004'; + memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); + translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category); +#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS + if (msg_ctxt_id != buf) + free (msg_ctxt_id); +#endif + if (!(translation == msg_ctxt_id || translation == msgid_plural)) + return translation; + } + return (n == 1 ? msgid : msgid_plural); +} + +#endif /* _LIBGETTEXT_H */ diff --exclude-from=exclude-from -ruN authforce-0.9.8/src/main.c ../authforce-0.9.8/src/main.c --- authforce-0.9.8/src/main.c 2007-02-13 11:35:34.000000000 +1100 +++ ../authforce-0.9.8/src/main.c 2007-04-17 06:48:11.000000000 +1000 @@ -7,11 +7,17 @@ #include #include #include +#include "gettext.h" #ifdef MEMWATCH #include "memwatch.h" #endif /* MEMWATCH */ #include "extern.h" -#include +#ifdef ENABLE_NLS +#define _(x) dgettext(PACKAGE_NAME, x) +#else +#define _(x) (x) +#endif + static const char *program_name = PACKAGE; static const char *author = "Zachary P. Landau";