* Add pgg-config support for downstream packages

* Bump version to 0.2 for downstream packages.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@528107 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 35 insertions, 104 deletions

diff --git a/qpid/cpp/Makefile.am b/qpid/cpp/Makefile.am
index 54e7041e99..1a7432ffe0 100644
--- a/qpid/cpp/Makefile.am
+++ b/qpid/cpp/Makefile.am
@@ -1,14 +1,19 @@
 AUTOMAKE_OPTIONS = 1.9.2 foreign
 ACLOCAL_AMFLAGS = -I m4
 
-bin_SCRIPTS = qpid-config
+# pkg-config data file.
+pkgconfigdir = $(libdir)/pkgconfig
+PC=$(PACKAGE).pc
+pkgconfig_DATA = $(PC)
+
+BUILT_SOURCES=$(PACKAGE).pc
 
 SPEC=$(PACKAGE).spec
 
 EXTRA_DIST = \
   LICENSE NOTICE README \
   etc/qpidd \
-  $(SPEC) $(SPEC).in \
+  $(SPEC) $(SPEC).in $(PC) $(PC).in\
   rpm/README.qpidd-devel 
 
 SUBDIRS = src docs/api docs/man
@@ -17,14 +22,6 @@ SUBDIRS = src docs/api docs/man
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 
-# This cannot be done by AC_CONFIG_FILES, because automake's
-# make distcheck target does not like auto-generated files
-# being included in the distributed archive.
-$(SPEC): %: %.in Makefile
-	sed 's/@''PACKAGE@/@PACKAGE@/;s/@''VERSION@/@VERSION@/' $< > $@-tmp
-	mv $@-tmp $@
-MAINTAINERCLEANFILES = $(SPEC)
-
 #
 # Build RPMs from the distribution tarball.
 #
diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac
index 14ec13292c..715b28e2e3 100644
--- a/qpid/cpp/configure.ac
+++ b/qpid/cpp/configure.ac
@@ -8,7 +8,7 @@ dnl This program is distributed in the hope that it will be useful, but
 dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-AC_INIT([qpidc], [0.1], [qpid-dev@incubator.apache.org])
