Author: borisk
Date: Mon Nov 23 08:17:49 2009
New Revision: 883272
URL: http://svn.apache.org/viewvc?rev=883272&view=rev
Log:
Redo libcurl check to avoid liking to the library when we don't use it. Also
update the make pretty-printing code.
Modified:
xerces/c/trunk/m4/xerces_curl_prefix.m4
xerces/c/trunk/samples/Makefile.am
xerces/c/trunk/src/Makefile.am
xerces/c/trunk/tests/Makefile.am
Modified: xerces/c/trunk/m4/xerces_curl_prefix.m4
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/m4/xerces_curl_prefix.m4?rev=883272&r1=883271&r2=883272&view=diff
==============================================================================
--- xerces/c/trunk/m4/xerces_curl_prefix.m4 (original)
+++ xerces/c/trunk/m4/xerces_curl_prefix.m4 Mon Nov 23 08:17:49 2009
@@ -59,12 +59,35 @@
CPPFLAGS=$orig_cppflags
if test x"$xerces_cv_curl_present" != x"no"; then
+
# Check that the library can be linked.
#
- orig_ldflags=$LDFLAGS
+ AC_MSG_CHECKING([for curl_multi_init in -lcurl])
+
+ orig_ldflags=$LDFLAGS
LDFLAGS="$curl_libs $LDFLAGS"
- AC_CHECK_LIB([curl], [curl_multi_init], [],
[xerces_cv_curl_present=no])
+
+ AC_LINK_IFELSE(
+ AC_LANG_SOURCE[[
+ #include <curl/curl.h>
+ #include <curl/multi.h>
+ #include <curl/easy.h>
+
+ int main ()
+ {
+ curl_multi_init();
+ return 0;
+ }
+ ]],
+ [], [xerces_cv_curl_present=no])
+
LDFLAGS=$orig_ldflags
+
+ if test x"$xerces_cv_curl_present" != x"no"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
fi
fi
])
Modified: xerces/c/trunk/samples/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/samples/Makefile.am?rev=883272&r1=883271&r2=883272&view=diff
==============================================================================
--- xerces/c/trunk/samples/Makefile.am (original)
+++ xerces/c/trunk/samples/Makefile.am Mon Nov 23 08:17:49 2009
@@ -114,11 +114,11 @@
src/StdInParse/StdInParse.hpp \
src/StdInParse/StdInParseHandlers.cpp \
src/StdInParse/StdInParseHandlers.hpp
-
+
sampleprogs += XInclude
XInclude_SOURCES = src/XInclude/XInclude.cpp \
src/XInclude/XInclude.hpp
-
+
#
# Override generated rules to provide prettier make rules
#
@@ -129,7 +129,7 @@
.cpp.o:
@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c
-o $@ $<; \
-...@am__fastdepcxx_true@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else
rm -f "$$depbase.Tpo"; exit 1; fi
+...@am__fastdepcxx_true@ then $(am__mv) "$$depbase.Tpo" "$$depbase.Po";
else rm -f "$$depbase.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
@@ -137,7 +137,7 @@
.cpp.obj:
@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c
-o $@ `$(CYGPATH_W) '$<'`; \
-...@am__fastdepcxx_true@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else
rm -f "$$depbase.Tpo"; exit 1; fi
+...@am__fastdepcxx_true@ then $(am__mv) "$$depbase.Tpo" "$$depbase.Po";
else rm -f "$$depbase.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
@@ -145,7 +145,7 @@
.cpp.lo:
@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo"
-c -o $@ $<; \
-...@am__fastdepcxx_true@ then mv -f "$$depbase.Tpo" "$$depbase.Plo";
else rm -f "$$depbase.Tpo"; exit 1; fi
+...@am__fastdepcxx_true@ then $(am__mv) "$$depbase.Tpo" "$$depbase.Plo";
else rm -f "$$depbase.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<' object='$@' libtool=yes
@AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
Modified: xerces/c/trunk/src/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/Makefile.am?rev=883272&r1=883271&r2=883272&view=diff
==============================================================================
--- xerces/c/trunk/src/Makefile.am (original)
+++ xerces/c/trunk/src/Makefile.am Mon Nov 23 08:17:49 2009
@@ -1123,17 +1123,17 @@
if XERCES_PRETTY_MAKE
.c.lo:
-...@am__fastdepcxx_true@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
-...@am__fastdepcxx_true@ if $(LTCOMPILE) -MT $@ -MD -MP -MF
"$$depbase.Tpo" -c -o $@ $<; \
-...@am__fastdepcxx_true@ then mv -f "$$depbase.Tpo" "$$depbase.Plo";
else rm -f "$$depbase.Tpo"; exit 1; fi
+...@am__fastdepcc_true@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
+...@am__fastdepcc_true@ if $(LTCOMPILE) -MT $@ -MD -MP -MF
"$$depbase.Tpo" -c -o $@ $<; \
+...@am__fastdepcc_true@ then $(am__mv) "$$depbase.Tpo" "$$depbase.Plo";
else rm -f "$$depbase.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<' object='$@' libtool=yes
@AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-...@am__fastdepcxx_false@ $(LTCOMPILE) -c -o $@ $<
+...@am__fastdepcc_false@ $(LTCOMPILE) -c -o $@ $<
.cpp.lo:
@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo"
-c -o $@ $<; \
-...@am__fastdepcxx_true@ then mv -f "$$depbase.Tpo" "$$depbase.Plo";
else rm -f "$$depbase.Tpo"; exit 1; fi
+...@am__fastdepcxx_true@ then $(am__mv) "$$depbase.Tpo" "$$depbase.Plo";
else rm -f "$$depbase.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<' object='$@' libtool=yes
@AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
Modified: xerces/c/trunk/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/tests/Makefile.am?rev=883272&r1=883271&r2=883272&view=diff
==============================================================================
--- xerces/c/trunk/tests/Makefile.am (original)
+++ xerces/c/trunk/tests/Makefile.am Mon Nov 23 08:17:49 2009
@@ -134,7 +134,7 @@
.cpp.o:
@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c
-o $@ $<; \
-...@am__fastdepcxx_true@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else
rm -f "$$depbase.Tpo"; exit 1; fi
+...@am__fastdepcxx_true@ then $(am__mv) "$$depbase.Tpo" "$$depbase.Po";
else rm -f "$$depbase.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
@@ -142,7 +142,7 @@
.cpp.obj:
@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c
-o $@ `$(CYGPATH_W) '$<'`; \
-...@am__fastdepcxx_true@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else
rm -f "$$depbase.Tpo"; exit 1; fi
+...@am__fastdepcxx_true@ then $(am__mv) "$$depbase.Tpo" "$$depbase.Po";
else rm -f "$$depbase.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
@@ -150,7 +150,7 @@
.cpp.lo:
@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo"
-c -o $@ $<; \
-...@am__fastdepcxx_true@ then mv -f "$$depbase.Tpo" "$$depbase.Plo";
else rm -f "$$depbase.Tpo"; exit 1; fi
+...@am__fastdepcxx_true@ then $(am__mv) "$$depbase.Tpo" "$$depbase.Plo";
else rm -f "$$depbase.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<' object='$@' libtool=yes
@AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
