Revision: 7269
http://svn.sourceforge.net/mahogany/?rev=7269&view=rev
Author: vadz
Date: 2007-05-05 17:30:47 -0700 (Sat, 05 May 2007)
Log Message:
-----------
add support for using PCH with gcc 3.4+
Modified Paths:
--------------
trunk/M/configure
trunk/M/configure.in
trunk/M/include/config.h.in
trunk/M/makeopts.in
trunk/M/src/Makefile
Modified: trunk/M/configure
===================================================================
--- trunk/M/configure 2007-05-05 22:52:00 UTC (rev 7268)
+++ trunk/M/configure 2007-05-06 00:30:47 UTC (rev 7269)
@@ -568,7 +568,7 @@
fi
-# From configure.in Id: configure.in 7222 2007-04-03 01:08:07Z vadz
+# From configure.in Id: configure.in 7233 2007-04-03 15:02:16Z vadz
rm -f conftestdata
if ln -s X conftestdata 2>/dev/null
@@ -2141,6 +2141,60 @@
esac
esac
+MAKE_USE_PCH=
+if test "$GXX" = "yes"; then
+ echo $ac_n "checking if ${CXX} supports precompiled headers""... $ac_c" 1>&6
+echo "configure:2148: checking if ${CXX} supports precompiled headers" >&5
+if eval "test \"`echo '$''{'m_cv_cxx_pch'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ cat > conftest.$ac_ext <<EOF
+#line 2154 "configure"
+#include "confdefs.h"
+
+int main() {
+
+ #if !defined(__GNUC__) || !defined(__GNUC_MINOR__)
+ There is no PCH support
+ #endif
+ #if (__GNUC__ < 3)
+ There is no PCH support
+ #endif
+ #if (__GNUC__ == 3) && (__GNUC_MINOR__ < 4)
+ There is no PCH support
+ #endif
+
+; return 0; }
+EOF
+if { (eval echo configure:2171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ m_cv_cxx_pch=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ m_cv_cxx_pch=no
+
+fi
+rm -f conftest*
+
+
+fi
+
+echo "$ac_t""$m_cv_cxx_pch" 1>&6
+
+ if test "$m_cv_cxx_pch" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define USE_PCH 1
+EOF
+
+ MAKE_USE_PCH="USE_PCH=1"
+ fi
+fi
+
+
+
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
@@ -2153,7 +2207,7 @@
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2157: checking for $ac_word" >&5
+echo "configure:2211: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2184,7 +2238,7 @@
# Extract the first word of "m4", so it can be a program name with args.
set dummy m4; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2188: checking for $ac_word" >&5
+echo "configure:2242: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_M4'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2222,7 +2276,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2226: checking for $ac_word" >&5
+echo "configure:2280: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2269,7 +2323,7 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2273: checking for a BSD compatible install" >&5
+echo "configure:2327: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2323,7 +2377,7 @@
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:2327: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:2381: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2357,12 +2411,12 @@
echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6
-echo "configure:2361: checking for variable length prototypes and stdarg.h" >&5
+echo "configure:2415: checking for variable length prototypes and stdarg.h" >&5
if eval "test \"`echo '$''{'m_cv_stdarg_prototypes'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2366 "configure"
+#line 2420 "configure"
#include "confdefs.h"
#include <stdarg.h>
int foo(int x, ...) {
@@ -2377,7 +2431,7 @@
return foo(10, "", 3.14);
; return 0; }
EOF
-if { (eval echo configure:2381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
m_cv_stdarg_prototypes=yes
else
@@ -2397,19 +2451,19 @@
esac
echo $ac_n "checking for bad exec* prototypes""... $ac_c" 1>&6
-echo "configure:2401: checking for bad exec* prototypes" >&5
+echo "configure:2455: checking for bad exec* prototypes" >&5
if eval "test \"`echo '$''{'m_cv_bad_exec'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2406 "configure"
+#line 2460 "configure"
#include "confdefs.h"
#include <unistd.h>
int main() {
char **t;execve("@",t,t);
; return 0; }
EOF
-if { (eval echo configure:2413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
m_cv_bad_exec=yes
else
@@ -2429,12 +2483,12 @@
esac
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2433: checking for ANSI C header files" >&5
+echo "configure:2487: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2438 "configure"
+#line 2492 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -2442,7 +2496,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2459,7 +2513,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 2463 "configure"
+#line 2517 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -2477,7 +2531,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 2481 "configure"
+#line 2535 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -2498,7 +2552,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 2502 "configure"
+#line 2556 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2509,7 +2563,7 @@
exit (0); }
EOF
-if { (eval echo configure:2513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -2533,12 +2587,12 @@
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2537: checking for size_t" >&5
+echo "configure:2591: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2542 "configure"
+#line 2596 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2566,12 +2620,12 @@
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:2570: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:2624: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2575 "configure"
+#line 2629 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -2579,7 +2633,7 @@
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:2583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
@@ -2602,12 +2656,12 @@
for ac_func in strsep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2606: checking for $ac_func" >&5
+echo "configure:2660: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2611 "configure"
+#line 2665 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2630,7 +2684,7 @@
; return 0; }
EOF
-if { (eval echo configure:2634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2659,7 +2713,7 @@
case "$USE_EFENCE" in 1)
echo $ac_n "checking for main in -lefence""... $ac_c" 1>&6
-echo "configure:2663: checking for main in -lefence" >&5
+echo "configure:2717: checking for main in -lefence" >&5
ac_lib_var=`echo efence'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2667,14 +2721,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lefence $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2671 "configure"
+#line 2725 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2699,7 +2753,7 @@
case "$USE_DMALLOC" in
1) echo $ac_n "checking for main in -ldmalloc""... $ac_c" 1>&6
-echo "configure:2703: checking for main in -ldmalloc" >&5
+echo "configure:2757: checking for main in -ldmalloc" >&5
m_lib_var=`echo dmalloc'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'m_cv_lib_$m_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2708,14 +2762,14 @@
for j in "." /usr/lib /usr/local/lib $prefix/lib ; do
LIBS="-L$j -ldmalloc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2712 "configure"
+#line 2766 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "m_cv_lib_$m_lib_var=\"libpath_$m_lib_var=-L$j\""
eval eval "`echo '$m_cv_lib_'$m_lib_var`"
@@ -2858,7 +2912,7 @@
CPPFLAGS="${CPPFLAGS} ${SSL_CPPFLAGS} -I${ssl_inc} -I/usr/ssl/include -I/usr/local/ssl/include"
m_safe=`echo "ssl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ssl.h""... $ac_c" 1>&6
-echo "configure:2862: checking for ssl.h" >&5
+echo "configure:2916: checking for ssl.h" >&5
if eval "test \"`echo '$''{'m_cv_header_$m_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2872,12 +2926,12 @@
; do
CPPFLAGS="-I$j $CPPFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 2876 "configure"
+#line 2930 "configure"
#include "confdefs.h"
#include <ssl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2931,7 +2985,7 @@
LIBS_SSL=""
echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6
-echo "configure:2935: checking for main in -lcrypto" >&5
+echo "configure:2989: checking for main in -lcrypto" >&5
m_lib_var=`echo crypto'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'m_cv_lib_$m_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2945,14 +2999,14 @@
; do
LIBS="-L$j -lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2949 "configure"
+#line 3003 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "m_cv_lib_$m_lib_var=\"libpath_$m_lib_var=-L$j\""
eval eval "`echo '$m_cv_lib_'$m_lib_var`"
@@ -2984,7 +3038,7 @@
echo $ac_n "checking for main in -lssl""... $ac_c" 1>&6
-echo "configure:2988: checking for main in -lssl" >&5
+echo "configure:3042: checking for main in -lssl" >&5
m_lib_var=`echo ssl'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'m_cv_lib_$m_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2999,14 +3053,14 @@
LIBS="-L$j -lssl $LIBS_SSL
$LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3003 "configure"
+#line 3057 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "m_cv_lib_$m_lib_var=\"libpath_$m_lib_var=-L$j\""
eval eval "`echo '$m_cv_lib_'$m_lib_var`"
@@ -3040,12 +3094,12 @@
if test "$ssl_option" != "no"; then
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:3044: checking for socket" >&5
+echo "configure:3098: checking for socket" >&5
if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3049 "configure"
+#line 3103 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
@@ -3068,7 +3122,7 @@
; return 0; }
EOF
-if { (eval echo configure:3072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socket=yes"
else
@@ -3086,7 +3140,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:3090: checking for socket in -lsocket" >&5
+echo "configure:3144: checking for socket in -lsocket" >&5
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3094,7 +3148,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3098 "configure"
+#line 3152 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3105,7 +3159,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3136,12 +3190,12 @@
fi
echo $ac_n "checking for gethostname""... $ac_c" 1>&6
-echo "configure:3140: checking for gethostname" >&5
+echo "configure:3194: checking for gethostname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3145 "configure"
+#line 3199 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostname(); below. */
@@ -3164,7 +3218,7 @@
; return 0; }
EOF
-if { (eval echo configure:3168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostname=yes"
else
@@ -3182,7 +3236,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostname in -lresolv""... $ac_c" 1>&6
-echo "configure:3186: checking for gethostname in -lresolv" >&5
+echo "configure:3240: checking for gethostname in -lresolv" >&5
ac_lib_var=`echo resolv'_'gethostname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3190,7 +3244,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3194 "configure"
+#line 3248 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3201,7 +3255,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:3205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3232,12 +3286,12 @@
fi
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:3236: checking for gethostbyname" >&5
+echo "configure:3290: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3241 "configure"
+#line 3295 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -3260,7 +3314,7 @@
; return 0; }
EOF
-if { (eval echo configure:3264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -3278,7 +3332,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3282: checking for gethostbyname in -lnsl" >&5
+echo "configure:3336: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3286,7 +3340,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3290 "configure"
+#line 3344 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3297,7 +3351,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:3301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3363,7 +3417,7 @@
echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
-echo "configure:3367: checking for main in -ldl" >&5
+echo "configure:3421: checking for main in -ldl" >&5
ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3371,14 +3425,14 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3375 "configure"
+#line 3429 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3407,12 +3461,12 @@
echo $ac_n "checking for crypt""... $ac_c" 1>&6
-echo "configure:3411: checking for crypt" >&5
+echo "configure:3465: checking for crypt" >&5
if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3416 "configure"
+#line 3470 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char crypt(); below. */
@@ -3435,7 +3489,7 @@
; return 0; }
EOF
-if { (eval echo configure:3439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_crypt=yes"
else
@@ -3453,7 +3507,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:3457: checking for crypt in -lcrypt" >&5
+echo "configure:3511: checking for crypt in -lcrypt" >&5
ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3461,7 +3515,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3465 "configure"
+#line 3519 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3472,7 +3526,7 @@
crypt()
; return 0; }
EOF
-if { (eval echo configure:3476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3509,7 +3563,7 @@
echo $ac_n "checking for main in -lshadow""... $ac_c" 1>&6
-echo "configure:3513: checking for main in -lshadow" >&5
+echo "configure:3567: checking for main in -lshadow" >&5
ac_lib_var=`echo shadow'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3517,14 +3571,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lshadow $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3521 "configure"
+#line 3575 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3554,12 +3608,12 @@
USE_RBL=1
echo $ac_n "checking for res_query""... $ac_c" 1>&6
-echo "configure:3558: checking for res_query" >&5
+echo "configure:3612: checking for res_query" >&5
if eval "test \"`echo '$''{'ac_cv_func_res_query'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3563 "configure"
+#line 3617 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char res_query(); below. */
@@ -3582,7 +3636,7 @@
; return 0; }
EOF
-if { (eval echo configure:3586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_res_query=yes"
else
@@ -3600,7 +3654,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for res_query in -lresolv""... $ac_c" 1>&6
-echo "configure:3604: checking for res_query in -lresolv" >&5
+echo "configure:3658: checking for res_query in -lresolv" >&5
ac_lib_var=`echo resolv'_'res_query | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3608,7 +3662,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3612 "configure"
+#line 3666 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3619,7 +3673,7 @@
res_query()
; return 0; }
EOF
-if { (eval echo configure:3623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3645,7 +3699,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for res_query in -lbind""... $ac_c" 1>&6
-echo "configure:3649: checking for res_query in -lbind" >&5
+echo "configure:3703: checking for res_query in -lbind" >&5
ac_lib_var=`echo bind'_'res_query | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3653,7 +3707,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3657 "configure"
+#line 3711 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3664,7 +3718,7 @@
res_query()
; return 0; }
EOF
-if { (eval echo configure:3668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3709,7 +3763,7 @@
for ver in 2.4 2.3 2.2 2.1 2.0 1.5; do
m_safe=`echo "Python.h_$ver" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Python.h ($ver)""... $ac_c" 1>&6
-echo "configure:3713: checking for Python.h ($ver)" >&5
+echo "configure:3767: checking for Python.h ($ver)" >&5
if eval "test \"`echo '$''{'m_cv_header_$m_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3722,12 +3776,12 @@
; do
CPPFLAGS="-I$j $CPPFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 3726 "configure"
+#line 3780 "configure"
#include "confdefs.h"
#include <Python.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3799,7 +3853,7 @@
if test "$USE_MAC" = 1; then
PYTHON_LIBS="-framework Python"
echo $ac_n "checking if we can link with Python framework""... $ac_c" 1>&6
-echo "configure:3803: checking if we can link with Python framework" >&5
+echo "configure:3857: checking if we can link with Python framework" >&5
if eval "test \"`echo '$''{'m_cv_framework_python'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3807,14 +3861,14 @@
LIBS_OLD=$LIBS
LIBS="$LIBS $PYTHON_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3811 "configure"
+#line 3865 "configure"
#include "confdefs.h"
#include "python.h"
int main() {
Py_Initialize();
; return 0; }
EOF
-if { (eval echo configure:3818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
m_cv_framework_python=yes
else
@@ -3836,7 +3890,7 @@
if test "x$PYTHON_LIBS" = "x"; then
echo $ac_n "checking for main in -lpython$PYTHON_VER""... $ac_c" 1>&6
-echo "configure:3840: checking for main in -lpython$PYTHON_VER" >&5
+echo "configure:3894: checking for main in -lpython$PYTHON_VER" >&5
m_lib_var=`echo python$PYTHON_VER'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'m_cv_lib_$m_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3855,14 +3909,14 @@
; do
LIBS="-L$j -lpython$PYTHON_VER $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3859 "configure"
+#line 3913 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "m_cv_lib_$m_lib_var=\"libpath_$m_lib_var=-L$j\""
eval eval "`echo '$m_cv_lib_'$m_lib_var`"
@@ -3904,12 +3958,12 @@
if test "$PYTHON_VER" != "1.5"; then
echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:3908: checking for openpty" >&5
+echo "configure:3962: checking for openpty" >&5
if eval "test \"`echo '$''{'ac_cv_func_openpty'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3913 "configure"
+#line 3967 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char openpty(); below. */
@@ -3932,7 +3986,7 @@
; return 0; }
EOF
-if { (eval echo configure:3936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_openpty=yes"
else
@@ -3950,7 +4004,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:3954: checking for openpty in -lutil" >&5
+echo "configure:4008: checking for openpty in -lutil" >&5
ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3958,7 +4012,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3962 "configure"
+#line 4016 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3969,7 +4023,7 @@
openpty()
; return 0; }
EOF
-if { (eval echo configure:3973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4022,7 +4076,7 @@
# Extract the first word of "swig", so it can be a program name with args.
set dummy swig; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4026: checking for $ac_word" >&5
+echo "configure:4080: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SWIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4061,7 +4115,7 @@
USE_SWIG=0
else
echo $ac_n "checking for swig version""... $ac_c" 1>&6
-echo "configure:4065: checking for swig version" >&5
+echo "configure:4119: checking for swig version" >&5
swig_ver=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/SWIG Version //'`
echo "$ac_t""$swig_ver" 1>&6
@@ -4120,7 +4174,7 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4124: checking for $ac_word" >&5
+echo "configure:4178: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4155,7 +4209,7 @@
# Extract the first word of "msgmerge", so it can be a program name with args.
set dummy msgmerge; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4159: checking for $ac_word" >&5
+echo "configure:4213: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGMERGE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4198,7 +4252,7 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4202: checking for $ac_word" >&5
+echo "configure:4256: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4262,14 +4316,14 @@
if test -x "$WX_CONFIG_NAME" ; then
echo $ac_n "checking for wx-config""... $ac_c" 1>&6
-echo "configure:4266: checking for wx-config" >&5
+echo "configure:4320: checking for wx-config" >&5
WX_CONFIG_PATH="$WX_CONFIG_NAME"
echo "$ac_t""$WX_CONFIG_PATH" 1>&6
else
# Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args.
set dummy $WX_CONFIG_NAME; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4273: checking for $ac_word" >&5
+echo "configure:4327: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_WX_CONFIG_PATH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4310,10 +4364,10 @@
min_wx_version=$MIN_WX_VERSION
if test -z "--unicode=no --debug=$debug_option" ; then
echo $ac_n "checking for wxWidgets version >= $min_wx_version""... $ac_c" 1>&6
-echo "configure:4314: checking for wxWidgets version >= $min_wx_version" >&5
+echo "configure:4368: checking for wxWidgets version >= $min_wx_version" >&5
else
echo $ac_n "checking for wxWidgets version >= $min_wx_version (--unicode=no --debug=$debug_option)""... $ac_c" 1>&6
-echo "configure:4317: checking for wxWidgets version >= $min_wx_version (--unicode=no --debug=$debug_option)" >&5
+echo "configure:4371: checking for wxWidgets version >= $min_wx_version (--unicode=no --debug=$debug_option)" >&5
fi
WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode=no --debug=$debug_option adv,base,core,html,net,qa"
@@ -4360,7 +4414,7 @@
WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
echo $ac_n "checking for wxWidgets static library""... $ac_c" 1>&6
-echo "configure:4364: checking for wxWidgets static library" >&5
+echo "configure:4418: checking for wxWidgets static library" >&5
WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
if test "x$WX_LIBS_STATIC" = "x"; then
echo "$ac_t""no" 1>&6
@@ -4458,7 +4512,7 @@
(returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH
or equivalent variable and wxWidgets version is $MIN_WX_VERSION or above."
- { echo "configure: error: $wx_error_message" 1>&2; exit 1; }
+ wxOK=0
fi
else
@@ -4470,7 +4524,7 @@
WX_LIBS_STATIC=""
WX_RESCOMP=""
- :
+ wxOK=0
fi
@@ -4492,6 +4546,261 @@
if test "$wxOK" != 1; then
+
+
+ if test x${WX_CONFIG_NAME+set} != xset ; then
+ WX_CONFIG_NAME=wx-config
+ fi
+
+ if test "x$wx_config_name" != x ; then
+ WX_CONFIG_NAME="$wx_config_name"
+ fi
+
+ if test x$wx_config_exec_prefix != x ; then
+ wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
+ WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
+ fi
+ if test x$wx_config_prefix != x ; then
+ wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
+ WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
+ fi
+ if test "$cross_compiling" = "yes"; then
+ wx_config_args="$wx_config_args --host=$host_alias"
+ fi
+
+ if test -x "$WX_CONFIG_NAME" ; then
+ echo $ac_n "checking for wx-config""... $ac_c" 1>&6
+echo "configure:4574: checking for wx-config" >&5
+ WX_CONFIG_PATH="$WX_CONFIG_NAME"
+ echo "$ac_t""$WX_CONFIG_PATH" 1>&6
+ else
+ # Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args.
+set dummy $WX_CONFIG_NAME; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:4581: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_WX_CONFIG_PATH'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$WX_CONFIG_PATH" in
+ /*)
+ ac_cv_path_WX_CONFIG_PATH="$WX_CONFIG_PATH" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_WX_CONFIG_PATH="$WX_CONFIG_PATH" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy=""$WX_LOOKUP_PATH:$PATH""
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_WX_CONFIG_PATH="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no"
+ ;;
+esac
+fi
+WX_CONFIG_PATH="$ac_cv_path_WX_CONFIG_PATH"
+if test -n "$WX_CONFIG_PATH"; then
+ echo "$ac_t""$WX_CONFIG_PATH" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+
+ if test "$WX_CONFIG_PATH" != "no" ; then
+ WX_VERSION_FULL=""
+
+ min_wx_version=2.9.0
+ if test -z "--debug=$debug_option" ; then
+ echo $ac_n "checking for wxWidgets version >= $min_wx_version""... $ac_c" 1>&6
+echo "configure:4622: checking for wxWidgets version >= $min_wx_version" >&5
+ else
+ echo $ac_n "checking for wxWidgets version >= $min_wx_version (--debug=$debug_option)""... $ac_c" 1>&6
+echo "configure:4625: checking for wxWidgets version >= $min_wx_version (--debug=$debug_option)" >&5
+ fi
+
+ WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --debug=$debug_option adv,base,core,html,net,qa"
+
+ WX_VERSION_FULL=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
+ wx_config_major_version=`echo $WX_VERSION_FULL | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+ wx_config_minor_version=`echo $WX_VERSION_FULL | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+ wx_config_micro_version=`echo $WX_VERSION_FULL | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+
+ wx_requested_major_version=`echo $min_wx_version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+ wx_requested_minor_version=`echo $min_wx_version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+ wx_requested_micro_version=`echo $min_wx_version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+
+
+ wx_ver_ok=""
+ if test "x$WX_VERSION_FULL" != x ; then
+ if test $wx_config_major_version -gt $wx_requested_major_version; then
+ wx_ver_ok=yes
+ else
+ if test $wx_config_major_version -eq $wx_requested_major_version; then
+ if test $wx_config_minor_version -gt $wx_requested_minor_version; then
+ wx_ver_ok=yes
+ else
+ if test $wx_config_minor_version -eq $wx_requested_minor_version; then
+ if test $wx_config_micro_version -ge $wx_requested_micro_version; then
+ wx_ver_ok=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+
+
+ if test -n "$wx_ver_ok"; then
+
+ echo "$ac_t""yes (version $WX_VERSION_FULL)" 1>&6
+ WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
+
+ echo $ac_n "checking for wxWidgets static library""... $ac_c" 1>&6
+echo "configure:4672: checking for wxWidgets static library" >&5
+ WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
+ if test "x$WX_LIBS_STATIC" = "x"; then
+ echo "$ac_t""no" 1>&6
+ else
+ echo "$ac_t""yes" 1>&6
+ fi
+
+ wx_has_cppflags=""
+ if test $wx_config_major_version -gt 2; then
+ wx_has_cppflags=yes
+ else
+ if test $wx_config_major_version -eq 2; then
+ if test $wx_config_minor_version -gt 2; then
+ wx_has_cppflags=yes
+ else
+ if test $wx_config_minor_version -eq 2; then
+ if test $wx_config_micro_version -ge 6; then
+ wx_has_cppflags=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+
+ wx_has_rescomp=""
+ if test $wx_config_major_version -gt 2; then
+ wx_has_rescomp=yes
+ else
+ if test $wx_config_major_version -eq 2; then
+ if test $wx_config_minor_version -ge 7; then
+ wx_has_rescomp=yes
+ fi
+ fi
+ fi
+ if test "x$wx_has_rescomp" = x ; then
+ WX_RESCOMP=
+ else
+ WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
+ fi
+
+ if test "x$wx_has_cppflags" = x ; then
+ WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
+ WX_CPPFLAGS=$WX_CFLAGS
+ WX_CXXFLAGS=$WX_CFLAGS
+
+ WX_CFLAGS_ONLY=$WX_CFLAGS
+ WX_CXXFLAGS_ONLY=$WX_CFLAGS
+ else
+ WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
+ WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
+ WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
+
+ WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
+ WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
+ fi
+
+ wxOK=1
+
+ else
+
+ if test "x$WX_VERSION_FULL" = x; then
+ echo "$ac_t""no" 1>&6
+ else
+ echo "$ac_t""no (version $WX_VERSION_FULL is not new enough)" 1>&6
+ fi
+
+ WX_CFLAGS=""
+ WX_CPPFLAGS=""
+ WX_CXXFLAGS=""
+ WX_LIBS=""
+ WX_LIBS_STATIC=""
+ WX_RESCOMP=""
+
+ if test ! -z "--debug=$debug_option"; then
+
+ wx_error_message="
+ The configuration you asked for $PACKAGE_NAME requires a wxWidgets
+ build with the following settings:
+ --debug=$debug_option
+ but such build is not available.
+
+ To see the wxWidgets builds available on this system, please use
+ 'wx-config --list' command. To use the default build, returned by
+ 'wx-config --selected-config', use the options with their 'auto'
+ default values."
+
+ fi
+
+ wx_error_message="
+ The requested wxWidgets build couldn't be found.
+ $wx_error_message
+
+ If you still get this error, then check that 'wx-config' is
+ in path, the directory where wxWidgets libraries are installed
+ (returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH
+ or equivalent variable and wxWidgets version is 2.9.0 or above."
+
+ wxOK=0
+
+ fi
+ else
+
+ WX_CFLAGS=""
+ WX_CPPFLAGS=""
+ WX_CXXFLAGS=""
+ WX_LIBS=""
+ WX_LIBS_STATIC=""
+ WX_RESCOMP=""
+
+ wxOK=0
+
+ fi
+
+
+
+
+
+
+
+
+
+
+
+ WX_VERSION_MAJOR="$wx_config_major_version"
+ WX_VERSION_MINOR="$wx_config_minor_version"
+
+
+
+
+fi
+
+if test "$wxOK" != 1; then
if test $debug_option = "yes"; then
wxkind=debug
else
@@ -4533,7 +4842,7 @@
# Extract the first word of "SetFile", so it can be a program name with args.
set dummy SetFile; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4537: checking for $ac_word" >&5
+echo "configure:4846: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SETFILE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4579,7 +4888,7 @@
case "$USE_THREADS" in 1)
echo $ac_n "checking if wxWidgets was compiled with threads""... $ac_c" 1>&6
-echo "configure:4583: checking if wxWidgets was compiled with threads" >&5
+echo "configure:4892: checking if wxWidgets was compiled with threads" >&5
if eval "test \"`echo '$''{'m_cv_wx_threads'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4587,7 +4896,7 @@
m_cv_wx_threads=x
else
cat > conftest.$ac_ext <<EOF
-#line 4591 "configure"
+#line 4900 "configure"
#include "confdefs.h"
#include "wx/setup.h"
int main(){
@@ -4598,7 +4907,7 @@
#endif
}
EOF
-if { (eval echo configure:4602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
m_cv_wx_threads=yes
else
@@ -4634,7 +4943,7 @@
case "$OSTYPE" in
linux* | Linux*)
echo $ac_n "checking for pam_end in -lpam""... $ac_c" 1>&6
-echo "configure:4638: checking for pam_end in -lpam" >&5
+echo "configure:4947: checking for pam_end in -lpam" >&5
ac_lib_var=`echo pam'_'pam_end | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4642,7 +4951,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpam $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4646 "configure"
+#line 4955 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4653,7 +4962,7 @@
pam_end()
; return 0; }
EOF
-if { (eval echo configure:4657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4681,7 +4990,7 @@
0)
case "$USE_CCOSTYPE" in
''|0|1) echo $ac_n "checking for c-client library OS type""... $ac_c" 1>&6
-echo "configure:4685: checking for c-client library OS type" >&5
+echo "configure:4994: checking for c-client library OS type" >&5
case "$OSTYPE" in
linux* | Linux*)
;; Solaris* | solaris* | SunOS*)
@@ -4742,17 +5051,17 @@
1)
ac_safe=`echo "pi-source.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for pi-source.h""... $ac_c" 1>&6
-echo "configure:4746: checking for pi-source.h" >&5
+echo "configure:5055: checking for pi-source.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4751 "configure"
+#line 5060 "configure"
#include "confdefs.h"
#include <pi-source.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4769,7 +5078,7 @@
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lpisock""... $ac_c" 1>&6
-echo "configure:4773: checking for main in -lpisock" >&5
+echo "configure:5082: checking for main in -lpisock" >&5
ac_lib_var=`echo pisock'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4777,14 +5086,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4781 "configure"
+#line 5090 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4805,7 +5114,7 @@
MAKE_PISOCKLIB="PISOCK_LIB:=-lpisock"
echo $ac_n "checking for pi_setmaxspeed in -lpisock""... $ac_c" 1>&6
-echo "configure:4809: checking for pi_setmaxspeed in -lpisock" >&5
+echo "configure:5118: checking for pi_setmaxspeed in -lpisock" >&5
ac_lib_var=`echo pisock'_'pi_setmaxspeed | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4813,7 +5122,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4817 "configure"
+#line 5126 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4824,7 +5133,7 @@
pi_setmaxspeed()
; return 0; }
EOF
-if { (eval echo configure:4828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4849,7 +5158,7 @@
fi
echo $ac_n "checking for pi_accept_to in -lpisock""... $ac_c" 1>&6
-echo "configure:4853: checking for pi_accept_to in -lpisock" >&5
+echo "configure:5162: checking for pi_accept_to in -lpisock" >&5
ac_lib_var=`echo pisock'_'pi_accept_to | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4857,7 +5166,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4861 "configure"
+#line 5170 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4868,7 +5177,7 @@
pi_accept_to()
; return 0; }
EOF
-if { (eval echo configure:4872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4914,7 +5223,7 @@
'') ;;
*)
echo $ac_n "checking for libmal in lib""... $ac_c" 1>&6
-echo "configure:4918: checking for libmal in lib" >&5
+echo "configure:5227: checking for libmal in lib" >&5
if test ! -d $srcdir/lib/libmal
then echo "$ac_t""not found - no MAL synch for PalmOS" 1>&6
elif test -f $srcdir/lib/libmal/Makefile.in \
@@ -4972,7 +5281,7 @@
;;
auto|Auto|AUTO|1)
echo $ac_n "checking how to link modules""... $ac_c" 1>&6
-echo "configure:4976: checking how to link modules" >&5
+echo "configure:5285: checking how to link modules" >&5
if test "$USE_MAC" = 0; then
LDD="ldd"
else
@@ -5029,7 +5338,7 @@
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5033: checking for $ac_word" >&5
+echo "configure:5342: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5064,7 +5373,7 @@
# Extract the first word of "latex", so it can be a program name with args.
set dummy latex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5068: checking for $ac_word" >&5
+echo "configure:5377: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5099,7 +5408,7 @@
# Extract the first word of "makeindex", so it can be a program name with args.
set dummy makeindex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5103: checking for $ac_word" >&5
+echo "configure:5412: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MAKEINDEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5134,7 +5443,7 @@
# Extract the first word of "dvips", so it can be a program name with args.
set dummy dvips; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5138: checking for $ac_word" >&5
+echo "configure:5447: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_DVIPS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5169,7 +5478,7 @@
# Extract the first word of "ps2pdf", so it can be a program name with args.
set dummy ps2pdf; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5173: checking for $ac_word" >&5
+echo "configure:5482: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PSTOPDF'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5204,7 +5513,7 @@
# Extract the first word of "latex2html", so it can be a program name with args.
set dummy latex2html; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5208: checking for $ac_word" >&5
+echo "configure:5517: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX2HTML'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5272,7 +5581,7 @@
IMAP_CFLAGS="$CFLAGS $IMAP_CFLAGS"
echo $ac_n "checking whether $CC accepts -Wno-pointer-sign""... $ac_c" 1>&6
-echo "configure:5276: checking whether $CC accepts -Wno-pointer-sign" >&5
+echo "configure:5585: checking whether $CC accepts -Wno-pointer-sign" >&5
if eval "test \"`echo '$''{'m_cv_cc_no_warn_ptr_sign'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5297,7 +5606,7 @@
IMAP_CFLAGS="$IMAP_CFLAGS -Wno-pointer-sign"
fi
echo $ac_n "checking whether $CC accepts -Wno-pointer-to-int-cast""... $ac_c" 1>&6
-echo "configure:5301: checking whether $CC accepts -Wno-pointer-to-int-cast" >&5
+echo "configure:5610: checking whether $CC accepts -Wno-pointer-to-int-cast" >&5
if eval "test \"`echo '$''{'m_cv_cc_no_warn_ptr_to_int_cast'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5373,7 +5682,7 @@
if test "x$DEPFLAGS" != "x"; then
if test "x$GXX" != "xyes"; then
echo $ac_n "checking whether ${CXX} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5377: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5686: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
if eval "test \"`echo '$''{'m_cv_cxx_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5396,7 +5705,7 @@
if test "x$DEPFLAGS" != "x"; then
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5400: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5709: checking whether ${CC} accepts ${DEPFLAGS}" >&5
if eval "test \"`echo '$''{'m_cv_c_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5622,6 +5931,7 @@
s%@CC@%$CC%g
s%@CPP@%$CPP%g
s%@CXX@%$CXX%g
+s%@MAKE_USE_PCH@%$MAKE_USE_PCH%g
s%@RANLIB@%$RANLIB%g
s%@M4@%$M4%g
s%@YACC@%$YACC%g
Modified: trunk/M/configure.in
===================================================================
--- trunk/M/configure.in 2007-05-05 22:52:00 UTC (rev 7268)
+++ trunk/M/configure.in 2007-05-06 00:30:47 UTC (rev 7269)
@@ -375,6 +375,38 @@
esac
esac
+dnl PCH support is currently for gcc 3.4+ only
+MAKE_USE_PCH=
+if test "$GXX" = "yes"; then
+ AC_CACHE_CHECK(if ${CXX} supports precompiled headers,
+ m_cv_cxx_pch,
+ [
+ AC_TRY_COMPILE([],
+ [
+ #if !defined(__GNUC__) || !defined(__GNUC_MINOR__)
+ There is no PCH support
+ #endif
+ #if (__GNUC__ < 3)
+ There is no PCH support
+ #endif
+ #if (__GNUC__ == 3) && (__GNUC_MINOR__ < 4)
+ There is no PCH support
+ #endif
+ ],
+ m_cv_cxx_pch=yes,
+ m_cv_cxx_pch=no
+ )
+ ]
+ )
+
+ if test "$m_cv_cxx_pch" = "yes"; then
+ AC_DEFINE(USE_PCH)
+ MAKE_USE_PCH="USE_PCH=1"
+ fi
+fi
+
+AC_SUBST(MAKE_USE_PCH)
+
AC_LANG_RESTORE
dnl Various other commands needed
@@ -931,12 +963,19 @@
dnl check for (wx)gtk libraries
dnl --------------------------------------------------------------------------
-dnl check for wxWidgets installation\xA4
+dnl check for wxWidgets installation: traditionally, we could only use ANSI
+dnl build
MIN_WX_VERSION=2.8.4
-AM_PATH_WXCONFIG($MIN_WX_VERSION, [wxOK=1],, [adv,base,core,html,net,qa],
+AM_PATH_WXCONFIG($MIN_WX_VERSION, [wxOK=1],[wxOK=0],[adv,base,core,html,net,qa],
[--unicode=no --debug=$debug_option])
+dnl but with wx3 we can also use Unicode build
if test "$wxOK" != 1; then
+ AM_PATH_WXCONFIG(2.9.0, [wxOK=1],[wxOK=0],[adv,base,core,html,net,qa],
+ [--debug=$debug_option])
+fi
+
+if test "$wxOK" != 1; then
if test $debug_option = "yes"; then
wxkind=debug
else
Modified: trunk/M/include/config.h.in
===================================================================
--- trunk/M/include/config.h.in 2007-05-05 22:52:00 UTC (rev 7268)
+++ trunk/M/include/config.h.in 2007-05-06 00:30:47 UTC (rev 7269)
@@ -19,6 +19,9 @@
#endif /* !C++ */
+/** Define if build system supports precompiled headers */
+#undef USE_PCH
+
/** Define if you need to in order for stat and other things to work. */
#undef _POSIX_SOURCE
Modified: trunk/M/makeopts.in
===================================================================
--- trunk/M/makeopts.in 2007-05-05 22:52:00 UTC (rev 7268)
+++ trunk/M/makeopts.in 2007-05-06 00:30:47 UTC (rev 7269)
@@ -39,6 +39,7 @@
@MAKE_USE_MAC@
@MAKE_USE_MINGW@
@MAKE_USE_RESOURCES@
+@MAKE_USE_PCH@
ifdef HAVE_LIBMAL
LIBMAL_SRC := $(SOURCEDIR)/extra/src/libmal
Modified: trunk/M/src/Makefile
===================================================================
--- trunk/M/src/Makefile 2007-05-05 22:52:00 UTC (rev 7268)
+++ trunk/M/src/Makefile 2007-05-06 00:30:47 UTC (rev 7269)
@@ -67,6 +67,19 @@
$(SETFILE) -a C $@
endif
+ifdef USE_PCH
+MPCH=../include/Mpch.gch
+MPCH_DEP=../include/Mpch.d
+
+$(MOBJS): $(MPCH)
+
+$(MPCH): .src/../include/Mpch.h
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MMD -MF $(MPCH_DEP) -o $@ $<
+
+-include ../include/Mpch.d
+
+endif
+
ifdef USE_MAC
include ../makeversion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.