sync with 0.52.2

diff --git a/Makefile.in b/Makefile.in
index 6e86b6ff48d707f324c4ef48b699574a0b8f2eff..86952834d06b95bc3e22d9c70cd2a9f6fb709ba8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,10 +46,10 @@ else
 TARGET=depend $(PROGS)
 endif
 
-all:   $(TARGET) _snackmodule.so po/po-stamp
+all:   $(TARGET) _snackmodule.so po/stamp-po
 
-po/po-stamp:
-       $(MAKE) -C po po-stamp
+po/stamp-po:
+       $(MAKE) -C po stamp-po
 
 test:  $(TESTOBJS) $(LIBNEWT)
        $(CC) -g -o test $(TESTOBJS) $(LIBNEWT) $(LIBS) -static
@@ -112,7 +112,7 @@ sharedlib: $(LIBNEWTSH)
 
 $(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
        $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
-       ln -s $(LIBNEWTSH) libnewt.so
+       ln -fs $(LIBNEWTSH) libnewt.so
 
 $(SHAREDDIR)/%.o : %.c
        $(CC) $(SHCFLAGS) -c $(CFLAGS) -o $@ $<

diff --git a/config.h.in b/config.h.in
index c642025dd59c98f59040e32e2aa715426b149baf..139da8f2a65d16aed8c8dc8b8e0466b34036fcc8 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,15 +1,86 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.in by autoheader.  */
 
-/* Define if you have the <alloca.h> header file.  */
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
+#undef ENABLE_NLS
+
+/* Define to 1 if you have the <alloca.h> header file. */
 #undef HAVE_ALLOCA_H
 
-/* Define if you have the <sys/select.h> header file.  */
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+   */
+#undef HAVE_DCGETTEXT
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Define if you have the iconv() function. */
+#undef HAVE_ICONV
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/select.h> header file. */
 #undef HAVE_SYS_SELECT_H
 
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Package Name */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* NEWT Library Version (SONAME) */
+#undef SONAME
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
 /* Define to 1 if GPM support is enabled */
 #undef USE_GPM
 
-#define PACKAGE "newt"
-#define ENABLE_NLS 1
-
-#define VERSION "0.51.6"
+/* NEWT Version String */
+#undef VERSION

diff --git a/configure.in b/configure.in
index ee314f7ec85b8af25dfb0478a533fc954641876a..3b01e29a41f45d9f3f0a57fddd2eeb1ed1729a4e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6,12 +6,16 @@ AC_CONFIG_HEADER(config.h)
 PACKAGE=newt
 VERSION=0.52.1
 SONAME=0.52
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [NEWT Version String])
 AC_SUBST(PACKAGE)
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Package Name])
 AC_SUBST(VERSION)
+AC_DEFINE_UNQUOTED(SONAME, "$SONAME", [NEWT Library Version (SONAME)])
 AC_SUBST(SONAME)
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
+AM_GNU_GETTEXT([external])
 
 AC_CHECK_HEADERS(sys/select.h alloca.h)
 
@@ -21,5 +25,5 @@ if test "x$with_gpm_support" = "xyes"; then
   AC_DEFINE(USE_GPM, 1, [Define to 1 if GPM support is enabled])
 fi
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT([Makefile po/Makefile.in])
 

diff --git a/newt.spec b/newt.spec
index 3470a99cdfaf2a44c9de0784de8bce921e2c7eee..d87b45e88bfe30d6aabe3c991a50725638e530e8 100644 (file)
--- a/newt.spec
+++ b/newt.spec
@@ -2,7 +2,7 @@
 
 Summary: A development library for text mode user interfaces.
 Name: newt
-%define version 0.52.1
+%define version 0.52.2
 Version: %{version}
 Release: 0
 License: LGPL
@@ -85,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libnewt.so
 
 %changelog
+* Fri Nov 22 2005 Petr Rockai <prockai@redhat.com> - 0.52.2-0
+- new upstream version (minor fixes for the source tarball
+  and build system)
+
 * Fri Sep 30 2005 Petr Rockai <prockai@redhat.com> - 0.52.1-0
 - revert bidi patch, objections by Jeremy Katz about
   anaconda breaking