View | Details | Raw Unified | Return to bug 76738
Collapse All | Expand All

(-)/usr/ports/local/monotone-0.16/Makefile (-22 / +4 lines)
Lines 2-13 Link Here
2
# Date created:                05 Feb 2004
2
# Date created:                05 Feb 2004
3
# Whom:                        Mark A. Wicks <mwicks@kettering.edu>
3
# Whom:                        Mark A. Wicks <mwicks@kettering.edu>
4
#
4
#
5
# $FreeBSD: ports/devel/monotone/Makefile,v 1.6 2004/12/23 08:25:46 nork Exp $
5
# $FreeBSD$
6
#
6
#
7
7
8
PORTNAME=	monotone
8
PORTNAME=	monotone
9
PORTVERSION=	0.11
9
PORTVERSION=	0.16
10
PORTREVISION=	1
11
CATEGORIES=	devel
10
CATEGORIES=	devel
12
MASTER_SITES=	http://www.venge.net/monotone/  \
11
MASTER_SITES=	http://www.venge.net/monotone/  \
13
		http://norton.kettering.edu/freebsd/
12
		http://norton.kettering.edu/freebsd/
Lines 16-22 Link Here
16
COMMENT=	A distributed version control system with digital signatures
15
COMMENT=	A distributed version control system with digital signatures
17
16
18
LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt		\
17
LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt		\
19
		boost_regex.1:${PORTSDIR}/devel/boost
18
		boost_regex.2:${PORTSDIR}/devel/boost
20
19
21
USE_ICONV=	yes
20
USE_ICONV=	yes
22
.if !defined(WITHOUT_NLS)
21
.if !defined(WITHOUT_NLS)
Lines 30-36 Link Here
30
CFLAGS+=	-I${LOCALBASE}/include
29
CFLAGS+=	-I${LOCALBASE}/include
31
CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
30
CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
32
31
33
PLIST_FILES=	bin/depot.cgi bin/monotone
32
PLIST_FILES=	bin/monotone
34
INFO=		monotone
33
INFO=		monotone
35
MAN1=		monotone.1
34
MAN1=		monotone.1
36
35
Lines 55-77 Link Here
55
54
56
.include <bsd.port.pre.mk>
55
.include <bsd.port.pre.mk>
57
56
58
.if ${OSVERSION} >= 502126
59
BROKEN=		"Does not compile on FreeBSD >= 5.x"
60
.endif
61
62
.if ${OSVERSION} < 500000
63
BROKEN=		"Does not run on FreeBSD-4.x at this time"
64
.endif
65
66
EXPIRATION_DATE=2005-02-18
67
DEPRECATED=	Does not compile (5.x) or run (4.x)
68
69
.if ${ARCH} != "i386"
70
BROKEN=		"Does not compile on !i386"
71
.endif
72
73
post-patch:
57
post-patch:
74
	${TOUCH} ${WRKDIR}/${DISTNAME}/configure
