diff options
Diffstat (limited to 'x11-toolkits/wxgtk/files/patch-configure')
| -rw-r--r-- | x11-toolkits/wxgtk/files/patch-configure | 115 |
1 files changed, 54 insertions, 61 deletions
diff --git a/x11-toolkits/wxgtk/files/patch-configure b/x11-toolkits/wxgtk/files/patch-configure index 9f94e418fd5b..2236f9edacee 100644 --- a/x11-toolkits/wxgtk/files/patch-configure +++ b/x11-toolkits/wxgtk/files/patch-configure @@ -1,50 +1,60 @@ - -$FreeBSD$ - ---- configure.orig Mon Sep 9 14:00:36 2002 -+++ configure Mon Sep 9 14:20:43 2002 -@@ -7993,14 +7993,14 @@ - TOOLKIT=GTK - GUIDIST=GTK_DIST +--- configure.orig Tue Nov 4 19:54:04 2003 ++++ configure Tue Nov 4 20:12:59 2003 +@@ -11731,7 +11731,7 @@ -- echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 --echo "configure:7998: checking for gdk_im_open in -lgdk" >&5 -+ echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6 -+echo "configure:7998: 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 - else - ac_save_LIBS="$LIBS" --LIBS="-lgdk $LIBS" -+LIBS="-lgdk12 $LIBS" - cat > conftest.$ac_ext <<EOF - #line 8006 "configure" - #include "confdefs.h" -@@ -9395,13 +9395,11 @@ - WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" - WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a" - --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.2" -+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.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" -+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so" + if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then +- if test "$USE_DARWIN" = 1; then ++ if test "$USE_DARWIN" = 1 -o "$USE_FREEBSD" = 1; then + system_zlib_h_ok="yes" + else + echo $ac_n "checking for zlib.h >= 1.1.4""... $ac_c" 1>&6 +@@ -16099,6 +16099,13 @@ + WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc" + fi + ;; ++ ++ *-*-freebsd* ) ++ WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}" ++ WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}" ++ WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}" ++ WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" ++ ;; + esac + WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" +@@ -18679,7 +18686,7 @@ + ;; + esac -@@ -12796,24 +12802,6 @@ - fi +- THREAD_OPTS="$THREAD_OPTS pthread none" ++ THREAD_OPTS= + THREADS_OK=no + for flag in $THREAD_OPTS; do +@@ -18736,6 +18743,8 @@ + THREADS_CFLAGS="" + done --CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" ` --CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" ` ++ THREADS_OK=yes ++ + if test "x$THREADS_OK" != "xyes"; then + wxUSE_THREADS=no + echo "configure: warning: No thread support on this system... disabled" 1>&2 +@@ -18752,7 +18761,6 @@ + flag="-D_THREAD_SAFE" + ;; + *-freebsd*) +- flag="-D_THREAD_SAFE" + ;; + *-hp-hpux* ) + flag="-D_REENTRANT" +@@ -19529,21 +19537,6 @@ + CODE_GEN_FLAGS="$CODE_GEN_FLAGS -ffunction-sections" + ;; + esac +-fi +- -if test "$wxUSE_OPTIMISE" = "no" ; then - OPTIMISE= -else @@ -58,23 +68,6 @@ $FreeBSD$ - else - OPTIMISE="-O" - fi --fi -- -- - if test "$wxUSE_GUI" = "yes"; then - cat >> confdefs.h <<\EOF - #define wxUSE_GUI 1 -@@ -14995,13 +14983,11 @@ - s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%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%@PROGRAM_EXT@%$PROGRAM_EXT%g - s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_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_ALL@%$WX_ALL%g - s%@WX_ALL_INSTALLED@%$WX_ALL_INSTALLED%g - s%@SHARED_LD@%$SHARED_LD%g + fi + + if test "$WXWIN_COMPATIBILITY_2" = "yes"; then |