blob: b7e190df8f3c4499d7c1dc6ef5ecf46ba962f899 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
--- configure.orig Fri Nov 28 17:36:36 2003
+++ configure Fri Nov 26 00:24:05 2004
@@ -4844,10 +4844,10 @@
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
WX_HOME=/usr/local/wx2
- if test ! -f "${WX_HOME}/include/wx/wx.h"
+ if test ! -f "${WX_HOME}/include/wx-2.5/wx/wx.h"
then
WX_HOME=/usr/local
- if test ! -f "${WX_HOME}/include/wx/wx.h"
+ if test ! -f "${WX_HOME}/include/wx-2.5/wx/wx.h"
then
WX_HOME=/usr
fi
@@ -5017,7 +5017,7 @@
LIBS="$LIBS -lwx_gtk2d_stc-${WX_VERSION} -lwx_gtk2d_xrc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
- *wx_gtk2u-*)
+ *wx_gtk2u*)
LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION} -lwx_gtk2u_xrc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
@@ -5033,13 +5033,18 @@
LIBS="$LIBS -lwx_gtk_stc-${WX_VERSION} -lwx_gtk_xrc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
+ *wx_gtk2*)
+ LIBS="$LIBS -lwx_gtk2_stc-${WX_VERSION} -lwx_gtk2_xrc-${WX_VERSION}"
+ LIBS="$LIBS $WX_NEW_LDFLAGS"
+ ;;
*)
;;
esac
fi
+ LIBS="$LIBS $PTHREAD_LIBS"
WX_NEW_CPPFLAGS=`${WX_CONFIG} --cxxflags`
- CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -I${WX_HOME}/include"
+ CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -I${WX_HOME}/include ${PTHREAD_CFLAGS}"
case "${host}" in
*-apple-darwin*)
CPPFLAGS="$CPPFLAGS -no-cpp-precomp -fno-rtti"
@@ -5048,18 +5053,18 @@
;;
esac
wx_wx_h="yes"
- if test ! -f "${WX_HOME}/include/wx/version.h"
+ if test ! -f "${WX_HOME}/include/wx-2.5/wx/version.h"
then
wx_wx_h="no"
fi
- if test ! -f "${WX_HOME}/include/wx/stc/stc.h"
+ if test ! -f "${WX_HOME}/include/wx-2.5/wx/stc/stc.h"
then
{ { echo "$as_me:$LINENO: error: you need to install the stc package from wxWindows/contrib/src/stc" >&5
echo "$as_me: error: you need to install the stc package from wxWindows/contrib/src/stc" >&2;}
{ (exit 1); exit 1; }; }
wx_wx_h="no"
fi
- if test ! -f "${WX_HOME}/include/wx/xrc/xmlres.h"
+ if test ! -f "${WX_HOME}/include/wx-2.5/wx/xrc/xmlres.h"
then
{ { echo "$as_me:$LINENO: error: you need to install the xrc package from wxWindows/contrib/src/xrc" >&5
echo "$as_me: error: you need to install the xrc package from wxWindows/contrib/src/xrc" >&2;}
|
