From 5cc9ffe646be15d4f47d85bd64cd11fec71206e2 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Sun, 18 Jun 2000 08:57:40 +0000
Subject: [PATCH]   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
---
 configure    | 10 +++++++++-
 configure.in |  8 ++++++++
 wx-config.in |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 4857f162c8..0e745713da 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/configure.in b/configure.in
index 902970add7..c627557332 100644
--- a/configure.in
+++ b/configure.in
@@ -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
 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
 if test "$GXX" = yes ; then
     dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
@@ -3814,6 +3821,7 @@ AC_SUBST(TOOLKIT_DEF)
 AC_SUBST(TOOLKIT_DIR)
 AC_SUBST(TOOLKIT_NAME)
 AC_SUBST(TOOLKIT_INCLUDE)
+AC_SUBST(WXCONFIG_INCLUDE)
 
 dnl what to compile
 AC_SUBST(GUIHEADERS)
diff --git a/wx-config.in b/wx-config.in
index 7286a94bd6..a89e5cf8b1 100755
--- a/wx-config.in
+++ b/wx-config.in
@@ -48,7 +48,7 @@ while test $# -gt 0; do
         fi
       fi
       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)
       if test @libdir@ != /usr/lib ; then