AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

htmlhelp.h no longer needed -> removed test in configure

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2002-03-10 00:01:33 +00:00
parent da0ddbd6df
commit 3b7bc64a2a
2 changed files with 6 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
configure vendored
View File

@ -19415,48 +19415,10 @@ EOF
if test "$wxUSE_MSW" = 1; then
if test "$wxUSE_MS_HTML_HELP" = "yes"; then
ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6
echo "configure:19421: checking for htmlhelp.h" >&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 19426 "configure"
#include "confdefs.h"
#include <htmlhelp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:19431: \"$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*
eval "ac_cv_header_$ac_safe=yes"
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
cat >> confdefs.h <<\EOF
#define wxUSE_MS_HTML_HELP 1
EOF
else
echo "$ac_t""no" 1>&6
echo "configure: warning: MS HTML Help cannot be used without htmlhelp.h... disabled" 1>&2
wxUSE_MS_HTML_HELP=no
fi
fi
fi
@ -19519,17 +19481,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:19523: checking for $ac_hdr" >&5
echo "configure:19485: 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 19528 "configure"
#line 19490 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:19533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:19495: \"$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*
@ -20504,7 +20466,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:20508: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo "configure:20470: 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

9
configure.in
View File

@ -4022,14 +4022,7 @@ if test "$wxUSE_HELP" = "yes"; then
if test "$wxUSE_MSW" = 1; then
if test "$wxUSE_MS_HTML_HELP" = "yes"; then
AC_CHECK_HEADER(htmlhelp.h,
[
AC_DEFINE(wxUSE_MS_HTML_HELP)
],
[
AC_MSG_WARN([MS HTML Help cannot be used without htmlhelp.h... disabled])
wxUSE_MS_HTML_HELP=no
])
AC_DEFINE(wxUSE_MS_HTML_HELP)
fi
fi