fixed MSLU check
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
7d92395d60
commit
bbc3925a8a
18
configure
vendored
18
configure
vendored
@ -19281,10 +19281,14 @@ if test "$wxUSE_UNICODE" = "yes" ; then
|
||||
#define wxUSE_UNICODE 1
|
||||
EOF
|
||||
|
||||
|
||||
if test "$wxUSE_MSW" != 1; then
|
||||
wxUSE_UNICODE_MSLU=no
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
|
||||
echo $ac_n "checking for main in -lunicows""... $ac_c" 1>&6
|
||||
echo "configure:19288: checking for main in -lunicows" >&5
|
||||
echo "configure:19292: checking for main in -lunicows" >&5
|
||||
ac_lib_var=`echo unicows'_'main | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -19292,14 +19296,14 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lunicows $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19296 "configure"
|
||||
#line 19300 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:19303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:19307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -19479,17 +19483,17 @@ if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:19483: checking for $ac_hdr" >&5
|
||||
echo "configure:19487: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19488 "configure"
|
||||
#line 19492 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:19493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:19497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@ -20460,7 +20464,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
|
||||
|
||||
|
||||
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
|
||||
echo "configure:20464: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
echo "configure:20468: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -3949,6 +3949,10 @@ fi
|
||||
|
||||
if test "$wxUSE_UNICODE" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_UNICODE)
|
||||
|
||||
if test "$wxUSE_MSW" != 1; then
|
||||
wxUSE_UNICODE_MSLU=no
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
|
||||
AC_CHECK_LIB(unicows,main,
|
||||
|
Loading…
Reference in New Issue
Block a user