80 lines
2.6 KiB
Text
80 lines
2.6 KiB
Text
|
|
$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
|
|
|
|
- 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"
|
|
|
|
|
|
|
|
@@ -12796,24 +12802,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
|
|
-
|
|
-
|
|
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
|