Minor fixes to code examples in wxPropertyGrid documentation.

[wxWidgets.git] / configure

diff --git a/configure b/configure
index cf8687b94e4f0936b24a749ba1283665515db383..c58a43c8684d4c4bdab17a59942dd4ad2a627dda 100755 (executable)
--- a/configure
+++ b/configure
@@ -1799,11 +1799,11 @@ Optional Features:
   --enable-mdidoc         use docview architecture with MDI
   --enable-mediactrl      use wxMediaCtrl class
   --enable-gstreamer8     force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix
   --enable-mdidoc         use docview architecture with MDI
   --enable-mediactrl      use wxMediaCtrl class
   --enable-gstreamer8     force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix

-  --enable-webkit         use wxWebKitCtrl (Mac)

   --enable-richtext       use wxRichTextCtrl
   --enable-postscript     use wxPostscriptDC device context (default for gtk+)
   --enable-printarch      use printing architecture
   --enable-svg            use wxSVGFileDC device context
   --enable-richtext       use wxRichTextCtrl
   --enable-postscript     use wxPostscriptDC device context (default for gtk+)
   --enable-printarch      use printing architecture
   --enable-svg            use wxSVGFileDC device context

+  --enable-webkit         use wxWebKitCtrl (Mac-only, use wxWebView instead)

   --enable-webview        use wxWebView library
   --enable-graphics_ctx   use graphics context 2D drawing API
   --enable-clipboard      use wxClipboard class
   --enable-webview        use wxWebView library
   --enable-graphics_ctx   use graphics context 2D drawing API
   --enable-clipboard      use wxClipboard class


@@ -9412,50 +9412,6 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 

-          enablestring=
-          defaultval=$wxUSE_ALL_FEATURES
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webkit" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; }
-          # Check whether --enable-webkit was given.
-if test "${enable_webkit+set}" = set; then
-  enableval=$enable_webkit;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_webkit='wxUSE_WEBKIT=yes'
-                          else
-                            wx_cv_use_webkit='wxUSE_WEBKIT=no'
-                          fi
-
-else
-
-                          wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_webkit"
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_WEBKIT = no; then
-              result=yes
-            else
-              result=no
-            fi
-          else
-            result=$wxUSE_WEBKIT
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-

           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then


@@ -9632,6 +9588,50 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 

+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webkit" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; }
+          # Check whether --enable-webkit was given.
+if test "${enable_webkit+set}" = set; then
+  enableval=$enable_webkit;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_webkit='wxUSE_WEBKIT=yes'
+                          else
+                            wx_cv_use_webkit='wxUSE_WEBKIT=no'
+                          fi
+
+else
+
+                          wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_webkit"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_WEBKIT = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_WEBKIT
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+

           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then


@@ -48026,7 +48026,7 @@ echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled wit
     fi
 fi
 
     fi
 fi
 

-if test "$wxUSE_TREECTRL" = "yes"; then
+if test "$wxUSE_TREELISTCTRL" = "yes"; then

     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_TREELISTCTRL 1
 _ACEOF
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_TREELISTCTRL 1
 _ACEOF


@@ -48405,21 +48405,11 @@ _ACEOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
 fi
 

-USE_WEBVIEW=0

 if test "$wxUSE_WEBVIEW" = "yes"; then
 if test "$wxUSE_WEBVIEW" = "yes"; then

-   cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WEBVIEW 1
-_ACEOF
-
-   USE_WEBVIEW=1
-   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview"
-
-   if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_GTK" = 1; then
-       cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WEBVIEW_WEBKIT 1
-_ACEOF
-
-       { echo "$as_me:$LINENO: checking for webkitgtk libraries" >&5
+    USE_WEBVIEW_WEBKIT=0
+    if test "$wxUSE_WEBVIEW_WEBKIT" = "yes"; then
+        if test "$wxUSE_GTK" = 1; then
+            { echo "$as_me:$LINENO: checking for webkitgtk libraries" >&5

 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=


@@ -48433,7 +48423,7 @@ echo $ECHO_N "checking for webkitgtk libraries... $ECHO_C" >&6; }
     done
   done
 
     done
   done
 

-       if test "$ac_find_libraries" != "" ; then
+            if test "$ac_find_libraries" != "" ; then

 
     if test "$ac_find_libraries" = "default location"; then
     ac_path_to_link=""
 
     if test "$ac_find_libraries" = "default location"; then
     ac_path_to_link=""


@@ -48447,25 +48437,15 @@ echo $ECHO_N "checking for webkitgtk libraries... $ECHO_C" >&6; }
     fi
   fi
 
     fi
   fi
 

