Fix wxListCtrl bakground colour bug Part II.

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 5cc0d2d3670cdfcb5deb05b702c74e5905135dac..417c406f68bed02ff644b498e36883235170e357 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1155,7 +1155,7 @@ AC_CACHE_SAVE
 dnl cross-compiling support: we're cross compiling if the build system is
 dnl different from the target one (assume host and target be always the same)
 if test "$build" != "$host" ; then
 dnl cross-compiling support: we're cross compiling if the build system is
 dnl different from the target one (assume host and target be always the same)
 if test "$build" != "$host" ; then

-    if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 ; then
+    if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 -o "$USE_UNIX"; then

         CC=$host_alias-gcc
         CXX=$host_alias-c++
         AR=$host_alias-ar
         CC=$host_alias-gcc
         CXX=$host_alias-c++
         AR=$host_alias-ar


@@ -2099,7 +2099,11 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         ALL_HEADERS="\$(ALL_HEADERS) \${UNIV_HEADERS}"
 
         PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
         ALL_HEADERS="\$(ALL_HEADERS) \${UNIV_HEADERS}"
 
         PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"

-        TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}"
+        if test "$wxUSE_X11" = 1; then
+            TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}${PATH_IFS}\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes"
+        else
+            TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}"
+        fi

         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
         WIDGET_SET=univ
     else
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
         WIDGET_SET=univ
     else


@@ -2712,7 +2716,15 @@ AC_CHECK_SIZEOF(short, 2)
 AC_CHECK_SIZEOF(void *, 4)
 AC_CHECK_SIZEOF(int, 4)
 AC_CHECK_SIZEOF(long, 4)
 AC_CHECK_SIZEOF(void *, 4)
 AC_CHECK_SIZEOF(int, 4)
 AC_CHECK_SIZEOF(long, 4)

-AC_CHECK_SIZEOF(long long, 0)
+
+case "${host}" in
+    arm-*-linux* )
+        AC_CHECK_SIZEOF(long long, 8)
+    ;;
+    * )
+        AC_CHECK_SIZEOF(long long, 0)
+esac
+

 
 dnl we have to do it ourselves because SGI/Irix's stdio.h does not include
 dnl wchar_t and AC_CHECK_SIZEOF only includes stdio.h
 
 dnl we have to do it ourselves because SGI/Irix's stdio.h does not include
 dnl wchar_t and AC_CHECK_SIZEOF only includes stdio.h


@@ -4681,7 +4693,7 @@ if test "$wxUSE_GUI" = "yes"; then
 
     dnl TODO some samples are never built so far:
     dnl      ipc, mfc, nativdlg, oleauto, ownerdrw
 
     dnl TODO some samples are never built so far:
     dnl      ipc, mfc, nativdlg, oleauto, ownerdrw

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \

                      drawing dynamic erase event exec font image \
                      minimal richedit rotate widgets"
 
                      drawing dynamic erase event exec font image \
                      minimal richedit rotate widgets"
 


@@ -4864,7 +4876,7 @@ if test "$wxUSE_GUI" = "yes"; then
     export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
            wx_cv_path_ifs wx_cv_program_ext \
            wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
     export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
            wx_cv_path_ifs wx_cv_program_ext \
            wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype

-    AC_CONFIG_SUBDIRS(demos samples utils contrib)
+    AC_CONFIG_SUBDIRS(demos samples utils contrib mobile)

 fi
 
 dnl create each of the files in the space separated list from the file.in
 fi
 
 dnl create each of the files in the space separated list from the file.in