GCC_INCLUDE:=${subst //,/,-I$(gcc_libdir)/include}
endif
-COMPILE_CXX=$(CXX) $c -nostdinc++ -nostdinc $(ALL_CXXFLAGS) $(GCC_INCLUDE) \
+nostdinc:=${shell [ -d "$$srcdir/w32api" ] && echo "-nostdinc -nostdinc++"]}
+
+COMPILE_CXX=$(CXX) $c $(nostdinc) $(ALL_CXXFLAGS) $(GCC_INCLUDE) \
-fno-rtti -fno-exceptions
-COMPILE_CC=$(CC) $c -nostdinc $(ALL_CFLAGS) $(GCC_INCLUDE)
+COMPILE_CC=$(CC) $c $(nostdinc) $(ALL_CFLAGS) $(GCC_INCLUDE)
vpath %.a $(cygwin_build):$(w32api_lib):$(newlib_build)/libc:$(newlib_build)/libm
CXXFLAGS='$(CFLAGS)'
-SUBDIRS='cygwin'
+SUBDIRS='cygwin w32api'
test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS"
-test -d $srcdir/w32api && SUBDIRS="w32api $SUBDIRS"
case "$with_cross_host" in
""|*cygwin*)
- test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
- test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
+ # test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
+ # test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
# test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth"
SUBDIRS="$SUBDIRS utils doc"
;;
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:937: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:936: 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
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section. Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
-t quote
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output. A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
+cat > conftest.defs <<\EOF
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
+s%\[%\\&%g
+s%\]%\\&%g
+s%\$%$$%g
+EOF
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+rm -f conftest.defs
# Without the "./", some shells look in PATH for config.status.
LIB_AC_PROG_CC
LIB_AC_PROG_CXX
-SUBDIRS='cygwin'
+SUBDIRS='cygwin w32api'
test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS"
-test -d $srcdir/w32api && SUBDIRS="w32api $SUBDIRS"
case "$with_cross_host" in
""|*cygwin*)
- test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
- test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
+ # test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
+ # test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
# test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth"
SUBDIRS="$SUBDIRS utils doc"
;;