debugging autoconf

usqcd-software · Aug 20, 2014 · c4b671e · c4b671e
1 parent ae6d8bf
commit c4b671e
Show file tree

Hide file tree

Showing 17 changed files with 46 additions and 46 deletions.
diff --git a/acinclude.m4 b/acinclude.m4
@@ -258,10 +258,10 @@ dnl - set the parallel compiler environment
       [pac_hdf5_working=yes],
       [pac_hdf5_working=no]
     )
-dnl    CFLAGS="$pac_saved_CFLAGS"
-dnl    CXXFLAGS="$pac_saved_CXXFLAGS"
-dnl    LDFLAGS="$pac_saved_LDFLAGS"
-dnl    LIBS="$pac_saved_LIBS"
+    CFLAGS="$pac_saved_CFLAGS"
+    CXXFLAGS="$pac_saved_CXXFLAGS"
+    LDFLAGS="$pac_saved_LDFLAGS"
+    LIBS="$pac_saved_LIBS"
     AC_LANG_RESTORE
     if test "X${pac_hdf5_working}X" = "XyesX" ; then
        ifelse([$6],,:,[$6])

diff --git a/configure.ac b/configure.ac
@@ -435,7 +435,7 @@ if test "X${with_libxml2}X" = "XnoX" ; then
   AC_MSG_NOTICE([Disabling Libxml])
   AC_SUBST(LIBXML2_CXXFLAGS, "")
   AC_SUBST(LIBXML2_LIBS,"")
-  AC_DEFINE(QDP_NO_LIBXML2, [1], [ Dont use LIBXML2 ])
+
 else
 
   if test "X${LIBXML2_HOME}X" = "XX" ; then
@@ -453,6 +453,7 @@ else
   AC_MSG_NOTICE([libxml2 compile flags: ${LIBXML2_CXXFLAGS}])
   AC_SUBST(LIBXML2_LIBS,     "`${LIBXML2_CONFIG} --libs`")
   AC_MSG_NOTICE([libxml2 libraries flags: ${LIBXML2_LIBS}])
+  AC_DEFINE_UNQUOTED(QDP_USE_LIBXML2, [1], [Enable LIBXML2 support])
 
   dnl This function is defined in acinclude.m4
   dnl it tries to try to compile the program 
@@ -498,7 +499,6 @@ if test "X${ac_build_hdf5}X" = "XnoX"; then
   AC_SUBST(HDF5_CFLAGS, "")
   AC_SUBST(HDF5_CXXFLAGS, "")
   AC_SUBST(HDF5_LIBS,"")
-  AC_DEFINE(QDP_NO_HDF5, [1], [ Dont use HDF5 ])
 
 else
   if test "X${HDF5_HOME}X" = "XX" ; then

diff --git a/examples/examples.h b/examples/examples.h
@@ -25,7 +25,7 @@ void reunit(LatticeColorMatrix& xa);
 void reunit(LatticeColorMatrix& xa, LatticeBoolean& bad, int& numbad, enum Reunitarize ruflag);
 
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
 void junk(XMLWriter&, LatticeColorMatrix& b3, const LatticeColorMatrix& b1, const LatticeColorMatrix& b2, const Subset& s);
 #endif
 
