Merge pull request #4 from barak/upstream

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

diff --git a/.gitignore b/.gitignore
index e39f4fb..c8c5e41 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ src/mans/*.3
 src/mans/*.8
 src/oping
 src/noping
+src/oping.pc
 *.bs
 *.la
 *.lo

diff --git a/autogen.sh b/autogen.sh
index f273d64..6a5d62d 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-libtoolize
-aclocal -I m4
-autoheader
-automake --add-missing
-autoconf
+set -e
+
+autoreconf --warnings=all --install
 echo "autoconfiguration done, to build: ./configure ; make"

diff --git a/configure.ac b/configure.ac
index f9be869..6e775e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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,6 +45,9 @@ AC_ARG_VAR(PERL, [Perl interpreter command])
 # configure libtool
 LT_INIT([dlopen])
 
+# pkg-config interface
+PKG_INSTALLDIR
+
 # Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_TIME

diff --git a/src/Makefile.am b/src/Makefile.am
index 844e0a4..65d7adb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,6 +33,24 @@ if BUILD_WITH_LIBXNET
 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