75
	${TOUCH} ${WRKDIR}/${DISTNAME}/*.in
76
58
77
.include <bsd.port.post.mk>
59
.include <bsd.port.post.mk>
(-)/usr/ports/local/monotone-0.16/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (monotone-0.11.tar.gz) = 126d792c5e9a4387db5f547c33b3fe5a
1
MD5 (monotone-0.16.tar.gz) = 66fe3f50a8fe621afc8f355b25201ecb
2
SIZE (monotone-0.11.tar.gz) = 1861996
2
SIZE (monotone-0.16.tar.gz) = 3438625
(-)/usr/ports/local/monotone-0.16/files/patch-Makefile.in (-6 / +10 lines)
Lines 1-11 Link Here
1
--- Makefile.in.orig	Mon Mar  1 00:49:43 2004
1
--- Makefile.in.orig	Fri Dec 31 03:17:42 2004
2
+++ Makefile.in	Sun Mar 21 22:49:58 2004
2
+++ Makefile.in	Wed Jan 26 22:20:17 2005
3
@@ -1143,7 +1143,7 @@
3
@@ -1153,10 +1153,10 @@
4
 	$(CXXLINK) $(depot_cgi_LDFLAGS) $(depot_cgi_OBJECTS) $(depot_cgi_LDADD) $(LIBS)
4
 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
5
 monotone$(EXEEXT): $(monotone_OBJECTS) $(monotone_DEPENDENCIES) 
5
 monotone$(EXEEXT): $(monotone_OBJECTS) $(monotone_DEPENDENCIES) 
6
 	@rm -f monotone$(EXEEXT)
6
 	@rm -f monotone$(EXEEXT)
7
-	$(CXXLINK) $(monotone_LDFLAGS) $(monotone_OBJECTS) $(monotone_LDADD) $(LIBS)
7
-	$(CXXLINK) $(monotone_LDFLAGS) $(monotone_OBJECTS) $(monotone_LDADD) $(LIBS)
8
+	$(CXXLINK) $(monotone_LDFLAGS) $(monotone_OBJECTS) $(monotone_LDADD) $(LIBS) $(LTLIBINTL) $(LTLIBICONV)
8
+	$(CXXLINK) $(monotone_LDFLAGS) $(monotone_OBJECTS) $(monotone_LDADD) $(LIBS) $(LIBINTL) $(LIBICONV)
9
 unit_tests$(EXEEXT): $(unit_tests_OBJECTS) $(unit_tests_DEPENDENCIES) 
9
 unit_tests$(EXEEXT): $(unit_tests_OBJECTS) $(unit_tests_DEPENDENCIES) 
10
 	@rm -f unit_tests$(EXEEXT)
10
 	@rm -f unit_tests$(EXEEXT)
11
 	$(CXXLINK) $(unit_tests_LDFLAGS) $(unit_tests_OBJECTS) $(unit_tests_LDADD) $(LIBS)
11
-	$(CXXLINK) $(unit_tests_LDFLAGS) $(unit_tests_OBJECTS) $(unit_tests_LDADD) $(LIBS)
12
+	$(CXXLINK) $(unit_tests_LDFLAGS) $(unit_tests_OBJECTS) $(unit_tests_LDADD) $(LIBS) $(LIBINTL) $(LIBICONV)
13
 
14
 mostlyclean-compile:
15
 	-rm -f *.$(OBJEXT)
(-)/usr/ports/local/monotone-0.16/files/patch-configure (-2093 / +11 lines)
Lines 1-2093 Link Here
1
--- configure-orig	Mon Mar 29 21:59:19 2004
2
+++ configure	Mon Mar 29 21:59:33 2004
3
@@ -310,7 +310,7 @@
4
 # include <unistd.h>
5
 #endif"
6
 
7
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBIN
8
T!
1
T!
9
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB C
10
X!
2
X!
11
 ac_subst_files=''
3
--- configure.orig	Fri Dec 31 03:17:44 2004
12
 
4
+++ configure	Wed Jan 26 22:20:17 2005
13
 # Initialize some variables set by options.
5
@@ -5143,7 +5143,7 @@
14
@@ -751,26 +751,6 @@
6
 #ifdef __cplusplus
15
 ac_env_target_alias_value=$target_alias
7
 "C"
16
 ac_cv_env_target_alias_set=${target_alias+set}
8
 #endif
17
 ac_cv_env_target_alias_value=$target_alias
9
-const char *_nl_expand_alias ();
18
-ac_env_CC_set=${CC+set}
10
+const char *_nl_expand_alias (int);
19
-ac_env_CC_value=$CC
11
 int
20
-ac_cv_env_CC_set=${CC+set}
12
 main ()
21
-ac_cv_env_CC_value=$CC
13
 {
22
-ac_env_CFLAGS_set=${CFLAGS+set}
23
-ac_env_CFLAGS_value=$CFLAGS
24
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
25
-ac_cv_env_CFLAGS_value=$CFLAGS
26
-ac_env_LDFLAGS_set=${LDFLAGS+set}
27
-ac_env_LDFLAGS_value=$LDFLAGS
28
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
29
-ac_cv_env_LDFLAGS_value=$LDFLAGS
30
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
31
-ac_env_CPPFLAGS_value=$CPPFLAGS
32
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
33
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
34
-ac_env_CPP_set=${CPP+set}
35
-ac_env_CPP_value=$CPP
36
-ac_cv_env_CPP_set=${CPP+set}
37
-ac_cv_env_CPP_value=$CPP
38
 ac_env_CXX_set=${CXX+set}
39
 ac_env_CXX_value=$CXX
40
 ac_cv_env_CXX_set=${CXX+set}
41
@@ -779,6 +759,22 @@
42
 ac_env_CXXFLAGS_value=$CXXFLAGS
43
 ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
44
 ac_cv_env_CXXFLAGS_value=$CXXFLAGS
45
+ac_env_LDFLAGS_set=${LDFLAGS+set}
46
+ac_env_LDFLAGS_value=$LDFLAGS
47
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
48
+ac_cv_env_LDFLAGS_value=$LDFLAGS
49
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
50
+ac_env_CPPFLAGS_value=$CPPFLAGS
51
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
52
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
53
+ac_env_CC_set=${CC+set}
54
+ac_env_CC_value=$CC
55
+ac_cv_env_CC_set=${CC+set}
56
+ac_cv_env_CC_value=$CC
57
+ac_env_CFLAGS_set=${CFLAGS+set}
58
+ac_env_CFLAGS_value=$CFLAGS
59
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
60
+ac_cv_env_CFLAGS_value=$CFLAGS
61
 ac_env_CXXCPP_set=${CXXCPP+set}
62
 ac_env_CXXCPP_value=$CXXCPP
63
 ac_cv_env_CXXCPP_set=${CXXCPP+set}
64
@@ -883,15 +879,14 @@
65
   --with-bundled-sqlite   Force use of bundled version of sqlite (default=no)
66
 
67
 Some influential environment variables:
68
-  CC          C compiler command
69
-  CFLAGS      C compiler flags
70
+  CXX         C++ compiler command
71
+  CXXFLAGS    C++ compiler flags
72
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
73
               nonstandard directory <lib dir>
74
   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
75
               headers in a nonstandard directory <include dir>
76
-  CPP         C preprocessor
77
-  CXX         C++ compiler command
78
-  CXXFLAGS    C++ compiler flags
79
+  CC          C compiler command
80
+  CFLAGS      C compiler flags
81
   CXXCPP      C++ preprocessor
82
 
83
 Use these variables to override the choices made by `configure' or to help
84
@@ -1725,88 +1720,28 @@
85
 if test "z$CXXFLAGS" = "z"
86
 then
87
 	CXXFLAGS="-O2 -fno-strict-aliasing"
88
-	# we have some sse2 code in cryptopp which is worth
89
-	# enabling if we're on a system which can build it
90
-	DEPDIR="${am__leading_dot}deps"
91
-
92
-          ac_config_commands="$ac_config_commands depfiles"
93
-
94
-
95
-am_make=${MAKE-make}
96
-cat > confinc << 'END'
97
-am__doit:
98
-	@echo done
99
-.PHONY: am__doit
100
-END
101
-# If we don't find an include directive, just comment out the code.
102
-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
103
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
104
-am__include="#"
105
-am__quote=
106
-_am_result=none
107
-# First try GNU make style include.
108
-echo "include confinc" > confmf
109
-# We grep out `Entering directory' and `Leaving directory'
110
-# messages which can occur if `w' ends up in MAKEFLAGS.
111
-# In particular we don't look at `^make:' because GNU make might
112
-# be invoked under some other name (usually "gmake"), in which
113
-# case it prints its new name instead of `make'.
114
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
115
-   am__include=include
116
-   am__quote=
117
-   _am_result=GNU
118
-fi
119
-# Now try BSD make style include.
120
-if test "$am__include" = "#"; then
121
-   echo '.include "confinc"' > confmf
122
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
123
-      am__include=.include
124
-      am__quote="\""
125
-      _am_result=BSD
126
-   fi
127
-fi
128
-
129
-
130
-echo "$as_me:$LINENO: result: $_am_result" >&5
131
-echo "${ECHO_T}$_am_result" >&6
132
-rm -f confinc confmf
133
-
134
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
135
-if test "${enable_dependency_tracking+set}" = set; then
136
-  enableval="$enable_dependency_tracking"
137
-
138
-fi;
139
-if test "x$enable_dependency_tracking" != xno; then
140
-  am_depcomp="$ac_aux_dir/depcomp"
141
-  AMDEPBACKSLASH='\'
142
-fi
143
-
144
-
145
-if test "x$enable_dependency_tracking" != xno; then
146
-  AMDEP_TRUE=
147
-  AMDEP_FALSE='#'
148
-else
149
-  AMDEP_TRUE='#'
150
-  AMDEP_FALSE=
151
 fi
152
 
153
+test "z$CFLAGS" = "z" && CFLAGS="-O2 -fno-strict-aliasing"
154
 
155
-
156
-ac_ext=c
157
-ac_cpp='$CPP $CPPFLAGS'
158
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
159
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
160
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
161
+# Checks for programs.
162
+ac_ext=cc
163
+ac_cpp='$CXXCPP $CPPFLAGS'
164
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
165
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
166
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
167
 if test -n "$ac_tool_prefix"; then
168
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
169
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
170
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
171
+  do
172
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
173
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
174
 echo "$as_me:$LINENO: checking for $ac_word" >&5
175
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
176
-if test "${ac_cv_prog_CC+set}" = set; then
177
+if test "${ac_cv_prog_CXX+set}" = set; then
178
   echo $ECHO_N "(cached) $ECHO_C" >&6
179
 else
180
-  if test -n "$CC"; then
181
-  ac_cv_prog_CC="$CC" # Let the user override the test.
182
+  if test -n "$CXX"; then
183
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
184
 else
185
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
186
 for as_dir in $PATH
187
@@ -1815,7 +1750,7 @@
188
   test -z "$as_dir" && as_dir=.
189
   for ac_exec_ext in '' $ac_executable_extensions; do
190
   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
191
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
192
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
193
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
194
     break 2
195
   fi
196
@@ -1824,69 +1759,31 @@
197
 
198
 fi
199
 fi
200
-CC=$ac_cv_prog_CC
201
-if test -n "$CC"; then
202
-  echo "$as_me:$LINENO: result: $CC" >&5
203
-echo "${ECHO_T}$CC" >&6
204
+CXX=$ac_cv_prog_CXX
205
+if test -n "$CXX"; then
206
+  echo "$as_me:$LINENO: result: $CXX" >&5
207
+echo "${ECHO_T}$CXX" >&6
208
 else
209
   echo "$as_me:$LINENO: result: no" >&5
210
 echo "${ECHO_T}no" >&6
211
 fi
212
 
213
+    test -n "$CXX" && break
214
+  done
215
 fi
216
-if test -z "$ac_cv_prog_CC"; then
217
-  ac_ct_CC=$CC
218
-  # Extract the first word of "gcc", so it can be a program name with args.
219
-set dummy gcc; ac_word=$2
220
-echo "$as_me:$LINENO: checking for $ac_word" >&5
221
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
222
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
223
-  echo $ECHO_N "(cached) $ECHO_C" >&6
224
-else
225
-  if test -n "$ac_ct_CC"; then
226
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
227
-else
228
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
229
-for as_dir in $PATH
230
+if test -z "$CXX"; then
231
+  ac_ct_CXX=$CXX
232
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
233
 do
234
-  IFS=$as_save_IFS
235
-  test -z "$as_dir" && as_dir=.
236
-  for ac_exec_ext in '' $ac_executable_extensions; do
237
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
238
-    ac_cv_prog_ac_ct_CC="gcc"
239
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
240
-    break 2
241
-  fi
242
-done
243
-done
244
-
245
-fi
246
-fi
247
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
248
-if test -n "$ac_ct_CC"; then
249
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
250
-echo "${ECHO_T}$ac_ct_CC" >&6
251
-else
252
-  echo "$as_me:$LINENO: result: no" >&5
253
-echo "${ECHO_T}no" >&6
254
-fi
255
-
256
-  CC=$ac_ct_CC
257
-else
258
-  CC="$ac_cv_prog_CC"
259
-fi
260
-
261
-if test -z "$CC"; then
262
-  if test -n "$ac_tool_prefix"; then
263
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
264
-set dummy ${ac_tool_prefix}cc; ac_word=$2
265
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
266
+set dummy $ac_prog; ac_word=$2
267
 echo "$as_me:$LINENO: checking for $ac_word" >&5
268
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
269
-if test "${ac_cv_prog_CC+set}" = set; then
270
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
271
   echo $ECHO_N "(cached) $ECHO_C" >&6
272
 else
273
-  if test -n "$CC"; then
274
-  ac_cv_prog_CC="$CC" # Let the user override the test.
275
+  if test -n "$ac_ct_CXX"; then
276
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
277
 else
278
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
279
 for as_dir in $PATH
280
@@ -1895,7 +1792,7 @@
281
   test -z "$as_dir" && as_dir=.
282
   for ac_exec_ext in '' $ac_executable_extensions; do
283
   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
284
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
285
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
286
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
287
     break 2
288
   fi
289
@@ -1904,212 +1801,26 @@
290
 
291
 fi
292
 fi
293
-CC=$ac_cv_prog_CC
294
-if test -n "$CC"; then
295
-  echo "$as_me:$LINENO: result: $CC" >&5
296
-echo "${ECHO_T}$CC" >&6
297
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
298
+if test -n "$ac_ct_CXX"; then
299
+  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
300
+echo "${ECHO_T}$ac_ct_CXX" >&6
301
 else
302
   echo "$as_me:$LINENO: result: no" >&5
303
 echo "${ECHO_T}no" >&6
304
 fi
305
 
306
-fi
307
-if test -z "$ac_cv_prog_CC"; then
308
-  ac_ct_CC=$CC
309
-  # Extract the first word of "cc", so it can be a program name with args.
310
-set dummy cc; ac_word=$2
311
-echo "$as_me:$LINENO: checking for $ac_word" >&5
312
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
313
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
314
-  echo $ECHO_N "(cached) $ECHO_C" >&6
315
-else
316
-  if test -n "$ac_ct_CC"; then
317
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
318
-else
319
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
320
-for as_dir in $PATH
321
-do
322
-  IFS=$as_save_IFS
323
-  test -z "$as_dir" && as_dir=.
324
-  for ac_exec_ext in '' $ac_executable_extensions; do
325
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
326
-    ac_cv_prog_ac_ct_CC="cc"
327
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
328
-    break 2
329
-  fi
330
-done
331
+  test -n "$ac_ct_CXX" && break
332
 done
333
+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
334
 
335
-fi
336
-fi
337
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
338
-if test -n "$ac_ct_CC"; then
339
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
340
-echo "${ECHO_T}$ac_ct_CC" >&6
341
-else
342
-  echo "$as_me:$LINENO: result: no" >&5
343
-echo "${ECHO_T}no" >&6
344
+  CXX=$ac_ct_CXX
345
 fi
346
 
347
-  CC=$ac_ct_CC
348
-else
349
-  CC="$ac_cv_prog_CC"
350
-fi
351
-
352
-fi
353
-if test -z "$CC"; then
354
-  # Extract the first word of "cc", so it can be a program name with args.
355
-set dummy cc; ac_word=$2
356
-echo "$as_me:$LINENO: checking for $ac_word" >&5
357
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
358
-if test "${ac_cv_prog_CC+set}" = set; then
359
-  echo $ECHO_N "(cached) $ECHO_C" >&6
360
-else
361
-  if test -n "$CC"; then
362
-  ac_cv_prog_CC="$CC" # Let the user override the test.
363
-else
364
-  ac_prog_rejected=no
365
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
366
-for as_dir in $PATH
367
-do
368
-  IFS=$as_save_IFS
369
-  test -z "$as_dir" && as_dir=.
370
-  for ac_exec_ext in '' $ac_executable_extensions; do
371
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
372
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
373
-       ac_prog_rejected=yes
374
-       continue
375
-     fi
376
-    ac_cv_prog_CC="cc"
377
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
378
-    break 2
379
-  fi
380
-done
381
-done
382
-
383
-if test $ac_prog_rejected = yes; then
384
-  # We found a bogon in the path, so make sure we never use it.
385
-  set dummy $ac_cv_prog_CC
386
-  shift
387
-  if test $# != 0; then
388
-    # We chose a different compiler from the bogus one.
389
-    # However, it has the same basename, so the bogon will be chosen
390
-    # first if we set CC to just the basename; use the full file name.
391
-    shift
392
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
393
-  fi
394
-fi
395
-fi
396
-fi
397
-CC=$ac_cv_prog_CC
398
-if test -n "$CC"; then
399
-  echo "$as_me:$LINENO: result: $CC" >&5
400
-echo "${ECHO_T}$CC" >&6
401
-else
402
-  echo "$as_me:$LINENO: result: no" >&5
403
-echo "${ECHO_T}no" >&6
404
-fi
405
-
406
-fi
407
-if test -z "$CC"; then
408
-  if test -n "$ac_tool_prefix"; then
409
-  for ac_prog in cl
410
-  do
411
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
412
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
413
-echo "$as_me:$LINENO: checking for $ac_word" >&5
414
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
415
-if test "${ac_cv_prog_CC+set}" = set; then
416
-  echo $ECHO_N "(cached) $ECHO_C" >&6
417
-else
418
-  if test -n "$CC"; then
419
-  ac_cv_prog_CC="$CC" # Let the user override the test.
420
-else
421
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
422
-for as_dir in $PATH
423
-do
424
-  IFS=$as_save_IFS
425
-  test -z "$as_dir" && as_dir=.
426
-  for ac_exec_ext in '' $ac_executable_extensions; do
427
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
428
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
429
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
430
-    break 2
431
-  fi
432
-done
433
-done
434
-
435
-fi
436
-fi
437
-CC=$ac_cv_prog_CC
438
-if test -n "$CC"; then
439
-  echo "$as_me:$LINENO: result: $CC" >&5
440
-echo "${ECHO_T}$CC" >&6
441
-else
442
-  echo "$as_me:$LINENO: result: no" >&5
443
-echo "${ECHO_T}no" >&6
444
-fi
445
-
446
-    test -n "$CC" && break
447
-  done
448
-fi
449
-if test -z "$CC"; then
450
-  ac_ct_CC=$CC
451
-  for ac_prog in cl
452
-do
453
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
454
-set dummy $ac_prog; ac_word=$2
455
-echo "$as_me:$LINENO: checking for $ac_word" >&5
456
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
457
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
458
-  echo $ECHO_N "(cached) $ECHO_C" >&6
459
-else
460
-  if test -n "$ac_ct_CC"; then
461
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
462
-else
463
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
464
-for as_dir in $PATH
465
-do
466
-  IFS=$as_save_IFS
467
-  test -z "$as_dir" && as_dir=.
468
-  for ac_exec_ext in '' $ac_executable_extensions; do
469
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
470
-    ac_cv_prog_ac_ct_CC="$ac_prog"
471
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
472
-    break 2
473
-  fi
474
-done
475
-done
476
-
477
-fi
478
-fi
479
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
480
-if test -n "$ac_ct_CC"; then
481
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
482
-echo "${ECHO_T}$ac_ct_CC" >&6
483
-else
484
-  echo "$as_me:$LINENO: result: no" >&5
485
-echo "${ECHO_T}no" >&6
486
-fi
487
-
488
-  test -n "$ac_ct_CC" && break
489
-done
490
-
491
-  CC=$ac_ct_CC
492
-fi
493
-
494
-fi
495
-
496
-
497
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
498
-See \`config.log' for more details." >&5
499
-echo "$as_me: error: no acceptable C compiler found in \$PATH
500
-See \`config.log' for more details." >&2;}
501
-   { (exit 1); exit 1; }; }
502
 
503
 # Provide some information about the compiler.
504
 echo "$as_me:$LINENO:" \
505
-     "checking for C compiler version" >&5
506
+     "checking for C++ compiler version" >&5
507
 ac_compiler=`set X $ac_compile; echo $2`
508
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
509
   (eval $ac_compiler --version </dev/null >&5) 2>&5
510
@@ -2148,8 +1859,8 @@
511
 # Try to create an executable without -o first, disregard a.out.
512
 # It will help us diagnose broken compilers, and finding out an intuition
513
 # of exeext.
514
-echo "$as_me:$LINENO: checking for C compiler default output" >&5
515
-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
516
+echo "$as_me:$LINENO: checking for C++ compiler default output" >&5
517
+echo $ECHO_N "checking for C++ compiler default output... $ECHO_C" >&6
518
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
519
 if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
520
   (eval $ac_link_default) 2>&5
521
@@ -2192,9 +1903,9 @@
522
   echo "$as_me: failed program was:" >&5
523
 sed 's/^/| /' conftest.$ac_ext >&5
524
 
525
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
526
+{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables
527
 See \`config.log' for more details." >&5
528
-echo "$as_me: error: C compiler cannot create executables
529
+echo "$as_me: error: C++ compiler cannot create executables
530
 See \`config.log' for more details." >&2;}
531
    { (exit 77); exit 77; }; }
532
 fi
533
@@ -2205,8 +1916,8 @@
534
 
535
 # Check the compiler produces executables we can run.  If not, either
536
 # the compiler is broken, or we cross compile.
537
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
538
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
539
+echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
540
+echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6
541
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
542
 # If not cross compiling, check that we can run a simple program.
543
 if test "$cross_compiling" != yes; then
544
@@ -2221,10 +1932,10 @@
545
     if test "$cross_compiling" = maybe; then
546
 	cross_compiling=yes
547
     else
548
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
549
+	{ { echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
550
 If you meant to cross compile, use \`--host'.
551
 See \`config.log' for more details." >&5
552
-echo "$as_me: error: cannot run C compiled programs.
553
+echo "$as_me: error: cannot run C++ compiled programs.
554
 If you meant to cross compile, use \`--host'.
555
 See \`config.log' for more details." >&2;}
556
    { (exit 1); exit 1; }; }
557
@@ -2259,1243 +1970,77 @@
558
   case $ac_file in
559
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
560
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
561
-          export ac_cv_exeext
562
-          break;;
563
-    * ) break;;
564
-  esac
565
-done
566
-else
567
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
568
-See \`config.log' for more details." >&5
569
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
570
-See \`config.log' for more details." >&2;}
571
-   { (exit 1); exit 1; }; }
572
-fi
573
-
574
-rm -f conftest$ac_cv_exeext
575
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
576
-echo "${ECHO_T}$ac_cv_exeext" >&6
577
-
578
-rm -f conftest.$ac_ext
579
-EXEEXT=$ac_cv_exeext
580
-ac_exeext=$EXEEXT
581
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
582
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
583
-if test "${ac_cv_objext+set}" = set; then
584
-  echo $ECHO_N "(cached) $ECHO_C" >&6
585
-else
586
-  cat >conftest.$ac_ext <<_ACEOF
587
-#line $LINENO "configure"
588
-/* confdefs.h.  */
589
-_ACEOF
590
-cat confdefs.h >>conftest.$ac_ext
591
-cat >>conftest.$ac_ext <<_ACEOF
592
-/* end confdefs.h.  */
593
-
594
-int
595
-main ()
596
-{
597
-
598
-  ;
599
-  return 0;
600
-}
601
-_ACEOF
602
-rm -f conftest.o conftest.obj
603
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
604
-  (eval $ac_compile) 2>&5
605
-  ac_status=$?
606
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
607
-  (exit $ac_status); }; then
608
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
609
-  case $ac_file in
610
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
611
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
612
-       break;;
613
-  esac
614
-done
615
-else
616
-  echo "$as_me: failed program was:" >&5
617
-sed 's/^/| /' conftest.$ac_ext >&5
618
-
619
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
620
-See \`config.log' for more details." >&5
621
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
622
-See \`config.log' for more details." >&2;}
623
-   { (exit 1); exit 1; }; }
624
-fi
625
-
626
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
627
-fi
628
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
629
-echo "${ECHO_T}$ac_cv_objext" >&6
630
-OBJEXT=$ac_cv_objext
631
-ac_objext=$OBJEXT
632
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
633
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
634
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
635
-  echo $ECHO_N "(cached) $ECHO_C" >&6
636
-else
637
-  cat >conftest.$ac_ext <<_ACEOF
638
-#line $LINENO "configure"
639
-/* confdefs.h.  */
640
-_ACEOF
641
-cat confdefs.h >>conftest.$ac_ext
642
-cat >>conftest.$ac_ext <<_ACEOF
643
-/* end confdefs.h.  */
644
-
645
-int
646
-main ()
647
-{
648
-#ifndef __GNUC__
649
-       choke me
650
-#endif
651
-
652
-  ;
653
-  return 0;
654
-}
655
-_ACEOF
656
-rm -f conftest.$ac_objext
657
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
658
-  (eval $ac_compile) 2>&5
659
-  ac_status=$?
660
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
661
-  (exit $ac_status); } &&
662
-         { ac_try='test -s conftest.$ac_objext'
663
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
664
-  (eval $ac_try) 2>&5
665
-  ac_status=$?
666
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
667
-  (exit $ac_status); }; }; then
668
-  ac_compiler_gnu=yes
669
-else
670
-  echo "$as_me: failed program was:" >&5
671
-sed 's/^/| /' conftest.$ac_ext >&5
672
-
673
-ac_compiler_gnu=no
674
-fi
675
-rm -f conftest.$ac_objext conftest.$ac_ext
676
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
677
-
678
-fi
679
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
680
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
681
-GCC=`test $ac_compiler_gnu = yes && echo yes`
682
-ac_test_CFLAGS=${CFLAGS+set}
683
-ac_save_CFLAGS=$CFLAGS
684
-CFLAGS="-g"
685
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
686
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
687
-if test "${ac_cv_prog_cc_g+set}" = set; then
688
-  echo $ECHO_N "(cached) $ECHO_C" >&6
689
-else
690
-  cat >conftest.$ac_ext <<_ACEOF
691
-#line $LINENO "configure"
692
-/* confdefs.h.  */
693
-_ACEOF
694
-cat confdefs.h >>conftest.$ac_ext
695
-cat >>conftest.$ac_ext <<_ACEOF
696
-/* end confdefs.h.  */
697
-
698
-int
699
-main ()
700
-{
701
-
702
-  ;
703
-  return 0;
704
-}
705
-_ACEOF
706
-rm -f conftest.$ac_objext
707
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
708
-  (eval $ac_compile) 2>&5
709
-  ac_status=$?
710
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
711
-  (exit $ac_status); } &&
712
-         { ac_try='test -s conftest.$ac_objext'
713
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
714
-  (eval $ac_try) 2>&5
715
-  ac_status=$?
716
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
717
-  (exit $ac_status); }; }; then
718
-  ac_cv_prog_cc_g=yes
719
-else
720
-  echo "$as_me: failed program was:" >&5
721
-sed 's/^/| /' conftest.$ac_ext >&5
722
-
723
-ac_cv_prog_cc_g=no
724
-fi
725
-rm -f conftest.$ac_objext conftest.$ac_ext
726
-fi
727
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
728
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
729
-if test "$ac_test_CFLAGS" = set; then
730
-  CFLAGS=$ac_save_CFLAGS
731
-elif test $ac_cv_prog_cc_g = yes; then
732
-  if test "$GCC" = yes; then
733
-    CFLAGS="-g -O2"
734
-  else
735
-    CFLAGS="-g"
736
-  fi
737
-else
738
-  if test "$GCC" = yes; then
739
-    CFLAGS="-O2"
740
-  else
741
-    CFLAGS=
742
-  fi
743
-fi
744
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
745
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
746
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
747
-  echo $ECHO_N "(cached) $ECHO_C" >&6
748
-else
749
-  ac_cv_prog_cc_stdc=no
750
-ac_save_CC=$CC
751
-cat >conftest.$ac_ext <<_ACEOF
752
-#line $LINENO "configure"
753
-/* confdefs.h.  */
754
-_ACEOF
755
-cat confdefs.h >>conftest.$ac_ext
756
-cat >>conftest.$ac_ext <<_ACEOF
757
-/* end confdefs.h.  */
758
-#include <stdarg.h>
759
-#include <stdio.h>
760
-#include <sys/types.h>
761
-#include <sys/stat.h>
762
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
763
-struct buf { int x; };
764
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
765
-static char *e (p, i)
766
-     char **p;
767
-     int i;
768
-{
769
-  return p[i];
770
-}
771
-static char *f (char * (*g) (char **, int), char **p, ...)
772
-{
773
-  char *s;
774
-  va_list v;
775
-  va_start (v,p);
776
-  s = g (p, va_arg (v,int));
777
-  va_end (v);
778
-  return s;
779
-}
780
-int test (int i, double x);
781
-struct s1 {int (*f) (int a);};
782
-struct s2 {int (*f) (double a);};
783
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
784
-int argc;
785
-char **argv;
786
-int
787
-main ()
788
-{
789
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
790
-  ;
791
-  return 0;
792
-}
793
-_ACEOF
794
-# Don't try gcc -ansi; that turns off useful extensions and
795
-# breaks some systems' header files.
796
-# AIX			-qlanglvl=ansi
797
-# Ultrix and OSF/1	-std1
798
-# HP-UX 10.20 and later	-Ae
799
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
800
-# SVR4			-Xc -D__EXTENSIONS__
801
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
802
-do
803
-  CC="$ac_save_CC $ac_arg"
804
-  rm -f conftest.$ac_objext
805
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
806
-  (eval $ac_compile) 2>&5
807
-  ac_status=$?
808
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
809
-  (exit $ac_status); } &&
810
-         { ac_try='test -s conftest.$ac_objext'
811
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
812
-  (eval $ac_try) 2>&5
813
-  ac_status=$?
814
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
815
-  (exit $ac_status); }; }; then
816
-  ac_cv_prog_cc_stdc=$ac_arg
817
-break
818
-else
819
-  echo "$as_me: failed program was:" >&5
820
-sed 's/^/| /' conftest.$ac_ext >&5
821
-
822
-fi
823
-rm -f conftest.$ac_objext
824
-done
825
-rm -f conftest.$ac_ext conftest.$ac_objext
826
-CC=$ac_save_CC
827
-
828
-fi
829
-
830
-case "x$ac_cv_prog_cc_stdc" in
831
-  x|xno)
832
-    echo "$as_me:$LINENO: result: none needed" >&5
833
-echo "${ECHO_T}none needed" >&6 ;;
834
-  *)
835
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
836
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
837
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
838
-esac
839
-
840
-# Some people use a C++ compiler to compile C.  Since we use `exit',
841
-# in C++ we need to declare it.  In case someone uses the same compiler
842
-# for both compiling C and C++ we need to have the C++ compiler decide
843
-# the declaration of exit, since it's the most demanding environment.
844
-cat >conftest.$ac_ext <<_ACEOF
845
-#ifndef __cplusplus
846
-  choke me
847
-#endif
848
-_ACEOF
849
-rm -f conftest.$ac_objext
850
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
851
-  (eval $ac_compile) 2>&5
852
-  ac_status=$?
853
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
854
-  (exit $ac_status); } &&
855
-         { ac_try='test -s conftest.$ac_objext'
856
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
857
-  (eval $ac_try) 2>&5
858
-  ac_status=$?
859
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
860
-  (exit $ac_status); }; }; then
861
-  for ac_declaration in \
862
-   ''\
863
-   '#include <stdlib.h>' \
864
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
865
-   'extern "C" void std::exit (int); using std::exit;' \
866
-   'extern "C" void exit (int) throw ();' \
867
-   'extern "C" void exit (int);' \
868
-   'void exit (int);'
869
-do
870
-  cat >conftest.$ac_ext <<_ACEOF
871
-#line $LINENO "configure"
872
-/* confdefs.h.  */
873
-_ACEOF
874
-cat confdefs.h >>conftest.$ac_ext
875
-cat >>conftest.$ac_ext <<_ACEOF
876
-/* end confdefs.h.  */
877
-#include <stdlib.h>
878
-$ac_declaration
879
-int
880
-main ()
881
-{
882
-exit (42);
883
-  ;
884
-  return 0;
885
-}
886
-_ACEOF
887
-rm -f conftest.$ac_objext
888
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
889
-  (eval $ac_compile) 2>&5
890
-  ac_status=$?
891
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
892
-  (exit $ac_status); } &&
893
-         { ac_try='test -s conftest.$ac_objext'
894
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
895
-  (eval $ac_try) 2>&5
896
-  ac_status=$?
897
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
898
-  (exit $ac_status); }; }; then
899
-  :
900
-else
901
-  echo "$as_me: failed program was:" >&5
902
-sed 's/^/| /' conftest.$ac_ext >&5
903
-
904
-continue
905
-fi
906
-rm -f conftest.$ac_objext conftest.$ac_ext
907
-  cat >conftest.$ac_ext <<_ACEOF
908
-#line $LINENO "configure"
909
-/* confdefs.h.  */
910
-_ACEOF
911
-cat confdefs.h >>conftest.$ac_ext
912
-cat >>conftest.$ac_ext <<_ACEOF
913
-/* end confdefs.h.  */
914
-$ac_declaration
915
-int
916
-main ()
917
-{
918
-exit (42);
919
-  ;
920
-  return 0;
921
-}
922
-_ACEOF
923
-rm -f conftest.$ac_objext
924
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
925
-  (eval $ac_compile) 2>&5
926
-  ac_status=$?
927
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
928
-  (exit $ac_status); } &&
929
-         { ac_try='test -s conftest.$ac_objext'
930
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
931
-  (eval $ac_try) 2>&5
932
-  ac_status=$?
933
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
934
-  (exit $ac_status); }; }; then
935
-  break
936
-else
937
-  echo "$as_me: failed program was:" >&5
938
-sed 's/^/| /' conftest.$ac_ext >&5
939
-
940
-fi
941
-rm -f conftest.$ac_objext conftest.$ac_ext
942
-done
943
-rm -f conftest*
944
-if test -n "$ac_declaration"; then
945
-  echo '#ifdef __cplusplus' >>confdefs.h
946
-  echo $ac_declaration      >>confdefs.h
947
-  echo '#endif'             >>confdefs.h
948
-fi
949
-
950
-else
951
-  echo "$as_me: failed program was:" >&5
952
-sed 's/^/| /' conftest.$ac_ext >&5
953
-
954
-fi
955
-rm -f conftest.$ac_objext conftest.$ac_ext
956
-ac_ext=c
957
-ac_cpp='$CPP $CPPFLAGS'
958
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
959
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
960
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
961
-
962
-depcc="$CC"   am_compiler_list=
963
-
964
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
965
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
966
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
967
-  echo $ECHO_N "(cached) $ECHO_C" >&6
968
-else
969
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
970
-  # We make a subdir and do the tests there.  Otherwise we can end up
971
-  # making bogus files that we don't know about and never remove.  For
972
-  # instance it was reported that on HP-UX the gcc test will end up
973
-  # making a dummy file named `D' -- because `-MD' means `put the output
974
-  # in D'.
975
-  mkdir conftest.dir
976
-  # Copy depcomp to subdir because otherwise we won't find it if we're
977
-  # using a relative directory.
978
-  cp "$am_depcomp" conftest.dir
979
-  cd conftest.dir
980
-  # We will build objects and dependencies in a subdirectory because
981
-  # it helps to detect inapplicable dependency modes.  For instance
982
-  # both Tru64's cc and ICC support -MD to output dependencies as a
983
-  # side effect of compilation, but ICC will put the dependencies in
984
-  # the current directory while Tru64 will put them in the object
985
-  # directory.
986
-  mkdir sub
987
-
988
-  am_cv_CC_dependencies_compiler_type=none
989
-  if test "$am_compiler_list" = ""; then
990
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
991
-  fi
992
-  for depmode in $am_compiler_list; do
993
-    # Setup a source with many dependencies, because some compilers
994
-    # like to wrap large dependency lists on column 80 (with \), and
995
-    # we should not choose a depcomp mode which is confused by this.
996
-    #
997
-    # We need to recreate these files for each test, as the compiler may
998
-    # overwrite some of them when testing with obscure command lines.
999
-    # This happens at least with the AIX C compiler.
1000
-    : > sub/conftest.c
1001
-    for i in 1 2 3 4 5 6; do
1002
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
1003
-      : > sub/conftst$i.h
1004
-    done
1005
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
1006
-
1007
-    case $depmode in
1008
-    nosideeffect)
1009
-      # after this tag, mechanisms are not by side-effect, so they'll
1010
-      # only be used when explicitly requested
1011
-      if test "x$enable_dependency_tracking" = xyes; then
1012
-	continue
1013
-      else
1014
-	break
1015
-      fi
1016
-      ;;
1017
-    none) break ;;
1018
-    esac
1019
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
1020
-    # mode.  It turns out that the SunPro C++ compiler does not properly
1021
-    # handle `-M -o', and we need to detect this.
1022
-    if depmode=$depmode \
1023
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
1024
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
1025
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
1026
-         >/dev/null 2>conftest.err &&
1027
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
1028
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
1029
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
1030
-      # icc doesn't choke on unknown options, it will just issue warnings
1031
-      # (even with -Werror).  So we grep stderr for any message
1032
-      # that says an option was ignored.
1033
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
1034
-        am_cv_CC_dependencies_compiler_type=$depmode
1035
-        break
1036
-      fi
1037
-    fi
1038
-  done
1039
-
1040
-  cd ..
1041
-  rm -rf conftest.dir
1042
-else
1043
-  am_cv_CC_dependencies_compiler_type=none
1044
-fi
1045
-
1046
-fi
1047
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
1048
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
1049
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
1050
-
1051
-
1052
-
1053
-if
1054
-  test "x$enable_dependency_tracking" != xno \
1055
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
1056
-  am__fastdepCC_TRUE=
1057
-  am__fastdepCC_FALSE='#'
1058
-else
1059
-  am__fastdepCC_TRUE='#'
1060
-  am__fastdepCC_FALSE=
1061
-fi
1062
-
1063
-
1064
-
1065
-ac_ext=c
1066
-ac_cpp='$CPP $CPPFLAGS'
1067
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1068
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1069
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
1070
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
1071
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
1072
-# On Suns, sometimes $CPP names a directory.
1073
-if test -n "$CPP" && test -d "$CPP"; then
1074
-  CPP=
1075
-fi
1076
-if test -z "$CPP"; then
1077
-  if test "${ac_cv_prog_CPP+set}" = set; then
1078
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1079
-else
1080
-      # Double quotes because CPP needs to be expanded
1081
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
1082
-    do
1083
-      ac_preproc_ok=false
1084
-for ac_c_preproc_warn_flag in '' yes
1085
-do
1086
-  # Use a header file that comes with gcc, so configuring glibc
1087
-  # with a fresh cross-compiler works.
1088
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1089
-  # <limits.h> exists even on freestanding compilers.
1090
-  # On the NeXT, cc -E runs the code through the compiler's parser,
1091
-  # not just through cpp. "Syntax error" is here to catch this case.
1092
-  cat >conftest.$ac_ext <<_ACEOF
1093
-#line $LINENO "configure"
1094
-/* confdefs.h.  */
1095
-_ACEOF
1096
-cat confdefs.h >>conftest.$ac_ext
1097
-cat >>conftest.$ac_ext <<_ACEOF
1098
-/* end confdefs.h.  */
1099
-#ifdef __STDC__
1100
-# include <limits.h>
1101
-#else
1102
-# include <assert.h>
1103
-#endif
1104
-                     Syntax error
1105
-_ACEOF
1106
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
1107
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
1108
-  ac_status=$?
1109
-  grep -v '^ *+' conftest.er1 >conftest.err
1110
-  rm -f conftest.er1
1111
-  cat conftest.err >&5
1112
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1113
-  (exit $ac_status); } >/dev/null; then
1114
-  if test -s conftest.err; then
1115
-    ac_cpp_err=$ac_c_preproc_warn_flag
1116
-  else
1117
-    ac_cpp_err=
1118
-  fi
1119
-else
1120
-  ac_cpp_err=yes
1121
-fi
1122
-if test -z "$ac_cpp_err"; then
1123
-  :
1124
-else
1125
-  echo "$as_me: failed program was:" >&5
1126
-sed 's/^/| /' conftest.$ac_ext >&5
1127
-
1128
-  # Broken: fails on valid input.
1129
-continue
1130
-fi
1131
-rm -f conftest.err conftest.$ac_ext
1132
-
1133
-  # OK, works on sane cases.  Now check whether non-existent headers
1134
-  # can be detected and how.
1135
-  cat >conftest.$ac_ext <<_ACEOF
1136
-#line $LINENO "configure"
1137
-/* confdefs.h.  */
1138
-_ACEOF
1139
-cat confdefs.h >>conftest.$ac_ext
1140
-cat >>conftest.$ac_ext <<_ACEOF
1141
-/* end confdefs.h.  */
1142
-#include <ac_nonexistent.h>
1143
-_ACEOF
1144
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
1145
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
1146
-  ac_status=$?
1147
-  grep -v '^ *+' conftest.er1 >conftest.err
1148
-  rm -f conftest.er1
1149
-  cat conftest.err >&5
1150
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1151
-  (exit $ac_status); } >/dev/null; then
1152
-  if test -s conftest.err; then
1153
-    ac_cpp_err=$ac_c_preproc_warn_flag
1154
-  else
1155
-    ac_cpp_err=
1156
-  fi
1157
-else
1158
-  ac_cpp_err=yes
1159
-fi
1160
-if test -z "$ac_cpp_err"; then
1161
-  # Broken: success on invalid input.
1162
-continue
1163
-else
1164
-  echo "$as_me: failed program was:" >&5
1165
-sed 's/^/| /' conftest.$ac_ext >&5
1166
-
1167
-  # Passes both tests.
1168
-ac_preproc_ok=:
1169
-break
1170
-fi
1171
-rm -f conftest.err conftest.$ac_ext
1172
-
1173
-done
1174
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1175
-rm -f conftest.err conftest.$ac_ext
1176
-if $ac_preproc_ok; then
1177
-  break
1178
-fi
1179
-
1180
-    done
1181
-    ac_cv_prog_CPP=$CPP
1182
-
1183
-fi
1184
-  CPP=$ac_cv_prog_CPP
1185
-else
1186
-  ac_cv_prog_CPP=$CPP
1187
-fi
1188
-echo "$as_me:$LINENO: result: $CPP" >&5
1189
-echo "${ECHO_T}$CPP" >&6
1190
-ac_preproc_ok=false
1191
-for ac_c_preproc_warn_flag in '' yes
1192
-do
1193
-  # Use a header file that comes with gcc, so configuring glibc
1194
-  # with a fresh cross-compiler works.
1195
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1196
-  # <limits.h> exists even on freestanding compilers.
1197
-  # On the NeXT, cc -E runs the code through the compiler's parser,
1198
-  # not just through cpp. "Syntax error" is here to catch this case.
1199
-  cat >conftest.$ac_ext <<_ACEOF
1200
-#line $LINENO "configure"
1201
-/* confdefs.h.  */
1202
-_ACEOF
1203
-cat confdefs.h >>conftest.$ac_ext
1204
-cat >>conftest.$ac_ext <<_ACEOF
1205
-/* end confdefs.h.  */
1206
-#ifdef __STDC__
1207
-# include <limits.h>
1208
-#else
1209
-# include <assert.h>
1210
-#endif
1211
-                     Syntax error
1212
-_ACEOF
1213
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
1214
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
1215
-  ac_status=$?
1216
-  grep -v '^ *+' conftest.er1 >conftest.err
1217
-  rm -f conftest.er1
1218
-  cat conftest.err >&5
1219
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1220
-  (exit $ac_status); } >/dev/null; then
1221
-  if test -s conftest.err; then
1222
-    ac_cpp_err=$ac_c_preproc_warn_flag
1223
-  else
1224
-    ac_cpp_err=
1225
-  fi
1226
-else
1227
-  ac_cpp_err=yes
1228
-fi
1229
-if test -z "$ac_cpp_err"; then
1230
-  :
1231
-else
1232
-  echo "$as_me: failed program was:" >&5
1233
-sed 's/^/| /' conftest.$ac_ext >&5
1234
-
1235
-  # Broken: fails on valid input.
1236
-continue
1237
-fi
1238
-rm -f conftest.err conftest.$ac_ext
1239
-
1240
-  # OK, works on sane cases.  Now check whether non-existent headers
1241
-  # can be detected and how.
1242
-  cat >conftest.$ac_ext <<_ACEOF
1243
-#line $LINENO "configure"
1244
-/* confdefs.h.  */
1245
-_ACEOF
1246
-cat confdefs.h >>conftest.$ac_ext
1247
-cat >>conftest.$ac_ext <<_ACEOF
1248
-/* end confdefs.h.  */
1249
-#include <ac_nonexistent.h>
1250
-_ACEOF
1251
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
1252
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
1253
-  ac_status=$?
1254
-  grep -v '^ *+' conftest.er1 >conftest.err
1255
-  rm -f conftest.er1
1256
-  cat conftest.err >&5
1257
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1258
-  (exit $ac_status); } >/dev/null; then
1259
-  if test -s conftest.err; then
1260
-    ac_cpp_err=$ac_c_preproc_warn_flag
1261
-  else
1262
-    ac_cpp_err=
1263
-  fi
1264
-else
1265
-  ac_cpp_err=yes
1266
-fi
1267
-if test -z "$ac_cpp_err"; then
1268
-  # Broken: success on invalid input.
1269
-continue
1270
-else
1271
-  echo "$as_me: failed program was:" >&5
1272
-sed 's/^/| /' conftest.$ac_ext >&5
1273
-
1274
-  # Passes both tests.
1275
-ac_preproc_ok=:
1276
-break
1277
-fi
1278
-rm -f conftest.err conftest.$ac_ext
1279
-
1280
-done
1281
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1282
-rm -f conftest.err conftest.$ac_ext
1283
-if $ac_preproc_ok; then
1284
-  :
1285
-else
1286
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
1287
-See \`config.log' for more details." >&5
1288
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
1289
-See \`config.log' for more details." >&2;}
1290
-   { (exit 1); exit 1; }; }
1291
-fi
1292
-
1293
-ac_ext=c
1294
-ac_cpp='$CPP $CPPFLAGS'
1295
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1296
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1297
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
1298
-
1299
-
1300
-echo "$as_me:$LINENO: checking for egrep" >&5
1301
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
1302
-if test "${ac_cv_prog_egrep+set}" = set; then
1303
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1304
-else
1305
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
1306
-    then ac_cv_prog_egrep='grep -E'
1307
-    else ac_cv_prog_egrep='egrep'
1308
-    fi
1309
-fi
1310
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
1311
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
1312
- EGREP=$ac_cv_prog_egrep
1313
-
1314
-
1315
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
1316
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
1317
-if test "${ac_cv_header_stdc+set}" = set; then
1318
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1319
-else
1320
-  cat >conftest.$ac_ext <<_ACEOF
1321
-#line $LINENO "configure"
1322
-/* confdefs.h.  */
1323
-_ACEOF
1324
-cat confdefs.h >>conftest.$ac_ext
1325
-cat >>conftest.$ac_ext <<_ACEOF
1326
-/* end confdefs.h.  */
1327
-#include <stdlib.h>
1328
-#include <stdarg.h>
1329
-#include <string.h>
1330
-#include <float.h>
1331
-
1332
-int
1333
-main ()
1334
-{
1335
-
1336
-  ;
1337
-  return 0;
1338
-}
1339
-_ACEOF
1340
-rm -f conftest.$ac_objext
1341
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1342
-  (eval $ac_compile) 2>&5
1343
-  ac_status=$?
1344
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1345
-  (exit $ac_status); } &&
1346
-         { ac_try='test -s conftest.$ac_objext'
1347
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1348
-  (eval $ac_try) 2>&5
1349
-  ac_status=$?
1350
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1351
-  (exit $ac_status); }; }; then
1352
-  ac_cv_header_stdc=yes
1353
-else
1354
-  echo "$as_me: failed program was:" >&5
1355
-sed 's/^/| /' conftest.$ac_ext >&5
1356
-
1357
-ac_cv_header_stdc=no
1358
-fi
1359
-rm -f conftest.$ac_objext conftest.$ac_ext
1360
-
1361
-if test $ac_cv_header_stdc = yes; then
1362
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
1363
-  cat >conftest.$ac_ext <<_ACEOF
1364
-#line $LINENO "configure"
1365
-/* confdefs.h.  */
1366
-_ACEOF
1367
-cat confdefs.h >>conftest.$ac_ext
1368
-cat >>conftest.$ac_ext <<_ACEOF
1369
-/* end confdefs.h.  */
1370
-#include <string.h>
1371
-
1372
-_ACEOF
1373
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1374
-  $EGREP "memchr" >/dev/null 2>&1; then
1375
-  :
1376
-else
1377
-  ac_cv_header_stdc=no
1378
-fi
1379
-rm -f conftest*
1380
-
1381
-fi
1382
-
1383
-if test $ac_cv_header_stdc = yes; then
1384
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
1385
-  cat >conftest.$ac_ext <<_ACEOF
1386
-#line $LINENO "configure"
1387
-/* confdefs.h.  */
1388
-_ACEOF
1389
-cat confdefs.h >>conftest.$ac_ext
1390
-cat >>conftest.$ac_ext <<_ACEOF
1391
-/* end confdefs.h.  */
1392
-#include <stdlib.h>
1393
-
1394
-_ACEOF
1395
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1396
-  $EGREP "free" >/dev/null 2>&1; then
1397
-  :
1398
-else
1399
-  ac_cv_header_stdc=no
1400
-fi
1401
-rm -f conftest*
1402
-
1403
-fi
1404
-
1405
-if test $ac_cv_header_stdc = yes; then
1406
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
1407
-  if test "$cross_compiling" = yes; then
1408
-  :
1409
-else
1410
-  cat >conftest.$ac_ext <<_ACEOF
1411
-#line $LINENO "configure"
1412
-/* confdefs.h.  */
1413
-_ACEOF
1414
-cat confdefs.h >>conftest.$ac_ext
1415
-cat >>conftest.$ac_ext <<_ACEOF
1416
-/* end confdefs.h.  */
1417
-#include <ctype.h>
1418
-#if ((' ' & 0x0FF) == 0x020)
1419
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
1420
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
1421
-#else
1422
-# define ISLOWER(c) \
1423
-                   (('a' <= (c) && (c) <= 'i') \
1424
-                     || ('j' <= (c) && (c) <= 'r') \
1425
-                     || ('s' <= (c) && (c) <= 'z'))
1426
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
1427
-#endif
1428
-
1429
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
1430
-int
1431
-main ()
1432
-{
1433
-  int i;
1434
-  for (i = 0; i < 256; i++)
1435
-    if (XOR (islower (i), ISLOWER (i))
1436
-        || toupper (i) != TOUPPER (i))
1437
-      exit(2);
1438
-  exit (0);
1439
-}
1440
-_ACEOF
1441
-rm -f conftest$ac_exeext
1442
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
1443
-  (eval $ac_link) 2>&5
1444
-  ac_status=$?
1445
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1446
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
1447
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1448
-  (eval $ac_try) 2>&5
1449
-  ac_status=$?
1450
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1451
-  (exit $ac_status); }; }; then
1452
-  :
1453
-else
1454
-  echo "$as_me: program exited with status $ac_status" >&5
1455
-echo "$as_me: failed program was:" >&5
1456
-sed 's/^/| /' conftest.$ac_ext >&5
1457
-
1458
-( exit $ac_status )
1459
-ac_cv_header_stdc=no
1460
-fi
1461
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
1462
-fi
1463
-fi
1464
-fi
1465
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
1466
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
1467
-if test $ac_cv_header_stdc = yes; then
1468
-
1469
-cat >>confdefs.h <<\_ACEOF
1470
-#define STDC_HEADERS 1
1471
-_ACEOF
1472
-
1473
-fi
1474
-
1475
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
1476
-
1477
-
1478
-
1479
-
1480
-
1481
-
1482
-
1483
-
1484
-
1485
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
1486
-                  inttypes.h stdint.h unistd.h
1487
-do
1488
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
1489
-echo "$as_me:$LINENO: checking for $ac_header" >&5
1490
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
1491
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
1492
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1493
-else
1494
-  cat >conftest.$ac_ext <<_ACEOF
1495
-#line $LINENO "configure"
1496
-/* confdefs.h.  */
1497
-_ACEOF
1498
-cat confdefs.h >>conftest.$ac_ext
1499
-cat >>conftest.$ac_ext <<_ACEOF
1500
-/* end confdefs.h.  */
1501
-$ac_includes_default
1502
-
1503
-#include <$ac_header>
1504
-_ACEOF
1505
-rm -f conftest.$ac_objext
1506
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1507
-  (eval $ac_compile) 2>&5
1508
-  ac_status=$?
1509
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1510
-  (exit $ac_status); } &&
1511
-         { ac_try='test -s conftest.$ac_objext'
1512
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1513
-  (eval $ac_try) 2>&5
1514
-  ac_status=$?
1515
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1516
-  (exit $ac_status); }; }; then
1517
-  eval "$as_ac_Header=yes"
1518
-else
1519
-  echo "$as_me: failed program was:" >&5
1520
-sed 's/^/| /' conftest.$ac_ext >&5
1521
-
1522
-eval "$as_ac_Header=no"
1523
-fi
1524
-rm -f conftest.$ac_objext conftest.$ac_ext
1525
-fi
1526
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
1527
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
1528
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
1529
-  cat >>confdefs.h <<_ACEOF
1530
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
1531
-_ACEOF
1532
-
1533
-fi
1534
-
1535
-done
1536
-
1537
-
1538
-
1539
-for ac_header in emmintrin.h
1540
-do
1541
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
1542
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
1543
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
1544
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
1545
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
1546
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1547
-fi
1548
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
1549
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
1550
-else
1551
-  # Is the header compilable?
1552
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
1553
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
1554
-cat >conftest.$ac_ext <<_ACEOF
1555
-#line $LINENO "configure"
1556
-/* confdefs.h.  */
1557
-_ACEOF
1558
-cat confdefs.h >>conftest.$ac_ext
1559
-cat >>conftest.$ac_ext <<_ACEOF
1560
-/* end confdefs.h.  */
1561
-$ac_includes_default
1562
-#include <$ac_header>
1563
-_ACEOF
1564
-rm -f conftest.$ac_objext
1565
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1566
-  (eval $ac_compile) 2>&5
1567
-  ac_status=$?
1568
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1569
-  (exit $ac_status); } &&
1570
-         { ac_try='test -s conftest.$ac_objext'
1571
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1572
-  (eval $ac_try) 2>&5
1573
-  ac_status=$?
1574
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1575
-  (exit $ac_status); }; }; then
1576
-  ac_header_compiler=yes
1577
-else
1578
-  echo "$as_me: failed program was:" >&5
1579
-sed 's/^/| /' conftest.$ac_ext >&5
1580
-
1581
-ac_header_compiler=no
1582
-fi
1583
-rm -f conftest.$ac_objext conftest.$ac_ext
1584
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1585
-echo "${ECHO_T}$ac_header_compiler" >&6
1586
-
1587
-# Is the header present?
1588
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
1589
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
1590
-cat >conftest.$ac_ext <<_ACEOF
1591
-#line $LINENO "configure"
1592
-/* confdefs.h.  */
1593
-_ACEOF
1594
-cat confdefs.h >>conftest.$ac_ext
1595
-cat >>conftest.$ac_ext <<_ACEOF
1596
-/* end confdefs.h.  */
1597
-#include <$ac_header>
1598
-_ACEOF
1599
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
1600
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
1601
-  ac_status=$?
1602
-  grep -v '^ *+' conftest.er1 >conftest.err
1603
-  rm -f conftest.er1
1604
-  cat conftest.err >&5
1605
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1606
-  (exit $ac_status); } >/dev/null; then
1607
-  if test -s conftest.err; then
1608
-    ac_cpp_err=$ac_c_preproc_warn_flag
1609
-  else
1610
-    ac_cpp_err=
1611
-  fi
1612
-else
1613
-  ac_cpp_err=yes
1614
-fi
1615
-if test -z "$ac_cpp_err"; then
1616
-  ac_header_preproc=yes
1617
-else
1618
-  echo "$as_me: failed program was:" >&5
1619
-sed 's/^/| /' conftest.$ac_ext >&5
1620
-
1621
-  ac_header_preproc=no
1622
-fi
1623
-rm -f conftest.err conftest.$ac_ext
1624
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1625
-echo "${ECHO_T}$ac_header_preproc" >&6
1626
-
1627
-# So?  What about this header?
1628
-case $ac_header_compiler:$ac_header_preproc in
1629
-  yes:no )
1630
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
1631
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
1632
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
1633
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
1634
-    (
1635
-      cat <<\_ASBOX
1636
-## ------------------------------------ ##
1637
-## Report this to bug-autoconf@gnu.org. ##
1638
-## ------------------------------------ ##
1639
-_ASBOX
1640
-    ) |
1641
-      sed "s/^/$as_me: WARNING:     /" >&2
1642
-    ;;
1643
-  no:yes )
1644
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
1645
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
1646
-    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
1647
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
1648
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
1649
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
1650
-    (
1651
-      cat <<\_ASBOX
1652
-## ------------------------------------ ##
1653
-## Report this to bug-autoconf@gnu.org. ##
1654
-## ------------------------------------ ##
1655
-_ASBOX
1656
-    ) |
1657
-      sed "s/^/$as_me: WARNING:     /" >&2
1658
-    ;;
1659
-esac
1660
-echo "$as_me:$LINENO: checking for $ac_header" >&5
1661
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
1662
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
1663
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1664
-else
1665
-  eval "$as_ac_Header=$ac_header_preproc"
1666
-fi
1667
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
1668
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
1669
-
1670
-fi
1671
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
1672
-  cat >>confdefs.h <<_ACEOF
1673
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
1674
-_ACEOF
1675
- CXXFLAGS="$CXXFLAGS -msse2"
1676
-fi
1677
-
1678
-done
1679
-
1680
-fi
1681
-
1682
-test "z$CFLAGS" = "z" && CFLAGS="-O2 -fno-strict-aliasing"
1683
-
1684
-# Checks for programs.
1685
-ac_ext=cc
1686
-ac_cpp='$CXXCPP $CPPFLAGS'
1687
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1688
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1689
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1690
-if test -n "$ac_tool_prefix"; then
1691
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
1692
-  do
1693
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1694
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1695
-echo "$as_me:$LINENO: checking for $ac_word" >&5
1696
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1697
-if test "${ac_cv_prog_CXX+set}" = set; then
1698
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1699
-else
1700
-  if test -n "$CXX"; then
1701
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
1702
-else
1703
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1704
-for as_dir in $PATH
1705
-do
1706
-  IFS=$as_save_IFS
1707
-  test -z "$as_dir" && as_dir=.
1708
-  for ac_exec_ext in '' $ac_executable_extensions; do
1709
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1710
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
1711
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1712
-    break 2
1713
-  fi
1714
-done
1715
-done
1716
-
1717
-fi
1718
-fi
1719
-CXX=$ac_cv_prog_CXX
1720
-if test -n "$CXX"; then
1721
-  echo "$as_me:$LINENO: result: $CXX" >&5
1722
-echo "${ECHO_T}$CXX" >&6
1723
-else
1724
-  echo "$as_me:$LINENO: result: no" >&5
1725
-echo "${ECHO_T}no" >&6
1726
-fi
1727
-
1728
-    test -n "$CXX" && break
1729
-  done
1730
-fi
1731
-if test -z "$CXX"; then
1732
-  ac_ct_CXX=$CXX
1733
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
1734
-do
1735
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
1736
-set dummy $ac_prog; ac_word=$2
1737
-echo "$as_me:$LINENO: checking for $ac_word" >&5
1738
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1739
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
1740
-  echo $ECHO_N "(cached) $ECHO_C" >&6
1741
-else
1742
-  if test -n "$ac_ct_CXX"; then
1743
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
1744
-else
1745
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1746
-for as_dir in $PATH
1747
-do
1748
-  IFS=$as_save_IFS
1749
-  test -z "$as_dir" && as_dir=.
1750
-  for ac_exec_ext in '' $ac_executable_extensions; do
1751
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1752
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
1753
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1754
-    break 2
1755
-  fi
1756
-done
1757
-done
1758
-
1759
-fi
1760
-fi
1761
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
1762
-if test -n "$ac_ct_CXX"; then
1763
-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
1764
-echo "${ECHO_T}$ac_ct_CXX" >&6
1765
+          export ac_cv_exeext
1766
+          break;;
1767
+    * ) break;;
1768
+  esac
1769
+done
1770
 else
1771
-  echo "$as_me:$LINENO: result: no" >&5
1772
-echo "${ECHO_T}no" >&6
1773
+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
1774
+See \`config.log' for more details." >&5
1775
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
1776
+See \`config.log' for more details." >&2;}
1777
+   { (exit 1); exit 1; }; }
1778
 fi
1779
 
1780
-  test -n "$ac_ct_CXX" && break
1781
-done
1782
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
1783
+rm -f conftest$ac_cv_exeext
1784
+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
1785
+echo "${ECHO_T}$ac_cv_exeext" >&6
1786
 
1787
-  CXX=$ac_ct_CXX
1788
-fi
1789
+rm -f conftest.$ac_ext
1790
+EXEEXT=$ac_cv_exeext
1791
+ac_exeext=$EXEEXT
1792
+echo "$as_me:$LINENO: checking for suffix of object files" >&5
1793
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
1794
+if test "${ac_cv_objext+set}" = set; then
1795
+  echo $ECHO_N "(cached) $ECHO_C" >&6
1796
+else
1797
+  cat >conftest.$ac_ext <<_ACEOF
1798
+#line $LINENO "configure"
1799
+/* confdefs.h.  */
1800
+_ACEOF
1801
+cat confdefs.h >>conftest.$ac_ext
1802
+cat >>conftest.$ac_ext <<_ACEOF
1803
+/* end confdefs.h.  */
1804
 
1805
+int
1806
+main ()
1807
+{
1808
 
1809
-# Provide some information about the compiler.
1810
-echo "$as_me:$LINENO:" \
1811
-     "checking for C++ compiler version" >&5
1812
-ac_compiler=`set X $ac_compile; echo $2`
1813
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
1814
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
1815
-  ac_status=$?
1816
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1817
-  (exit $ac_status); }
1818
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
1819
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
1820
-  ac_status=$?
1821
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1822
-  (exit $ac_status); }
1823
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
1824
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
1825
+  ;
1826
+  return 0;
1827
+}
1828
+_ACEOF
1829
+rm -f conftest.o conftest.obj
1830
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1831
+  (eval $ac_compile) 2>&5
1832
   ac_status=$?
1833
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
1834
-  (exit $ac_status); }
1835
+  (exit $ac_status); }; then
1836
+  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
1837
+  case $ac_file in
1838
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
1839
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
1840
+       break;;
1841
+  esac
1842
+done
1843
+else
1844
+  echo "$as_me: failed program was:" >&5
1845
+sed 's/^/| /' conftest.$ac_ext >&5
1846
+
1847
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
1848
+See \`config.log' for more details." >&5
1849
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
1850
+See \`config.log' for more details." >&2;}
1851
+   { (exit 1); exit 1; }; }
1852
+fi
1853
 
1854
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
1855
+fi
1856
+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
1857
+echo "${ECHO_T}$ac_cv_objext" >&6
1858
+OBJEXT=$ac_cv_objext
1859
+ac_objext=$OBJEXT
1860
 echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
1861
 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
1862
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
1863
@@ -3702,6 +2247,71 @@
1864
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1865
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1866
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
1867
+DEPDIR="${am__leading_dot}deps"
1868
+
1869
+          ac_config_commands="$ac_config_commands depfiles"
1870
+
1871
+
1872
+am_make=${MAKE-make}
1873
+cat > confinc << 'END'
1874
+am__doit:
1875
+	@echo done
1876
+.PHONY: am__doit
1877
+END
1878
+# If we don't find an include directive, just comment out the code.
1879
+echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
1880
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
1881
+am__include="#"
1882
+am__quote=
1883
+_am_result=none
1884
+# First try GNU make style include.
1885
+echo "include confinc" > confmf
1886
+# We grep out `Entering directory' and `Leaving directory'
1887
+# messages which can occur if `w' ends up in MAKEFLAGS.
1888
+# In particular we don't look at `^make:' because GNU make might
1889
+# be invoked under some other name (usually "gmake"), in which
1890
+# case it prints its new name instead of `make'.
1891
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
1892
+   am__include=include
1893
+   am__quote=
1894
+   _am_result=GNU
1895
+fi
1896
+# Now try BSD make style include.
1897
+if test "$am__include" = "#"; then
1898
+   echo '.include "confinc"' > confmf
1899
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
1900
+      am__include=.include
1901
+      am__quote="\""
1902
+      _am_result=BSD
1903
+   fi
1904
+fi
1905
+
1906
+
1907
+echo "$as_me:$LINENO: result: $_am_result" >&5
1908
+echo "${ECHO_T}$_am_result" >&6
1909
+rm -f confinc confmf
1910
+
1911
+# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
1912
+if test "${enable_dependency_tracking+set}" = set; then
1913
+  enableval="$enable_dependency_tracking"
1914
+
1915
+fi;
1916
+if test "x$enable_dependency_tracking" != xno; then
1917
+  am_depcomp="$ac_aux_dir/depcomp"
1918
+  AMDEPBACKSLASH='\'
1919
+fi
1920
+
1921
+
1922
+if test "x$enable_dependency_tracking" != xno; then
1923
+  AMDEP_TRUE=
1924
+  AMDEP_FALSE='#'
1925
+else
1926
+  AMDEP_TRUE='#'
1927
+  AMDEP_FALSE=
1928
+fi
1929
+
1930
+
1931
+
1932
 
