X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d04f535c7ed59bdebcdc97f50f7a10aeadb16cc4..569c7d8ccb0c3f350b50f0f8435b6c6ac3d78cc8:/configure

diff --git a/configure b/configure
index cf8687b94e..4a875dff04 100755
--- 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-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-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
@@ -1870,6 +1870,7 @@ Optional Features:
   --enable-taskbaricon    use wxTaskBarIcon class
   --enable-tbarnative     use native wxToolBar class
   --enable-textctrl       use wxTextCtrl class
+  --enable-timepick       use wxTimePickerCtrl class
   --enable-tipwindow      use wxTipWindow class
   --enable-togglebtn      use wxToggleButton class
   --enable-toolbar        use wxToolBar class
@@ -9412,50 +9413,6 @@ fi
 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
@@ -9632,6 +9589,50 @@ fi
 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
@@ -9911,6 +9912,7 @@ if test "$wxUSE_CONTROLS" = "no"; then
     DEFAULT_wxUSE_STATBOX=no
     DEFAULT_wxUSE_STATLINE=no
     DEFAULT_wxUSE_STATUSBAR=no
+    DEFAULT_wxUSE_TIMEPICKCTRL=no
     DEFAULT_wxUSE_TIPWINDOW=no
     DEFAULT_wxUSE_TOGGLEBTN=no
     DEFAULT_wxUSE_TOOLBAR=no
@@ -12608,6 +12610,50 @@ fi
 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}-datepick" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6; }
+          # Check whether --enable-datepick was given.
+if test "${enable_datepick+set}" = set; then
+  enableval=$enable_datepick;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=yes'
+                          else
+                            wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=no'
+                          fi
+
+else
+
+                          wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=${'DEFAULT_wxUSE_TIMEPICKCTRL":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_datepick"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TIMEPICKCTRL = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_TIMEPICKCTRL
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -26999,8 +27045,8 @@ SEARCH_INCLUDE="\
                               \
     /usr/openwin/share/include"
 
-{ echo "$as_me:$LINENO: checking for libraries directory" >&5
-echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for libraries directories" >&5
+echo $ECHO_N "checking for libraries directories... $ECHO_C" >&6; }
 
 case "${host}" in
     *-*-irix6* )
@@ -27052,9 +27098,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
                         fi
                     done
                 done
-                if test "x$wx_cv_std_libpath" = "x"; then
-                    wx_cv_std_libpath="lib"
-                fi
 
 
 fi
@@ -27064,29 +27107,44 @@ fi
     *-*-solaris2* )
                 if test "$ac_cv_sizeof_void_p" = 8 -a -d "/usr/lib/64"; then
             wx_cv_std_libpath="lib/64"
-        else
-            wx_cv_std_libpath="lib"
         fi
         ;;
 
     *-*-linux* )
-                if test "$ac_cv_sizeof_void_p" = 8 -a \
-                -d "/usr/lib64" -a ! -h "/usr/lib64"; then
-            wx_cv_std_libpath="lib64"
+                                        if test "$ac_cv_sizeof_void_p" = 8; then
+            if test -d "/usr/lib/`uname -m`-linux-gnu"; then
+                wx_cv_std_libfullpath="/usr/lib/`uname -m`-linux-gnu"
+            elif test -d "/usr/lib64" -a ! -h "/usr/lib64"; then
+                wx_cv_std_libpath="lib64"
+            fi
         else
-            wx_cv_std_libpath="lib"
+            case "${host}" in
+                i*86-*-linux* )
+                    if test -d '/usr/lib/i386-linux-gnu'; then
+                        wx_cv_std_libfullpath='/usr/lib/i386-linux-gnu'
+                    fi
+            esac
         fi
-        ;;
 
-    *)
-        wx_cv_std_libpath="lib";
+                                if test -n "$wx_cv_std_libfullpath" -a -d "/usr/lib"; then
+            wx_cv_std_libfullpath="$wx_cv_std_libfullpath /usr/lib"
+        fi
         ;;
 esac
 
-{ echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5
-echo "${ECHO_T}$wx_cv_std_libpath" >&6; }
+if test -z "$wx_cv_std_libpath"; then
+    wx_cv_std_libpath="lib"
+fi
 
-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"
+if test -z "$wx_cv_std_libfullpath"; then
+    wx_cv_std_libfullpath="/usr/$wx_cv_std_libpath"
+fi
+
+
+{ echo "$as_me:$LINENO: result: $wx_cv_std_libfullpath" >&5
+echo "${ECHO_T}$wx_cv_std_libfullpath" >&6; }
+
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` $wx_cv_std_libfullpath"
 
 if test "$build" != "$host" -a "$GCC" = yes; then
                     if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
@@ -47943,6 +48001,14 @@ _ACEOF
 
 fi
 
+if test "$wxUSE_TIMEPICKCTRL" = "yes"; then
+  cat >>confdefs.h <<\_ACEOF
+#define wxUSE_TIMEPICKCTRL 1
+_ACEOF
+
+  USES_CONTROLS=1
+fi
+
 if test "$wxUSE_TOGGLEBTN" = "yes"; then
     if test "$wxUSE_OLD_COCOA" = 1 ; then
         { echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&5
@@ -48026,7 +48092,7 @@ echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled wit
     fi
 fi
 
-if test "$wxUSE_TREECTRL" = "yes"; then
+if test "$wxUSE_TREELISTCTRL" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_TREELISTCTRL 1
 _ACEOF
@@ -48405,21 +48471,11 @@ _ACEOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
 fi
 
-USE_WEBVIEW=0
 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=
@@ -48433,7 +48489,7 @@ echo $ECHO_N "checking for webkitgtk libraries... $ECHO_C" >&6; }
     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=""
@@ -48447,25 +48503,15 @@ echo $ECHO_N "checking for webkitgtk libraries... $ECHO_C" >&6; }
     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; }
-       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
@@ -48476,8 +48522,8 @@ for ac_dir in $SEARCH_INCLUDE /usr/include/webkit-1.0 /usr/include
     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
@@ -48492,19 +48538,10 @@ echo "${ECHO_T}found in $ac_find_includes" >&6; }
     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
@@ -48515,8 +48552,8 @@ for ac_dir in $SEARCH_INCLUDE /usr/include/libsoup-2.4 /usr/include
     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
@@ -48531,23 +48568,31 @@ echo "${ECHO_T}found in $ac_find_includes" >&6; }
     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
@@ -48559,8 +48604,8 @@ cat confdefs.h >>conftest.$ac_ext
 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>
@@ -48596,38 +48641,55 @@ fi
 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
 
-                           { 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
 
 
-        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
 
-    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
 
+        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
@@ -50385,20 +50447,7 @@ else
 fi
 
 
-            { echo "$as_me:$LINENO: checking for command to install directories" >&5
-echo $ECHO_N "checking for command to install directories... $ECHO_C" >&6; }
-    INSTALL_TEST_DIR=acbftest$$
-    $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1
-    if test $? = 0 -a -d $INSTALL_TEST_DIR; then
-        rmdir $INSTALL_TEST_DIR
-                        INSTALL_DIR='$(INSTALL) -d'
-        { echo "$as_me:$LINENO: result: $INSTALL -d" >&5
-echo "${ECHO_T}$INSTALL -d" >&6; }
-    else
-        INSTALL_DIR="mkdir -p"
-        { echo "$as_me:$LINENO: result: mkdir -p" >&5
-echo "${ECHO_T}mkdir -p" >&6; }
-    fi
+    INSTALL_DIR="mkdir -p"
 
 
     LDFLAGS_GUI=