fixed quoting in CPPFLAGS (last change broke the Unix build)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 67003a004408d3439cbae908ace710b54b383a84..bd6119851f3eb10199dfb50601393234f59f19f1 100755 (executable)
--- a/configure
+++ b/configure
@@ -27490,7 +27490,7 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>

 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1


@@ -27517,7 +27517,7 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do

-  if test -r "$ac_dir/X11/Xlib.h"; then
+  if test -r "$ac_dir/X11/Intrinsic.h"; then

     ac_x_includes=$ac_dir
     break
   fi
     ac_x_includes=$ac_dir
     break
   fi


@@ -27531,18 +27531,18 @@ if test "$ac_x_libraries" = no; then
   # See if we find them without any special options.
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   # See if we find them without any special options.
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS

-  LIBS="-lX11 $LIBS"
+  LIBS="-lXt $LIBS"

   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>

 int
 main ()
 {
 int
 main ()
 {

-XrmInitialize ()
+XtMalloc (0)

   ;
   return 0;
 }
   ;
   return 0;
 }


@@ -27580,7 +27580,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
   for ac_extension in a so sl; do
 do
   # Don't even attempt the hair of trying to link an X program!
   for ac_extension in a so sl; do

-    if test -r $ac_dir/libX11.$ac_extension; then
+    if test -r $ac_dir/libXt.$ac_extension; then

       ac_x_libraries=$ac_dir
       break 2
     fi
       ac_x_libraries=$ac_dir
       break 2
     fi


@@ -43495,8 +43495,8 @@ WXCONFIG_CXXFLAGS=`echo $WXCONFIG_CFLAGS $WXCONFIG_CXXFLAGS`
 
 
 CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $CPPFLAGS \
 
 
 CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $CPPFLAGS \

- -I\${top_builddir}lib/wx/include/${TOOLCHAIN_FULLNAME} \
- -I\${top_srcdir}/include $TOOLKIT_INCLUDE`
+ -I\\${top_builddir}lib/wx/include/${TOOLCHAIN_FULLNAME} \
+ -I\\${top_srcdir}/include $TOOLKIT_INCLUDE`

 
 C_AND_CXX_FLAGS="$DEBUG_FLAG $PROFILE_FLAG $OPTIMISE_FLAG"
 CFLAGS=`echo $WXCONFIG_CFLAGS $CFLAGS $CWARNINGS $C_AND_CXX_FLAGS`
 
 C_AND_CXX_FLAGS="$DEBUG_FLAG $PROFILE_FLAG $OPTIMISE_FLAG"
 CFLAGS=`echo $WXCONFIG_CFLAGS $CFLAGS $CWARNINGS $C_AND_CXX_FLAGS`

diff --git a/configure.in b/configure.in
index d065c63aeed0730a4ec2f8301b2e2f04ef953b0f..e4fdbb32d7ee9c5af3802a541d317703c324fb17 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6973,8 +6973,8 @@ dnl come first and the one with setup.h should be before $(top_srcdir)/include
 dnl in case the latter contains setup.h used by non-autoconf makefiles (e.g.
 dnl CodeWarrior):
 CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $CPPFLAGS \
 dnl in case the latter contains setup.h used by non-autoconf makefiles (e.g.
 dnl CodeWarrior):
 CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $CPPFLAGS \

- -I\${top_builddir}lib/wx/include/${TOOLCHAIN_FULLNAME} \
- -I\${top_srcdir}/include $TOOLKIT_INCLUDE`
+ -I\\${top_builddir}lib/wx/include/${TOOLCHAIN_FULLNAME} \
+ -I\\${top_srcdir}/include $TOOLKIT_INCLUDE`

 
 C_AND_CXX_FLAGS="$DEBUG_FLAG $PROFILE_FLAG $OPTIMISE_FLAG"
 CFLAGS=`echo $WXCONFIG_CFLAGS $CFLAGS $CWARNINGS $C_AND_CXX_FLAGS`
 
 C_AND_CXX_FLAGS="$DEBUG_FLAG $PROFILE_FLAG $OPTIMISE_FLAG"
 CFLAGS=`echo $WXCONFIG_CFLAGS $CFLAGS $CWARNINGS $C_AND_CXX_FLAGS`