1933
 depcc="$CXX"  am_compiler_list=
1934
 
1935
@@ -6943,6 +5553,21 @@
1936
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1937
 
1938
 
1939
+echo "$as_me:$LINENO: checking for egrep" >&5
1940
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
1941
+if test "${ac_cv_prog_egrep+set}" = set; then
1942
+  echo $ECHO_N "(cached) $ECHO_C" >&6
1943
+else
1944
+  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
1945
+    then ac_cv_prog_egrep='grep -E'
1946
+    else ac_cv_prog_egrep='egrep'
1947
+    fi
1948
+fi
1949
+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
1950
+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
1951
+ EGREP=$ac_cv_prog_egrep
1952
+
1953
+
1954
 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
1955
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
1956
 if test "${ac_cv_header_stdc+set}" = set; then
1957
@@ -7103,6 +5728,69 @@
1958
 
1959
 fi
1960
 
1961
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
1962
+
1963
+
1964
+
1965
+
1966
+
1967
+
1968
+
1969
+
1970
+
1971
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
1972
+                  inttypes.h stdint.h unistd.h
1973
+do
1974
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
1975
+echo "$as_me:$LINENO: checking for $ac_header" >&5
1976
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
1977
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
1978
+  echo $ECHO_N "(cached) $ECHO_C" >&6
1979
+else
1980
+  cat >conftest.$ac_ext <<_ACEOF
1981
+#line $LINENO "configure"
1982
+/* confdefs.h.  */
1983
+_ACEOF
1984
+cat confdefs.h >>conftest.$ac_ext
1985
+cat >>conftest.$ac_ext <<_ACEOF
1986
+/* end confdefs.h.  */
1987
+$ac_includes_default
1988
+
1989
+#include <$ac_header>
1990
+_ACEOF
1991
+rm -f conftest.$ac_objext
1992
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1993
+  (eval $ac_compile) 2>&5
1994
+  ac_status=$?
1995
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
1996
+  (exit $ac_status); } &&
1997
+         { ac_try='test -s conftest.$ac_objext'
1998
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1999
+  (eval $ac_try) 2>&5
2000
+  ac_status=$?
2001
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
2002
+  (exit $ac_status); }; }; then
2003
+  eval "$as_ac_Header=yes"
2004
+else
2005
+  echo "$as_me: failed program was:" >&5
2006
+sed 's/^/| /' conftest.$ac_ext >&5
2007
+
2008
+eval "$as_ac_Header=no"
2009
+fi
2010
+rm -f conftest.$ac_objext conftest.$ac_ext
2011
+fi
2012
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
2013
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
2014
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
2015
+  cat >>confdefs.h <<_ACEOF
2016
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
2017
+_ACEOF
2018
+
2019
+fi
2020
+
2021
+done
2022
+
2023
+
2024
 
