blob: ecf255bfc8ee215172d3b059589e8c5d817c3fd4 (
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
|
--- configure.in Wed Jul 6 18:52:02 2005
+++ configure Wed Jul 6 18:53:03 2005
@@ -10798,48 +10798,6 @@
fi
-# Extract the first word of "wx-config", so it can be a program name with args.
-set dummy wx-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_WXCONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$WXCONFIG"; then
- ac_cv_prog_WXCONFIG="$WXCONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_WXCONFIG=""yes""
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- test -z "$ac_cv_prog_WXCONFIG" && ac_cv_prog_WXCONFIG=""no""
-fi
-fi
-WXCONFIG=$ac_cv_prog_WXCONFIG
-if test -n "$WXCONFIG"; then
- echo "$as_me:$LINENO: result: $WXCONFIG" >&5
-echo "${ECHO_T}$WXCONFIG" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-if test x"$WXCONFIG" != x"yes"; then
- { { echo "$as_me:$LINENO: error: wx-config not found" >&5
-echo "$as_me: error: wx-config not found" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10848,8 +10806,8 @@
-WXCXX=`wx-config --cxxflags`
-WXLIB=`wx-config --libs`
+WXCXX=`${WXCONFIG} --cxxflags`
+WXLIB=`${WXCONFIG} --libs`
CPPFLAGS="$WXCXX -DWXINTL_NO_GETTEXT_MACRO $CPPFLAGS"
LIBS="$WXLIB -lnewpki $LIBS"
|
