Try to get more information about wxFileSystemWatcher unit test failures.

[wxWidgets.git] / configure

diff --git a/configure b/configure
index bcb787d64496134442791de028787a0026cb8200..a986af452dd523068c0dac0d41bee293123f43fe 100755 (executable)
--- a/configure
+++ b/configure
@@ -4499,6 +4499,8 @@ else
 
 fi
 
 
 fi
 

+{ echo "$as_me:$LINENO: result: ${enable_debug-default}" >&5
+echo "${ECHO_T}${enable_debug-default}" >&6; }

 
 case "$wxUSE_DEBUG" in
     yes)
 
 case "$wxUSE_DEBUG" in
     yes)


@@ -19583,8 +19585,22 @@ case "${host}" in
 esac
 
 
 esac
 
 

-if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then
-    CXXFLAGS="-qunique $CXXFLAGS"
+if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
+                    cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+
+            GNU_SOURCE_FLAG="-D_GNU_SOURCE"
+    CFLAGS="$GNU_SOURCE_FLAG $CFLAGS"
+fi
+
+if test "x$USE_AIX" = "x1"; then
+            if test "x$XLCXX" = "xyes"; then
+        CXXFLAGS="-qunique $CXXFLAGS"
+    fi
+
+                                CPPFLAGS="-D_LINUX_SOURCE_COMPAT $CPPFLAGS"

 fi
 
 case "${host}" in
 fi
 
 case "${host}" in


@@ -25593,7 +25609,7 @@ _ACEOF
 
 
 if test "x$SUNCXX" = xyes; then
 
 
 if test "x$SUNCXX" = xyes; then

-    CXXFLAGS="-features=tmplife $CXXFLAGS"
+    CXXFLAGS="-features=tmplife $GNU_SOURCE_FLAG $CXXFLAGS"

 fi
 
 if test "x$SUNCC" = xyes; then
 fi
 
 if test "x$SUNCC" = xyes; then


@@ -27285,7 +27301,7 @@ for ac_dir in $SEARCH_INCLUDE /usr/include
         if test -z "$x_libraries" -o "$x_libraries" = NONE; then
 
   ac_find_libraries=
         if test -z "$x_libraries" -o "$x_libraries" = NONE; then
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB
+  for ac_dir in  $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXt.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXt.$ac_extension"; then


@@ -27375,84 +27391,6 @@ echo "$as_me: not updating unwritable cache $cache_file" >&6;}
 fi
 rm -f confcache
 
 fi
 rm -f confcache
 

-if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
-    { echo "$as_me:$LINENO: checking for glibc 2.1 or later" >&5
-echo $ECHO_N "checking for glibc 2.1 or later... $ECHO_C" >&6; }
-if test "${wx_cv_lib_glibc21+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <features.h>
-int
-main ()
-{
-
-                #if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1)
-                not glibc 2.1
-                #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-                wx_cv_lib_glibc21=yes
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-                wx_cv_lib_glibc21=no
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_lib_glibc21" >&5
-echo "${ECHO_T}$wx_cv_lib_glibc21" >&6; }
-    if test "$wx_cv_lib_glibc21" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxHAVE_GLIBC2 1
-_ACEOF
-
-    fi
-fi
-
-if test "x$wx_cv_lib_glibc21" = "xyes"; then
-    if test "$wxUSE_UNICODE" = "yes" -o "$wxUSE_THREADS" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define _GNU_SOURCE 1
-_ACEOF
-
-    fi
-fi
-

 have_cos=0
 have_floor=0
 
 have_cos=0
 have_floor=0
 


@@ -29965,61 +29903,6 @@ fi
                 WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
 
         WIN32INSTALL=win32install
                 WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
 
         WIN32INSTALL=win32install

-
-        { echo "$as_me:$LINENO: checking for pbt.h" >&5
-echo $ECHO_N "checking for pbt.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_pbt_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-#include <pbt.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_pbt_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_pbt_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_pbt_h" >&5
-echo "${ECHO_T}$ac_cv_header_pbt_h" >&6; }
-if test $ac_cv_header_pbt_h = yes; then
-  :
-else
-  cat >>confdefs.h <<\_ACEOF
-#define NEED_PBT_H 1
-_ACEOF
-
-fi
-
-

 fi
 
 if test "$wxUSE_GUI" = "yes"; then
 fi
 
 if test "$wxUSE_GUI" = "yes"; then


@@ -31495,7 +31378,7 @@ done
 echo $ECHO_N "checking for gpewidget library... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking for gpewidget library... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB
+  for ac_dir in  $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libgpewidget.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libgpewidget.$ac_extension"; then


@@ -33785,7 +33668,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 echo $ECHO_N "checking for Motif/Lesstif library... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking for Motif/Lesstif library... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB
+  for ac_dir in  $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXm.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXm.$ac_extension"; then


@@ -34189,7 +34072,7 @@ _ACEOF
 echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB
+  for ac_dir in  $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXpm.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXpm.$ac_extension"; then


@@ -34976,7 +34859,7 @@ fi
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB
+  for ac_dir in  $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXinerama.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXinerama.$ac_extension"; then


@@ -35072,7 +34955,7 @@ fi
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB
+  for ac_dir in  $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXinerama.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXinerama.$ac_extension"; then


@@ -35448,7 +35331,7 @@ fi
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB
+  for ac_dir in  $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXxf86vm.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXxf86vm.$ac_extension"; then


@@ -35544,7 +35427,7 @@ fi
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB
+  for ac_dir in  $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXxf86vm.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXxf86vm.$ac_extension"; then


@@ -35913,7 +35796,7 @@ fi
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB
+  for ac_dir in  $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libSM.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libSM.$ac_extension"; then