2025
 
2026
 for ac_header in unistd.h errno.h
2027
@@ -8306,6 +6994,7 @@
2028
 # We don't use threads, but some Boost libraries make locking calls
2029
 # anyway.  So we need to ensure that these symbols are available.  But
2030
 # It's okay if they're just stubs.
2031
+
2032
 echo "$as_me:$LINENO: checking for pthread_mutex_lock" >&5
2033
 echo $ECHO_N "checking for pthread_mutex_lock... $ECHO_C" >&6
2034
 if test "${ac_cv_func_pthread_mutex_lock+set}" = set; then
2035
@@ -11429,13 +10118,6 @@
2036
 Usually this means the macro was only invoked conditionally." >&2;}
2037
    { (exit 1); exit 1; }; }
2038
 fi
2039
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
2040
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
2041
-Usually this means the macro was only invoked conditionally." >&5
2042
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
2043
-Usually this means the macro was only invoked conditionally." >&2;}
2044
-   { (exit 1); exit 1; }; }
2045
-fi
2046
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
2047
   { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
2048
 Usually this means the macro was only invoked conditionally." >&5
2049
@@ -12072,11 +10754,11 @@
2050
 s,@AWK@,$AWK,;t t
2051
 s,@SET_MAKE@,$SET_MAKE,;t t
2052
 s,@am__leading_dot@,$am__leading_dot,;t t
2053
-s,@CC@,$CC,;t t
2054
-s,@CFLAGS@,$CFLAGS,;t t
2055
+s,@CXX@,$CXX,;t t
2056
+s,@CXXFLAGS@,$CXXFLAGS,;t t
2057
 s,@LDFLAGS@,$LDFLAGS,;t t
2058
 s,@CPPFLAGS@,$CPPFLAGS,;t t
2059
-s,@ac_ct_CC@,$ac_ct_CC,;t t
2060
+s,@ac_ct_CXX@,$ac_ct_CXX,;t t
2061
 s,@EXEEXT@,$EXEEXT,;t t
2062
 s,@OBJEXT@,$OBJEXT,;t t
2063
 s,@DEPDIR@,$DEPDIR,;t t
2064
@@ -12085,17 +10767,15 @@
2065
 s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
2066
 s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
2067
 s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
2068
-s,@CCDEPMODE@,$CCDEPMODE,;t t
2069
-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
2070
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
2071
-s,@CPP@,$CPP,;t t
2072
-s,@EGREP@,$EGREP,;t t
2073
-s,@CXX@,$CXX,;t t
2074
-s,@CXXFLAGS@,$CXXFLAGS,;t t
2075
-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
2076
 s,@CXXDEPMODE@,$CXXDEPMODE,;t t
2077
 s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
2078
 s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
2079
+s,@CC@,$CC,;t t
2080
+s,@CFLAGS@,$CFLAGS,;t t
2081
+s,@ac_ct_CC@,$ac_ct_CC,;t t
2082
+s,@CCDEPMODE@,$CCDEPMODE,;t t
2083
+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
2084
+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
2085
 s,@RANLIB@,$RANLIB,;t t
2086
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
2087
 s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
2088
@@ -12119,6 +10799,7 @@
2089
 s,@LTLIBINTL@,$LTLIBINTL,;t t
2090
 s,@POSUB@,$POSUB,;t t
2091
 s,@CXXCPP@,$CXXCPP,;t t
2092
+s,@EGREP@,$EGREP,;t t
2093
 s,@acx_pthread_config@,$acx_pthread_config,;t t
2094
 s,@PTHREAD_CC@,$PTHREAD_CC,;t t
2095
 s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
(-)/usr/ports/local/monotone-0.16/files/patch-monotone.cc (-6 / +5 lines)
Lines 1-14 Link Here
1
--- monotone.cc.orig	Wed Jan  7 13:11:47 2004
1
--- monotone.cc.orig	Fri Dec 31 03:16:53 2004
2
+++ monotone.cc	Sun Mar 21 22:49:59 2004
2
+++ monotone.cc	Wed Jan 26 22:20:17 2005
3
@@ -129,8 +129,11 @@
3
@@ -140,8 +140,10 @@
4
 
4
 
5
   setlocale(LC_CTYPE, "");
5
   setlocale(LC_CTYPE, "");
6
   setlocale(LC_MESSAGES, "");
6
   setlocale(LC_MESSAGES, "");
7
+
8
+#ifdef ENABLE_NLS
7
+#ifdef ENABLE_NLS
9
   bindtextdomain(PACKAGE, LOCALEDIR);
8
   bindtextdomain(PACKAGE, LOCALEDIR);
10
   textdomain(PACKAGE);
9
   textdomain(PACKAGE);
11
+#endif
10
+#endif
12
 
11
 
13
   // decode all argv values into a UTF-8 array
12
   L(F("set locale: LC_CTYPE=%s, LC_MESSAGES=%s\n")
14
 
13
     % (setlocale(LC_CTYPE, NULL) == NULL ? "n/a" : setlocale(LC_CTYPE, NULL))
(-)/usr/ports/local/monotone-0.16/files/patch-sanity.hh (-4 / +5 lines)
Lines 1-6 Link Here
1
--- sanity.hh.orig	Wed Jan  7 13:11:48 2004
1
--- sanity.hh.orig	Fri Dec 31 03:16:54 2004
2
+++ sanity.hh	Sun Mar 21 22:49:59 2004
2
+++ sanity.hh	Wed Jan 26 22:20:17 2005
3
@@ -58,7 +58,11 @@
3
@@ -64,7 +64,12 @@
4
 extern sanity global_sanity;
4
 extern sanity global_sanity;
5
 
5
 
6
 // F is for when you want to build a boost formatter
6
 // F is for when you want to build a boost formatter
Lines 9-14 Link Here
9
+#else
9
+#else
10
+#define F(str) boost::format((str))
10
+#define F(str) boost::format((str))
11
+#endif
11
+#endif
12
+
12
 
13
 
13
 // L is for logging, you can log all you want
14
 // L is for logging, you can log all you want
14
 #define L(fmt) global_sanity.log(fmt)
15
 #define L(fmt) global_sanity.log(fmt, __FILE__, __LINE__)

Return to bug 76738