-           if test "$ac_path_to_link" != " -L/usr/lib" ; then
-               LDFLAGS="$LDFLAGS $ac_path_to_link"
-           fi
-           GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwebkitgtk-1.0"
-           { echo "$as_me:$LINENO: result: yes" >&5
+                if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                    LDFLAGS="$LDFLAGS $ac_path_to_link"
+                fi
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwebkitgtk-1.0"
+                { echo "$as_me:$LINENO: result: yes" >&5

 echo "${ECHO_T}yes" >&6; }
 echo "${ECHO_T}yes" >&6; }

-       else
-           { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-           { echo "$as_me:$LINENO: WARNING: libwebkitgtk-1.0 not found; disabling webkit backend" >&5
-echo "$as_me: WARNING: libwebkitgtk-1.0 not found; disabling webkit backend" >&2;}
-           cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WEBVIEW_WEBKIT 0
-_ACEOF
-
-       fi

 
 

-       { echo "$as_me:$LINENO: checking for webkitgtk includes" >&5
-echo $ECHO_N "checking for webkitgtk includes... $ECHO_C" >&6; }
+                { echo "$as_me:$LINENO: checking for webkitgtk headers" >&5
+echo $ECHO_N "checking for webkitgtk headers... $ECHO_C" >&6; }

 
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE /usr/include/webkit-1.0 /usr/include
 
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE /usr/include/webkit-1.0 /usr/include


@@ -48476,8 +48456,8 @@ for ac_dir in $SEARCH_INCLUDE /usr/include/webkit-1.0 /usr/include
     fi
   done
 
     fi
   done
 

-       if test "$ac_find_includes" != "" ; then
-           { echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5
+                if test "$ac_find_includes" != "" ; then
+                   { echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5

 echo "${ECHO_T}found in $ac_find_includes" >&6; }
 
     if test "x$ac_find_includes" = "x/usr/include"; then
 echo "${ECHO_T}found in $ac_find_includes" >&6; }
 
     if test "x$ac_find_includes" = "x/usr/include"; then


@@ -48492,19 +48472,10 @@ echo "${ECHO_T}found in $ac_find_includes" >&6; }
     fi
   fi
 
     fi
   fi
 

-           CPPFLAGS="$ac_path_to_include $CPPFLAGS"
-       else
-           { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-           { echo "$as_me:$LINENO: WARNING: webkit includes not found; disabling webkit backend" >&5
-echo "$as_me: WARNING: webkit includes not found; disabling webkit backend" >&2;}
-           cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WEBVIEW_WEBKIT 0
-_ACEOF
+                   CPPFLAGS="$ac_path_to_include $CPPFLAGS"

 
 

-       fi
-              { echo "$as_me:$LINENO: checking for libsoup includes" >&5
-echo $ECHO_N "checking for libsoup includes... $ECHO_C" >&6; }
+                                      { echo "$as_me:$LINENO: checking for libsoup headers" >&5
+echo $ECHO_N "checking for libsoup headers... $ECHO_C" >&6; }

 
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE /usr/include/libsoup-2.4 /usr/include
 
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE /usr/include/libsoup-2.4 /usr/include


@@ -48515,8 +48486,8 @@ for ac_dir in $SEARCH_INCLUDE /usr/include/libsoup-2.4 /usr/include
     fi
   done
 
     fi
   done
 

-       if test "$ac_find_includes" != "" ; then
-           { echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5
+                   if test "$ac_find_includes" != "" ; then
+                       { echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5

 echo "${ECHO_T}found in $ac_find_includes" >&6; }
 
     if test "x$ac_find_includes" = "x/usr/include"; then
 echo "${ECHO_T}found in $ac_find_includes" >&6; }
 
     if test "x$ac_find_includes" = "x/usr/include"; then


@@ -48531,23 +48502,31 @@ echo "${ECHO_T}found in $ac_find_includes" >&6; }
     fi
   fi
 
     fi
   fi
 

