From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 17 Mar 2008 18:02:17 +0000 (+0000)
Subject: Infrastructure: Export pkgconfig file.
X-Git-Tag: 2.0.4^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/commitdiff_plain/e3afa470a387e2726de5541e9871ccb2e9915a83

Infrastructure: Export pkgconfig file.

This should keep us going while mLib-3 is worked on.
---

diff --git a/Makefile.am b/Makefile.am
index 1b6a078..381ba0b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,13 +33,13 @@ AUTOMAKE_OPTIONS = foreign
 ## --- What to build ---
 
 SUBDIRS = man
-
-bin_SCRIPTS = mLib-config
 bin_PROGRAMS = crc-mktab unihash-mkstatic
 
 lib_LTLIBRARIES = libmLib.la
 pkglibexecdir = $(libexecdir)/$(PACKAGE)
 pkglibexec_PROGRAMS = @BRES_LIBEXEC@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = mLib.pc
 EXTRA_PROGRAMS = bres
 
 pkginclude_HEADERS = \
@@ -56,7 +56,7 @@ pkginclude_HEADERS = \
 
 ## --- Things to put in the library ---
 
-libmLib_la_LDFLAGS = -version-info 2:3:0
+libmLib_la_LDFLAGS = -version-info 2:4:0
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
diff --git a/configure.in b/configure.in
index 64d63c4..39ca6b5 100644
--- a/configure.in
+++ b/configure.in
@@ -27,17 +27,17 @@ dnl Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 dnl MA 02111-1307, USA.
 
 AC_INIT(exc.c)
-mdw_INIT_LIB(mLib, mLib, 2.0.3)
+AM_INIT_AUTOMAKE(mLib, 2.0.4)
 
 AC_PROG_CC
 AM_PROG_LIBTOOL
-mdw_GCC_FLAGS
+AX_CFLAGS_WARN_ALL
 mdw_MANEXT
 
 AC_CHECK_HEADERS(float.h)
 
-mdw_CHECK_MANYLIBS(socket, socket)
-mdw_CHECK_MANYLIBS(gethostbyname, nsl resolv)
+AC_SEARCH_LIBS(socket, socket)
+AC_SEARCH_LIBS(gethostbyname, nsl resolv)
 
 DEPLIBS=$LIBS AC_SUBST(DEPLIBS)
 BRES_LIBEXEC="bres\$(EXEEXT)" BRES_SOURCE="bres"
@@ -48,7 +48,7 @@ AC_ARG_WITH(adns,
 if test $want_adns != no; then
   save_LIBS=$LIBS
   LIBS=$DEPLIBS
-  mdw_CHECK_MANYLIBS(adns_init, adns, [have_adns=yes], [have_adns=no])
+  AC_SEARCH_LIBS(adns_init, adns, [have_adns=yes], [have_adns=no])
   DEPLIBS=$LIBS
   LIBS=$save_LIBS
   if test $have_adns = yes; then
@@ -73,6 +73,5 @@ if test $mdw_cv_msg_control = no; then
 fi
 
 AC_DEFINE(BUILDING_MLIB)
-mdw_OPT_mLib_DEBUG(mLib)
 
-AC_OUTPUT(Makefile man/Makefile mLib-config:lib-config.in)
+AC_OUTPUT(Makefile man/Makefile mLib.pc)
diff --git a/debian/changelog b/debian/changelog
index 5686546..2d18770 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mlib (2.0.4) experimental; urgency=low
+
+  * Switch over to pkgconfig.  This is largely a stopgap release, to stop
+    stuff breaking hopelessly while mLib 3 is worked on.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Mon, 17 Mar 2008 17:51:45 +0000
+
 mlib (2.0.3) experimental; urgency=low
 
   * Document hex encoding/decoding.
diff --git a/debian/rules b/debian/rules
index e183c54..a4e5864 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,9 @@ install: build
 	mkdir -p debian/mlib-dev/usr/lib
 	mkdir -p debian/mlib-dev/usr/share/man
 	mkdir -p debian/mlib-dev/usr/bin
-	mv debian/mlib2/usr/bin/mLib-config debian/mlib-dev/usr/bin
+	mkdir -p debian/mlib-dev/usr/lib/pkgconfig
+	mv debian/mlib2/usr/lib/pkgconfig/mLib.pc \
+	  debian/mlib-dev/usr/lib/pkgconfig/
 	mv debian/mlib2/usr/share/man/man3 debian/mlib-dev/usr/share/man
 	mv debian/mlib2/usr/lib/*.a debian/mlib-dev/usr/lib
 	mv debian/mlib2/usr/lib/*.so debian/mlib-dev/usr/lib
@@ -42,6 +44,7 @@ install: build
 	make -C deb-build install DESTDIR=`pwd`/debian/mlib2-adns
 	rmdir debian/mlib2-adns/usr/lib/mLib
 	rm -rf debian/mlib2-adns/usr/bin
+	rm -rf debian/mlib2-adns/usr/lib/pkgconfig
 	rm -rf debian/mlib2-adns/usr/share/man
 	rm -rf debian/mlib2-adns/usr/include
 	rm debian/mlib2-adns/usr/lib/*.a
diff --git a/mLib.pc.in b/mLib.pc.in
new file mode 100644
index 0000000..624d60a
--- /dev/null
+++ b/mLib.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: mLib
+Description: A library of miscellaneous stuff
+Version: @VERSION@
+Libs: -L${libdir} -lmLib
+Cflags: -I${includedir}