X-Git-Url: https://git.octo.it/?p=liboping.git;a=blobdiff_plain;f=configure.ac;h=aea4efba1b9d9c0d92ad30af0d89dfe3692d5f06;hp=ba73a31a1c5fad63a69c555400a63dfcf27309e1;hb=fd1715441f92d3607749c37e01d1fcafe78e7d9b;hpb=d4172e1e04799fc8039e35a6c07ab3236c9c71c3

diff --git a/configure.ac b/configure.ac
index ba73a31..aea4efb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,11 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.65])
-AC_INIT([liboping],[1.6.2],[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])
@@ -20,7 +24,7 @@ AC_SUBST(LIBOPING_PATCH)
 
 # ABI version
 LIBOPING_CURRENT=2
-LIBOPING_REVISION=9
+LIBOPING_REVISION=11
 LIBOPING_AGE=2
 AC_SUBST(LIBOPING_CURRENT)
 AC_SUBST(LIBOPING_REVISION)
@@ -45,10 +49,19 @@ AC_ARG_VAR(PERL, [Perl interpreter command])
 # configure libtool
 LT_INIT([dlopen])
 
+# 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
-AC_CHECK_HEADERS([math.h signal.h fcntl.h inttypes.h netdb.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
+AC_CHECK_HEADERS([math.h signal.h fcntl.h inttypes.h netdb.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h locale.h langinfo.h])
 
 # This sucks, but what can I do..?
 AC_CHECK_HEADERS(netinet/in_systm.h, [], [],
@@ -161,12 +174,16 @@ AC_TYPE_UINT16_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)))
-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.
@@ -176,20 +193,36 @@ if test "x$with_libxnet" = "xyes"
 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
 
-nanosleep_needs_rt="no"
-AC_CHECK_FUNCS(nanosleep, [],
-	AC_CHECK_LIB(rt, nanosleep,
-		[nanosleep_needs_rt="yes"],
-		AC_MSG_ERROR(cannot find nanosleep)))
-AM_CONDITIONAL(BUILD_WITH_LIBRT, test "x$nanosleep_needs_rt" = "xyes")
+AC_SUBST(LIBOPING_PC_LIBS_PRIVATE)
 
-with_ncurses="yes"
-AC_CHECK_HEADERS(ncurses.h, [with_ncurses="yes"], [with_ncurses="no"])
+AC_SEARCH_LIBS([nanosleep],[rt],[],
+		[AC_MSG_ERROR([cannot find nanosleep])])
+AC_SEARCH_LIBS([clock_gettime],[rt],[],
+		[AC_MSG_ERROR([cannot find clock_gettime])])
+
+with_ncurses="no"
+AC_CHECK_HEADERS(ncursesw/ncurses.h ncurses.h, [with_ncurses="yes"], [])
 if test "x$with_ncurses" = "xyes"
 then
-	AC_CHECK_LIB(ncurses, mvwprintw, [with_ncurses="yes"], [with_ncurses="no"])
+	have_ncursesw="no"
+	have_ncurses="no"
+	NCURSES_LIB=""
+
+	AC_CHECK_LIB(ncursesw, mvwprintw, [have_ncursesw="yes"], [have_ncursesw="no"])
+	AC_CHECK_LIB(ncurses, mvwprintw, [have_ncurses="yes"], [have_ncurses="no"])
+
+	if test "x$have_ncursesw" = "xyes"; then
+		NCURSES_LIB="-lncursesw"
+	else if test "x$have_ncurses" = "xyes"; then
+		NCURSES_LIB="-lncurses"
+	else
+		with_ncurses="no"
+	fi; fi
+	AC_SUBST(NCURSES_LIB)
 fi
 AM_CONDITIONAL(BUILD_WITH_LIBNCURSES, test "x$with_ncurses" = "xyes")
 
@@ -236,5 +269,5 @@ AC_FUNC_MALLOC
 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