From 750a2333304acca1b9b5b5b519aa404f2963e124 Mon Sep 17 00:00:00 2001
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Thu, 31 Jan 2002 13:00:35 +0000
Subject: Update to 2.3.2.

Submitted by:	tg (mostly)
---
 x11-toolkits/wxgtk-devel/files/patch-configure | 122 ++++++++++++++-----------
 1 file changed, 69 insertions(+), 53 deletions(-)

(limited to 'x11-toolkits/wxgtk-devel/files/patch-configure')

diff --git a/x11-toolkits/wxgtk-devel/files/patch-configure b/x11-toolkits/wxgtk-devel/files/patch-configure
index eb1343aead3e..6c8ac364caa6 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-configure
+++ b/x11-toolkits/wxgtk-devel/files/patch-configure
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Nov 27 13:14:10 2001
-+++ configure	Tue Nov 27 13:18:58 2001
-@@ -7657,10 +7657,10 @@
+--- configure.orig	Thu Jan 31 12:17:48 2002
++++ configure	Thu Jan 31 13:45:16 2002
+@@ -10036,10 +10036,10 @@
    else
       echo "$ac_t""no" 1>&6
       if test "$GTK_CONFIG_2_0" = "no" ; then
@@ -18,14 +18,14 @@ $FreeBSD$
       else
         if test -f conf.gtktest ; then
          :
-@@ -7992,14 +7992,14 @@
-     TOOLKIT=GTK
-     GUIDIST=GTK_DIST
+@@ -10397,16 +10397,16 @@
+         TOOLKIT=GTK
+         GUIDIST=GTK_DIST
  
--        echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
--echo "configure:7997: checking for gdk_im_open in -lgdk" >&5
-+        echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6
-+echo "configure:7997: checking for gdk_im_open in -lgdk12" >&5
+-                echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
+-echo "configure:10402: checking for gdk_im_open in -lgdk" >&5
++                echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6
++echo "configure:10413: checking for gdk_im_open in -lgdk12" >&5
  ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -34,31 +34,59 @@ $FreeBSD$
 -LIBS="-lgdk  $LIBS"
 +LIBS="-lgdk12  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 8005 "configure"
+-#line 10410 "configure"
++#line 10421 "configure"
  #include "confdefs.h"
-@@ -9258,16 +9258,12 @@
- WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
- WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11862,8 +11862,8 @@
+     lib_debug_suffix=d
+ fi
  
--WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
--WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
--
--WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
--WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
--WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
--WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}"
--WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so"
--WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so"
-+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.2"
-+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.2"
+-TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
+-TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
++TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
++TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl"
+ 
+ if test "$cross_compiling" = "yes"; then
+     TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
+@@ -11873,13 +11873,11 @@
+ WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
+ WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
+ 
+-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
++WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.2"
++WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.2"
+ 
+-WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}"
+-WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
+-WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
+-WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
++WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}"
++WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+ 
+ WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
+ WX_RESOURCES_MACOSX_COMPILED="lib${WX_LIBRARY}.r"
+@@ -12478,7 +12476,7 @@
+ fi
+ done
  
-+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so"
-+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so"
-+       
- SHARED_LD=
- PIC_FLAG=
- WX_ALL=
-@@ -13135,6 +13131,7 @@
+-for ac_hdr in iconv.h
++for ac_hdr in giconv.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -14244,7 +14242,7 @@
+     cat > conftest.$ac_ext <<EOF
+ #line 14246 "configure"
+ #include "confdefs.h"
+-#include <iconv.h>
++#include <giconv.h>
+ int main() {
+ 
+         char **inbuf, **outbuf;
+@@ -16167,6 +16165,7 @@
    fi
  fi
  
@@ -66,10 +94,11 @@ $FreeBSD$
  if test "$WXGTK20" = 1 ; then
    cat >> confdefs.h <<EOF
  #define __WXGTK20__ $WXGTK20
-@@ -13305,24 +13302,6 @@
+@@ -16256,24 +16255,6 @@
+     fi
  fi
  
- 
+-
 -CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
 -CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
 -if test "$wxUSE_OPTIMISE" = "no" ; then
@@ -87,33 +116,20 @@ $FreeBSD$
 -    fi
 -fi
 -
--
- ZLIB_INCLUDE=
- if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
-   cat >> confdefs.h <<\EOF
-@@ -13526,6 +13505,7 @@
-   cat > conftest.$ac_ext <<EOF
- #line 13528 "configure"
- #include "confdefs.h"
-+#undef HAVE_STDLIB_H
- #include <jpeglib.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-@@ -16156,8 +16136,6 @@
- s%@WX_LIBRARY@%$WX_LIBRARY%g
+ if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
+     cat >> confdefs.h <<\EOF
+ #define WXWIN_COMPATIBILITY_2 1
+@@ -18935,13 +18916,11 @@
+ s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g
  s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
  s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g
 -s%@WX_LIBRARY_LINK2@%$WX_LIBRARY_LINK2%g
--s%@WX_LIBRARY_LINK3@%$WX_LIBRARY_LINK3%g
  s%@PROGRAM_EXT@%$PROGRAM_EXT%g
- s%@WX_LIBRARY_NAME_GL@%$WX_LIBRARY_NAME_GL%g
  s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_GL%g
-@@ -16165,8 +16143,6 @@
- s%@WX_LIBRARY_GL@%$WX_LIBRARY_GL%g
+ s%@WX_LIBRARY_NAME_SHARED_GL@%$WX_LIBRARY_NAME_SHARED_GL%g
  s%@WX_TARGET_LIBRARY_GL@%$WX_TARGET_LIBRARY_GL%g
  s%@WX_LIBRARY_LINK1_GL@%$WX_LIBRARY_LINK1_GL%g
 -s%@WX_LIBRARY_LINK2_GL@%$WX_LIBRARY_LINK2_GL%g
--s%@WX_LIBRARY_LINK3_GL@%$WX_LIBRARY_LINK3_GL%g
  s%@WX_ALL@%$WX_ALL%g
  s%@WX_ALL_INSTALLED@%$WX_ALL_INSTALLED%g
  s%@SHARED_LD@%$SHARED_LD%g
-- 
cgit v1.2.3