ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Don't enable maintainer mode if it is explicitly not requested.

This commit is contained in:
Andrew Nguyen 2010-05-25 22:20:14 -05:00 committed by Alexandre Julliard
parent 162e420f0e
commit 2eda9c72cd
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -671,6 +671,7 @@ CPP
OPENGL_LIBS OPENGL_LIBS
XLIB XLIB
PRELINK PRELINK
MAINTAINER_MODE
ICOTOOL ICOTOOL
CONVERT CONVERT
RSVG RSVG
@ -715,7 +716,6 @@ build_os
build_vendor build_vendor
build_cpu build_cpu
build build
MAINTAINER_MODE
target_alias target_alias
host_alias host_alias
build_alias build_alias
@ -2490,9 +2490,6 @@ fi
# Check whether --enable-maintainer-mode was given. # Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then : if test "${enable_maintainer_mode+set}" = set; then :
enableval=$enable_maintainer_mode; enableval=$enable_maintainer_mode;
else
MAINTAINER_MODE=\#
fi fi
@ -5106,8 +5103,11 @@ done
test -n "$ICOTOOL" || ICOTOOL="false" test -n "$ICOTOOL" || ICOTOOL="false"
if test "${enable_maintainer_mode+set}" = set if test "x$enable_maintainer_mode" != "xyes"
then then
MAINTAINER_MODE=\#
else
if test "$FONTFORGE" = "false"; then as_fn_append wine_warnings "|fontforge is missing, fonts can't be rebuilt."; fi if test "$FONTFORGE" = "false"; then as_fn_append wine_warnings "|fontforge is missing, fonts can't be rebuilt."; fi
if test "$RSVG" = "false"; then as_fn_append wine_warnings "|rsvg is missing, icons can't be rebuilt."; fi if test "$RSVG" = "false"; then as_fn_append wine_warnings "|rsvg is missing, icons can't be rebuilt."; fi
@ -11895,7 +11895,7 @@ $as_echo "$ac_cv_c_string_h_warnings" >&6; }
EXTRACFLAGS="$EXTRACFLAGS -Wpointer-arith" EXTRACFLAGS="$EXTRACFLAGS -Wpointer-arith"
fi fi
if test "${enable_maintainer_mode+set}" = set if test "x$enable_maintainer_mode" = "xyes"
then then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror" >&5
$as_echo_n "checking whether the compiler supports -Werror... " >&6; } $as_echo_n "checking whether the compiler supports -Werror... " >&6; }

9
configure.ac
View File

@ -25,8 +25,7 @@ dnl **** Command-line arguments ****
AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 support])) AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 support]))
AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)])) AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)]))
AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests])) AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests]))
AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules]), AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules]))
,[AC_SUBST([MAINTAINER_MODE],[\#])])
AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]), AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]),
[if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi]) [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi])
@ -286,8 +285,10 @@ AC_CHECK_PROGS(RSVG, rsvg, false)
AC_CHECK_PROGS(CONVERT, convert, false) AC_CHECK_PROGS(CONVERT, convert, false)
AC_CHECK_PROGS(ICOTOOL, icotool, false) AC_CHECK_PROGS(ICOTOOL, icotool, false)
if test "${enable_maintainer_mode+set}" = set if test "x$enable_maintainer_mode" != "xyes"
then then
AC_SUBST([MAINTAINER_MODE],[\#])
else
if test "$FONTFORGE" = "false"; then WINE_WARNING([fontforge is missing, fonts can't be rebuilt.]); fi if test "$FONTFORGE" = "false"; then WINE_WARNING([fontforge is missing, fonts can't be rebuilt.]); fi
if test "$RSVG" = "false"; then WINE_WARNING([rsvg is missing, icons can't be rebuilt.]); fi if test "$RSVG" = "false"; then WINE_WARNING([rsvg is missing, icons can't be rebuilt.]); fi
@ -1610,7 +1611,7 @@ then
fi fi
dnl Enable -Werror for maintainer mode dnl Enable -Werror for maintainer mode
if test "${enable_maintainer_mode+set}" = set if test "x$enable_maintainer_mode" = "xyes"
then then
WINE_TRY_CFLAGS([-Werror]) WINE_TRY_CFLAGS([-Werror])
fi fi