Applied patch [ 817665 ] make file: URL return 0 on GetInputStream() for missing...

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 34a7d2007cd9d9317f783711d7ac45f55c466d07..9054a539eb4b75ceda8bfa2fc15d7bfcc1a34039 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -569,14 +569,14 @@ else
 
   DEFAULT_wxUSE_GUI=yes
 
-  DEFAULT_wxUSE_REGEX=sys
+  DEFAULT_wxUSE_REGEX=yes
   DEFAULT_wxUSE_XML=yes
-  DEFAULT_wxUSE_EXPAT=sys
-  DEFAULT_wxUSE_ZLIB=sys
-  DEFAULT_wxUSE_LIBPNG=sys
-  DEFAULT_wxUSE_LIBJPEG=sys
-  DEFAULT_wxUSE_LIBTIFF=sys
-  DEFAULT_wxUSE_LIBXPM=sys
+  DEFAULT_wxUSE_EXPAT=yes
+  DEFAULT_wxUSE_ZLIB=yes
+  DEFAULT_wxUSE_LIBPNG=yes
+  DEFAULT_wxUSE_LIBJPEG=yes
+  DEFAULT_wxUSE_LIBTIFF=yes
+  DEFAULT_wxUSE_LIBXPM=yes
   DEFAULT_wxUSE_LIBMSPACK=yes
   DEFAULT_wxUSE_ODBC=no
   DEFAULT_wxUSE_OPENGL=no
@@ -1874,7 +1874,6 @@ dnl ------------------------------------------------------------------------
 dnl Check for regex libraries
 dnl ------------------------------------------------------------------------
 
-REGEX_INCLUDE=
 if test "$wxUSE_REGEX" != "no"; then
     AC_DEFINE(wxUSE_REGEX)
 
@@ -1895,17 +1894,12 @@ if test "$wxUSE_REGEX" != "no"; then
             wxUSE_REGEX=sys
         fi
     fi
-
-    if test "$wxUSE_REGEX" = "builtin" ; then
-        REGEX_INCLUDE="-I\${top_srcdir}/src/regex"
-    fi
 fi
 
 dnl ------------------------------------------------------------------------
 dnl Check for zlib compression library
 dnl ------------------------------------------------------------------------
 
-ZLIB_INCLUDE=
 ZLIB_LINK=
 if test "$wxUSE_ZLIB" != "no" ; then
     AC_DEFINE(wxUSE_ZLIB)
@@ -1973,17 +1967,12 @@ if test "$wxUSE_ZLIB" != "no" ; then
             wxUSE_ZLIB=sys
         fi
     fi
-
-    if test "$wxUSE_ZLIB" = "builtin" ; then
-        ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
-    fi
 fi
 
 dnl ------------------------------------------------------------------------
 dnl Check for png library
 dnl ------------------------------------------------------------------------
 
-PNG_INCLUDE=
 PNG_LINK=
 if test "$wxUSE_LIBPNG" != "no" ; then
     AC_DEFINE(wxUSE_LIBPNG)
@@ -2048,10 +2037,6 @@ if test "$wxUSE_LIBPNG" != "no" ; then
         fi
     fi
 
-    if test "$wxUSE_LIBPNG" = "builtin" ; then
-        PNG_INCLUDE="-I\${top_srcdir}/src/png"
-    fi
-
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
 fi
 
@@ -2059,7 +2044,6 @@ dnl ------------------------------------------------------------------------
 dnl Check for jpeg library
 dnl ------------------------------------------------------------------------
 
-JPEG_INCLUDE=
 JPEG_LINK=
 if test "$wxUSE_LIBJPEG" != "no" ; then
     AC_DEFINE(wxUSE_LIBJPEG)
@@ -2108,17 +2092,12 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
             fi
         fi
     fi
-
-    if test "$wxUSE_LIBJPEG" = "builtin" ; then
-        JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
-    fi
 fi
 
 dnl ------------------------------------------------------------------------
 dnl Check for tiff library
 dnl ------------------------------------------------------------------------
 
-TIFF_INCLUDE=
 TIFF_LINK=
 TIFF_PREREQ_LINKS=-lm
 if test "$wxUSE_LIBTIFF" != "no" ; then
@@ -2154,10 +2133,6 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
             wxUSE_LIBTIFF=sys
         fi
     fi
-
-    if test "$wxUSE_LIBTIFF" = "builtin" ; then
-        TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
-    fi
 fi
 
 dnl ------------------------------------------------------------------------
@@ -5628,15 +5603,12 @@ fi
 
 dnl all -I options we must pass to the compiler
 dnl
-dnl note that the order is somewhat important, in particular the ZLIB_INCLUDE
-dnl and other stuff for the built in libraries should come first to avoid
-dnl including the system headers with the same name (it is particularly
-dnl important for zlib because XFree 4.2.0 has its own, horribly old and
-dnl incompatible, zlib.h) and the wxWindows headers should come first anyhow
+dnl note that the order is somewhat important: wxWindows headers should
+dnl come first and the one with setup.h should be before $(top_srcdir)/include
+dnl in case the latter contains setup.h used by non-autoconf makefiles (e.g.
+dnl CodeWarrior):
 INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_NAME} \
--I\${top_srcdir}/include \
-$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
-$TOOLKIT_INCLUDE"
+-I\${top_srcdir}/include $TOOLKIT_INCLUDE"
 
 dnl C/C++ compiler options used to compile wxWindows
 if test "$GXX" = yes ; then
@@ -5769,24 +5741,18 @@ AC_BAKEFILE
 
 dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP:
 if test $GCC_PCH = 1 ; then
+    CODE_GEN_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CODE_GEN_FLAGS"
     CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS"
 else
     case "${host}" in
         powerpc-*-darwin* )
             dnl Some Apple's GCC version are broken and can't handle the
             dnl pragmas:
+            CODE_GEN_FLAGS="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS"
             CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
             ;;
     esac
 fi
-dnl We have to output NO_GCC_PRAGMA with wx-config on Apple, too:
-case "${host}" in
-    powerpc-*-darwin* )
-        dnl Some Apple's GCC version are broken and can't handle the
-        dnl pragmas:
-        CODE_GEN_FLAGS_CXX="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS_CXX"
-        ;;
-esac
 
 
 dnl for convenience, sort the samples in alphabetical order