@@ -36009,7 +35892,7 @@ fi
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB
+  for ac_dir in  $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libSM.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libSM.$ac_extension"; then


@@ -36477,7 +36360,7 @@ fi
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib
+  for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libGL.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libGL.$ac_extension"; then


@@ -36573,7 +36456,7 @@ fi
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib
+  for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libGL.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libGL.$ac_extension"; then


@@ -36891,7 +36774,7 @@ fi
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB
+  for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libGLU.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libGLU.$ac_extension"; then


@@ -36987,7 +36870,7 @@ fi
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB
+  for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libGLU.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libGLU.$ac_extension"; then


@@ -37312,7 +37195,7 @@ fi
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB
+  for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libMesaGL.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libMesaGL.$ac_extension"; then


@@ -37408,7 +37291,7 @@ fi
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB
+  for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libMesaGL.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libMesaGL.$ac_extension"; then


@@ -47215,15 +47098,25 @@ fi
        echo "$LIBGNOMEPRINTUI_PKG_ERRORS" >&5
 
 
        echo "$LIBGNOMEPRINTUI_PKG_ERRORS" >&5
 
 

-                        { echo "$as_me:$LINENO: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5
+                        if test "$wxUSE_GTKPRINT" = yes; then
+                            { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+                        else
+                            { echo "$as_me:$LINENO: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5

 echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;}
 echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;}

+                        fi

                         wxUSE_LIBGNOMEPRINT="no"
 
 
 elif test $pkg_failed = untried; then
 
                         wxUSE_LIBGNOMEPRINT="no"
 
 
 elif test $pkg_failed = untried; then
 

-                        { echo "$as_me:$LINENO: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5
+                        if test "$wxUSE_GTKPRINT" = yes; then
+                            { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+                        else
+                            { echo "$as_me:$LINENO: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5

 echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;}
 echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;}

+                        fi

                         wxUSE_LIBGNOMEPRINT="no"
 
 
                         wxUSE_LIBGNOMEPRINT="no"
 
 


@@ -50485,6 +50378,7 @@ if test "$wxUSE_TREELISTCTRL" = "yes"; then
 _ACEOF
 
     USES_CONTROLS=1
 _ACEOF
 
     USES_CONTROLS=1

+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelist"

 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then
 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then


@@ -50866,7 +50760,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
 echo $ECHO_N "checking for webkitgtk libraries... $ECHO_C" >&6; }
 
   ac_find_libraries=
 echo $ECHO_N "checking for webkitgtk libraries... $ECHO_C" >&6; }
 
   ac_find_libraries=

-  for ac_dir in $SEARCH_LIB
+  for ac_dir in  $SEARCH_LIB

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libwebkitgtk-1.0.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libwebkitgtk-1.0.$ac_extension"; then


@@ -51056,7 +50950,7 @@ _ACEOF
 echo "$as_me: WARNING: WebKit not available, disabling wxWebView" >&2;}
         fi
     elif test "$wxUSE_MSW" = 1; then
 echo "$as_me: WARNING: WebKit not available, disabling wxWebView" >&2;}
         fi
     elif test "$wxUSE_MSW" = 1; then

-        if test "wxUSE_WEBVIEW_IE" = "yes"; then
+        if test "$wxUSE_WEBVIEW_IE" = "yes"; then

                                     wxUSE_WEBVIEW="yes"
             cat >>confdefs.h <<\_ACEOF
 #define wxUSE_WEBVIEW_IE 1
                                     wxUSE_WEBVIEW="yes"
             cat >>confdefs.h <<\_ACEOF
 #define wxUSE_WEBVIEW_IE 1


@@ -51612,12 +51506,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_GST_CFLAGS="$GST_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
         pkg_cv_GST_CFLAGS="$GST_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \

-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION gconf-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION") 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then

-  pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0" 2>/dev/null`
+  pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION" 2>/dev/null`

 else
   pkg_failed=yes
 fi
 else
   pkg_failed=yes
 fi


@@ -51630,12 +51524,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_GST_LIBS="$GST_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
         pkg_cv_GST_LIBS="$GST_LIBS"
     else
         if test -n "$PKG_CONFIG" && \

-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION gconf-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION") 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then

-  pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0" 2>/dev/null`
+  pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION" 2>/dev/null`

 else
   pkg_failed=yes
 fi
 else
   pkg_failed=yes
 fi


@@ -51654,9 +51548,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then

-               GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0"`
+               GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION"`

         else
         else

-               GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0"`
+               GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION"`

         fi
        # Put the nasty error message in config.log where it belongs
        echo "$GST_PKG_ERRORS" >&5
         fi
        # Put the nasty error message in config.log where it belongs
        echo "$GST_PKG_ERRORS" >&5


@@ -55641,17 +55535,17 @@ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS"
 case "${host}" in
     *-*-solaris2* )
                         if test "$GCC" = yes; then
 case "${host}" in
     *-*-solaris2* )
                         if test "$GCC" = yes; then

-            CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//'`
-            LIBS=`echo $LIBS | sed 's/-mt//'`
-            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//'`
+            CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//g'`
+            LIBS=`echo $LIBS | sed 's/-mt//g'`
+            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//g'`

         fi
         ;;
 
     *-*-linux* )
                         if test "x$SUNCXX" = xyes; then
         fi
         ;;
 
     *-*-linux* )
                         if test "x$SUNCXX" = xyes; then

-            CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//'`
-            LIBS=`echo $LIBS | sed 's/-pthread//'`
-            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//'`
+            CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//g'`
+            LIBS=`echo $LIBS | sed 's/-pthread//g'`
+            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//g'`

         fi
         ;;
 esac
         fi
         ;;
 esac