Commit 51d287c9 authored by Matteo Quintiliani's avatar Matteo Quintiliani
Browse files

Fixed small bug for checking library nmxp 

Added check earthworm header
Minor changes


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@511 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent 8a799506

configure.in

+6 −5
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ AC_ARG_WITH([seedlink], 
AS_IF([test "x$with_libmseed" != xno], 

      [AC_CHECK_LIB([mseed], [msr_init],

		    [LIBS="$LIBS -lmseed"

		     AC_DEFINE([HAVE_LIBMSEED], [1], [Define if you have libreadline]) 

		     AC_DEFINE([HAVE_LIBMSEED], [1], [Define if you have libmseed]) 

		     AC_CHECK_LIB([nmxp], [nmxp_openSocket], [], [AC_MSG_ERROR([libnmxp is not installed])]) 

		     AC_CHECK_LIB([nmxp], [nmxp_data_msr_pack],

				  [],

				  [AC_MSG_FAILURE([libmseed is installed but libnmxp does not support it. (Try --without-libmseed to disable)])])
@@ -90,10 +91,6 @@ AS_IF([test "x$with_ew" != xno], 
      [

    AS_IF([test "x$EW_HOME" != x], 

	  [

	   # TODO: Added automatically GLOBALFLAGS to CFLAGS

	# AC_CHECK_HEADERS([earthworm.h kom.h transport.h trace_buf.h],

	#		 [AC_DEFINE([HAVE_EARTHWORMFILES_H], [1], [Define if you have earthworm header file])],

	#		 AC_MSG_WARN([earthworm header files not found!]))

	EWLIB=$EW_HOME/$EW_VERSION/lib

	EWOBJS="$EWLIB/kom.o $EWLIB/getutil.o $EWLIB/logit_mt.o $EWLIB/socket_ew_common.o $EWLIB/transport.o $EWLIB/sleep_ew.o $EWLIB/socket_ew.o $EWLIB/time_ew.o $EWLIB/threads_ew.o $EWLIB/sema_ew.o $EWLIB/swap.o $EWLIB/mem_circ_queue.o"

	AC_CHECK_FILES([$EWLIB/kom.o $EWLIB/getutil.o $EWLIB/logit_mt.o $EWLIB/socket_ew_common.o $EWLIB/transport.o $EWLIB/sleep_ew.o $EWLIB/socket_ew.o $EWLIB/time_ew.o $EWLIB/threads_ew.o $EWLIB/sema_ew.o $EWLIB/swap.o $EWLIB/mem_circ_queue.o],
@@ -101,6 +98,10 @@ AS_IF([test "x$with_ew" != xno], 
		       [

			AC_MSG_WARN(Earthworm object file is missing! Attempt to compile from source!)

			EWOSOURCES=yes

			AC_CHECK_HEADERS([earthworm.h kom.h transport.h trace_buf.h],

					 [AC_DEFINE([HAVE_EARTHWORMFILES_H], [1], [Define if you have earthworm header file])],

					 AC_MSG_WARN([Earthworm header files not found!])

					 )

			]

		       )

	AC_DEFINE([HAVE_EARTHWORMOBJS], [1], [Define if you have all earthworm object files])