diff options
Diffstat (limited to 'x11-toolkits/wxgtk24/files/patch-configure')
| -rw-r--r-- | x11-toolkits/wxgtk24/files/patch-configure | 111 |
1 files changed, 111 insertions, 0 deletions
diff --git a/x11-toolkits/wxgtk24/files/patch-configure b/x11-toolkits/wxgtk24/files/patch-configure new file mode 100644 index 000000000000..05998ba6dfaa --- /dev/null +++ b/x11-toolkits/wxgtk24/files/patch-configure @@ -0,0 +1,111 @@ + +$FreeBSD$ + +--- configure.orig Mon May 28 20:11:23 2001 ++++ configure Mon May 28 20:14:20 2001 +@@ -7606,10 +7606,10 @@ + else + echo "$ac_t""no" 1>&6 + if test "$GTK_CONFIG_2_0" = "no" ; then +- echo "*** The gtk-config-2.0 script installed by GTK could not be found" +- echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" +- echo "*** your path, or set the GTK_CONFIG_2_0 environment variable to the" +- echo "*** full path to gtk-config-2.0." ++# echo "*** The gtk-config-2.0 script installed by GTK could not be found" ++# echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" ++# echo "*** your path, or set the GTK_CONFIG_2_0 environment variable to the" ++# echo "*** full path to gtk-config-2.0." + else + if test -f conf.gtktest ; then + : +@@ -7941,14 +7941,14 @@ + TOOLKIT=GTK + GUIDIST=GTK_DIST + +- echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 +-echo "configure:7946: checking for gdk_im_open in -lgdk" >&5 ++ echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6 ++echo "configure:7946: 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 7954 "configure" + #include "confdefs.h" +@@ -9207,16 +9207,12 @@ + 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}-${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" + ++WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so" ++WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so" ++ + SHARED_LD= + PIC_FLAG= + WX_ALL= +@@ -12945,6 +12941,7 @@ + fi + fi + ++WXGTK20= + if test "$WXGTK20" = 1 ; then + cat >> confdefs.h <<EOF + #define __WXGTK20__ $WXGTK20 +@@ -13115,24 +13112,6 @@ + fi + + +-CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" ` +-CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" ` +-if test "$wxUSE_OPTIMISE" = "no" ; then +- OPTIMISE= +-else +- if test "$GCC" = yes ; then +- OPTIMISE="-O2" +- case "${host}" in +- i586-*-*|i686-*-* ) +- OPTIMISE="${OPTIMISE} " +- ;; +- esac +- else +- OPTIMISE="-O" +- fi +-fi +- +- + ZLIB_INCLUDE= + if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then + cat >> confdefs.h <<\EOF +@@ -15947,8 +15926,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_LIBRARY_NAME_GL@%$WX_LIBRARY_NAME_GL%g + s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_GL%g +@@ -15956,8 +15933,6 @@ + s%@WX_LIBRARY_GL@%$WX_LIBRARY_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 |