Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use MoreFilesX instead of MoreFiles when building with Apple Developer Tools

Browse Source 
added wxWindows version compatibility information to configuration summary


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2003-01-01 17:59:01 +00:00
parent ec341c7e1f
commit 0c98a14e54
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@@ -11849,9 +11849,9 @@ fi
if test "x$PNG_LINK" = "x" ; then if test "x$PNG_LINK" = "x" ; then
if test "$wxUSE_LIBPNG" = "sys" ; then 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; } { echo "configure: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" 1>&2; exit 1; }
else else
echo "configure: warning: png library not found or too old, will use built-in instead" 1>&2 echo "configure: warning: system png library not found or too old, will use built-in instead" 1>&2
wxUSE_LIBPNG=builtin wxUSE_LIBPNG=builtin
fi fi
else else
@@ -15617,9 +15617,9 @@ rm -f conftest*
fi fi
if test "$wxUSE_MAC" = 1; then if test "$wxUSE_MAC" = 1; then
CPPFLAGS="$CPPFLAGS -fpascal-strings -I\${top_srcdir}/src/mac/morefile -I/Developer/Headers/FlatCarbon" CPPFLAGS="$CPPFLAGS -fpascal-strings -I\${top_srcdir}/src/mac/morefilex -I/Developer/Headers/FlatCarbon"
TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile" TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex"
TOOLKIT=MAC TOOLKIT=MAC
GUIDIST=MACX_DIST GUIDIST=MACX_DIST
fi fi
@@ -22897,6 +22897,10 @@ echo " Should wxWindows be compiled in debug mode? ${wxUSE_DEBUG:-n
echo " Should wxWindows be linked as a shared library? ${wxUSE_SHARED:-no}" echo " Should wxWindows be linked as a shared library? ${wxUSE_SHARED:-no}"
echo " Should wxWindows be compiled in Unicode mode? ${wxUSE_UNICODE:-no}" echo " Should wxWindows be compiled in Unicode mode? ${wxUSE_UNICODE:-no}"
echo " What level of wxWindows compatibility should be enabled?"
echo " wxWindows 2.0 ${WXWIN_COMPATIBILITY_2:-no}"
echo " wxWindows 2.2 ${WXWIN_COMPATIBILITY_2_2:-yes}"
echo " Which libraries should wxWindows use?" echo " Which libraries should wxWindows use?"
echo " jpeg ${wxUSE_LIBJPEG-none}" echo " jpeg ${wxUSE_LIBJPEG-none}"
echo " png ${wxUSE_LIBPNG-none}" echo " png ${wxUSE_LIBPNG-none}"

12
configure.in
View File

@@ -1821,9 +1821,9 @@ if test "$wxUSE_LIBPNG" != "no" ; then
if test "x$PNG_LINK" = "x" ; then if test "x$PNG_LINK" = "x" ; then
if test "$wxUSE_LIBPNG" = "sys" ; then if test "$wxUSE_LIBPNG" = "sys" ; then
AC_MSG_ERROR([system png library not found! Use --with-libpng=builtin to use built-in version]) AC_MSG_ERROR([system png library not found or too old! Use --with-libpng=builtin to use built-in version])
else else
AC_MSG_WARN([png library not found or too old, will use built-in instead]) AC_MSG_WARN([system png library not found or too old, will use built-in instead])
wxUSE_LIBPNG=builtin wxUSE_LIBPNG=builtin
fi fi
else else
@@ -2529,9 +2529,9 @@ equivalent variable and GTK+ is version 1.2.3 or above.
fi fi
if test "$wxUSE_MAC" = 1; then if test "$wxUSE_MAC" = 1; then
CPPFLAGS="$CPPFLAGS -fpascal-strings -I\${top_srcdir}/src/mac/morefile -I/Developer/Headers/FlatCarbon" CPPFLAGS="$CPPFLAGS -fpascal-strings -I\${top_srcdir}/src/mac/morefilex -I/Developer/Headers/FlatCarbon"
TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile" TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex"
TOOLKIT=MAC TOOLKIT=MAC
dnl we can't call this MAC_DIST or autoconf thinks its a macro dnl we can't call this MAC_DIST or autoconf thinks its a macro
GUIDIST=MACX_DIST GUIDIST=MACX_DIST
@@ -5483,6 +5483,10 @@ echo " Should wxWindows be compiled in debug mode? ${wxUSE_DEBUG:-n
echo " Should wxWindows be linked as a shared library? ${wxUSE_SHARED:-no}" echo " Should wxWindows be linked as a shared library? ${wxUSE_SHARED:-no}"
echo " Should wxWindows be compiled in Unicode mode? ${wxUSE_UNICODE:-no}" echo " Should wxWindows be compiled in Unicode mode? ${wxUSE_UNICODE:-no}"
echo " What level of wxWindows compatibility should be enabled?"
echo " wxWindows 2.0 ${WXWIN_COMPATIBILITY_2:-no}"
echo " wxWindows 2.2 ${WXWIN_COMPATIBILITY_2_2:-yes}"
echo " Which libraries should wxWindows use?" echo " Which libraries should wxWindows use?"
echo " jpeg ${wxUSE_LIBJPEG-none}" echo " jpeg ${wxUSE_LIBJPEG-none}"
echo " png ${wxUSE_LIBPNG-none}" echo " png ${wxUSE_LIBPNG-none}"