Fix typo from version 1.528.

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 0e99b98620daa5ec83dfb30d95117bf9e7aa4977..3ffec5c0fa40e1a88cf17842dfe8b67cce6ed4c1 100755 (executable)
--- a/configure
+++ b/configure
@@ -1686,7 +1686,7 @@ else
   DEFAULT_wxUSE_DIALUP_MANAGER=yes
   DEFAULT_wxUSE_JOYSTICK=yes
   DEFAULT_wxUSE_DYNLIB_CLASS=yes
   DEFAULT_wxUSE_DIALUP_MANAGER=yes
   DEFAULT_wxUSE_JOYSTICK=yes
   DEFAULT_wxUSE_DYNLIB_CLASS=yes

-  DEFAULT_wxUSE_DYNAMIC_LOADER=no
+  DEFAULT_wxUSE_DYNAMIC_LOADER=yes

   DEFAULT_wxUSE_LONGLONG=yes
   DEFAULT_wxUSE_GEOMETRY=yes
 
   DEFAULT_wxUSE_LONGLONG=yes
   DEFAULT_wxUSE_GEOMETRY=yes
 


@@ -9299,7 +9299,7 @@ if eval "test \"`echo '$''{'wx_cv_prog_makeisgnu'+set}'`\" = set"; then
 else
   
     if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
 else
   
     if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |

-            egrep -qs GNU); then
+            egrep qs GNU > /dev/null); then

         wx_cv_prog_makeisgnu="yes"
     else
         wx_cv_prog_makeisgnu="no"
         wx_cv_prog_makeisgnu="yes"
     else
         wx_cv_prog_makeisgnu="no"


@@ -12156,7 +12156,7 @@ fi
         AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 
         AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 

-        if test "$wxUSE_NANOX" = 1; then
+        if test "$wxUSE_NANOX" = "yes"; then

             echo $ac_n "checking for MicroWindows/NanoX distribution""... $ac_c" 1>&6
 echo "configure:12162: checking for MicroWindows/NanoX distribution" >&5
             if test "x$MICROWIN" = x ; then
             echo $ac_n "checking for MicroWindows/NanoX distribution""... $ac_c" 1>&6
 echo "configure:12162: checking for MicroWindows/NanoX distribution" >&5
             if test "x$MICROWIN" = x ; then


@@ -12237,7 +12237,7 @@ fi
 rm -f conftest*
         fi
 
 rm -f conftest*
         fi
 

-        if test "$wxUSE_NANOX" = 1; then
+        if test "$wxUSE_NANOX" = "yes"; then

             TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__"
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$MICROWIN/src/lib/libnano-X.a \$MICROWIN/src/lib/libmwengine.a \$MICROWIN/src/lib/libmwfonts.a \$MICROWIN/src/lib/libmwdrivers.a \$MICROWIN/src/lib/libmwobjects.a"
             TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__"
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$MICROWIN/src/lib/libnano-X.a \$MICROWIN/src/lib/libmwengine.a \$MICROWIN/src/lib/libmwfonts.a \$MICROWIN/src/lib/libmwdrivers.a \$MICROWIN/src/lib/libmwobjects.a"


@@ -14603,7 +14603,7 @@ else
 int main() {
 
 /* Ultrix mips cc rejects this.  */
 int main() {
 
 /* Ultrix mips cc rejects this.  */

-typedef int charset[2]; const charset x;
+typedef int charset[2]; const charset x = {0,0};

 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;


@@ -14678,7 +14678,7 @@ for ac_kw in inline __inline__ __inline; do
 #include "confdefs.h"
 
 int main() {
 #include "confdefs.h"
 
 int main() {

-} $ac_kw foo() {
+} int $ac_kw foo() {

 ; return 0; }
 EOF
 if { (eval echo configure:14685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 ; return 0; }
 EOF
 if { (eval echo configure:14685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then


@@ -19478,11 +19478,15 @@ EOF
 fi
 
 if test "$wxUSE_RESOURCES" = "yes" ; then
 fi
 
 if test "$wxUSE_RESOURCES" = "yes" ; then

-    cat >> confdefs.h <<\EOF
+    if test "$wxUSE_NANOX" = "yes"; then
+        echo "configure: warning: Cannot use resource database functions in NanoX" 1>&2
+       else
+               cat >> confdefs.h <<\EOF

 #define wxUSE_RESOURCES 1
 EOF
 
 #define wxUSE_RESOURCES 1
 EOF
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
+               SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
+    fi

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


@@ -19500,17 +19504,17 @@ if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:19504: checking for $ac_hdr" >&5
+echo "configure:19508: checking for $ac_hdr" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 19509 "configure"
+#line 19513 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:19514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:19518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -20491,7 +20495,7 @@ 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:20495: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:20499: 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
 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