shortened configure warning messages to avoid exceeding 80 characters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
18
configure
vendored
18
configure
vendored
@@ -8999,7 +8999,7 @@ fi
|
||||
if test "$wxUSE_REGEX" = "sys" ; then
|
||||
{ echo "configure: error: system regex library not found! Use --with-regex to use built-in version" 1>&2; exit 1; }
|
||||
else
|
||||
echo "configure: warning: system regex library not found, will compile built-in version instead" 1>&2
|
||||
echo "configure: warning: system regex library not found, will use built-in instead" 1>&2
|
||||
wxUSE_REGEX=builtin
|
||||
fi
|
||||
else
|
||||
@@ -9099,7 +9099,7 @@ fi
|
||||
if test "$wxUSE_ZLIB" = "sys" ; then
|
||||
{ echo "configure: error: system zlib compression library not found! Use --with-zlib=builtin to use built-in version" 1>&2; exit 1; }
|
||||
else
|
||||
echo "configure: warning: system zlib compression library not found, will compile built-in version instead" 1>&2
|
||||
echo "configure: warning: system zlib compression library not found, will use built-in instead" 1>&2
|
||||
wxUSE_ZLIB=builtin
|
||||
fi
|
||||
else
|
||||
@@ -9122,7 +9122,7 @@ EOF
|
||||
|
||||
|
||||
if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
|
||||
echo "configure: warning: system png library doesn't work without system zlib, will compile built-in instead" 1>&2
|
||||
echo "configure: warning: system png library doesn't work without system zlib, will use built-in instead" 1>&2
|
||||
wxUSE_LIBPNG=builtin
|
||||
fi
|
||||
|
||||
@@ -9205,7 +9205,7 @@ fi
|
||||
if test "$wxUSE_LIBPNG" = "sys" ; then
|
||||
{ echo "configure: error: system png library not found! Use --with-libpng=builtin to use built-in version" 1>&2; exit 1; }
|
||||
else
|
||||
echo "configure: warning: system png library not found, will compile built-in version instead" 1>&2
|
||||
echo "configure: warning: system png library not found, will use built-in instead" 1>&2
|
||||
wxUSE_LIBPNG=builtin
|
||||
fi
|
||||
else
|
||||
@@ -9311,7 +9311,7 @@ fi
|
||||
if test "$wxUSE_LIBJPEG" = "sys" ; then
|
||||
{ echo "configure: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" 1>&2; exit 1; }
|
||||
else
|
||||
echo "configure: warning: system jpeg library not found, will compile built-in version instead" 1>&2
|
||||
echo "configure: warning: system jpeg library not found, will use built-in instead" 1>&2
|
||||
wxUSE_LIBJPEG=builtin
|
||||
fi
|
||||
else
|
||||
@@ -9412,7 +9412,7 @@ fi
|
||||
if test "$wxUSE_LIBTIFF" = "sys" ; then
|
||||
{ echo "configure: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" 1>&2; exit 1; }
|
||||
else
|
||||
echo "configure: warning: system tiff library not found, will compile built-in version instead" 1>&2
|
||||
echo "configure: warning: system tiff library not found, will use built-in instead" 1>&2
|
||||
wxUSE_LIBTIFF=builtin
|
||||
fi
|
||||
else
|
||||
@@ -9513,7 +9513,7 @@ fi
|
||||
if test "$wxUSE_FREETYPE" = "sys" ; then
|
||||
{ echo "configure: error: system freetype library not found! Use --with-freetype=builtin to use built-in version" 1>&2; exit 1; }
|
||||
else
|
||||
echo "configure: warning: system freetype library not found, will compile built-in version instead" 1>&2
|
||||
echo "configure: warning: system freetype library not found, will use built-in instead" 1>&2
|
||||
wxUSE_FREETYPE=builtin
|
||||
fi
|
||||
else
|
||||
@@ -12866,7 +12866,7 @@ else
|
||||
int main() {
|
||||
|
||||
/* Ultrix mips cc rejects this. */
|
||||
typedef int charset[2]; const charset x = {0,0};
|
||||
typedef int charset[2]; const charset x;
|
||||
/* SunOS 4.1.1 cc rejects this. */
|
||||
char const *const *ccp;
|
||||
char **p;
|
||||
@@ -12941,7 +12941,7 @@ for ac_kw in inline __inline__ __inline; do
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
} int $ac_kw foo() {
|
||||
} $ac_kw foo() {
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
|
||||
14
configure.in
14
configure.in
@@ -1639,7 +1639,7 @@ if test "$wxUSE_REGEX" != "no"; then
|
||||
if test "$wxUSE_REGEX" = "sys" ; then
|
||||
AC_MSG_ERROR([system regex library not found! Use --with-regex to use built-in version])
|
||||
else
|
||||
AC_MSG_WARN([system regex library not found, will compile built-in version instead])
|
||||
AC_MSG_WARN([system regex library not found, will use built-in instead])
|
||||
wxUSE_REGEX=builtin
|
||||
fi
|
||||
else
|
||||
@@ -1669,7 +1669,7 @@ if test "$wxUSE_ZLIB" != "no" ; then
|
||||
if test "$wxUSE_ZLIB" = "sys" ; then
|
||||
AC_MSG_ERROR([system zlib compression library not found! Use --with-zlib=builtin to use built-in version])
|
||||
else
|
||||
AC_MSG_WARN([system zlib compression library not found, will compile built-in version instead])
|
||||
AC_MSG_WARN([system zlib compression library not found, will use built-in instead])
|
||||
wxUSE_ZLIB=builtin
|
||||
fi
|
||||
else
|
||||
@@ -1695,7 +1695,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then
|
||||
dnl for the check below to have a chance to succeed, we must already have
|
||||
dnl libz somewhere
|
||||
if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
|
||||
AC_MSG_WARN([system png library doesn't work without system zlib, will compile built-in instead])
|
||||
AC_MSG_WARN([system png library doesn't work without system zlib, will use built-in instead])
|
||||
wxUSE_LIBPNG=builtin
|
||||
fi
|
||||
|
||||
@@ -1711,7 +1711,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then
|
||||
if test "$wxUSE_LIBPNG" = "sys" ; then
|
||||
AC_MSG_ERROR([system png library not found! Use --with-libpng=builtin to use built-in version])
|
||||
else
|
||||
AC_MSG_WARN([system png library not found, will compile built-in version instead])
|
||||
AC_MSG_WARN([system png library not found, will use built-in instead])
|
||||
wxUSE_LIBPNG=builtin
|
||||
fi
|
||||
else
|
||||
@@ -1764,7 +1764,7 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
|
||||
if test "$wxUSE_LIBJPEG" = "sys" ; then
|
||||
AC_MSG_ERROR([system jpeg library not found! Use --with-libjpeg=builtin to use built-in version])
|
||||
else
|
||||
AC_MSG_WARN([system jpeg library not found, will compile built-in version instead])
|
||||
AC_MSG_WARN([system jpeg library not found, will use built-in instead])
|
||||
wxUSE_LIBJPEG=builtin
|
||||
fi
|
||||
else
|
||||
@@ -1799,7 +1799,7 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
|
||||
if test "$wxUSE_LIBTIFF" = "sys" ; then
|
||||
AC_MSG_ERROR([system tiff library not found! Use --with-libtiff=builtin to use built-in version])
|
||||
else
|
||||
AC_MSG_WARN([system tiff library not found, will compile built-in version instead])
|
||||
AC_MSG_WARN([system tiff library not found, will use built-in instead])
|
||||
wxUSE_LIBTIFF=builtin
|
||||
fi
|
||||
else
|
||||
@@ -1834,7 +1834,7 @@ if test "$wxUSE_FREETYPE" != "no" ; then
|
||||
if test "$wxUSE_FREETYPE" = "sys" ; then
|
||||
AC_MSG_ERROR([system freetype library not found! Use --with-freetype=builtin to use built-in version])
|
||||
else
|
||||
AC_MSG_WARN([system freetype library not found, will compile built-in version instead])
|
||||
AC_MSG_WARN([system freetype library not found, will use built-in instead])
|
||||
wxUSE_FREETYPE=builtin
|
||||
fi
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user