autoconf 2.52

[Jon Griffiths <jon_p_griffiths@yahoo.com>]

Hi,

I have a feeling this isn't the way to do this, but this allows
configure to be regenerated with autoconf 2.52. With this version of
autoconf the PACKAGE_ defines are left commented out in
include/config.h after regenerating and running configure.

Is there a better way to do this?

Cheers,
Jon

ChangeLog:

  Jon Griffiths <jon_p_griffiths@yahoo.com>

+configure.ac,misc/options.c,programs/clock/main.c,programs/winver/winver.c,
  programs/winepath/winepath.c,windows/nonclient.c
   Don't fail to build if PACKAGE_NAME etc are not defined.


=====
"Don't wait for the seas to part, or messiahs to come;
 Don't you sit around and waste this chance..." - Live

jon_p_griffiths@yahoo.com

__________________________________________________
Do You Yahoo!?
Yahoo! Autos - Get free new car price quotes
http://autos.yahoo.com
diff -urP wine/configure.ac wine-patch/configure.ac
--- wine/configure.ac	Wed Jul 17 07:10:06 2002
+++ wine-patch/configure.ac	Wed Jul 17 10:56:00 2002
@@ -4,7 +4,7 @@
 
 m4_define(WINE_VERSION,regexp(m4_include(VERSION),[version \([-.0-9A-Za-z]+\)],[\1]))
 
-AC_PREREQ(2.53)
+AC_PREREQ(2.52)
 AC_INIT([Wine],WINE_VERSION)
 AC_CONFIG_SRCDIR(server/atom.c)
 AC_CONFIG_HEADERS(include/config.h)
diff -urP wine/misc/options.c wine-patch/misc/options.c
--- wine/misc/options.c	Wed Jun  5 05:48:41 2002
+++ wine-patch/misc/options.c	Wed Jul 17 10:56:23 2002
@@ -30,6 +30,10 @@
 #include "module.h"
 #include "wine/debug.h"
 
+#ifndef PACKAGE_STRING
+#define PACKAGE_STRING "Wine (Version Unknown - Try upgrading autoconf)"
+#endif
+
 struct option_descr
 {
     const char *longname;
diff -urP wine/programs/clock/main.c wine-patch/programs/clock/main.c
--- wine/programs/clock/main.c	Sat Jun  1 11:40:58 2002
+++ wine-patch/programs/clock/main.c	Wed Jul 17 11:05:51 2002
@@ -33,6 +33,10 @@
 #include "winclock.h"
 #include "commdlg.h"
 
+#ifndef PACKAGE_STRING
+#define PACKAGE_STRING "Wine (Version Unknown - Try upgrading autoconf)"
+#endif
+
 CLOCK_GLOBALS Globals;
 
 /***********************************************************************
diff -urP wine/programs/winepath/winepath.c wine-patch/programs/winepath/winepath.c
--- wine/programs/winepath/winepath.c	Sat Jun  1 11:41:00 2002
+++ wine-patch/programs/winepath/winepath.c	Wed Jul 17 11:06:50 2002
@@ -24,6 +24,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifndef PACKAGE_STRING
+#define PACKAGE_STRING "Wine (Version Unknown - Try upgrading autoconf)"
+#endif
+
 #define VERSION "0.1 (" PACKAGE_STRING ")"
 
 enum {
diff -urP wine/programs/winver/winver.c wine-patch/programs/winver/winver.c
--- wine/programs/winver/winver.c	Fri Apr 12 09:54:02 2002
+++ wine-patch/programs/winver/winver.c	Wed Jul 17 11:06:30 2002
@@ -21,6 +21,14 @@
 #include "config.h"
 #include "windows.h"
 
+#ifndef PACKAGE_NAME
+#define PACKAGE_NAME "Wine"
+#endif
+
+#ifndef PACKAGE_STRING
+#define PACKAGE_STRING "Wine (Version Unknown - Try upgrading autoconf)"
+#endif
+
 int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 {
    return ShellAbout((HWND)0, PACKAGE_NAME, PACKAGE_STRING, 0);
diff -urP wine/windows/nonclient.c wine-patch/windows/nonclient.c
--- wine/windows/nonclient.c	Sat Jun  1 11:06:54 2002
+++ wine-patch/windows/nonclient.c	Wed Jul 17 11:07:05 2002
@@ -38,6 +38,14 @@
 WINE_DEFAULT_DEBUG_CHANNEL(nonclient);
 WINE_DECLARE_DEBUG_CHANNEL(shell);
 
+#ifndef PACKAGE_NAME
+#define PACKAGE_NAME "Wine"
+#endif
+
+#ifndef PACKAGE_STRING
+#define PACKAGE_STRING "Wine (Version Unknown - Try upgrading autoconf)"
+#endif
+
 BOOL NC_DrawGrayButton(HDC hdc, int x, int y);
 
 static HBITMAP hbitmapClose;