infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-12 03:18:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

8140762: Specifying --without-LIB if not needed should not result in warning

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2015-10-29 15:24:36 +01:00
parent 1b3ee82ffc
commit ce3cdee0b2
6 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
common/autoconf/generated-configure.sh
View File

@ -4595,7 +4595,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1445964676
DATE_WHEN_GENERATED=1446128654
###############################################################################
#
@ -46894,7 +46894,7 @@ $as_echo "no" >&6; }
if test "x$NEEDS_LIB_X11" = xfalse; then
if test "x${with_x}" != x; then
if (test "x${with_x}" != x && test "x${with_x}" != xno); then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: X11 is not used, so --with-x is ignored" >&5
$as_echo "$as_me: WARNING: X11 is not used, so --with-x is ignored" >&2;}
fi
@ -47790,9 +47790,10 @@ fi
if test "x$NEEDS_LIB_CUPS" = xfalse; then
if test "x${with_cups}" != x || test "x${with_cups_include}" != x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cups not used, so --with-cups is ignored" >&5
$as_echo "$as_me: WARNING: cups not used, so --with-cups is ignored" >&2;}
if (test "x${with_cups}" != x && test "x${with_cups}" != xno) || \
(test "x${with_cups_include}" != x && test "x${with_cups_include}" != xno); then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cups not used, so --with-cups[-*] is ignored" >&5
$as_echo "$as_me: WARNING: cups not used, so --with-cups[-*] is ignored" >&2;}
fi
CUPS_CFLAGS=
else
@ -47922,11 +47923,14 @@ fi
FREETYPE_BUNDLE_LIB_PATH=
if test "x$NEEDS_LIB_FREETYPE" = xfalse; then
if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x || test "x$with_freetype_src" != x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: freetype not used, so --with-freetype is ignored" >&5
$as_echo "$as_me: WARNING: freetype not used, so --with-freetype is ignored" >&2;}
if (test "x$with_freetype" != x && test "x$with_freetype" != xno) || \
(test "x$with_freetype_include" != x && test "x$with_freetype_include" != xno) || \
(test "x$with_freetype_lib" != x && test "x$with_freetype_lib" != xno) || \
(test "x$with_freetype_src" != x && test "x$with_freetype_src" != xno); then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: freetype not used, so --with-freetype[-*] is ignored" >&5
$as_echo "$as_me: WARNING: freetype not used, so --with-freetype[-*] is ignored" >&2;}
fi
if test "x$enable_freetype_bundling" != x; then
if (test "x$enable_freetype_bundling" != x && test "x$enable_freetype_bundling" != xno); then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: freetype not used, so --enable-freetype-bundling is ignored" >&5
$as_echo "$as_me: WARNING: freetype not used, so --enable-freetype-bundling is ignored" >&2;}
fi
@ -51926,9 +51930,11 @@ fi
if test "x$NEEDS_LIB_ALSA" = xfalse; then
if test "x${with_alsa}" != x || test "x${with_alsa_include}" != x || test "x${with_alsa_lib}" != x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: alsa not used, so --with-alsa is ignored" >&5
$as_echo "$as_me: WARNING: alsa not used, so --with-alsa is ignored" >&2;}
if (test "x${with_alsa}" != x && test "x${with_alsa}" != xno) || \
(test "x${with_alsa_include}" != x && test "x${with_alsa_include}" != xno) || \
(test "x${with_alsa_lib}" != x && test "x${with_alsa_lib}" != xno); then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: alsa not used, so --with-alsa[-*] is ignored" >&5
$as_echo "$as_me: WARNING: alsa not used, so --with-alsa[-*] is ignored" >&2;}
fi
ALSA_CFLAGS=
ALSA_LIBS=
@ -52105,9 +52111,11 @@ fi
if test "x$NEEDS_LIB_FFI" = xfalse; then
if test "x${with_libffi}" != x || test "x${with_libffi_include}" != x || test "x${with_libffi_lib}" != x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libffi not used, so --with-libffi is ignored" >&5
$as_echo "$as_me: WARNING: libffi not used, so --with-libffi is ignored" >&2;}
if (test "x${with_libffi}" != x && test "x${with_libffi}" != xno) || \
(test "x${with_libffi_include}" != x && test "x${with_libffi_include}" != xno) || \
(test "x${with_libffi_lib}" != x && test "x${with_libffi_lib}" != xno); then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libffi not used, so --with-libffi[-*] is ignored" >&5
$as_echo "$as_me: WARNING: libffi not used, so --with-libffi[-*] is ignored" >&2;}
fi
LIBFFI_CFLAGS=
LIBFFI_LIBS=

