--- configure.in~ 2004-01-11 23:17:48.000000000 +0200
+++ configure.in 2004-01-12 22:12:08.000000000 +0200
@@ -2047,11 +2047,11 @@
WX_CXXFLAGS="\`$WX_CONFIG --cxxflags\`"
GUI_LINK_OPTS_WX="\`$WX_CONFIG --libs\`"
# if gtk-config exists, then add it to the cflags.
- gtkconf=`gtk-config --cflags`
+ gtkconf=`pkg-config gtk+-2.0 --cflags`
if test $? = 0; then
# gtk-config was found and returned 0, so it must return valid output
- WX_CFLAGS="$WX_CFLAGS \`gtk-config --cflags\`"
- WX_CXXFLAGS="$WX_CXXFLAGS \`gtk-config --cflags\`"
+ WX_CFLAGS="$WX_CFLAGS \`pkg-config gtk+-2.0 --cflags\`"
+ WX_CXXFLAGS="$WX_CXXFLAGS \`pkg-config gtk+-2.0 --cflags\`"
fi
# GUI_C*FLAGS are added to the compilation of every bochs file, not just
# the files in gui/*.cc. They are not used when building other things
--- configure~ 2004-01-11 22:06:17.000000000 +0200
+++ configure 2004-01-12 22:12:28.000000000 +0200
@@ -34560,11 +34560,11 @@
WX_CXXFLAGS="\`$WX_CONFIG --cxxflags\`"
GUI_LINK_OPTS_WX="\`$WX_CONFIG --libs\`"
# if gtk-config exists, then add it to the cflags.
- gtkconf=`gtk-config --cflags`
+ gtkconf=`pkg-config gtk+-2.0 --cflags`
if test $? = 0; then
# gtk-config was found and returned 0, so it must return valid output
- WX_CFLAGS="$WX_CFLAGS \`gtk-config --cflags\`"
- WX_CXXFLAGS="$WX_CXXFLAGS \`gtk-config --cflags\`"
+ WX_CFLAGS="$WX_CFLAGS \`pkg-config gtk+-2.0 --cflags\`"
+ WX_CXXFLAGS="$WX_CXXFLAGS \`pkg-config gtk+-2.0 --cflags\`"
fi
# GUI_C*FLAGS are added to the compilation of every bochs file, not just
# the files in gui/*.cc. They are not used when building other things