removed OGL files from wxGTK build, fixed configure for wxBase

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure.in

@@ -288,6 +288,52 @@ AC_DEFUN(WX_ARG_CACHE_FLUSH,
           mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
         ])
 
+dnl this macro checks for a three-valued command line --with argument:
+dnl   possible arguments are 'yes', 'no', or 'sys'
+dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
+AC_DEFUN(WX_ARG_SYS_WITH,
+        [
+          AC_MSG_CHECKING("for --with-$1")
+          no_cache=0
+          AC_ARG_WITH($1, $2,
+                      [
+                        if test "$withval" = yes; then
+                          ac_cv_use_$1='$3=yes'
+                        elif test "$withval" = no; then
+                          ac_cv_use_$1='$3=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_$1='$3=sys'
+                        else
+                          AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no or sys])
+                        fi
+                      ],
+                      [
+                        LINE=`grep "$3" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_$1='$3='$DEFAULT_$3
+                      ])
+
+          eval "$ac_cv_use_$1"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$$3" = yes; then
+            AC_MSG_RESULT(yes)
+          elif test "$$3" = no; then
+            AC_MSG_RESULT(no)
+          elif test "$$3" = sys; then
+            AC_MSG_RESULT(system version)
+          else
+            AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no or sys])
+          fi
+        ])
+
 dnl this macro checks for a command line argument and caches the result
 dnl usage: WX_ARG_WITH(option, helpmessage, variable-name)
 AC_DEFUN(WX_ARG_WITH,
@@ -909,8 +955,8 @@ AC_ARG_WITH(gtk-prefix,    [  --with-gtk-prefix=PFX   Prefix where GTK is instal
 AC_ARG_WITH(gtk-exec-prefix, [  --with-gtk-exec-prefix=PFX  Exec prefix where GTK is installed],
             gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
 
-WX_ARG_WITH(libpng,        [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
+WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
-WX_ARG_WITH(libjpeg,       [  --with-libjpeg          use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
+WX_ARG_SYS_WITH(libjpeg,   [  --with-libjpeg          use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
 WX_ARG_WITH(libtiff,       [  --with-libtiff          use libtiff (TIFF file format)], wxUSE_LIBTIFF)
 WX_ARG_WITH(opengl,        [  --with-opengl           use OpenGL (or Mesa)], wxUSE_OPENGL)
 
@@ -918,7 +964,7 @@ fi
 dnl for GUI only
 
 WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (www.letters.com/dmalloc)], wxUSE_DMALLOC)
-WX_ARG_WITH(zlib,          [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
+WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
 WX_ARG_WITH(odbc,          [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)
 
 dnl ====================
@@ -1947,7 +1993,10 @@ if test "$wxUSE_SHARED" = "yes"; then
             BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
         fi
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
+        WX_ALL="CREATE_LINKS"
+        if test "$USE_GUI" = 1; then
+            WX_ALL="$WX_ALL CREATE_LINKS_GL"
+        fi
       ;;
       *-*-irix5* | *-*-irix6* )
         if test "$GCC" = yes ; then
@@ -1957,7 +2006,10 @@ if test "$wxUSE_SHARED" = "yes"; then
            SHARED_LD="${CXX} -shared -o"
         fi
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
+        WX_ALL="CREATE_LINKS"
+        if test "$USE_GUI" = 1; then
+            WX_ALL="$WX_ALL CREATE_LINKS_GL"
+        fi
       ;;
       *-*-solaris2* )
         if test "$GCC" = yes ; then
@@ -2517,22 +2569,59 @@ dnl Optional libraries
 dnl ---------------------------------------------------------------------------
 
 ZLIB_INCLUDE=
-if test "$wxUSE_ZLIB" = "yes" ; then
+if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
   AC_DEFINE(wxUSE_ZLIB)
-  ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
+  if test "$wxUSE_ZLIB" = "yes" ; then
+    ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
+  else
+    ZLIB_LINK=
+    AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, deflate, ZLIB_LINK="-lz"))
+    if test "x$ZLIB_LINK" = "x" ; then
+        AC_MSG_ERROR(system zlib compression library not found! Use --with-zlib=yes to use built-in zlib)
+    fi
+  fi
 fi
 
 PNG_INCLUDE=
-if test "$wxUSE_LIBPNG" = "yes" ; then
+if test "$wxUSE_LIBPNG" = "yes" -o "$wxUSE_LIBPNG" = "sys" ; then
   AC_DEFINE(wxUSE_LIBPNG)
-  PNG_INCLUDE="-I\${top_srcdir}/src/png"
+  dnl for the check below to have a chance to succeed, we must already have
+  dnl libz somewhere
+  if test "$wxUSE_ZLIB" != "sys" ; then
+    AC_MSG_WARN([--with-libpng=sys doesn't work without --with-zlib=sys, will compile the built-in libpng instead])
+    wxUSE_LIBPNG=yes
+  fi
+
+  if test "$wxUSE_LIBPNG" = "yes" ; then
+    PNG_INCLUDE="-I\${top_srcdir}/src/png"
+  else
+    PNG_LINK=
+    AC_CHECK_HEADER(png.h,
+                    AC_CHECK_LIB(png, png_check_sig,
+                                 PNG_LINK="-lpng",
+                                 ,
+                                 [-lz -lm])
+                   )
+    if test "x$PNG_LINK" = "x" ; then
+        AC_MSG_ERROR(system png library not found! Use --with-png=yes to use built-in libpng)
+    fi
+  fi
+
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
 fi
 
 JPEG_INCLUDE=
-if test "$wxUSE_LIBJPEG" = "yes" ; then
+if test "$wxUSE_LIBJPEG" = "yes" -o "$wxUSE_LIBJPEG" = "sys" ; then
   AC_DEFINE(wxUSE_LIBJPEG)
-  JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
+  if test "$wxUSE_LIBJPEG" = "yes" ; then
+    JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
+  else
+    JPEG_LINK=
+    AC_CHECK_HEADER(jpeglib.h, AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK="-ljpeg"))
+    if test "x$JPEG_LINK" = "x" ; then
+        AC_MSG_ERROR(system jpeg library not found! Use --with-jpeg=yes to use built-in one)
+    fi
+  fi
 fi
 
 TIFF_INCLUDE=
@@ -3377,9 +3466,9 @@ dnl ---------------------------------------------------------------------------
 GUILIBS="$GUI_TK_LIBRARY $OPENGL_LINK $TOOLKIT_LINK"
 
 dnl all additional libraries (except wxWindows itself) we link with
-EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK"
+EXTRA_LIBS="$LIBS $ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK"
 if test "$wxUSE_GUI" = "yes"; then
-    EXTRA_LIBS="$EXTRA_LIBS $GUILIBS"
+    EXTRA_LIBS="$EXTRA_LIBS $GUILIBS $PNG_LINK $JPEG_LINK"
 fi
 
 dnl all the libraries needed to link wxWindows programs when using the

distrib/msw/tmake/filelist.t

@@ -47,8 +47,6 @@
             $wxOS2PM{$fields[0]} = $fields[2];
         } elsif ( $fields[1] eq "H" ) {
             $wxHTML{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "J" ) {
-            $wxOGL{$fields[0]} = $fields[2];
         } elsif ( $fields[1] eq "U" ) {
             $wxUNIX{$fields[0]} = $fields[2];
         } elsif ( $fields[1] eq "B" ) {
@@ -59,8 +57,6 @@
             $wxPROTOCOLINCLUDE{$fields[0]} = $fields[2];
         } elsif ( $fields[1] eq "L" ) {
             $wxHTMLINCLUDE{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "Z" ) {
-            $wxOGLINCLUDE{$fields[0]} = $fields[2];
         } elsif ( $fields[1] eq "F" ) {
             $wxMOTIFINCLUDE{$fields[0]} = $fields[2];
         } elsif ( $fields[1] eq "9" ) {

distrib/msw/tmake/filelist.txt

@@ -16,7 +16,6 @@
 #  R	/src/gtk     R for Robert
 #  O	/src/os2
 #  H	/src/html
-#  J	/src/ogl
 #  W	/include/wx
 #  K	/include/wx/gtk        K for gtK
 #  F	/include/wx/motif      F for motiF
@@ -24,7 +23,6 @@
 #  2	/include/wx/os2        2 for os2
 #  N	/include/wx/generic    N for geNeric
 #  L	/include/wx/html       L for htmL
-#  Z	/include/wx/ogl
 #  P	/include/wx/protocol
 #  S	/include/wx/unix       S for poSix
 #
@@ -532,19 +530,6 @@ m_tables.cpp	H
 m_meta.cpp	H
 htmprint.cpp	H
 
-basic.cpp	J
-basic2.cpp	J
-bmpshape.cpp	J
-canvas.cpp	J
-composit.cpp	J
-constrnt.cpp	J
-divided.cpp	J
-drawn.cpp	J
-lines.cpp	J
-mfutils.cpp	J
-oglmisc.cpp	J
-ogldiag.cpp	J
-
 arrimpl.cpp	W	B
 listimpl.cpp	W	B
 accel.h	W
@@ -1087,22 +1072,6 @@ winpars.h	L
 m_templ.h	L
 htmprint.h	L
 
-basic.h	Z
-basicp.h	Z
-bmpshape.h	Z
-canvas.h	Z
-composit.h	Z
-constrnt.h	Z
-divided.h	Z
-drawn.h	Z
-drawnp.h	Z
-lines.h	Z
-linesp.h	Z
-mfutils.h	Z
-misc.h	Z
-ogl.h	Z
-ogldiag.h	Z
-
 calctrl.h	N
 caret.h	N
 choicdgg.h	N

distrib/msw/tmake/gtk.t

@@ -65,15 +65,6 @@
         $project{"HTMLDEPS"} .= $filedep . " "
     }
     
-    foreach $file (sort keys %wxOGL) {
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
-
-        $project{"GTK_SOURCES"} .= "ogl/" . $file . " ";
-        $project{"OGLOBJS"} .= $fileobj . " ";
-        $project{"OGLDEPS"} .= $filedep . " "
-    }
-    
     #! find all our headers
     foreach $file (sort keys %wxWXINCLUDE) {
         $project{"GTK_HEADERS"} .= $file . " "
@@ -95,10 +86,6 @@
         $project{"GTK_HEADERS"} .= "html/" . $file . " "
     }
 
-    foreach $file (sort keys %wxOGLINCLUDE) {
-        $project{"GTK_HEADERS"} .= "ogl/" . $file . " "
-    }
-
     foreach $file (sort keys %wxPROTOCOLINCLUDE) {
         $project{"GTK_HEADERS"} .= "protocol/" . $file . " "
     }
@@ -141,9 +128,3 @@ HTMLOBJS = \
 HTMLDEPS = \
 		#$ ExpandList("HTMLDEPS");
 
-OGLOBJS = \
-		#$ ExpandList("OGLOBJS");
-
-OGLDEPS = \
-		#$ ExpandList("OGLDEPS");
-