1 files changed, 22 insertions, 30 deletions
diff --git a/x11-toolkits/wxgtk/files/patch-aa b/x11-toolkits/wxgtk/files/patch-aa
index c2d2fde6c6e8..c176d82fe805 100644
--- a/x11-toolkits/wxgtk/files/patch-aa
+++ b/x11-toolkits/wxgtk/files/patch-aa
@@ -1,34 +1,26 @@
---- configure.orig	Thu Aug 26 11:03:32 1999
-+++ configure	Sun Sep 19 13:24:58 1999
-@@ -6730,7 +6730,7 @@
-     fi
+--- configure.in.orig	Fri Jan 14 09:24:19 2000
++++ configure.in	Fri Jan 14 09:26:29 2000
+@@ -1701,12 +1701,10 @@
+ WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
  
-     TOOLKIT_INCLUDE="$GTK_CFLAGS"
--    GUI_TK_LIBRARY="$GTK_LIBS -ldl"
-+    GUI_TK_LIBRARY="$GTK_LIBS"
-     TOOLKIT=GTK
-   
-     GUIHEADERS=GTK_HEADERS
-@@ -7834,11 +7834,8 @@
+ dnl the name of the shared library
+-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
++WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.2"
  
- WX_LIBRARY_NAME_STATIC="libwx_${TOOLKIT_DIR}.a"
- 
--WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
--
--WX_LIBRARY_LINK1="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}"
--WX_LIBRARY_LINK2="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so"
--WX_LIBRARY_LINK3="libwx_${TOOLKIT_DIR}.so"
-+WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.so.1"
-+WX_LIBRARY_LINK1="libwx_${TOOLKIT_DIR}.so"
+ dnl the name of the links to the shared library
+-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="lib${WX_LIBRARY}.so"
  
+ dnl shared library settings
  SHARED_LD=
- PIC_FLAG=
-@@ -12035,8 +12032,6 @@
- s%@WX_LIBRARY@%$WX_LIBRARY%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_CREATE_LINKS@%$WX_CREATE_LINKS%g
- s%@WX_CREATE_INSTALLED_LINKS@%$WX_CREATE_INSTALLED_LINKS%g
+@@ -2964,8 +2962,6 @@
+ AC_SUBST(WX_LIBRARY)
+ AC_SUBST(WX_TARGET_LIBRARY)
+ AC_SUBST(WX_LIBRARY_LINK1)
+-AC_SUBST(WX_LIBRARY_LINK2)
+-AC_SUBST(WX_LIBRARY_LINK3)
+ AC_SUBST(PROGRAM_EXT)
+ 
+ dnl are we supposed to create the links?