@@ -45,7 +45,7 @@ void dslash(LatticeFermion& chi, const multi1d<LatticeColorMatrix>& u, const Lat
 void dslash2(LatticeFermion& chi, const multi1d<LatticeColorMatrix>& u, const LatticeFermion& psi,
 	    int isign, int cb);
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
 void FormFac(const multi1d<LatticeColorMatrix>& u, const LatticePropagator& quark_propagator,
 	     const LatticePropagator& seq_quark_prop, const multi1d<int>& t_source, 
 	     int t_sink, int j_decay, XMLWriter& xml);

diff --git a/examples/t_linalg.cc b/examples/t_linalg.cc
@@ -23,7 +23,7 @@ int main(int argc, char *argv[])
   Layout::setLattSize(nrow);
   Layout::create();
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   XMLFileWriter xml("t_linalg.xml");
   push(xml, "linalgTest");
 
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << Nflops / tt << " Mflops" << endl;
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_M_eq_M_times_M");
   write(xml,"c", c);
   pop(xml);
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << Nflops / tt << " Mflops" << endl;
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_M_eq_Ma_times_M");
   write(xml,"a",a);
   write(xml,"b",b);
@@ -152,7 +152,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << Nflops / tt << " Mflops" << endl;
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_M_eq_M_times_Ma");
   write(xml,"a",a);
   write(xml,"b",b);
@@ -170,7 +170,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << Nflops / tt << " Mflops" << endl;
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_M_eq_Ma_times_Ma");
   write(xml,"a",a);
   write(xml,"b",b);
@@ -189,7 +189,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << Nflops / tt << " Mflops" << endl;
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_M_peq_M_times_M");
   write(xml,"c",c);
   pop(xml);
@@ -205,7 +205,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << Nflops / tt << " Mflops" << endl;
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_M_peq_Ma_times_M");
   write(xml,"c",c);
   pop(xml);
@@ -221,7 +221,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << Nflops / tt << " Mflops" << endl;
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_M_peq_M_times_Ma");
   write(xml,"c",c);
   pop(xml);
@@ -237,7 +237,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << Nflops / tt << " Mflops" << endl;
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_M_peq_Ma_times_Ma");
   write(xml,"c",c);
   pop(xml);
@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << Nflops / tt << " Mflops" << endl;
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_M_meq_M_times_M");
   write(xml,"c",c);
   pop(xml);
@@ -269,7 +269,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << Nflops / tt << " Mflops" << endl;
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_M_meq_Ma_times_M");
   write(xml,"c",c);
   pop(xml);
@@ -285,7 +285,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << Nflops / tt << " Mflops" << endl;
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_M_meq_M_times_Ma");
   write(xml,"c",c);
   pop(xml)
@@ -301,7 +301,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << Nflops / tt << " Mflops" << endl;
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_M_meq_Ma_times_Ma");
   write(xml,"c",c);
   pop(xml);
@@ -337,7 +337,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << 66 / tt << " Mflops" << endl;   // check the flop count
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_V_eq_M_times_V");
   write(xml,"lv2",lv2);
   pop(xml)
@@ -353,7 +353,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << 66 / tt << " Mflops" << endl;   // check the flop count
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_V_eq_Ma_times_V");
   write(xml,"lv2",lv2);
   pop(xml);
@@ -384,7 +384,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << 6 / tt << " Mflops" << endl;   // check the flop count
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_V_eq_V_plus_V");
   write(xml,"lv3",lv3);
   pop(xml);
@@ -420,7 +420,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << 264 / tt << " Mflops" << endl;   // check the flop count
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_D_eq_M_times_D");
   write(xml,"lf2",lf2);
   pop(xml);
@@ -435,7 +435,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << 264 / tt << " Mflops" << endl;   // check the flop count
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_D_eq_Ma_times_D");
   write(xml,"lf2",lf2);
   pop(xml);
@@ -470,7 +470,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << 132 / tt << " Mflops" << endl;   // check the flop count
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_H_eq_M_times_H");
   write(xml,"lh2", lh2);
   pop(xml);
@@ -486,7 +486,7 @@ int main(int argc, char *argv[])
 	      << " micro-secs/site/iteration" 
 	      << " , " << 132 / tt << " Mflops" << endl;   // check the flop count
 #else
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   push(xml,"QDP_H_eq_Ma_times_H");
   write(xml,"lh2", lh2);
   pop(xml);
@@ -495,7 +495,7 @@ int main(int argc, char *argv[])
 #endif
 
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   pop(xml);
   xml.close();
 #endif

diff --git a/examples/t_mesplq.cc b/examples/t_mesplq.cc
@@ -22,7 +22,7 @@ int main(int argc, char *argv[])
   Layout::setLattSize(nrow);
   Layout::create();
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   XMLFileWriter xml("t_mesplq.xml");
   push(xml,"t_mesplq");
 
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
   QDPIO::cout << "w_plaq = " << w_plaq << endl;
   QDPIO::cout << "link = " << link << endl;
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
   // Write out the results
   push(xml,"observables");
   write(xml,"w_plaq",w_plaq);

diff --git a/include/qdp.h b/include/qdp.h
@@ -109,14 +109,14 @@ namespace QDP {
 #include "qdp_io.h"
 #include "qdp_stdio.h"
 
-#ifdef QDP_NO_LIBXML2
+#ifndef QDP_USE_LIBXML2
 #warning not using libxml2
 #else
 #include "qdp_xmlio.h"
 #include "qdp_qdpio.h"
 #endif
 
-#ifdef QDP_NO_HDF5
+#ifndef QDP_USE_HDF5
 #warning not using hdf5
 #else
 #include "qdp_hdf5.h"

diff --git a/include/qdp_config_internal.h.in b/include/qdp_config_internal.h.in
@@ -67,10 +67,10 @@
 #undef QDP_ND
 
 /* Dont use HDF5 */
-#undef QDP_NO_HDF5
+#undef QDP_USE_HDF5
 
 /* Dont use LIBXML2 */
-#undef QDP_NO_LIBXML2
+#undef QDP_USE_LIBXML2
 
 /* Number of spin components */
 #undef QDP_NS

diff --git a/include/qdp_inner.h b/include/qdp_inner.h
@@ -213,7 +213,7 @@ TextWriter& operator<<(TextWriter& s, const IScalar<T>& d)
   return s << d.elem();
 }
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
 //! XML output
 template<class T>
 inline

diff --git a/include/qdp_outer.h b/include/qdp_outer.h
@@ -200,7 +200,7 @@ StandardOutputStream& operator<<(StandardOutputStream& s, const QDPExpr<RHS, OSc
   return s << C1(l);
 }
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
 //! XML output
 /*! Supports also having an inner grid */
 template<class T>

diff --git a/include/qdp_primmatrix.h b/include/qdp_primmatrix.h
@@ -187,7 +187,7 @@ TextWriter& operator<<(TextWriter& txt, const PMatrix<T,N,C>& d)
   return txt;
 }
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
 //! XML output
 template<class T, int N, template<class,int> class C>  
 inline

