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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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" 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 if test "$GXX" = yes ; then
CXXWARNINGS="-Wall" CXXWARNINGS="-Wall"
fi 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 $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_%'` 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 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 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_DIR@%$TOOLKIT_DIR%g
s%@TOOLKIT_NAME@%$TOOLKIT_NAME%g s%@TOOLKIT_NAME@%$TOOLKIT_NAME%g
s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g
s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g
s%@GUIHEADERS@%$GUIHEADERS%g s%@GUIHEADERS@%$GUIHEADERS%g
s%@GUIOBJS@%$GUIOBJS%g s%@GUIOBJS@%$GUIOBJS%g
s%@COMMONOBJS@%$COMMONOBJS%g s%@COMMONOBJS@%$COMMONOBJS%g

8
configure.in
View File

@@ -3723,6 +3723,13 @@ LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
dnl all -I options we must pass to the compiler dnl all -I options we must pass to the compiler
INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE" INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
dnl wxGTK does not need TOOLKIT includes in wx-config
if test "$wxUSE_GTK" = 1; then
WXCONFIG_INCLUDE=""
else
WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
fi
dnl C/C++ compiler options used to compile wxWindows dnl C/C++ compiler options used to compile wxWindows
if test "$GXX" = yes ; then if test "$GXX" = yes ; then
dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror" dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
@@ -3814,6 +3821,7 @@ AC_SUBST(TOOLKIT_DEF)
AC_SUBST(TOOLKIT_DIR) AC_SUBST(TOOLKIT_DIR)
AC_SUBST(TOOLKIT_NAME) AC_SUBST(TOOLKIT_NAME)
AC_SUBST(TOOLKIT_INCLUDE) AC_SUBST(TOOLKIT_INCLUDE)
AC_SUBST(WXCONFIG_INCLUDE)
dnl what to compile dnl what to compile
AC_SUBST(GUIHEADERS) AC_SUBST(GUIHEADERS)

2
wx-config.in
View File

@@ -48,7 +48,7 @@ while test $# -gt 0; do
fi fi
fi fi
includes="$includes -I@libdir@/wx/include" includes="$includes -I@libdir@/wx/include"
echo $includes -D__USE_WXCONFIG__ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @TOOLKIT_INCLUDE@ echo $includes -D__USE_WXCONFIG__ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @WXCONFIG_INCLUDE@
;; ;;
--libs) --libs)
if test @libdir@ != /usr/lib ; then if test @libdir@ != /usr/lib ; then