July 2007 - Wine-Commits - list.winehq.org

Anatoly Lyutin : cmd: Use toupperW instead of toupper.
by Alexandre Julliard July 11, 2007

July 11, 2007

Module: wine Branch: master Commit: 24866e7906e8af3c945b9a519da3300526f123be URL: http://source.winehq.org/git/wine.git/?a=commit;h=24866e7906e8af3c945b9a519… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Mon Jul 9 12:27:50 2007 +0400 cmd: Use toupperW instead of toupper. --- programs/cmd/builtins.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 33e96c1..af58717 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2303,7 +2303,7 @@ BOOL WCMD_ask_confirm (WCHAR *message, BOOL showSureText, BOOL *optionAll) { WCMD_output_asis (endBkt); WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer)/sizeof(WCHAR), &count, NULL); - answer[0] = toupper(answer[0]); + answer[0] = toupperW(answer[0]); } /* Return the answer */

1 0

Mikołaj Zalewski : comctl32: toolbar: We should send TBN_GETDISPINFOW even for ANSI controls (with testcase).
by Alexandre Julliard July 11, 2007

July 11, 2007

Module: wine Branch: master Commit: 5507a073c5e1be9101440c110d2d1e7092a4d293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5507a073c5e1be9101440c110… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Jul 10 15:53:38 2007 +0200 comctl32: toolbar: We should send TBN_GETDISPINFOW even for ANSI controls (with testcase). --- dlls/comctl32/tests/toolbar.c | 21 ++++++++++++++++++++- dlls/comctl32/toolbar.c | 6 +++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 443e3eb..f5476d3 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -74,6 +74,9 @@ static LRESULT MyWnd_Notify(LPARAM lParam) break; case TBN_GETDISPINFOA: + ok(FALSE, "TBN_GETDISPINFOA received\n"); + break; + case TBN_GETDISPINFOW: nmdisp = (NMTBDISPINFOA *)lParam; @@ -992,14 +995,30 @@ static void test_dispinfo(void) {-1, 20, TBSTATE_ENABLED, 0, {0, }, 0, -1}, {0, 21, TBSTATE_ENABLED, 0, {0, }, 0, -1}, }; + BOOL ret; rebuild_toolbar(&hToolbar); SendMessageA(hToolbar, TB_LOADIMAGES, IDB_HIST_SMALL_COLOR, (LPARAM)HINST_COMMCTRL); SendMessageA(hToolbar, TB_ADDBUTTONS, 2, (LPARAM)buttons_disp); g_dwExpectedDispInfoMask = 1; - /* some TBN_GETDISPINFO tests will be done in MyWnd_Notify function */ + /* Some TBN_GETDISPINFO tests will be done in MyWnd_Notify function. + * We will receive TBN_GETDISPINFOW even if the control is ANSI */ + compare((BOOL)SendMessageA(hToolbar, CCM_GETUNICODEFORMAT, 0, 0), 0, "%d"); ShowWindow(hToolbar, SW_SHOW); UpdateWindow(hToolbar); + + ret = (BOOL)SendMessageA(hToolbar, CCM_SETUNICODEFORMAT, TRUE, 0); + compare(ret, FALSE, "%d"); + compare(SendMessageA(hToolbar, CCM_GETUNICODEFORMAT, 0, 0), 1L, "%ld"); + InvalidateRect(hToolbar, NULL, FALSE); + UpdateWindow(hToolbar); + + ret = (BOOL)SendMessageA(hToolbar, CCM_SETUNICODEFORMAT, FALSE, 0); + compare(ret, TRUE, "%d"); + compare(SendMessageA(hToolbar, CCM_GETUNICODEFORMAT, 0, 0), 0L, "%ld"); + InvalidateRect(hToolbar, NULL, FALSE); + UpdateWindow(hToolbar); + DestroyWindow(hToolbar); g_dwExpectedDispInfoMask = 0; } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index ec7b99d..da6ceab 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -360,15 +360,15 @@ TOOLBAR_GetBitmapIndex(const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr) if (ret == I_IMAGECALLBACK) { /* issue TBN_GETDISPINFO */ - NMTBDISPINFOA nmgd; + NMTBDISPINFOW nmgd; memset(&nmgd, 0, sizeof(nmgd)); nmgd.idCommand = btnPtr->idCommand; nmgd.lParam = btnPtr->dwData; nmgd.dwMask = TBNF_IMAGE; nmgd.iImage = -1; - TOOLBAR_SendNotify(&nmgd.hdr, infoPtr, - infoPtr->bUnicode ? TBN_GETDISPINFOW : TBN_GETDISPINFOA); + /* Windows also send TBN_GETDISPINFOW even if the control is ANSI */ + TOOLBAR_SendNotify(&nmgd.hdr, infoPtr, TBN_GETDISPINFOW); if (nmgd.dwMask & TBNF_DI_SETITEM) btnPtr->iBitmap = nmgd.iImage; ret = nmgd.iImage;

1 0

appdb/. application.css apidb.css
by WineHQ July 11, 2007

July 11, 2007

ChangeSet ID: 31248 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/10 23:45:12 Modified files: . : application.css apidb.css Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Make the background color for platinum a little bit darker for people with bright displays. Switch to using the name for 'gold' instead of a hex rgb color value. Patch: http://cvs.winehq.org/patch.py?id=31248 Old revision New revision Changes Path 1.9 1.10 +4 -4 appdb/application.css 1.20 1.21 +3 -3 appdb/apidb.css Index: appdb/application.css diff -u -p appdb/application.css:1.9 appdb/application.css:1.10 --- appdb/application.css:1.9 11 Jul 2007 4:45:12 -0000 +++ appdb/application.css 11 Jul 2007 4:45:12 -0000 @@ -43,14 +43,14 @@ table.historyTable { border: 1px; font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; font-size: 12px; } -td.platinum { background-color: #EFEFEF; } -td.gold { background-color: #fff600; } +td.platinum { background-color: #ECECEC; } +td.gold { background-color: gold; } td.silver { background-color: silver; } td.bronze { background-color: #fcba0a; } td.garbage { background-color: #999966; } -td.platinum { background-color: #EFEFEF; } -tr.gold { background-color: #fff600; } +td.platinum { background-color: #ECECEC; } +tr.gold { background-color: gold; } tr.silver { background-color: silver; } tr.bronze { background-color: #fcba0a; } tr.garbage { background-color: #999966; } Index: appdb/apidb.css diff -u -p appdb/apidb.css:1.20 appdb/apidb.css:1.21 --- appdb/apidb.css:1.20 11 Jul 2007 4:45:12 -0000 +++ appdb/apidb.css 11 Jul 2007 4:45:12 -0000 @@ -133,9 +133,9 @@ p.indent { padding-left: 1em; .committed { font-style: italic; color: gray; } /* App Support status */ -.platinum { background-color: #EFEFEF; } -.gold { background-color: #fff600; } -.silver { background-color: silver; } +.platinum { background-color: #ECECEC; } +.gold { background-color: gold; } +.silver { background-color: silver; } .bronze { background-color: #fcba0a; } .Garbage { background-color: #999966; }

1 0

appdb/. index.php
by WineHQ July 11, 2007

July 11, 2007

ChangeSet ID: 31247 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/10 23:35:46 Modified files: . : index.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Make the browse by 'silver' link the same as the rest of the browse by links Patch: http://cvs.winehq.org/patch.py?id=31247 Old revision New revision Changes Path 1.50 1.51 +1 -1 appdb/index.php Index: appdb/index.php diff -u -p appdb/index.php:1.50 appdb/index.php:1.51 --- appdb/index.php:1.50 11 Jul 2007 4:35:46 -0000 +++ appdb/index.php 11 Jul 2007 4:35:46 -0000 @@ -124,7 +124,7 @@ if(!$_SESSION['current']->isLoggedIn()) <div class="topx_style silver"> <div class="rating_header"> <div class="rating_title"> - Top-10 <a href="browse_by_rating.php?sRating=Silver">Silver List</a> + Top-10 <a href="browse_by_rating.php?sRating=Silver">Silver</a> List </div> Applications with minor issues that do not affect typical usage </div>

1 0

appdb/. apidb.css
by WineHQ July 11, 2007

July 11, 2007

ChangeSet ID: 31246 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/10 23:28:21 Modified files: . : apidb.css Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add some padding to the application name cells in the top-X tables so the text isn't right against the left hand side of the table. Patch: http://cvs.winehq.org/patch.py?id=31246 Old revision New revision Changes Path 1.19 1.20 +1 -1 appdb/apidb.css Index: appdb/apidb.css diff -u -p appdb/apidb.css:1.19 appdb/apidb.css:1.20 --- appdb/apidb.css:1.19 11 Jul 2007 4:28:21 -0000 +++ appdb/apidb.css 11 Jul 2007 4:28:21 -0000 @@ -197,7 +197,7 @@ TD.no { color: #B10000; font-style: ita TD.stub { color: #0000B1; font-style: italic; text-align: center } /* width of the application column in the top 'X' lists on the main page */ -TD.app_name { width: 150px } +TD.app_name { padding:10px; width: 150px } /* Rating Number */ .rating { font-family: Helvetica, Arial; font-size: 6pt; color: #333333; }

1 0

appdb/. application.css index.php
by WineHQ July 11, 2007

July 11, 2007

ChangeSet ID: 31245 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/10 23:17:02 Modified files: . : application.css index.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Clean up the appdb main page. Update top-X lists to be inside of colored DIVs so the sections can be easily distinguished. Remove unnecessary text to make the page easier to read. Patch: http://cvs.winehq.org/patch.py?id=31245 Old revision New revision Changes Path 1.8 1.9 +5 -0 appdb/application.css 1.49 1.50 +54 -37 appdb/index.php Index: appdb/application.css diff -u -p appdb/application.css:1.8 appdb/application.css:1.9 --- appdb/application.css:1.8 11 Jul 2007 4:17: 2 -0000 +++ appdb/application.css 11 Jul 2007 4:17: 2 -0000 @@ -62,3 +62,8 @@ div.info_container { margin:6px; border: div.info_contents { padding:10px; background-color: #eee; } div.title_class { font-weight: bold; border-bottom: 1px solid; padding: 4px; font-size: 140%; background-color: #ddd; } + +/* classes for the main page */ +div.rating_header { padding: 8px; } +div.rating_title { padding-bottom: 4px; font-weight: bold; font-size: 160%; } +div.topx_style { padding:7px; margin:6px; border:2px solid; } Index: appdb/index.php diff -u -p appdb/index.php:1.49 appdb/index.php:1.50 --- appdb/index.php:1.49 11 Jul 2007 4:17: 2 -0000 +++ appdb/index.php 11 Jul 2007 4:17: 2 -0000 @@ -54,9 +54,6 @@ if(!$_SESSION['current']->isLoggedIn()) } ?> -<p> -If you have screenshots or links to contribute, please browse the database and use the AppDB interface to send us your contributions (any member can send screenshots; if you want to send how-to's or other information, you can either enroll to be a maintainer or post this information as a comment for the application of interest). -</p> <?php $iNumApps = version::objectGetEntriesCount(false, false); @@ -84,44 +81,64 @@ If you have screenshots or links to cont <br /><br /> -<h2>Top Voted Applications</h2> - -<p>This is a list of applications that are known to be working well and for which many users have voted.</p> - -<h3>The Top-10 <a href="browse_by_rating.php?sRating=Platinum">Platinum</a> List</h3> -<p>Only applications which install and run flawlessly on an out-of-the-box Wine installation make it to the Platinum list.</p> -<table class="platinum"> - <tr class="rowtitle"> - <th>Application</th><th>Description</th><th>Screenshot</th> - </tr> -<?php - outputTopXRowAppsFromRating('Platinum', 10); -?> -</table> +<div class="topx_style platinum"> + <div class="rating_header"> + <div class="rating_title"> + Top-10 <a href="browse_by_rating.php?sRating=Platinum">Platinum</a> List + </div> + Applications which install and run flawlessly on an out-of-the-box Wine installation + </div> + <div> + <table class="platinum"> + <tr class="rowtitle"> + <th>Application</th><th>Description</th><th>Screenshot</th> + </tr> + <?php + outputTopXRowAppsFromRating('Platinum', 10); + ?> + </table> + </div> +</div> <br /> -<h3>The Top-10 <a href="browse_by_rating.php?sRating=Gold">Gold</a> List</h3> -<p>Applications that work flawlessly with some DLL overrides or other settings, crack etc. make it to the Gold list.</p> -<table class="gold"> - <tr class="rowtitle"> - <th>Application</th><th>Description</th><th>Screenshot</th> - </tr> -<?php - outputTopXRowAppsFromRating('Gold', 10); -?> -</table> +<div class="topx_style gold"> + <div class="rating_header"> + <div class="rating_title"> + Top-10 <a href="browse_by_rating.php?sRating=Gold">Gold</a> List + </div> + Applications that work flawlessly with some special configuration + </div> + <div> + <table class="gold"> + <tr class="rowtitle"> + <th>Application</th><th>Description</th><th>Screenshot</th> + </tr> + <?php + outputTopXRowAppsFromRating('Gold', 10); + ?> + </table> + </div> +</div> <br /> -<h3>The Top-10 <a href="browse_by_rating.php?sRating=Silver">Silver List</a></h3> -<p>The Silver list contains apps which we hope we can easily fix so they make it to Gold status.</p> -<table class=silver> - <tr class=rowtitle> - <th>Application</th><th>Description</th><th>Screenshot</th> - </tr> -<?php - outputTopXRowAppsFromRating('Silver', 10); -?> -</table> +<div class="topx_style silver"> + <div class="rating_header"> + <div class="rating_title"> + Top-10 <a href="browse_by_rating.php?sRating=Silver">Silver List</a> + </div> + Applications with minor issues that do not affect typical usage + </div> + <div> + <table class="silver"> + <tr class="rowtitle"> + <th>Application</th><th>Description</th><th>Screenshot</th> + </tr> + <?php + outputTopXRowAppsFromRating('Silver', 10); + ?> + </table> + </div> +</div> <br /><br />

1 0

appdb/include sidebar.php
by WineHQ July 11, 2007

July 11, 2007

ChangeSet ID: 31244 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/10 21:41:58 Modified files: include : sidebar.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Place the 'AppDB' link at the top of the global menu, users may use it to return back to the main page of the AppDB and having it be the second link makes it more difficult to locate Patch: http://cvs.winehq.org/patch.py?id=31244 Old revision New revision Changes Path 1.32 1.33 +1 -1 appdb/include/sidebar.php Index: appdb/include/sidebar.php diff -u -p appdb/include/sidebar.php:1.32 appdb/include/sidebar.php:1.33 --- appdb/include/sidebar.php:1.32 11 Jul 2007 2:41:58 -0000 +++ appdb/include/sidebar.php 11 Jul 2007 2:41:58 -0000 @@ -11,8 +11,8 @@ function global_sidebar_menu() global $aClean; $g = new htmlmenu(APPDB_OWNER." Menu"); - $g->add(APPDB_OWNER, APPDB_OWNER_URL); $g->add("AppDB", BASE); + $g->add(APPDB_OWNER, APPDB_OWNER_URL); $g->add("Bugzilla", BUGZILLA_ROOT); $g->add("Wine Wiki", "http://wiki.winehq.org"); $g->done();

1 0

appdb/include testData.php version.php
by WineHQ July 11, 2007

July 11, 2007

ChangeSet ID: 31243 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/10 21:38:09 Modified files: include : testData.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Application view should list the number of test results for each version, this lets the appdb user see which versions have the most feedback Patch: http://cvs.winehq.org/patch.py?id=31243 Old revision New revision Changes Path 1.64 1.65 +15 -0 appdb/include/testData.php 1.134 1.135 +2 -0 appdb/include/version.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.64 appdb/include/testData.php:1.65 --- appdb/include/testData.php:1.64 11 Jul 2007 2:38: 9 -0000 +++ appdb/include/testData.php 11 Jul 2007 2:38: 9 -0000 @@ -777,6 +777,21 @@ class testData{ return $sReturn; } + // return the number of test data entries for a particular version id + function get_testdata_count_for_versionid($iVersionId) + { + $sQuery = "SELECT count(*) as cnt + FROM testResults + WHERE versionId = '?' + AND + queued = '?';"; + + $hResult = query_parameters($sQuery, $iVersionId, 'false'); + + $oRow = mysql_fetch_object($hResult); + return $oRow->cnt; + } + function objectGetEntriesCount($bQueued, $bRejected) { $oTest = new testData(); Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.134 appdb/include/version.php:1.135 --- appdb/include/version.php:1.134 11 Jul 2007 2:38:10 -0000 +++ appdb/include/version.php 11 Jul 2007 2:38:10 -0000 @@ -1010,6 +1010,7 @@ class version { echo " <td>Description</td>\n"; echo " <td width=\"80\">Rating</td>\n"; echo " <td width=\"80\">Wine version</td>\n"; + echo " <td width=\"80\">Test results</td>\n"; echo " <td width=\"40\">Comments</td>\n"; echo "</tr>\n\n"; @@ -1033,6 +1034,7 @@ class version { echo " <td>".util_trim_description($oVersion->sDescription)."</td>\n"; echo " <td $sRatingColor align=center>".$oVersion->sTestedRating."</td>\n"; echo " <td $sRatingColor align=center>".$oVersion->sTestedRelease."</td>\n"; + echo " <td align=center>".testData::get_testdata_count_for_versionid($oVersion->iVersionId)."</td>\n"; echo " <td align=center>".Comment::get_comment_count_for_versionid($oVersion->iVersionId)."</td>\n"; echo "</tr>\n\n";

1 0

Alexandre Julliard : configure: Add a few more notices for missing packages .
by Alexandre Julliard July 10, 2007

July 10, 2007

Module: wine Branch: master Commit: 7f674966e774f083d7cae6e5bcfaa6a32a62a898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f674966e774f083d7cae6e5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 10 15:22:18 2007 +0200 configure: Add a few more notices for missing packages. --- configure | 20 ++++++++++++++++++++ configure.ac | 8 ++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 270564b..8567e53 100755 --- a/configure +++ b/configure @@ -14442,6 +14442,11 @@ _ACEOF fi fi +if test "x$ac_cv_lib_soname_fontconfig" = "x"; then + wine_notices="$wine_notices|fontconfig development files not found. +Wine will be built without fontconfig support." +fi + if test "$ac_cv_header_openssl_err_h" = "yes" -a "$ac_cv_header_openssl_ssl_h" = "yes" then @@ -14602,6 +14607,11 @@ _ACEOF fi fi +if test "x$ac_cv_lib_soname_ssl" = "x"; then + wine_notices="$wine_notices|OpenSSL development files not found. +Wine will be built without SSL support. (wininet.dll)" +fi + if test "$ac_cv_header_jpeglib_h" = "yes" then @@ -14684,6 +14694,11 @@ _ACEOF fi fi +if test "x$ac_cv_lib_soname_jpeg" = "x"; then + wine_notices="$wine_notices|libjpeg development files not found. +Wine will be built without JPEG support. (oleaut32.dll)" +fi + if test "$ac_cv_header_png_h" = "yes" then @@ -14766,6 +14781,11 @@ _ACEOF fi fi +if test "x$ac_cv_lib_soname_png" = "x"; then + wine_notices="$wine_notices|libpng development files not found. +Wine will be built without PNG support. (oleaut32.dll)" +fi + if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \ "$ac_cv_header_sys_soundcard_h" != "yes" -a \ diff --git a/configure.ac b/configure.ac index a5010c0..227e410 100644 --- a/configure.ac +++ b/configure.ac @@ -1032,6 +1032,8 @@ if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes" then WINE_CHECK_SONAME(fontconfig,FcInit) fi +WINE_NOTICE_IF([test "x$ac_cv_lib_soname_fontconfig" = "x"],[fontconfig development files not found. +Wine will be built without fontconfig support.]) dnl **** Check for SSL **** if test "$ac_cv_header_openssl_err_h" = "yes" -a "$ac_cv_header_openssl_ssl_h" = "yes" @@ -1039,18 +1041,24 @@ then WINE_CHECK_SONAME(ssl,SSL_library_init) WINE_CHECK_SONAME(crypto,BIO_new_socket) fi +WINE_NOTICE_IF([test "x$ac_cv_lib_soname_ssl" = "x"],[OpenSSL development files not found. +Wine will be built without SSL support. (wininet.dll)]) dnl **** Check for libjpeg **** if test "$ac_cv_header_jpeglib_h" = "yes" then WINE_CHECK_SONAME(jpeg,jpeg_start_decompress) fi +WINE_NOTICE_IF([test "x$ac_cv_lib_soname_jpeg" = "x"],[libjpeg development files not found. +Wine will be built without JPEG support. (oleaut32.dll)]) dnl **** Check for libpng **** if test "$ac_cv_header_png_h" = "yes" then WINE_CHECK_SONAME(png,png_create_read_struct,,,,[[libpng[[0-9]]*]]) fi +WINE_NOTICE_IF([test "x$ac_cv_lib_soname_png" = "x"],[libpng development files not found. +Wine will be built without PNG support. (oleaut32.dll)]) dnl **** Check for any sound system **** WINE_WARNING_IF([test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \

1 0

Alexandre Julliard : aclocal: Add macros for logging messages about missing features.
by Alexandre Julliard July 10, 2007

July 10, 2007

Module: wine Branch: master Commit: 8d8c5c60a6c46ef193f140d4bf02ecba502e4d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8c5c60a6c46ef193f140d4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 10 15:05:40 2007 +0200 aclocal: Add macros for logging messages about missing features. --- aclocal.m4 | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index ff071f5..1799ff0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -153,6 +153,37 @@ dnl AC_DEFUN([WINE_CONFIG_EXTRA_DIR], [AC_CONFIG_COMMANDS([$1],[test -d "$1" || (AC_MSG_NOTICE([creating $1]) && mkdir "$1")])]) +dnl **** Add a message to the list displayed at the end **** +dnl +dnl Usage: WINE_NOTICE(notice) +dnl Usage: WINE_NOTICE_IF(test, notice) +dnl Usage: WINE_WARNING(warning) +dnl Usage: WINE_WARNING_IF(test, warning) +dnl Usage: WINE_PRINT_MESSAGES +dnl +AC_DEFUN([WINE_NOTICE],[wine_notices="$wine_notices|$1"]) +AC_DEFUN([WINE_NOTICE_IF],[AS_IF([$1],[WINE_NOTICE([$2],[$3])])]) +AC_DEFUN([WINE_WARNING],[wine_warnings="$wine_warnings|$1"]) +AC_DEFUN([WINE_WARNING_IF],[AS_IF([$1],[WINE_WARNING([$2],[$3])])]) + +AC_DEFUN([WINE_PRINT_MESSAGES],[ac_save_IFS="$IFS" +IFS="|" +if test "$verbose" = "yes"; then + for msg in $wine_notices; do + if test -n "$msg"; then + echo >&2 + AC_MSG_NOTICE([$msg]) + fi + done +fi +for msg in $wine_warnings; do + if test -n "$msg"; then + echo >&2 + AC_MSG_WARN([$msg]) + fi +done +IFS="$ac_save_IFS"]) + dnl Local Variables: dnl compile-command: "autoreconf --warnings=all" dnl End:

1 0