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

Add wx/osx/textentry.h to the list of OS X headers.

Browse Source 
Fix problem with "make install" which didn't install this header.

Backport of r63137 from HEAD.

Closes #11624.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@63138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-01-12 15:51:48 +00:00
parent cea6e8c61a
commit 2044a5f9cc
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 62501 2009-10-25 17:48:32Z PC .
# From configure.in Id.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.10.
#
@@ -26379,9 +26379,9 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6
if test "$ac_cv_header_png_h" = "yes"; then
echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6
if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -26399,11 +26399,11 @@ extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char png_check_sig ();
char png_sig_cmp ();
int
main ()
{
png_check_sig ();
png_sig_cmp ();
;
return 0;
}
@@ -26429,20 +26429,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_png_png_check_sig=yes
ac_cv_lib_png_png_sig_cmp=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_png_png_check_sig=no
ac_cv_lib_png_png_sig_cmp=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6
if test $ac_cv_lib_png_png_check_sig = yes; then
echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6
if test $ac_cv_lib_png_png_sig_cmp = yes; then
PNG_LINK=" -lpng -lz"
fi

2
configure.in
View File

@@ -3050,7 +3050,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then
AC_CHECK_HEADER(png.h,,, [ ])
if test "$ac_cv_header_png_h" = "yes"; then
AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng -lz", , [-lz -lm])
AC_CHECK_LIB(png, png_sig_cmp, PNG_LINK=" -lpng -lz", , [-lz -lm])
fi
if test "x$PNG_LINK" = "x" ; then

1
docs/changes.txt
View File

@@ -127,6 +127,7 @@ All (GUI):
- Corrected writing direction for Farsi.
- Added wxBORDER_THEME to XRC.
- Speeded up wxTreeCtrl by caching text size (botg).
- Fix building with using system libpng 1.4 (Volker Grabsch).
wxMSW: