X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e606c822972f940a8829d7c618a41b825474fa7b..6d595f3d7abc59d903dba5c8d9e6dd082f7b4671:/build/bakefiles/wxpresets/presets/wx_unix.bkl

diff --git a/build/bakefiles/wxpresets/presets/wx_unix.bkl b/build/bakefiles/wxpresets/presets/wx_unix.bkl
index 6cc4a5e0eb..cd9bddb8d4 100644
--- a/build/bakefiles/wxpresets/presets/wx_unix.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_unix.bkl
@@ -8,12 +8,14 @@ See wx.bkl for platform-independent notes.
 Format-specific notes:
 
 * autoconf:
-        Beware that you have to use AM_OPTIONS_WXCONFIG and
-        AM_PATH_WXCONFIG in your configure.in to get at least the
+        Beware that you have to use WX_CONFIG_OPTIONS and
+        WX_CONFIG_CHECK in your configure.in to get at least the
         WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS option values defined.
+
         To detect the WX_* option values typically you also want to use
-        the AM_WXPRESETS_OPTIONS and AM_WXPRESETS_CHECKS macros
-        (see wxpresets.m4 for more info).
+        the WX_STANDARD_OPTIONS, WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS,
+        WX_CONFIG_CHECK and finally WX_DETECT_STANDARD_OPTION_VALUES macros
+        (see wxwin.m4 for more info).
 
 -->
 
@@ -48,7 +50,7 @@ Format-specific notes:
                      thus we can now add WX_LIBS to the linker line -->
                 <ldlibs>$(WX_LIBS)</ldlibs>
             </if>
-            <if cond="value not in ALLLIB_LIST.split()">
+            <if cond="value not in WX_LIB_LIST.split()">
                 <error>Unknown wxWidgets library given in the wx-lib tag</error>
             </if>
         </define-tag>
@@ -185,15 +187,16 @@ Format-specific notes:
                          that simply creating the following target; if it fails the make
                          program will halt with the wx-config error message...
         -->
-        <action id="test_for_selected_wxbuild">
-            <dependency-of>all</dependency-of>
-
-            <!-- Use @ to hide to the user that we're running wx-config... -->
-            <command>@$(DOLLAR)(WX_CONFIG) $(WX_CONFIG_FLAGS)</command>
-        </action>
+        <if cond="WX_TEST_FOR_SELECTED_WXBUILD=='1'">
+            <action id="test_for_selected_wxbuild">
+                <dependency-of>all</dependency-of>
 
+                <!-- Use @ to hide to the user that we're running wx-config... -->
+                <command>@$(DOLLAR)(WX_CONFIG) $(WX_CONFIG_FLAGS)</command>
+            </action>
+        </if>
 
-        <!-- we need this but the trick used in default-values above
+        <!-- we need these vars but the trick used in the default values above
              prevents bakefile from detecting it: -->
         <set var="FORMAT_OUTPUT_VARIABLES" append="1">WX_CONFIG WX_VERSION</set>
 
@@ -204,14 +207,14 @@ Format-specific notes:
         <define-tag name="wx-lib" rules="exe,dll,module">
             <if cond="value=='base'">
                 <!-- all wx libraries should have been already specified, thus
-                    $(__liblist) should contain the full list... -->
+                    $(__liblist) should contain the full list of required wxlibs... -->
                 <set var="__liblist" append="1">base</set>
-                <ldlibs>`$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs $(','.join(__liblist.split()))`</ldlibs>
+                <ldflags>`$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs $(','.join(__liblist.split()))`</ldflags>
             </if>
             <if cond="value!='base'">
                 <set var="__liblist" append="1">$(value)</set>
             </if>
-            <if cond="value not in ALLLIB_LIST.split()">
+            <if cond="value not in WX_LIB_LIST.split()">
                 <error>Unknown wxWidgets library given in the wx-lib tag</error>
             </if>
         </define-tag>