Alexandre Julliard : configure: Revert the error exit code for warnings, it causes more

Alexandre Julliard julliard at wine.codeweavers.com
Fri Jul 14 10:50:23 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 100e24213f70988005856e744c2d6786e5e69a50
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=100e24213f70988005856e744c2d6786e5e69a50

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jul 14 11:32:11 2006 +0200

configure: Revert the error exit code for warnings, it causes more
trouble than it's worth.

---

 configure    |    8 --------
 configure.ac |    8 --------
 2 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index 5b032c6..e046057 100755
--- a/configure
+++ b/configure
@@ -25959,7 +25959,6 @@ if test "$no_create" != yes; then
 fi
 
 
-exitcode=0
 if test "$have_x" = "no"
 then
   echo >&2
@@ -25971,7 +25970,6 @@ echo "$as_me: WARNING: X support, which 
 echo "$as_me: WARNING: isn't what you want anyway. You will need to install devel" >&2;}
   { echo "$as_me:$LINENO: WARNING:  packages of Xlib/Xfree86 at the very least." >&5
 echo "$as_me: WARNING:  packages of Xlib/Xfree86 at the very least." >&2;}
-  exitcode=1
 fi
 
 if test "$wine_cv_opengl_version_OK" = "no"
@@ -25981,7 +25979,6 @@ then
 echo "$as_me: WARNING: Old Mesa headers detected. Wine will be built without Direct3D" >&2;}
   { echo "$as_me:$LINENO: WARNING: support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)." >&5
 echo "$as_me: WARNING: support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)." >&2;}
-  exitcode=1
 fi
 
 if test "$wine_cv_msg_freetype" = "yes"
@@ -25995,7 +25992,6 @@ echo "$as_me: WARNING: installed, but 'f
 echo "$as_me: WARNING: the freetype-devel package (or its equivalent on your distribution)" >&2;}
   { echo "$as_me:$LINENO: WARNING: to enable Wine to use TrueType fonts." >&5
 echo "$as_me: WARNING: to enable Wine to use TrueType fonts." >&2;}
-  exitcode=1
 fi
 
 if test -z "$FONTSSUBDIRS"
@@ -26011,7 +26007,6 @@ echo "$as_me: WARNING: FreeType is missi
   fi
   { echo "$as_me:$LINENO: WARNING: Fonts will not be built. Dialog text may be invisible or unaligned." >&5
 echo "$as_me: WARNING: Fonts will not be built. Dialog text may be invisible or unaligned." >&2;}
-  exitcode=1
 fi
 
 if test -z "$ALSALIBS" -a \
@@ -26031,12 +26026,9 @@ echo "$as_me: WARNING: No sound system w
 echo "$as_me: WARNING: The currently supported sound systems are:" >&2;}
   { echo "$as_me:$LINENO: WARNING: ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" >&5
 echo "$as_me: WARNING: ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" >&2;}
-  exitcode=1
 fi
 
 echo
 echo "Configure finished.  Do '${ac_make} depend && ${ac_make}' to compile Wine."
 echo
 
-exit $exitcode
-
diff --git a/configure.ac b/configure.ac
index bf94eaa..ff7ec32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1848,7 +1848,6 @@ tools/wrc/Makefile])
 
 AC_OUTPUT
 
-exitcode=0
 if test "$have_x" = "no"
 then
   echo >&2
@@ -1856,7 +1855,6 @@ then
   AC_MSG_WARN([X support, which currently does not work, and probably])
   AC_MSG_WARN([isn't what you want anyway. You will need to install devel])
   AC_MSG_WARN([ packages of Xlib/Xfree86 at the very least.])
-  exitcode=1
 fi
 
 if test "$wine_cv_opengl_version_OK" = "no"
@@ -1864,7 +1862,6 @@ then
   echo >&2
   AC_MSG_WARN([Old Mesa headers detected. Wine will be built without Direct3D])
   AC_MSG_WARN([support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/).])
-  exitcode=1
 fi
 
 if test "$wine_cv_msg_freetype" = "yes"
@@ -1874,7 +1871,6 @@ then
   AC_MSG_WARN([installed, but 'freetype-config' is not in your PATH. Install])
   AC_MSG_WARN([the freetype-devel package (or its equivalent on your distribution)])
   AC_MSG_WARN([to enable Wine to use TrueType fonts.])
-  exitcode=1
 fi
 
 if test -z "$FONTSSUBDIRS"
@@ -1887,7 +1883,6 @@ then
     AC_MSG_WARN([FreeType is missing.])
   fi
   AC_MSG_WARN([Fonts will not be built. Dialog text may be invisible or unaligned.])
-  exitcode=1
 fi
 
 if test -z "$ALSALIBS" -a \
@@ -1904,15 +1899,12 @@ then
   AC_MSG_WARN([No sound system was found. Windows applications will be silent.])
   AC_MSG_WARN([The currently supported sound systems are:])
   AC_MSG_WARN([ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS])
-  exitcode=1
 fi
 
 echo
 echo "Configure finished.  Do '${ac_make} depend && ${ac_make}' to compile Wine."
 echo
 
-exit $exitcode
-
 dnl Local Variables:
 dnl comment-start: "dnl "
 dnl comment-end: ""




More information about the wine-cvs mailing list