wine/tools winemaker (1.49 - breaks winemaker)

[Martin Wilck]

Am Mit, 2002-09-11 um 03.09 schrieb Alexandre Julliard:
> ChangeSet ID:	1031706598725635746101947

Sorry, but this patch is severely broken - it introduces several
regressions.

> Log message:
> 	Francois Gouget <fgouget at codeweavers.com>
> 	Store the global settings in Make.rules.in instead of duplicating them
> 	in each Makefile.in file.
> 	Introduce generate_from_template which replaces generate_configure
> 	and generate_generic
> 	Simplify the wrapper generation by using generate_from_template.
> 	Rename configure.in to configure.ac. Now works with autoconf 2.5x.

This is what happened to me with a trivial winelib test setup:

1. winemaker doesn't even run - perl compilation error in
   generate_wrapper_file().

2. After that's fixed, autoconf fails. 
   Winemaker may now work with autoconf 2.5x, but is
   broken with 2.13. I wonder if this is intentional. If yes, I am
   against it - you cannot assume that all winelib developers have 
   autoconf 2.5x. At the very least, it should be documented.

3. After that's fixed, configure fails with  
   "Could not include the Wine headers (windef.h)".

At this point I have stopped investigating further.

Here is a quick fix for 1. and 2. - I will look into 3. and possible
further problems later.

Martin

Index: winemaker
===================================================================
RCS file: /home/wine/wine/tools/winemaker,v
retrieving revision 1.49
diff -u -r1.49 winemaker
--- winemaker	11 Sep 2002 01:09:58 -0000	1.49
+++ winemaker	11 Sep 2002 09:52:51 -0000
@@ -1670,6 +1670,7 @@
 {
   my $path=$_[0];
   my $target=$_[1];
+  my $app_name=@$target[$T_NAME];
 
   return generate_from_template("wrapper.c","$path${app_name}_wrapper.c",[
       ["APP_NAME",@$target[$T_NAME]],
@@ -2069,7 +2070,7 @@
       ["PROJECTS",join("\n",map { "@$_[$P_PATH]Makefile" } @projects)],
       ["SOURCE","$a_source_file"],
       ["NEEDS_MFC","$needs_mfc"]]);
-  system("autoconf");
+  system("autoconf configure.ac > configure");
 
   # Add execute permission to configure for whoever has the right to read it
   my @st=stat("configure");


-- 
Martin Wilck                Phone: +49 5251 8 15113
Fujitsu Siemens Computers   Fax:   +49 5251 8 20409
Heinz-Nixdorf-Ring 1	    mailto:Martin.Wilck at Fujitsu-Siemens.com
D-33106 Paderborn           http://www.fujitsu-siemens.com/primergy