+AC_INIT([qpidc], [0.2], [qpid-dev@incubator.apache.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([dist-bzip2])
 
@@ -131,9 +131,16 @@ test "$enable_VALGRIND" = no && VALGRIND=
 # If rpmlint is availalbe we'll run it when building RPMs.
 AC_CHECK_PROG([RPMLINT], [rpmlint], [rpmlint])
 AM_CONDITIONAL([HAS_RPMLINT], [test -n "$RPMLINT"])
+
+# URL and download URL for the package.
+URL=http://rhm.et.redhat.com/qpidc
+AC_SUBST(URL)
+DOWNLOAD_URL=http://rhm.et.redhat.com/download
+AC_SUBST(DOWNLOAD_URL)
 	
 AC_CONFIG_FILES([
-  qpid-config	
+  qpidc.pc
+  qpidc.spec
   Makefile
   src/Makefile
   src/tests/Makefile
@@ -143,3 +150,4 @@ AC_CONFIG_FILES([
   docs/api/developer.doxygen
   ])
 AC_OUTPUT
+
diff --git a/qpid/cpp/m4/qpid.m4 b/qpid/cpp/m4/qpid.m4
deleted file mode 100644
index 54fea30e7f..0000000000
--- a/qpid/cpp/m4/qpid.m4
+++ /dev/null
@@ -1,89 +0,0 @@
-dnl
-dnl AM_PATH_QPID(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-AC_DEFUN([AM_PATH_QPID],
-[
-
-AC_ARG_WITH(qpid-prefix,[  --with-qpid-prefix=PFX   Prefix where Qpid is installed (optional)],
-            qpid_config_prefix="$withval", qpid_config_prefix="")
-AC_ARG_WITH(qpid-exec-prefix,[  --with-qpid-exec-prefix=PFX  Exec prefix where Qpid is installed (optional)],
-            qpid_config_exec_prefix="$withval", qpid_config_exec_prefix="")
-
-  if test x$qpid_config_exec_prefix != x ; then
-     qpid_config_args="$qpid_config_args --exec-prefix=$qpid_config_exec_prefix"
-     if test x${QPID_CONFIG+set} != xset ; then
-        QPID_CONFIG=$qpid_config_exec_prefix/bin/qpid-config
-     fi
-  fi
-  if test x$qpid_config_prefix != x ; then
-     qpid_config_args="$qpid_config_args --prefix=$qpid_config_prefix"
-     if test x${QPID_CONFIG+set} != xset ; then
-        QPID_CONFIG=$qpid_config_prefix/bin/qpid-config
-     fi
-  fi
-
-  AC_PATH_PROG(QPID_CONFIG, qpid-config, no)
-  qpid_version_min=$1
-
-  AC_MSG_CHECKING(for Qpid - version >= $qpid_version_min)
-  no_qpid=""
-  if test "$QPID_CONFIG" = "no" ; then
-    AC_MSG_RESULT(no)
-    no_qpid=yes
-  else
-    QPID_CFLAGS=`$QPID_CONFIG --cflags`
-    QPID_LIBS=`$QPID_CONFIG --libs`
-    qpid_version=`$QPID_CONFIG --version`
-
-    qpid_major_version=`echo $qpid_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    qpid_minor_version=`echo $qpid_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    qpid_micro_version=`echo $qpid_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    qpid_major_min=`echo $qpid_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    if test "x${qpid_major_min}" = "x" ; then
-       qpid_major_min=0
-    fi
-
-    qpid_minor_min=`echo $qpid_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    if test "x${qpid_minor_min}" = "x" ; then
-       qpid_minor_min=0
-    fi
-
-    qpid_micro_min=`echo $qpid_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x${qpid_micro_min}" = "x" ; then
-       qpid_micro_min=0
-    fi
-
-    qpid_version_proper=`expr \
-        $qpid_major_version \> $qpid_major_min \| \
-        $qpid_major_version \= $qpid_major_min \& \
-        $qpid_minor_version \> $qpid_minor_min \| \
-        $qpid_major_version \= $qpid_major_min \& \
-        $qpid_minor_version \= $qpid_minor_min \& \
-        $qpid_micro_version \>= $qpid_micro_min `
-
-    if test "$qpid_version_proper" = "1" ; then
-      AC_MSG_RESULT([$qpid_major_version.$qpid_minor_version.$qpid_micro_version])
-    else
-      AC_MSG_RESULT(no)
-      no_qpid=yes
-    fi
-  fi
-
-  if test "x$no_qpid" = x ; then
-     ifelse([$2], , :, [$2])
-  else
-     QPID_CFLAGS=""
-     QPID_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-
-  AC_SUBST(QPID_CFLAGS)
-  AC_SUBST(QPID_LIBS)
-])
diff --git a/qpid/cpp/qpidc.pc.in b/qpid/cpp/qpidc.pc.in
new file mode 100644
index 0000000000..5c9c9ea6cc
--- /dev/null
+++ b/qpid/cpp/qpidc.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE@
+Description: C++ implementation of the AMQP messaging specification.
+Version: @VERSION@
+Requires:
+URL: @URL@
+Libs: -L${libdir} -lqpidcommon
+Cflags: -I${includedir}
diff --git a/qpid/cpp/qpidc.spec.in b/qpid/cpp/qpidc.spec.in
index 130654dae6..4f63b90ced 100644
--- a/qpid/cpp/qpidc.spec.in
+++ b/qpid/cpp/qpidc.spec.in
@@ -5,12 +5,12 @@
 
 Name:           @PACKAGE@
 Version:        @VERSION@
-Release:        5%{?dist}
+Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        Apache Software License
-URL:            http://rhm.et.redhat.com/qpidc/
-Source0:        http://rhm.et.redhat.com/download/%{name}-%{version}.tar.gz
+URL:            @URL@
+Source0:        @DOWNLOAD_URL@/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libtool
@@ -146,6 +146,9 @@ fi
 
 %changelog
 
+* THU Apr 12 2007 Alan Conway <aconway@redhat.com> - 0.2-1
+- Bumped version number for rhm dependencies. 
+
 * Wed Apr 11 2007 Alan Conway <aconway@redhat.com> - 0.1-5
 - Add qpidd-devel sub-package.