diff options
Diffstat (limited to 'x11-toolkits/wxgtk/files/patch-aa')
| -rw-r--r-- | x11-toolkits/wxgtk/files/patch-aa | 56 |
1 files changed, 33 insertions, 23 deletions
diff --git a/x11-toolkits/wxgtk/files/patch-aa b/x11-toolkits/wxgtk/files/patch-aa index ee9147edcbb4..c2d2fde6c6e8 100644 --- a/x11-toolkits/wxgtk/files/patch-aa +++ b/x11-toolkits/wxgtk/files/patch-aa @@ -1,24 +1,34 @@ ---- configure.orig Sat Jun 19 14:34:17 1999 -+++ configure Sat Jun 19 14:34:30 1999 -@@ -6424,18 +6424,18 @@ - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk10-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -+ GTK_CONFIG=$gtk_config_prefix/bin/gtk10-config - fi - fi +--- configure.orig Thu Aug 26 11:03:32 1999 ++++ configure Sun Sep 19 13:24:58 1999 +@@ -6730,7 +6730,7 @@ + fi - # Extract the first word of "gtk-config", so it can be a program name with args. --set dummy gtk-config; ac_word=$2 -+set dummy gtk10-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:6441: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then + TOOLKIT_INCLUDE="$GTK_CFLAGS" +- GUI_TK_LIBRARY="$GTK_LIBS -ldl" ++ GUI_TK_LIBRARY="$GTK_LIBS" + TOOLKIT=GTK + + GUIHEADERS=GTK_HEADERS +@@ -7834,11 +7834,8 @@ + + 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" + + 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 |