From: <nig...@us...> - 2013-03-13 12:54:42
|
Revision: 5648 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5648&view=rev Author: nightstrike Date: 2013-03-13 12:54:30 +0000 (Wed, 13 Mar 2013) Log Message: ----------- Cleanup error message logic Modified Paths: -------------- trunk/mingw-w64-headers/configure trunk/mingw-w64-headers/configure.ac Modified: trunk/mingw-w64-headers/configure =================================================================== --- trunk/mingw-w64-headers/configure 2013-03-13 12:41:40 UTC (rev 5647) +++ trunk/mingw-w64-headers/configure 2013-03-13 12:54:30 UTC (rev 5648) @@ -2462,7 +2462,9 @@ # Check whether --with-widl was given. if test "${with_widl+set}" = set; then : - withval=$with_widl; + withval=$with_widl; if test "x$with_widl" = xyes; then : + with_widl="$PATH" +fi else with_widl=no fi @@ -2470,13 +2472,16 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_widl" >&5 $as_echo "$with_widl" >&6; } -if test "x$with_widl" = xyes; then : - with_widl="$PATH" -fi if test "x$with_widl" = xno; then : else + if test "x$srcdir" = x.; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-widl used in out of the tree compilation. Existing generated files will not be modified." >&5 +$as_echo "$as_me: WARNING: --with-widl used in out of the tree compilation. Existing generated files will not be modified." >&2;} +fi for ac_prog in $host-widl widl do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2536,11 +2541,6 @@ fi -if test ! "$with_widl" = "no" -a ! "$srcdir" = "."; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-widl used in out of the tree compilation. Existing generated files won't be modified." >&5 -$as_echo "$as_me: WARNING: --with-widl used in out of the tree compilation. Existing generated files won't be modified." >&2;} -fi - # Checks for libraries. # Checks for header files. Modified: trunk/mingw-w64-headers/configure.ac =================================================================== --- trunk/mingw-w64-headers/configure.ac 2013-03-13 12:41:40 UTC (rev 5647) +++ trunk/mingw-w64-headers/configure.ac 2013-03-13 12:54:30 UTC (rev 5648) @@ -23,21 +23,18 @@ AC_ARG_WITH([widl], AS_HELP_STRING([--with-widl=PATH], [use widl to update idl-based headers. Optionally search for a compatible widl in PATH]), - [], + [AS_VAR_IF([with_widl],[yes],[AS_VAR_SET([with_widl],["$PATH"])])], [AS_VAR_SET([with_widl],[no])]) AC_MSG_RESULT([$with_widl]) -AS_VAR_IF([with_widl],[yes],[AS_VAR_SET([with_widl],["$PATH"])]) AS_VAR_IF([with_widl],[no],[],[ + AS_VAR_IF([srcdir],[.],[], + [AC_MSG_WARN([--with-widl used in out of the tree compilation. Existing generated files will not be modified.])]) AC_PATH_PROGS([WIDL], [$host-widl widl], [], [$with_widl]) AS_VAR_IF([WIDL],[],[AC_MSG_ERROR([--with-widl is specified, but widl installation could not be found.])])]) AM_CONDITIONAL([HAVE_WIDL],[AS_VAR_TEST_SET([WIDL])]) -if test ! "$with_widl" = "no" -a ! "$srcdir" = "."; then - AC_MSG_WARN([--with-widl used in out of the tree compilation. Existing generated files won't be modified.]) -fi - # Checks for libraries. # Checks for header files. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |