Commit 00341b78 authored by Matteo Quintiliani's avatar Matteo Quintiliani

Up to date to version 1.2.0


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@889 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent fdffd80d
......@@ -2,6 +2,10 @@
nmxptool Release History
#########################
* Release 1.2.0 (2008/03/07)
- Reorganized structure of directories.
Compilation in a single shot of configure and make.
* Release 1.1.8 (2008/03/03)
- Added management of channel sample sequences.
Allow data continuity between program restarts, (option -F)
......
# mtheo
SUBDIRS = src
dist_doc_DATA = BUGS HISTORY README earthworm seiscomp_templates makefile.sol makefile.ux
SUBDIRS = lib src
dist_doc_DATA = BUGS HISTORY README earthworm seiscomp_templates makefile.sol makefile.ux doc/html doc/man
EWMAKEFILESOL=earthworm/makefile.ux.nognu
EWMAKEFILEUX=earthworm/makefile.ux.nognu
......
......@@ -74,10 +74,7 @@ architectures.
tar xvfz nmxptool-X.X.X.tar.gz
cd nmxptool-X.X.X/libnmxp
./configure
make
cd ..
cd nmxptool-X.X.X
./configure
make
......
#!/bin/sh
autoheader && aclocal && autoconf && automake -a -c
glibtoolize --force --copy && autoheader && aclocal && autoconf && automake -a -c
......@@ -8,8 +8,8 @@ m4_define([full_package_name], [nmxptool])
dnl These three define the plug-in version number
m4_define([major_version], [1])
m4_define([minor_version], [1])
m4_define([micro_version], [8])
m4_define([minor_version], [2])
m4_define([micro_version], [0])
m4_define([version],
[major_version.minor_version.micro_version])
......@@ -27,14 +27,16 @@ AC_CANONICAL_SYSTEM
# AM_INIT_AUTOMAKE(FULL_PACKAGE_NAME,VERSION)
AM_INIT_AUTOMAKE([full_package_name], [version])
NMXP_CFLAGS="-I`pwd`/libnmxp/src"
NMXP_LDFLAGS="-L`pwd`/libnmxp/src"
CFLAGS="$CFLAGS $NMXP_CFLAGS"
LDFLAGS="$LDFLAGS $NMXP_LDFLAGS"
# Checks for programs.
# AC_PROG_CXX
AC_PROG_CC
AM_PROG_CC_C_O
# AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
# AC_PROG_RANLIB Using `AC_PROG_RANLIB' is rendered obsolete by `AC_PROG_LIBTOOL'
AC_PROG_LIBTOOL
# Checks for libraries.
AC_CHECK_LIB(nsl,gethostent)
......@@ -65,31 +67,48 @@ AC_ARG_WITH([seedlink],
[with_seedlink=yes]
)
case "$OSTYPE" in
win32*)
WINSOURCES=$OSTYPE
;;
msys*)
WINSOURCES=$OSTYPE
;;
*)
AC_MSG_WARN(Operating system is not Windows. $OSTYPE)
;;
esac
AM_CONDITIONAL(WITHWINSOURCES, test x$WINSOURCES != x)
# mtheo
AM_PROG_LIBTOOL
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdint.h stdlib.h string.h])
AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/socket.h unistd.h])
AC_CHECK_HEADERS([windows.h winsock2.h])
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 libmseed])
AC_CHECK_LIB([nmxp], [nmxp_openSocket], [], [AC_MSG_ERROR([libnmxp not found!])])
AC_CHECK_LIB([nmxp], [nmxp_data_msr_pack],
[],
[AC_MSG_FAILURE([libmseed found but libnmxp does not support it. (Try --without-libmseed to disable)])])
# AC_CHECK_LIB([nmxp], [nmxp_openSocket], [], [AC_MSG_ERROR([libnmxp not found!])])
# AC_CHECK_LIB([nmxp], [nmxp_data_msr_pack],
# [],
# [AC_MSG_FAILURE([libmseed found but libnmxp does not support it. (Try --without-libmseed to disable)])])
],
[AC_MSG_WARN([
libmseed is not available (--without-libmseed to disable)
])
AC_CHECK_LIB([nmxp], [nmxp_openSocket], [], [AC_MSG_ERROR([libnmxp not found or it supports libmseed
but libmseed is not available anymore! Try to recompile libnmxp!
])])
# AC_CHECK_LIB([nmxp], [nmxp_openSocket], [], [AC_MSG_ERROR([libnmxp not found or it supports libmseed
# but libmseed is not available anymore! Try to recompile libnmxp!
# ])])
],
)
],
[
AC_CHECK_LIB([nmxp], [nmxp_openSocket], [], [AC_MSG_ERROR([libnmxp not found or supports libmseed (--with-libmseed to enable)!])])
# AC_CHECK_LIB([nmxp], [nmxp_openSocket], [], [AC_MSG_ERROR([libnmxp not found or supports libmseed (--with-libmseed to enable)!])])
AC_MSG_WARN([Mini-SEED support has been disabled!])
]
)
......@@ -194,18 +213,78 @@ AM_CONDITIONAL(WITHSEEDLINK, test x$with_seedlink != xno)
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_INT16_T
AC_TYPE_INT32_T
AC_TYPE_UINT32_T
AC_TYPE_INT8_T
AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_TYPE_SSIZE_T
AC_STRUCT_TM
AC_TYPE_UINT32_T
# Checks for library functions.
AC_FUNC_MALLOC
AC_CHECK_FUNCS([memset strdup])
AC_FUNC_MKTIME
AC_FUNC_SELECT_ARGTYPES
AC_FUNC_STRERROR_R
AC_CHECK_FUNCS([gethostbyname inet_ntoa memset select socket strcasecmp strchr strdup strerror strtol])
AC_CHECK_FUNCS([timegm], [], [
AC_CHECK_FUNCS([getenv setenv unsetenv tzset],
[],
[AC_MSG_WARN([
Computation of packet latencies could be wrong
if local time is not equal to UTC.
])]
)
])
AC_CHECK_MEMBERS([struct tm.tm_gmtoff])
# Test whether SO_RCVTIMEO is broken. (On Solaris SO_RCVTIMEO is defined but not implemented)
AC_CACHE_CHECK([whether setsockopt(SO_RCVTIMEO) is broken],
ac_cv_so_rcvtimeo_broken, [dnl
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#if defined(HAVE_SYS_TYPES_H)
#include <sys/types.h>
#endif
#if defined(HAVE_SYS_SOCKET_H)
#include <sys/socket.h>
#endif
#if defined(HAVE_SYS_TIME_H)
#include <sys/time.h>
#endif
int main(void) {
#ifdef HAVE_WINDOWS_H
return 0;
#else
int fd;
int ret;
struct timeval new_tv;
/* Open the socket (INET/TCP).*/
fd = socket(AF_INET, SOCK_STREAM, 0);
/* set the timeout for the incoming queue */
/* 1 second for example */
new_tv.tv_sec = 1;
new_tv.tv_usec = 0;
ret = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &new_tv, sizeof(new_tv));
return ret;
#endif
}
]])],[ac_cv_so_rcvtimeo_broken=no],[ac_cv_so_rcvtimeo_broken=yes],[ac_cv_so_rcvtimeo_broken=cross])])
if test x"$ac_cv_so_rcvtimeo_broken" = x"yes"; then
AC_DEFINE(HAVE_BROKEN_SO_RCVTIMEO, 1, [Define if setsockopt(SO_RCVTIMEO) is broken])
fi
AC_CONFIG_FILES([Makefile
lib/Makefile
src/Makefile])
# AC_CONFIG_SUBDIRS([libnmxp])
......
AUTOMAKE_OPTIONS = gnu
lib_LIBRARIES = libnmxp.a
libnmxp_a_CFLAGS = -I../include
INCDIR=../include
include_HEADERS = $(INCDIR)/nmxp.h \
$(INCDIR)/nmxp_base.h \
$(INCDIR)/nmxp_data.h \
$(INCDIR)/nmxp_chan.h \
$(INCDIR)/nmxp_log.h \
$(INCDIR)/nmxp_crc32.h
libnmxp_a_SOURCES = nmxp.c nmxp_base.c nmxp_data.c nmxp_chan.c nmxp_log.c nmxp_crc32.c
include_HEADERS = nmxp.h nmxp_base.h nmxp_data.h nmxp_chan.h nmxp_log.h nmxp_crc32.h
if WITHWINSOURCES
libnmxp_a_SOURCES += nmxp_win.c
include_HEADERS += nmxp_win.h
include_HEADERS += $(INCDIR)/nmxp_win.h
endif
# libnmxp_la_LDFLAGS = -version-info 0:0:1
......@@ -5,6 +5,9 @@ nmxptool_SOURCES = nmxptool.c
nmxptool_SOURCES += nmxptool_getoptlong.c nmxptool_getoptlong.h
nmxptool_SOURCES += nmxptool_ew.c nmxptool_ew.h
nmxptool_CFLAGS= -I../include
nmxptool_LDADD= ../lib/libnmxp.a
if WITHSEEDLINK
nmxptool_SOURCES += seedlink_plugin.c seedlink_plugin.h
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment