From: Florian Forster <ff@octo.it>
Date: Thu, 25 Sep 2014 00:22:44 +0000 (-0700)
Subject: Merge pull request #4 from barak/upstream
X-Git-Tag: liboping-1.7.0~3
X-Git-Url: https://git.octo.it/?p=liboping.git;a=commitdiff_plain;h=9d202856e82632ad1b9a64ce154a5526e86621eb;hp=-c

Merge pull request #4 from barak/upstream

minor build system tweaks, to generate oping.pc file for pkg-config oping
---

9d202856e82632ad1b9a64ce154a5526e86621eb
diff --combined configure.ac
index f9be869,e220822..6e775e2
--- a/configure.ac
+++ b/configure.ac
@@@ -1,7 -1,7 +1,7 @@@
  # Process this file with autoconf to produce a configure script.
  
  AC_PREREQ([2.65])
- AC_INIT([liboping],[1.6.2])
+ AC_INIT([liboping],[1.6.2],[ff@octo.it],,[http://github.com/octo/liboping/])
  AC_CONFIG_SRCDIR([src/liboping.c])
  AC_CONFIG_HEADERS([src/config.h])
  AC_CONFIG_MACRO_DIR([m4])
@@@ -45,10 -45,13 +45,13 @@@ AC_ARG_VAR(PERL, [Perl interpreter comm
  # configure libtool
  LT_INIT([dlopen])
  
+ # pkg-config interface
+ PKG_INSTALLDIR
+ 
  # 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, [], [],
@@@ -185,25 -188,11 +188,25 @@@ AC_CHECK_FUNCS(nanosleep, []
  		AC_MSG_ERROR(cannot find nanosleep)))
  AM_CONDITIONAL(BUILD_WITH_LIBRT, test "x$nanosleep_needs_rt" = "xyes")
  
 -with_ncurses="yes"
 -AC_CHECK_HEADERS(ncurses.h, [with_ncurses="yes"], [with_ncurses="no"])
 +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")
  
diff --combined src/Makefile.am
index 844e0a4,7278c68..65d7adb
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -33,6 -33,24 +33,24 @@@ if BUILD_WITH_LIBXNE
  liboping_la_LIBADD += -lxnet
  endif
  
+ oping.pc:
+ 	echo 'prefix=$(prefix)'			>  $@
+ 	echo 'exec_prefix=$(exec_prefix)'	>> $@
+ 	echo 'includedir=$(includedir)'		>> $@
+ 	echo 'libdir=$(libdir)'			>> $@
+ 	echo					>> $@
+ 	echo 'Name: $(PACKAGE_TARNAME)'		>> $@
+ 	echo 'Description: $(PACKAGE_NAME)'	>> $@
+ 	echo 'URL: $(PACKAGE_URL)'		>> $@
+ 	echo 'Version: $(PACKAGE_VERSION)'	>> $@
+ 	echo 'Cflags: -I${includedir}'		>> $@
+ 	echo 'Libs: -L${libdir} -loping'	>> $@
+ 	echo 'Libs.private: $(AM_LDFLAGS) $(LIBS) $(liboping_la_LIBADD)'	>> $@
+ 
+ pkgconfig_DATA = oping.pc
+ 
+ MOSTLYCLEANFILES = $(pkgconfig_DATA)
+ 
  bin_PROGRAMS = oping
  
  oping_SOURCES = oping.c
@@@ -46,7 -64,7 +64,7 @@@ bin_PROGRAMS += nopin
  
  noping_SOURCES = oping.c
  noping_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_NCURSES=1
 -noping_LDADD = liboping.la -lm -lncurses
 +noping_LDADD = liboping.la -lm $(NCURSES_LIB)
  if BUILD_WITH_LIBRT
  noping_LDADD += -lrt
  endif