Fix compilation error

[wxWidgets.git] / build / update-setup-h

diff --git a/build/update-setup-h b/build/update-setup-h
index 399e9104274f840147fe568b05e012a48413ad94..804b4f43ac1688b2daa5dee33240998e9ecb3d6d 100755 (executable)
--- a/build/update-setup-h
+++ b/build/update-setup-h
@@ -28,7 +28,8 @@ msg()
 # file the common options are meant to be included in is the parameter)
 cat_common_options_for()
 {
-    cmd="cat include/wx/setup_inc.h"
+    # get rid of the copyright header on top of the file
+    cmd="sed '1,/^$/d' include/wx/setup_inc.h"
 
     # the file used for configure is special: we need to get rid of C++
     # comments in it because it is included by some C code and we also have to
@@ -37,7 +38,7 @@ cat_common_options_for()
     if [ $1 = "setup.h.in" ]; then
         cmd="$cmd | sed -e '/^\/\//d' \
                         -e 's@ *//.*\$@@' \
-                        -e 's/#define wxUSE_\(.\+\) \+1/#define wxUSE_\1 0/'"
+                        -e 's/# *define \(.\+\) \+1 *\$/#define \1 0/'"
     fi
 
     eval $cmd
@@ -52,7 +53,7 @@ update_single_setup_h()
         return 0
     fi
 
-    echo -n "Updating $1..."
+    echo -n "Updating $1 ..."
 
     tmp=$i.$$.tmp
     sed -e '/^\/\* --- start common options --- \*\/$/q' $1 > $tmp &&
@@ -76,7 +77,11 @@ if [ ! -f wxwin.m4 ]; then
 fi
 
 update_single_setup_h include/wx/msw/setup0.h
+update_single_setup_h include/wx/msw/wince/setup.h
 update_single_setup_h include/wx/mac/setup0.h
+update_single_setup_h include/wx/palmos/setup0.h
+update_single_setup_h include/wx/os2/setup0.h
+update_single_setup_h include/wx/motif/setup0.h
 update_single_setup_h setup.h.in
 
 exit $rc