6
common/autoconf/lib-alsa.m4
View File

@ -37,8 +37,10 @@ AC_DEFUN_ONCE([LIB_SETUP_ALSA],
[specify directory for the alsa library])])
if test "x$NEEDS_LIB_ALSA" = xfalse; then
if test "x${with_alsa}" != x || test "x${with_alsa_include}" != x || test "x${with_alsa_lib}" != x; then
AC_MSG_WARN([alsa not used, so --with-alsa is ignored])
if (test "x${with_alsa}" != x && test "x${with_alsa}" != xno) || \
(test "x${with_alsa_include}" != x && test "x${with_alsa_include}" != xno) || \
(test "x${with_alsa_lib}" != x && test "x${with_alsa_lib}" != xno); then
AC_MSG_WARN([[alsa not used, so --with-alsa[-*] is ignored]])
fi
ALSA_CFLAGS=
ALSA_LIBS=

5
common/autoconf/lib-cups.m4
View File

@ -35,8 +35,9 @@ AC_DEFUN_ONCE([LIB_SETUP_CUPS],
[specify directory for the cups include files])])
if test "x$NEEDS_LIB_CUPS" = xfalse; then
if test "x${with_cups}" != x || test "x${with_cups_include}" != x; then
AC_MSG_WARN([cups not used, so --with-cups is ignored])
if (test "x${with_cups}" != x && test "x${with_cups}" != xno) || \
(test "x${with_cups_include}" != x && test "x${with_cups_include}" != xno); then
AC_MSG_WARN([[cups not used, so --with-cups[-*] is ignored]])
fi
CUPS_CFLAGS=
else

6
common/autoconf/lib-ffi.m4
View File

@ -37,8 +37,10 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
[specify directory for the libffi library])])
if test "x$NEEDS_LIB_FFI" = xfalse; then
if test "x${with_libffi}" != x || test "x${with_libffi_include}" != x || test "x${with_libffi_lib}" != x; then
AC_MSG_WARN([libffi not used, so --with-libffi is ignored])
if (test "x${with_libffi}" != x && test "x${with_libffi}" != xno) || \
(test "x${with_libffi_include}" != x && test "x${with_libffi_include}" != xno) || \
(test "x${with_libffi_lib}" != x && test "x${with_libffi_lib}" != xno); then
AC_MSG_WARN([[libffi not used, so --with-libffi[-*] is ignored]])
fi
LIBFFI_CFLAGS=
LIBFFI_LIBS=

9
common/autoconf/lib-freetype.m4
View File

@ -202,10 +202,13 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
FREETYPE_BUNDLE_LIB_PATH=
if test "x$NEEDS_LIB_FREETYPE" = xfalse; then
if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x || test "x$with_freetype_src" != x; then
AC_MSG_WARN([freetype not used, so --with-freetype is ignored])
if (test "x$with_freetype" != x && test "x$with_freetype" != xno) || \
(test "x$with_freetype_include" != x && test "x$with_freetype_include" != xno) || \
(test "x$with_freetype_lib" != x && test "x$with_freetype_lib" != xno) || \
(test "x$with_freetype_src" != x && test "x$with_freetype_src" != xno); then
AC_MSG_WARN([[freetype not used, so --with-freetype[-*] is ignored]])
fi
if test "x$enable_freetype_bundling" != x; then
if (test "x$enable_freetype_bundling" != x && test "x$enable_freetype_bundling" != xno); then
AC_MSG_WARN([freetype not used, so --enable-freetype-bundling is ignored])
fi
else

2
common/autoconf/lib-x11.m4
View File

@ -29,7 +29,7 @@
AC_DEFUN_ONCE([LIB_SETUP_X11],
[
if test "x$NEEDS_LIB_X11" = xfalse; then
if test "x${with_x}" != x; then
if (test "x${with_x}" != x && test "x${with_x}" != xno); then
AC_MSG_WARN([X11 is not used, so --with-x is ignored])
fi
X_CFLAGS=