Revision: 7222
http://svn.sourceforge.net/mahogany/?rev=7222&view=rev
Author: vadz
Date: 2007-04-02 18:08:07 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
don't use IMAP_CPPFLAGS, just IMAP_CFLAGS are anough; add -Wno-pointer-to-int-cast and -Wno-int-to-pointer-cast to IMAP_CFLAGS if supported to suppress tons of warnings which MRC is never going to fix when compiling under 64 bit platforms
Modified Paths:
--------------
trunk/M/configure
trunk/M/configure.in
trunk/M/lib/imap/Makefile.M
trunk/M/makeopts.in
Modified: trunk/M/configure
===================================================================
--- trunk/M/configure 2007-04-03 00:40:35 UTC (rev 7221)
+++ trunk/M/configure 2007-04-03 01:08:07 UTC (rev 7222)
@@ -568,7 +568,7 @@
fi
-# From configure.in Id: configure.in 7176 2006-12-22 12:24:11Z vadz
+# From configure.in Id: configure.in 7221 2007-04-03 00:40:35Z vadz
rm -f conftestdata
if ln -s X conftestdata 2>/dev/null
@@ -1510,56 +1510,34 @@
fi
-
- echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:1516: checking for strerror in -lcposix" >&5
-ac_lib_var=`echo cposix'_'strerror | 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="-lcposix $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1524 "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
- builtin and then its argument prototype would still apply. */
-char strerror();
-
-int main() {
-strerror()
-; return 0; }
+echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
+echo "configure:1515: checking for POSIXized ISC" >&5
+if test -d /etc/conf/kconfig.d &&
+ grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
+then
+ echo "$ac_t""yes" 1>&6
+ ISC=yes # If later tests want to check for ISC.
+ cat >> confdefs.h <<\EOF
+#define _POSIX_SOURCE 1
EOF
-if { (eval echo configure:1535: \"$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
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- LIBS="$LIBS -lcposix"
+ if test "$GCC" = yes; then
+ CC="$CC -posix"
+ else
+ CC="$CC -Xp"
+ fi
else
echo "$ac_t""no" 1>&6
+ ISC=
fi
-
-
if test "x$CC" != xcc; then
echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
-echo "configure:1560: checking whether $CC and cc understand -c and -o together" >&5
+echo "configure:1538: checking whether $CC and cc understand -c and -o together" >&5
else
echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
-echo "configure:1563: checking whether cc understands -c and -o together" >&5
+echo "configure:1541: checking whether cc understands -c and -o together" >&5
fi
set dummy $CC; ac_cc="`echo $2 |
sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
@@ -1571,16 +1549,16 @@
# We do the test twice because some compilers refuse to overwrite an
# existing .o file with -o, though they will create one.
ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
-if { (eval echo configure:1575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
- test -f conftest.o && { (eval echo configure:1576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+if { (eval echo configure:1553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+ test -f conftest.o && { (eval echo configure:1554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
then
eval ac_cv_prog_cc_${ac_cc}_c_o=yes
if test "x$CC" != xcc; then
# Test first that cc exists at all.
- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
ac_try='cc -c conftest.c -o conftest.o 1>&5'
- if { (eval echo configure:1583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
- test -f conftest.o && { (eval echo configure:1584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+ if { (eval echo configure:1561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+ test -f conftest.o && { (eval echo configure:1562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
then
# cc works too.
:
@@ -1615,7 +1593,7 @@
esac
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1619: checking how to run the C preprocessor" >&5
+echo "configure:1597: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1630,13 +1608,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1634 "configure"
+#line 1612 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1618: \"$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
:
@@ -1647,13 +1625,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1651 "configure"
+#line 1629 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1635: \"$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
:
@@ -1664,13 +1642,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1668 "configure"
+#line 1646 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1652: \"$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
:
@@ -1697,13 +1675,13 @@
if test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:1701: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:1679: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
-#line 1707 "configure"
+#line 1685 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@@ -1721,7 +1699,7 @@
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 1725 "configure"
+#line 1703 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@@ -1744,12 +1722,12 @@
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1748: checking for working const" >&5
+echo "configure:1726: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1753 "configure"
+#line 1731 "configure"
#include "confdefs.h"
int main() {
@@ -1798,7 +1776,7 @@
; return 0; }
EOF
-if { (eval echo configure:1802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1819,21 +1797,21 @@
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1823: checking for inline" >&5
+echo "configure:1801: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 1830 "configure"
+#line 1808 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:1837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -1876,7 +1854,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:1880: checking for $ac_word" >&5
+echo "configure:1858: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1908,7 +1886,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1912: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1890: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1919,12 +1897,12 @@
cat > conftest.$ac_ext << EOF
-#line 1923 "configure"
+#line 1901 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:1928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1950,12 +1928,12 @@
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1954: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1932: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1959: checking whether we are using GNU C++" >&5
+echo "configure:1937: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1964,7 +1942,7 @@
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -1983,7 +1961,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1987: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1965: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2017,7 +1995,7 @@
case "$GXX" in yes)
echo $ac_n "checking whether ${CXX-g++} accepts -fno-exceptions""... $ac_c" 1>&6
-echo "configure:2021: checking whether ${CXX-g++} accepts -fno-exceptions" >&5
+echo "configure:1999: checking whether ${CXX-g++} accepts -fno-exceptions" >&5
if eval "test \"`echo '$''{'m_cv_gxx_exceptions'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2035,7 +2013,7 @@
esac
echo $ac_n "checking whether ${CXX-g++} accepts -fno-rtti""... $ac_c" 1>&6
-echo "configure:2039: checking whether ${CXX-g++} accepts -fno-rtti" >&5
+echo "configure:2017: checking whether ${CXX-g++} accepts -fno-rtti" >&5
if eval "test \"`echo '$''{'m_cv_gxx_rtti'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2054,7 +2032,7 @@
esac
echo $ac_n "checking if ${CXX} supports logical operator names""... $ac_c" 1>&6
-echo "configure:2058: checking if ${CXX} supports logical operator names" >&5
+echo "configure:2036: checking if ${CXX} supports logical operator names" >&5
if eval "test \"`echo '$''{'m_cv_cxx_opernames'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2074,7 +2052,7 @@
case "$m_cv_cxx_opernames" in yes)
echo $ac_n "checking if ${CXX} can redefine logical operator names""... $ac_c" 1>&6
-echo "configure:2078: checking if ${CXX} can redefine logical operator names" >&5
+echo "configure:2056: checking if ${CXX} can redefine logical operator names" >&5
if eval "test \"`echo '$''{'m_cv_cxx_redefineopernames'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2093,7 +2071,7 @@
EOF
;;
no) echo $ac_n "checking if logical operator names can be disabled""... $ac_c" 1>&6
-echo "configure:2097: checking if logical operator names can be disabled" >&5
+echo "configure:2075: checking if logical operator names can be disabled" >&5
if eval "test \"`echo '$''{'m_cv_cxx_disableopernames'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2120,7 +2098,7 @@
and submit a bug against the Build component telling us which
flag will work." 1>&2; exit 1; } ;;
*) echo $ac_n "checking if disabling the logical operator names is buggy""... $ac_c" 1>&6
-echo "configure:2124: checking if disabling the logical operator names is buggy" >&5
+echo "configure:2102: checking if disabling the logical operator names is buggy" >&5
if eval "test \"`echo '$''{'m_cv_gcc_buggy_fno_operator_names'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2175,7 +2153,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:2179: checking for $ac_word" >&5
+echo "configure:2157: 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
@@ -2206,7 +2184,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:2210: checking for $ac_word" >&5
+echo "configure:2188: 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
@@ -2244,7 +2222,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:2248: checking for $ac_word" >&5
+echo "configure:2226: 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
@@ -2291,7 +2269,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:2295: checking for a BSD compatible install" >&5
+echo "configure:2273: 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
@@ -2345,7 +2323,7 @@
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:2349: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:2327: 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
@@ -2379,12 +2357,12 @@
echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6
-echo "configure:2383: checking for variable length prototypes and stdarg.h" >&5
+echo "configure:2361: 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 2388 "configure"
+#line 2366 "configure"
#include "confdefs.h"
#include <stdarg.h>
int foo(int x, ...) {
@@ -2399,7 +2377,7 @@
return foo(10, "", 3.14);
; return 0; }
EOF
-if { (eval echo configure:2403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
m_cv_stdarg_prototypes=yes
else
@@ -2419,19 +2397,19 @@
esac
echo $ac_n "checking for bad exec* prototypes""... $ac_c" 1>&6
-echo "configure:2423: checking for bad exec* prototypes" >&5
+echo "configure:2401: 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 2428 "configure"
+#line 2406 "configure"
#include "confdefs.h"
#include <unistd.h>
int main() {
char **t;execve("@",t,t);
; return 0; }
EOF
-if { (eval echo configure:2435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
m_cv_bad_exec=yes
else
@@ -2451,12 +2429,12 @@
esac
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2455: checking for ANSI C header files" >&5
+echo "configure:2433: 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 2460 "configure"
+#line 2438 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -2464,7 +2442,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2468: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2446: \"$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*
@@ -2481,7 +2459,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 2485 "configure"
+#line 2463 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -2499,7 +2477,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 2503 "configure"
+#line 2481 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -2520,7 +2498,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 2524 "configure"
+#line 2502 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2531,7 +2509,7 @@
exit (0); }
EOF
-if { (eval echo configure:2535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -2555,12 +2533,12 @@
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2559: checking for size_t" >&5
+echo "configure:2537: 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 2564 "configure"
+#line 2542 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2588,12 +2566,12 @@
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:2592: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:2570: 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 2597 "configure"
+#line 2575 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -2601,7 +2579,7 @@
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:2605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
@@ -2624,12 +2602,12 @@
for ac_func in strsep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2628: checking for $ac_func" >&5
+echo "configure:2606: 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 2633 "configure"
+#line 2611 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2652,7 +2630,7 @@
; return 0; }
EOF
-if { (eval echo configure:2656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2634: \"$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
@@ -2681,7 +2659,7 @@
case "$USE_EFENCE" in 1)
echo $ac_n "checking for main in -lefence""... $ac_c" 1>&6
-echo "configure:2685: checking for main in -lefence" >&5
+echo "configure:2663: 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
@@ -2689,14 +2667,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lefence $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2693 "configure"
+#line 2671 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2678: \"$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
@@ -2721,7 +2699,7 @@
case "$USE_DMALLOC" in
1) echo $ac_n "checking for main in -ldmalloc""... $ac_c" 1>&6
-echo "configure:2725: checking for main in -ldmalloc" >&5
+echo "configure:2703: 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
@@ -2730,14 +2708,14 @@
for j in "." /usr/lib /usr/local/lib $prefix/lib ; do
LIBS="-L$j -ldmalloc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2734 "configure"
+#line 2712 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2719: \"$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`"
@@ -2880,7 +2858,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:2884: checking for ssl.h" >&5
+echo "configure:2862: 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
@@ -2894,12 +2872,12 @@
; do
CPPFLAGS="-I$j $CPPFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 2898 "configure"
+#line 2876 "configure"
#include "confdefs.h"
#include <ssl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2881: \"$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*
@@ -2953,7 +2931,7 @@
LIBS_SSL=""
echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6
-echo "configure:2957: checking for main in -lcrypto" >&5
+echo "configure:2935: 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
@@ -2967,14 +2945,14 @@
; do
LIBS="-L$j -lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2971 "configure"
+#line 2949 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2956: \"$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`"
@@ -3006,7 +2984,7 @@
echo $ac_n "checking for main in -lssl""... $ac_c" 1>&6
-echo "configure:3010: checking for main in -lssl" >&5
+echo "configure:2988: 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
@@ -3021,14 +2999,14 @@
LIBS="-L$j -lssl $LIBS_SSL
$LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3025 "configure"
+#line 3003 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3032: \"$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`"
@@ -3062,12 +3040,12 @@
if test "$ssl_option" != "no"; then
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:3066: checking for socket" >&5
+echo "configure:3044: 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 3071 "configure"
+#line 3049 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
@@ -3090,7 +3068,7 @@
; return 0; }
EOF
-if { (eval echo configure:3094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3072: \"$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
@@ -3108,7 +3086,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:3112: checking for socket in -lsocket" >&5
+echo "configure:3090: 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
@@ -3116,7 +3094,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3120 "configure"
+#line 3098 "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
@@ -3127,7 +3105,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:3131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3109: \"$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
@@ -3158,12 +3136,12 @@
fi
echo $ac_n "checking for gethostname""... $ac_c" 1>&6
-echo "configure:3162: checking for gethostname" >&5
+echo "configure:3140: 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 3167 "configure"
+#line 3145 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostname(); below. */
@@ -3186,7 +3164,7 @@
; return 0; }
EOF
-if { (eval echo configure:3190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3168: \"$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
@@ -3204,7 +3182,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostname in -lresolv""... $ac_c" 1>&6
-echo "configure:3208: checking for gethostname in -lresolv" >&5
+echo "configure:3186: 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
@@ -3212,7 +3190,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3216 "configure"
+#line 3194 "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
@@ -3223,7 +3201,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3205: \"$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
@@ -3254,12 +3232,12 @@
fi
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:3258: checking for gethostbyname" >&5
+echo "configure:3236: 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 3263 "configure"
+#line 3241 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -3282,7 +3260,7 @@
; return 0; }
EOF
-if { (eval echo configure:3286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3264: \"$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
@@ -3300,7 +3278,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3304: checking for gethostbyname in -lnsl" >&5
+echo "configure:3282: 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
@@ -3308,7 +3286,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3312 "configure"
+#line 3290 "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
@@ -3319,7 +3297,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:3323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3301: \"$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
@@ -3373,7 +3351,7 @@
SSL_CPPFLAGS="-I$ssl_inc $SSL_CPPFLAGS"
esac
- IMAP_CPPFLAGS="-I$ssl_inc/openssl $SSL_CPPFLAGS $IMAP_CPPFLAGS"
+ IMAP_CFLAGS="-I$ssl_inc/openssl $SSL_CPPFLAGS $IMAP_CFLAGS"
CPPFLAGS="$SSL_CPPFLAGS $CPPFLAGS"
IMAP_SSLTYPE="unix"
@@ -3385,7 +3363,7 @@
echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
-echo "configure:3389: checking for main in -ldl" >&5
+echo "configure:3367: 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
@@ -3393,14 +3371,14 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3397 "configure"
+#line 3375 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3382: \"$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
@@ -3429,12 +3407,12 @@
echo $ac_n "checking for crypt""... $ac_c" 1>&6
-echo "configure:3433: checking for crypt" >&5
+echo "configure:3411: 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 3438 "configure"
+#line 3416 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char crypt(); below. */
@@ -3457,7 +3435,7 @@
; return 0; }
EOF
-if { (eval echo configure:3461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3439: \"$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
@@ -3475,7 +3453,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:3479: checking for crypt in -lcrypt" >&5
+echo "configure:3457: 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
@@ -3483,7 +3461,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3487 "configure"
+#line 3465 "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
@@ -3494,7 +3472,7 @@
crypt()
; return 0; }
EOF
-if { (eval echo configure:3498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3476: \"$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
@@ -3531,7 +3509,7 @@
echo $ac_n "checking for main in -lshadow""... $ac_c" 1>&6
-echo "configure:3535: checking for main in -lshadow" >&5
+echo "configure:3513: 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
@@ -3539,14 +3517,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lshadow $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3543 "configure"
+#line 3521 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3528: \"$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
@@ -3576,12 +3554,12 @@
USE_RBL=1
echo $ac_n "checking for res_query""... $ac_c" 1>&6
-echo "configure:3580: checking for res_query" >&5
+echo "configure:3558: 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 3585 "configure"
+#line 3563 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char res_query(); below. */
@@ -3604,7 +3582,7 @@
; return 0; }
EOF
-if { (eval echo configure:3608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3586: \"$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
@@ -3622,7 +3600,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for res_query in -lresolv""... $ac_c" 1>&6
-echo "configure:3626: checking for res_query in -lresolv" >&5
+echo "configure:3604: 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
@@ -3630,7 +3608,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3634 "configure"
+#line 3612 "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
@@ -3641,7 +3619,7 @@
res_query()
; return 0; }
EOF
-if { (eval echo configure:3645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3623: \"$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
@@ -3667,7 +3645,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for res_query in -lbind""... $ac_c" 1>&6
-echo "configure:3671: checking for res_query in -lbind" >&5
+echo "configure:3649: 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
@@ -3675,7 +3653,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3679 "configure"
+#line 3657 "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
@@ -3686,7 +3664,7 @@
res_query()
; return 0; }
EOF
-if { (eval echo configure:3690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3668: \"$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
@@ -3731,7 +3709,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:3735: checking for Python.h ($ver)" >&5
+echo "configure:3713: 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
@@ -3744,12 +3722,12 @@
; do
CPPFLAGS="-I$j $CPPFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 3748 "configure"
+#line 3726 "configure"
#include "confdefs.h"
#include <Python.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3731: \"$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*
@@ -3821,7 +3799,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:3825: checking if we can link with Python framework" >&5
+echo "configure:3803: 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
@@ -3829,14 +3807,14 @@
LIBS_OLD=$LIBS
LIBS="$LIBS $PYTHON_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3833 "configure"
+#line 3811 "configure"
#include "confdefs.h"
#include "python.h"
int main() {
Py_Initialize();
; return 0; }
EOF
-if { (eval echo configure:3840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
m_cv_framework_python=yes
else
@@ -3858,7 +3836,7 @@
if test "x$PYTHON_LIBS" = "x"; then
echo $ac_n "checking for main in -lpython$PYTHON_VER""... $ac_c" 1>&6
-echo "configure:3862: checking for main in -lpython$PYTHON_VER" >&5
+echo "configure:3840: 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
@@ -3877,14 +3855,14 @@
; do
LIBS="-L$j -lpython$PYTHON_VER $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3881 "configure"
+#line 3859 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3866: \"$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`"
@@ -3926,12 +3904,12 @@
if test "$PYTHON_VER" != "1.5"; then
echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:3930: checking for openpty" >&5
+echo "configure:3908: 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 3935 "configure"
+#line 3913 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char openpty(); below. */
@@ -3954,7 +3932,7 @@
; return 0; }
EOF
-if { (eval echo configure:3958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3936: \"$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
@@ -3972,7 +3950,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:3976: checking for openpty in -lutil" >&5
+echo "configure:3954: 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
@@ -3980,7 +3958,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3984 "configure"
+#line 3962 "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
@@ -3991,7 +3969,7 @@
openpty()
; return 0; }
EOF
-if { (eval echo configure:3995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3973: \"$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
@@ -4044,7 +4022,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:4048: checking for $ac_word" >&5
+echo "configure:4026: 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
@@ -4083,7 +4061,7 @@
USE_SWIG=0
else
echo $ac_n "checking for swig version""... $ac_c" 1>&6
-echo "configure:4087: checking for swig version" >&5
+echo "configure:4065: 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
@@ -4142,7 +4120,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:4146: checking for $ac_word" >&5
+echo "configure:4124: 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
@@ -4177,7 +4155,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:4181: checking for $ac_word" >&5
+echo "configure:4159: 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
@@ -4220,7 +4198,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:4224: checking for $ac_word" >&5
+echo "configure:4202: 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
@@ -4260,6 +4238,7 @@
+
if test x${WX_CONFIG_NAME+set} != xset ; then
WX_CONFIG_NAME=wx-config
fi
@@ -4282,14 +4261,14 @@
if test -x "$WX_CONFIG_NAME" ; then
echo $ac_n "checking for wx-config""... $ac_c" 1>&6
-echo "configure:4286: checking for wx-config" >&5
+echo "configure:4265: 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:4293: checking for $ac_word" >&5
+echo "configure:4272: 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
@@ -4325,25 +4304,25 @@
fi
if test "$WX_CONFIG_PATH" != "no" ; then
- WX_VERSION=""
+ WX_VERSION_FULL=""
min_wx_version=2.7.2
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:4334: checking for wxWidgets version >= $min_wx_version" >&5
+echo "configure:4313: 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:4337: checking for wxWidgets version >= $min_wx_version (--unicode=no --debug=$debug_option)" >&5
+echo "configure:4316: 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"
- WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
- wx_config_major_version=`echo $WX_VERSION | \
+ 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 | \
+ wx_config_minor_version=`echo $WX_VERSION_FULL | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
- wx_config_micro_version=`echo $WX_VERSION | \
+ 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 | \
@@ -4355,7 +4334,7 @@
wx_ver_ok=""
- if test "x$WX_VERSION" != x ; then
+ 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
@@ -4376,11 +4355,11 @@
if test -n "$wx_ver_ok"; then
- echo "$ac_t""yes (version $WX_VERSION)" 1>&6
+ 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:4384: checking for wxWidgets static library" >&5
+echo "configure:4363: 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
@@ -4441,10 +4420,10 @@
else
- if test "x$WX_VERSION" = x; then
+ if test "x$WX_VERSION_FULL" = x; then
echo "$ac_t""no" 1>&6
else
- echo "$ac_t""no (version $WX_VERSION is not new enough)" 1>&6
+ echo "$ac_t""no (version $WX_VERSION_FULL is not new enough)" 1>&6
fi
WX_CFLAGS=""
@@ -4453,8 +4432,33 @@
WX_LIBS=""
WX_LIBS_STATIC=""
WX_RESCOMP=""
- :
+ if test ! -z "--unicode=no --debug=$debug_option"; then
+
+ wx_error_message="
+ The configuration you asked for $PACKAGE_NAME requires a wxWidgets
+ build with the following settings:
+ --unicode=no --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.7.2 or above."
+
+ { echo "configure: error: $wx_error_message" 1>&2; exit 1; }
+
fi
else
@@ -4479,7 +4483,13 @@
+ WX_VERSION_MAJOR="$wx_config_major_version"
+ WX_VERSION_MINOR="$wx_config_minor_version"
+
+
+
+
if test "$wxOK" != 1; then
if test $debug_option = "yes"; then
wxkind=debug
@@ -4522,7 +4532,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:4526: checking for $ac_word" >&5
+echo "configure:4536: 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
@@ -4568,7 +4578,7 @@
case "$USE_THREADS" in 1)
echo $ac_n "checking if wxWidgets was compiled with threads""... $ac_c" 1>&6
-echo "configure:4572: checking if wxWidgets was compiled with threads" >&5
+echo "configure:4582: 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
@@ -4576,7 +4586,7 @@
m_cv_wx_threads=x
else
cat > conftest.$ac_ext <<EOF
-#line 4580 "configure"
+#line 4590 "configure"
#include "confdefs.h"
#include "wx/setup.h"
int main(){
@@ -4587,7 +4597,7 @@
#endif
}
EOF
-if { (eval echo configure:4591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4601: \"$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
@@ -4623,7 +4633,7 @@
case "$OSTYPE" in
linux* | Linux*)
echo $ac_n "checking for pam_end in -lpam""... $ac_c" 1>&6
-echo "configure:4627: checking for pam_end in -lpam" >&5
+echo "configure:4637: 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
@@ -4631,7 +4641,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpam $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4635 "configure"
+#line 4645 "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
@@ -4642,7 +4652,7 @@
pam_end()
; return 0; }
EOF
-if { (eval echo configure:4646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4656: \"$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
@@ -4670,7 +4680,7 @@
0)
case "$USE_CCOSTYPE" in
''|0|1) echo $ac_n "checking for c-client library OS type""... $ac_c" 1>&6
-echo "configure:4674: checking for c-client library OS type" >&5
+echo "configure:4684: checking for c-client library OS type" >&5
case "$OSTYPE" in
linux* | Linux*)
;; Solaris* | solaris* | SunOS*)
@@ -4731,17 +4741,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:4735: checking for pi-source.h" >&5
+echo "configure:4745: 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 4740 "configure"
+#line 4750 "configure"
#include "confdefs.h"
#include <pi-source.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4755: \"$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*
@@ -4758,7 +4768,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:4762: checking for main in -lpisock" >&5
+echo "configure:4772: 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
@@ -4766,14 +4776,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4770 "configure"
+#line 4780 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:4777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4787: \"$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
@@ -4794,7 +4804,7 @@
MAKE_PISOCKLIB="PISOCK_LIB:=-lpisock"
echo $ac_n "checking for pi_setmaxspeed in -lpisock""... $ac_c" 1>&6
-echo "configure:4798: checking for pi_setmaxspeed in -lpisock" >&5
+echo "configure:4808: 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
@@ -4802,7 +4812,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4806 "configure"
+#line 4816 "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
@@ -4813,7 +4823,7 @@
pi_setmaxspeed()
; return 0; }
EOF
-if { (eval echo configure:4817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4827: \"$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
@@ -4838,7 +4848,7 @@
fi
echo $ac_n "checking for pi_accept_to in -lpisock""... $ac_c" 1>&6
-echo "configure:4842: checking for pi_accept_to in -lpisock" >&5
+echo "configure:4852: 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
@@ -4846,7 +4856,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4850 "configure"
+#line 4860 "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
@@ -4857,7 +4867,7 @@
pi_accept_to()
; return 0; }
EOF
-if { (eval echo configure:4861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4871: \"$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
@@ -4903,7 +4913,7 @@
'') ;;
*)
echo $ac_n "checking for libmal in lib""... $ac_c" 1>&6
-echo "configure:4907: checking for libmal in lib" >&5
+echo "configure:4917: 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 \
@@ -4961,7 +4971,7 @@
;;
auto|Auto|AUTO|1)
echo $ac_n "checking how to link modules""... $ac_c" 1>&6
-echo "configure:4965: checking how to link modules" >&5
+echo "configure:4975: checking how to link modules" >&5
if test "$USE_MAC" = 0; then
LDD="ldd"
else
@@ -5018,7 +5028,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:5022: checking for $ac_word" >&5
+echo "configure:5032: 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
@@ -5053,7 +5063,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:5057: checking for $ac_word" >&5
+echo "configure:5067: 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
@@ -5088,7 +5098,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:5092: checking for $ac_word" >&5
+echo "configure:5102: 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
@@ -5123,7 +5133,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:5127: checking for $ac_word" >&5
+echo "configure:5137: 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
@@ -5158,7 +5168,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:5162: checking for $ac_word" >&5
+echo "configure:5172: 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
@@ -5193,7 +5203,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:5197: checking for $ac_word" >&5
+echo "configure:5207: 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
@@ -5259,10 +5269,9 @@
CXXFLAGS="$CXXFLAGS $CODE_GEN_FLAGS"
LIBS="$LIBS $PYTHON_LIBS $LIB_EFENCE $LIB_DMALLOC $LIB_PAM"
-IMAP_CFLAGS="$CFLAGS"
-IMAP_CPPFLAGS="$IMAP_CPPFLAGS $CPPFLAGS"
+IMAP_CFLAGS="$CFLAGS $IMAP_CFLAGS"
echo $ac_n "checking whether $CC accepts -Wno-pointer-sign""... $ac_c" 1>&6
-echo "configure:5266: checking whether $CC accepts -Wno-pointer-sign" >&5
+echo "configure:5275: 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
@@ -5284,11 +5293,35 @@
echo "$ac_t""$m_cv_cc_no_warn_ptr_sign" 1>&6
if test $m_cv_cc_no_warn_ptr_sign = "yes"; then
- IMAP_CPPFLAGS="$IMAP_CPPFLAGS -Wno-pointer-sign"
+ 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:5300: 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
+
+
+ if test "x$GCC" = "xyes"; then
+ echo 'void f(){}' >conftest.c
+ case "`$CC -Wno-pointer-to-int-cast -c conftest.c 2>&1`" in
+ '') m_cv_cc_no_warn_ptr_to_int_cast="yes" ;;
+ *) m_cv_cc_no_warn_ptr_to_int_cast="no" ;;
+ esac
+ rm -f conftest.*
+ else
+ m_cv_cc_no_warn_ptr_to_int_cast="no"
+ fi
+fi
+echo "$ac_t""$m_cv_cc_no_warn_ptr_to_int_cast" 1>&6
+if test $m_cv_cc_no_warn_ptr_to_int_cast = "yes"; then
+ IMAP_CFLAGS="$IMAP_CFLAGS -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast"
+fi
+
+
CFACE_CPPFLAGS="${CPPFLAGS}"
CFACE_CFLAGS="${CFLAGS}"
case "$OSTYPE" in
@@ -5339,7 +5372,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:5343: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5376: 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
@@ -5362,7 +5395,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:5366: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5399: 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
@@ -5613,8 +5646,10 @@
s%@WX_CXXFLAGS_ONLY@%$WX_CXXFLAGS_ONLY%g
s%@WX_LIBS@%$WX_LIBS%g
s%@WX_LIBS_STATIC@%$WX_LIBS_STATIC%g
-s%@WX_VERSION@%$WX_VERSION%g
+s%@WX_VERSION_FULL@%$WX_VERSION_FULL%g
s%@WX_RESCOMP@%$WX_RESCOMP%g
+s%@WX_VERSION_MAJOR@%$WX_VERSION_MAJOR%g
+s%@WX_VERSION_MINOR@%$WX_VERSION_MINOR%g
s%@GUI_LIBS@%$GUI_LIBS%g
s%@GUI_LIBS_QUARTSTATIC@%$GUI_LIBS_QUARTSTATIC%g
s%@GUI_LIBS_SEMISTATIC@%$GUI_LIBS_SEMISTATIC%g
@@ -5638,7 +5673,6 @@
s%@LATEX2HTML@%$LATEX2HTML%g
s%@MAKE_HAVE_DOCTOOLS@%$MAKE_HAVE_DOCTOOLS%g
s%@RESFLAGS@%$RESFLAGS%g
-s%@IMAP_CPPFLAGS@%$IMAP_CPPFLAGS%g
s%@IMAP_CFLAGS@%$IMAP_CFLAGS%g
s%@CFACE_CPPFLAGS@%$CFACE_CPPFLAGS%g
s%@CFACE_CFLAGS@%$CFACE_CFLAGS%g
Modified: trunk/M/configure.in
===================================================================
--- trunk/M/configure.in 2007-04-03 00:40:35 UTC (rev 7221)
+++ trunk/M/configure.in 2007-04-03 01:08:07 UTC (rev 7222)
@@ -671,7 +671,7 @@
SSL_CPPFLAGS="-I$ssl_inc $SSL_CPPFLAGS"
esac
- IMAP_CPPFLAGS="-I$ssl_inc/openssl $SSL_CPPFLAGS $IMAP_CPPFLAGS"
+ IMAP_CFLAGS="-I$ssl_inc/openssl $SSL_CPPFLAGS $IMAP_CFLAGS"
CPPFLAGS="$SSL_CPPFLAGS $CPPFLAGS"
dnl c-client default is "nopwd" which means that plain text authentication
@@ -932,7 +932,7 @@
dnl --------------------------------------------------------------------------
dnl check for wxWidgets installation\xA4
-AM_PATH_WXCONFIG(2.7.2, wxOK=1,, [adv,base,core,html,net,qa],
+AM_PATH_WXCONFIG(2.7.2, [wxOK=1],, [adv,base,core,html,net,qa],
[--unicode=no --debug=$debug_option])
if test "$wxOK" != 1; then
@@ -1294,8 +1294,7 @@
LIBS="$LIBS $PYTHON_LIBS $LIB_EFENCE $LIB_DMALLOC $LIB_PAM"
dnl imap
-IMAP_CFLAGS="$CFLAGS"
-IMAP_CPPFLAGS="$IMAP_CPPFLAGS $CPPFLAGS"
+IMAP_CFLAGS="$CFLAGS $IMAP_CFLAGS"
dnl there are too many warnings in c-client sources which its author
dnl refuses to fix, suppress them when using gcc4
AC_CACHE_CHECK([whether $CC accepts -Wno-pointer-sign],
@@ -1305,9 +1304,19 @@
m_cv_cc_no_warn_ptr_sign="no")]
)
if test $m_cv_cc_no_warn_ptr_sign = "yes"; then
- IMAP_CPPFLAGS="$IMAP_CPPFLAGS -Wno-pointer-sign"
+ IMAP_CFLAGS="$IMAP_CFLAGS -Wno-pointer-sign"
fi
-AC_SUBST(IMAP_CPPFLAGS)
+AC_CACHE_CHECK([whether $CC accepts -Wno-pointer-to-int-cast],
+ m_cv_cc_no_warn_ptr_to_int_cast,
+ [M_GCC_OPTION(-Wno-pointer-to-int-cast,
+ m_cv_cc_no_warn_ptr_to_int_cast="yes",
+ m_cv_cc_no_warn_ptr_to_int_cast="no")]
+)
+if test $m_cv_cc_no_warn_ptr_to_int_cast = "yes"; then
+ dnl assume that if -Wno-pointer-to-int-cast is supported, then so is the
+ dnl opposite option
+ IMAP_CFLAGS="$IMAP_CFLAGS -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast"
+fi
AC_SUBST(IMAP_CFLAGS)
dnl compface
Modified: trunk/M/lib/imap/Makefile.M
===================================================================
--- trunk/M/lib/imap/Makefile.M 2007-04-03 00:40:35 UTC (rev 7221)
+++ trunk/M/lib/imap/Makefile.M 2007-04-03 01:08:07 UTC (rev 7222)
@@ -61,7 +61,7 @@
@$(MAKE) -C c-client $(IMAP_OSTYPE) --no-print-directory \
MAKE="$(MAKE)" CC="$(CC)" \
SSLTYPE="$(IMAP_SSLTYPE)" \
- EXTRACFLAGS="$(IMAP_CPPFLAGS)"
+ EXTRACFLAGS="$(IMAP_CFLAGS)"
# subsequent make call, only call c-client's Makefile if it looks
# like there's something to do
Modified: trunk/M/makeopts.in
===================================================================
--- trunk/M/makeopts.in 2007-04-03 00:40:35 UTC (rev 7221)
+++ trunk/M/makeopts.in 2007-04-03 01:08:07 UTC (rev 7222)
@@ -9,7 +9,6 @@
# the c-client (imap) library:
IMAP_OSTYPE := @CCOSTYPE@
IMAP_SSLTYPE := @IMAP_SSLTYPE@
-IMAP_CPPFLAGS := @IMAP_CPPFLAGS@
IMAP_CFLAGS := @IMAP_CFLAGS@
# the compface library:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
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.