Changeset 1751

Timestamp:

12/11/11 22:59:36 (6 months ago)

Author:

Freddie Akeroyd

Message:

Handle dependency on readline and libxml2 better. refs #302

Location:

trunk

Files:

• applications/NXbrowse/Makefile.am (modified) (1 diff)
• applications/NXsummary/Makefile.am (modified) (1 diff)
• applications/NXtranslate/Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)

trunk/applications/NXbrowse/Makefile.am

@@ -40 +40 @@
 nxbrowse_SOURCES = NXbrowse.c
 nxbrowse_LDADD = $(LIBNEXUS)
-nxbrowse_LDFLAGS = -static @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ $(LDFLAGS)
+nxbrowse_LDFLAGS = -static @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ @READLINE_LDFLAGS@ $(LDFLAGS)
 
 include $(top_srcdir)/build_rules.am

trunk/applications/NXsummary/Makefile.am

@@ -38 +38 @@
 nxsummary_SOURCES = data_util.cpp main.cpp string_util.cpp preferences.cpp output.cpp
 nxsummary_LDADD = $(LIBNEXUS)
-nxsummary_LDFLAGS = -static @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ $(LDFLAGS)
+nxsummary_LDFLAGS = -static @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ @LIBXML2_LDFLAGS@ $(LDFLAGS)
 EXTRA_DIST = LICENSE $(man_MANS)
 include $(top_srcdir)/build_rules.am

trunk/applications/NXtranslate/Makefile.am

@@ -68 +68 @@
         esrf_edf/libEdf.la
 
-nxtranslate_LDFLAGS = -static @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ $(LDFLAGS)
+nxtranslate_LDFLAGS = -static @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ @LIBXML2_LDFLAGS@ $(LDFLAGS)
 
 EXTRA_DIST = $(srcdir)/*.xml $(srcdir)/*.nxt $(srcdir)/*.dat $(srcdir)/*.run $(man_MANS)

trunk/configure.ac

@@ -366 +366 @@
 AC_SUBST(SHARED_EXT)
 
+SAVE_LIBS="$LIBS"
 AC_CHECK_LIB(xml2, [xmlParseFile])
 if test "x$ac_cv_lib_xml2_xmlParseFile" = xyes; then
     LIBXML2_CFLAGS='`xml2-config --cflags`'
+    LIBXML2_LDFLAGS='`xml2-config --libs`'
     LIBXML2_MESSAGE="yes"
 else
     LIBXML2_CFLAGS=''
+    LIBXML2_LDFLAGS=''
     LIBXML2_MESSAGE="no (will not build NXsummary or NXtranslate)"
 fi
+LIBS="$SAVE_LIBS"
 AC_SUBST(LIBXML2_CFLAGS)
+AC_SUBST(LIBXML2_LDFLAGS)
 
 # set up for linux here - mac is covered in the case $host statement
@@ -657 +662 @@
 AC_CHECK_LIB(mfhdf, SDcreate)
 AC_CHECK_LIB(hdf5, H5open)
+SAVE_LIBS="$LIBS"
 AC_CHECK_LIB(termcap, tputs)
 AC_CHECK_LIB(readline, readline)
 AC_CHECK_LIB(history, add_history)
+if test x$ac_cv_lib_termcap_tputs = xyes; then READLINE_LDFLAGS="-ltermcap $READLINE_LDFLAGS"; fi
+if test x$ac_cv_lib_readline_readline = xyes; then READLINE_LDFLAGS="-lreadline $READLINE_LDFLAGS"; fi
+if test x$ac_cv_lib_history_add_history = xyes; then READLINE_LDFLAGS="-lhistory $READLINE_LDFLAGS"; fi
+AC_SUBST(READLINE_LDFLAGS)
+LIBS="$SAVE_LIBS"
 dnl AC_LANG_PUSH([C++])
 dnl AC_CHECK_LIB(mxmlplus, _ZN4MXML4NodeD2Ev)