No GTK includes reported by wx-config. I left wxMotif

unchanged.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-06-18 08:57:40 +00:00
parent 5f53644cbb
commit 5cc9ffe646
3 changed files with 18 additions and 2 deletions

10
configure vendored
View File

@@ -14343,6 +14343,12 @@ LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
if test "$wxUSE_GTK" = 1; then
WXCONFIG_INCLUDE=""
else
WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
fi
if test "$GXX" = yes ; then
CXXWARNINGS="-Wall"
fi
@@ -14456,10 +14462,11 @@ 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:14463: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo "configure:14470: 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
@@ -14723,6 +14730,7 @@ s%@TOOLKIT_DEF@%$TOOLKIT_DEF%g
s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g
s%@TOOLKIT_NAME@%$TOOLKIT_NAME%g
s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g
s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g
s%@GUIHEADERS@%$GUIHEADERS%g
s%@GUIOBJS@%$GUIOBJS%g
s%@COMMONOBJS@%$COMMONOBJS%g