Adjust for YAXT split of library into C and Fortran part.

configure.ac

@@ -231,9 +231,24 @@ main(int argc, char **argv)
    AS_IF([test "x$MPI_LAUNCH" = xtrue],
      [AC_MSG_WARN([MPI launch command unavailable])])
 
+   AC_ARG_VAR([YAXT_FC_LIB],[Flags needed to link YAXT for the Fortran API])
+   AC_ARG_VAR([YAXT_FC_INCLUDE],
+     [Flags needed to compile for the Fortran API of YAXT])
    PKG_CHECK_MODULES([YAXT],[yaxt],
      [AC_DEFINE([HAVE_YAXT],,[yaxt library is available])],
      [AC_MSG_FAILURE([Required yaxt library unavailable.])])
+   AS_IF([test x${YAXT_FC_LIB+set} != xset],
+     [YAXT_FC_LIB=$YAXT_LIBS])
+   AS_IF([test x${YAXT_FC_INCLUDE+set} != xset],
+     [YAXT_FC_INCLUDE=$YAXT_CFLAGS])
+   PKG_CHECK_MODULES([YAXT_C],[yaxt_c],
+     [YAXT_LIBS=$YAXT_C_LIBS
+      YAXT_CFLAGS=$YAXT_C_CFLAGS],
+     [YAXT_VERSION=`pkg-config --modversion yaxt`
+      YAXT_MAJOR_VERSION=`expr "$YAXT_VERSION" : "@<:@0-9@:>@*"`
+      YAXT_MINOR_VERSION=`echo "$YAXT_VERSION" | sed -e 's/^@<:@0-9@:>@*\.\(@<:@0-9@:>@*\).*/\1/'`
+      AS_IF([test "$YAXT_MAJOR_VERSION" -gt 0 -o "$YAXT_MINOR_VERSION" -gt 4],
+        [YAXT_LIBS=`echo "$YAXT_LIBS" | sed -e 's/-lyaxt *$/-lyaxt_c/'`])])
    dnl parallel netCDF support still requires ScalES-PPM and YAXT to
    dnl re-arrange the data when running with more than one collector
    PKG_CHECK_MODULES([PPM_CORE],[scales-ppm-core],

examples/pio/Makefile.am

@@ -17,7 +17,7 @@ collectData_SOURCES=collectData.c
 
 if USE_MPI
 LDADD=$(top_builddir)/src/libcdipio.la $(top_builddir)/src/libcdi.la $(YAXT_LIBS) $(MPI_C_LIB)
-collectData2003_LDADD=$(top_builddir)/src/libcdipio.la $(top_builddir)/src/libcdi.la $(YAXT_LIBS) $(MPI_FC_LIB)
+collectData2003_LDADD=$(top_builddir)/src/libcdipio.la $(top_builddir)/src/libcdi.la $(YAXT_FC_LIB) $(MPI_FC_LIB)
 else
 LDADD=$(top_builddir)/src/libcdi.la
 collectData2003_LDADD=$(top_builddir)/src/libcdi.la