diff --git a/include/qdp_primscalar.h b/include/qdp_primscalar.h
@@ -213,7 +213,7 @@ TextWriter& operator<<(TextWriter& txt, const PScalar<T>& d)
   return txt << d.elem();
 }
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
 //! XML output
 template<class T>
 inline

diff --git a/include/qdp_primseed.h b/include/qdp_primseed.h
@@ -166,7 +166,7 @@ TextWriter& operator<<(TextWriter& txt, const PSeed<T>& d)
   return txt;
 }
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
 //! XML output
 template<class T>
 inline

diff --git a/include/qdp_primspinvec.h b/include/qdp_primspinvec.h
@@ -166,7 +166,7 @@ TextWriter& operator<<(TextWriter& txt, const PSpinVector<T,N>& d)
   return txt;
 }
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
 //! XML output
 template<class T, int N>
 inline

diff --git a/include/qdp_primvector.h b/include/qdp_primvector.h
@@ -198,7 +198,7 @@ TextWriter& operator<<(TextWriter& txt, const PVector<T,N,C>& d)
   return txt;
 }
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
 //! XML output
 template<class T, int N, template<class,int> class C> 
 inline

diff --git a/include/qdp_reality.h b/include/qdp_reality.h
@@ -216,7 +216,7 @@ TextWriter& operator<<(TextWriter& s, const RScalar<T>& d)
   return s << d.elem();
 }
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
 //! XML output
 template<class T>
 inline
@@ -422,7 +422,7 @@ TextWriter& operator<<(TextWriter& s, const RComplex<T>& d)
   return s << d.real() << d.imag();
 }
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
 //! XML output
 template<class T>
 inline

diff --git a/include/qdp_scalar_specific.h b/include/qdp_scalar_specific.h
@@ -1913,7 +1913,7 @@ class ArrayBiDirectionalMap
 //! Decompose a lexicographic site into coordinates
 multi1d<int> crtesn(int ipos, const multi1d<int>& latt_size);
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
 //! XML output
 template<class T>  
 XMLWriter& operator<<(XMLWriter& xml, const OLattice<T>& d)

diff --git a/include/qdp_specializations.h b/include/qdp_specializations.h
@@ -43,7 +43,7 @@ toBool(const Boolean& s)
   return toBool(s.elem());
 }
 
-#ifndef QDP_NO_LIBXML2
+#ifdef QDP_USE_LIBXML2
 // XML readers
 template<>
 void read(XMLReader& xml, const string& s, multi1d<Integer>& d);