projects
/
liboping.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/oping.c: Fix calculation of fractional time.
[liboping.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
ee99bfb
..
f83f5ab
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,7
+1,11
@@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.65])
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.65])
-AC_INIT([liboping],[1.7.0],[ff@octo.it],,[http://github.com/octo/liboping/])
+AC_INIT([liboping],
+ [1.9.0],
+ [liboping@verplant.org],
+ [],
+ [http://noping.cc/])
AC_CONFIG_SRCDIR([src/liboping.c])
AC_CONFIG_HEADERS([src/config.h])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([src/liboping.c])
AC_CONFIG_HEADERS([src/config.h])
AC_CONFIG_MACRO_DIR([m4])
@@
-20,7
+24,7
@@
AC_SUBST(LIBOPING_PATCH)
# ABI version
LIBOPING_CURRENT=2
# ABI version
LIBOPING_CURRENT=2
-LIBOPING_REVISION=1
0
+LIBOPING_REVISION=1
1
LIBOPING_AGE=2
AC_SUBST(LIBOPING_CURRENT)
AC_SUBST(LIBOPING_REVISION)
LIBOPING_AGE=2
AC_SUBST(LIBOPING_CURRENT)
AC_SUBST(LIBOPING_REVISION)
@@
-48,6
+52,12
@@
LT_INIT([dlopen])
# pkg-config interface
PKG_INSTALLDIR
# pkg-config interface
PKG_INSTALLDIR
+AC_ARG_WITH(pkgconfigdir,
+ AC_HELP_STRING([--with-pkgconfigdir], [Use the specified pkgconfig dir (default is libdir/pkgconfig)]),
+ [pkgconfigdir="${withval}"],
+ [pkgconfigdir='${libdir}/pkgconfig'])
+AC_SUBST([pkgconfigdir])
+
# Checks for header files.
AC_HEADER_STDC
AC_HEADER_TIME
# Checks for header files.
AC_HEADER_STDC
AC_HEADER_TIME
@@
-164,12
+174,16
@@
AC_TYPE_UINT16_T
AC_TYPE_UINT32_T
AC_TYPE_UINT8_T
AC_TYPE_UINT32_T
AC_TYPE_UINT8_T
+LIBOPING_PC_LIBS_PRIVATE=''
+
socket_needs_socket="no"
AC_CHECK_FUNCS(socket, [],
AC_CHECK_LIB(socket, socket,
[socket_needs_socket="yes"],
AC_MSG_ERROR(cannot find socket)))
socket_needs_socket="no"
AC_CHECK_FUNCS(socket, [],
AC_CHECK_LIB(socket, socket,
[socket_needs_socket="yes"],
AC_MSG_ERROR(cannot find socket)))
-AM_CONDITIONAL(BUILD_WITH_LIBSOCKET, test "x$socket_needs_socket" = "xyes")
+if test "x$socket_needs_socket" = "xyes"; then
+ LIBOPING_PC_LIBS_PRIVATE="${LIBOPING_PC_LIBS_PRIVATE} -lsocket"
+fi
# Under Solaris, the `xnet' library provides `recvmsg' which complies with the
# X/Open CAE Specification.
# Under Solaris, the `xnet' library provides `recvmsg' which complies with the
# X/Open CAE Specification.
@@
-179,7
+193,11
@@
if test "x$with_libxnet" = "xyes"
then
CPPFLAGS="$CPPFLAGS -D_XPG4_2 -D__EXTENSIONS__"
fi
then
CPPFLAGS="$CPPFLAGS -D_XPG4_2 -D__EXTENSIONS__"
fi
-AM_CONDITIONAL(BUILD_WITH_LIBXNET, test "x$with_libxnet" = "xyes")
+if test "x$with_libxnet" = "xyes"; then
+ LIBOPING_PC_LIBS_PRIVATE="${LIBOPING_PC_LIBS_PRIVATE} -lxnet"
+fi
+
+AC_SUBST(LIBOPING_PC_LIBS_PRIVATE)
nanosleep_needs_rt="no"
AC_CHECK_FUNCS(nanosleep, [],
nanosleep_needs_rt="no"
AC_CHECK_FUNCS(nanosleep, [],
@@
-253,5
+271,5
@@
AC_FUNC_MALLOC
AC_FUNC_STRERROR_R
AC_CHECK_FUNCS([gettimeofday memset modf select socket sqrt strcasecmp strdup strerror strncasecmp strtoul])
AC_FUNC_STRERROR_R
AC_CHECK_FUNCS([gettimeofday memset modf select socket sqrt strcasecmp strdup strerror strncasecmp strtoul])
-AC_CONFIG_FILES([Makefile src/Makefile src/mans/Makefile bindings/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile src/
liboping.pc src/
mans/Makefile bindings/Makefile])
AC_OUTPUT
AC_OUTPUT