-           CPPFLAGS="$ac_path_to_include $CPPFLAGS"
-       else
-           { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-           { echo "$as_me:$LINENO: WARNING: libsoup includes not found; disabling webkit backend" >&5
-echo "$as_me: WARNING: libsoup includes not found; disabling webkit backend" >&2;}
-           cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WEBVIEW_WEBKIT 0
-_ACEOF
-
-       fi
-   fi
+                       CPPFLAGS="$ac_path_to_include $CPPFLAGS"

 
 

-    if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
-        old_CPPFLAGS="$CPPFLAGS"
-        CPPFLAGS="-x objective-c++ $CPPFLAGS"
-        { echo "$as_me:$LINENO: checking for WebKit/HIWebView.h" >&5
+                       USE_WEBVIEW_WEBKIT=1
+                   else
+                       { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+                       { echo "$as_me:$LINENO: WARNING: libsoup headers not found; disabling WebKit backend" >&5
+echo "$as_me: WARNING: libsoup headers not found; disabling WebKit backend" >&2;}
+                   fi
+                else
+                   { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+                   { echo "$as_me:$LINENO: WARNING: WebKit headers not found; disabling WebKit backend" >&5
+echo "$as_me: WARNING: WebKit headers not found; disabling WebKit backend" >&2;}
+                fi
+            else
+                { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+                { echo "$as_me:$LINENO: WARNING: WebKit libraries not found; disabling WebKit backend" >&5
+echo "$as_me: WARNING: WebKit libraries not found; disabling WebKit backend" >&2;}
+            fi
+        elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
+                                    old_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="-x objective-c++ $CPPFLAGS"
+            { echo "$as_me:$LINENO: checking for WebKit/HIWebView.h" >&5

 echo $ECHO_N "checking for WebKit/HIWebView.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_WebKit_HIWebView_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for WebKit/HIWebView.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_WebKit_HIWebView_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -48559,8 +48538,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-                           #include <Carbon/Carbon.h>
-                           #include <WebKit/WebKit.h>
+                                #include <Carbon/Carbon.h>
+                                #include <WebKit/WebKit.h>

 
 
 #include <WebKit/HIWebView.h>
 
 
 #include <WebKit/HIWebView.h>


@@ -48596,38 +48575,55 @@ fi
 echo "${ECHO_T}$ac_cv_header_WebKit_HIWebView_h" >&6; }
 if test $ac_cv_header_WebKit_HIWebView_h = yes; then
 
 echo "${ECHO_T}$ac_cv_header_WebKit_HIWebView_h" >&6; }
 if test $ac_cv_header_WebKit_HIWebView_h = yes; then
 

-                           cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WEBVIEW_WEBKIT 1
-_ACEOF
-
-                           WEBKIT_LINK="-framework WebKit"
+                                USE_WEBVIEW_WEBKIT=1
+                                WEBKIT_LINK="-framework WebKit"

 
 else
 
 
 else
 

-                           { echo "$as_me:$LINENO: WARNING: WebKit headers not found; disabling wxWebView WebKit" >&5
-echo "$as_me: WARNING: WebKit headers not found; disabling wxWebView WebKit" >&2;}
-                           cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WEBVIEW_WEBKIT 0
-_ACEOF
-
+                                { echo "$as_me:$LINENO: WARNING: WebKit headers not found" >&5
+echo "$as_me: WARNING: WebKit headers not found" >&2;}

 
 fi
 
 
 
 fi
 
 

-        CPPFLAGS="$old_CPPFLAGS"
-    elif test "$wxUSE_OLD_COCOA" = 1; then
-        cat >>confdefs.h <<\_ACEOF
+            CPPFLAGS="$old_CPPFLAGS"
+        fi
+    fi
+
+    wxUSE_WEBVIEW="no"
+    if test "$wxUSE_GTK" = 1 -o "$wxUSE_MAC" = 1; then
+        if test "$USE_WEBVIEW_WEBKIT" = 1; then
+            wxUSE_WEBVIEW="yes"
+            cat >>confdefs.h <<\_ACEOF

 #define wxUSE_WEBVIEW_WEBKIT 1
 _ACEOF
 
 #define wxUSE_WEBVIEW_WEBKIT 1
 _ACEOF
 

-    else
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WEBVIEW_WEBKIT 0
+        else
+            { echo "$as_me:$LINENO: WARNING: WebKit not available, disabling wxWebView" >&5
+echo "$as_me: WARNING: WebKit not available, disabling wxWebView" >&2;}
+        fi
+    elif test "$wxUSE_MSW" = 1; then
+        if test "wxUSE_WEBVIEW_IE" = "yes"; then
+                                    wxUSE_WEBVIEW="yes"
+            cat >>confdefs.h <<\_ACEOF
+#define wxUSE_WEBVIEW_IE 1

 _ACEOF
 
 _ACEOF
 

+        fi

     fi
 fi
 
     fi
 fi
 

+if test "$wxUSE_WEBVIEW" = "yes"; then
+    USE_WEBVIEW=1
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_WEBVIEW 1
+_ACEOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview"
+else
+    USE_WEBVIEW=0
+fi
+

 
 if test "$wxUSE_IMAGE" = "yes" ; then
     cat >>confdefs.h <<\_ACEOF
 
 if test "$wxUSE_IMAGE" = "yes" ; then
     cat >>confdefs.h <<\_ACEOF