From 2f598049a8a42327a2ff77407a86e7be83bd5ccc Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 12 Apr 2007 16:04:01 +0000 Subject: * cpp/qpid-config.in, Makefile.am, configure.ac: added qpid-config script. * cpp/m4/qpid.m4: added qpid.m4 script. * cpp/docs/api/doxygen_mk.sh: removed, unused. * cpp/docs/api/Makefile.am: fixed dependency typo. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@527998 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/Makefile.am | 2 + qpid/cpp/configure.ac | 2 +- qpid/cpp/docs/api/Makefile.am | 16 +++---- qpid/cpp/docs/api/doxygen_mk.sh | 19 -------- qpid/cpp/m4/qpid.m4 | 89 +++++++++++++++++++++++++++++++++++++ qpid/cpp/qpid-config.in | 98 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 195 insertions(+), 31 deletions(-) delete mode 100755 qpid/cpp/docs/api/doxygen_mk.sh create mode 100644 qpid/cpp/m4/qpid.m4 create mode 100755 qpid/cpp/qpid-config.in (limited to 'qpid/cpp') diff --git a/qpid/cpp/Makefile.am b/qpid/cpp/Makefile.am index dcdcb7cea0..54e7041e99 100644 --- a/qpid/cpp/Makefile.am +++ b/qpid/cpp/Makefile.am @@ -1,6 +1,8 @@ AUTOMAKE_OPTIONS = 1.9.2 foreign ACLOCAL_AMFLAGS = -I m4 +bin_SCRIPTS = qpid-config + SPEC=$(PACKAGE).spec EXTRA_DIST = \ diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac index 54b2342875..14ec13292c 100644 --- a/qpid/cpp/configure.ac +++ b/qpid/cpp/configure.ac @@ -133,6 +133,7 @@ AC_CHECK_PROG([RPMLINT], [rpmlint], [rpmlint]) AM_CONDITIONAL([HAS_RPMLINT], [test -n "$RPMLINT"]) AC_CONFIG_FILES([ + qpid-config Makefile src/Makefile src/tests/Makefile @@ -141,5 +142,4 @@ AC_CONFIG_FILES([ docs/api/user.doxygen docs/api/developer.doxygen ]) - AC_OUTPUT diff --git a/qpid/cpp/docs/api/Makefile.am b/qpid/cpp/docs/api/Makefile.am index c1cc118d58..adc7a5d8b3 100644 --- a/qpid/cpp/docs/api/Makefile.am +++ b/qpid/cpp/docs/api/Makefile.am @@ -3,22 +3,16 @@ # Generate dependency files so its rebuilt only when needed. # -EXTRA_DIST = html user.doxygen developer.doxygen - -dist-hook: html +# TODO aconway 2007-04-12: html should have a +# dependency on source/header files. -src=$(top_srcdir)/src +EXTRA_DIST = html user.doxygen developer.doxygen -headers: $(src)/*.h $(src)/*/*.h $(src)/*/*/*.h -sources: $(src)/*.cpp $(src)/*/*.cpp $(src)/*/*/*.cpp +html: html.timestamp -html: headers user.doxygen +html.timestamp: doxygen user.doxygen touch $@ -html-dev: headers sources developer.doxygen - doxygen developer.doxygen - touch $@ - clean-local: rm -rf html html-dev diff --git a/qpid/cpp/docs/api/doxygen_mk.sh b/qpid/cpp/docs/api/doxygen_mk.sh deleted file mode 100755 index ba65531e04..0000000000 --- a/qpid/cpp/docs/api/doxygen_mk.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# -# Generate makefile for doxygen with dependencies on source files. -# - -deps() { - find "$top_srcdir/src" -name "$2" -exec echo -ne '\\\n {} ' \; - echo ; echo -} - -cat <= $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/qpid-config.in b/qpid/cpp/qpid-config.in new file mode 100755 index 0000000000..5a65767a8c --- /dev/null +++ b/qpid/cpp/qpid-config.in @@ -0,0 +1,98 @@ +#!/bin/sh + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +exec_prefix_set=no +includedir=@includedir@ + +usage() +{ + cat <&2 +fi + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + if test $exec_prefix_set = no ; then + exec_prefix=$optarg + fi + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix=$optarg + exec_prefix_set=yes + ;; + --exec-prefix) + echo_exec_prefix=yes + ;; + --version) + echo @QPID_VERSION@ + ;; + --help) + usage 0 + ;; + --cflags) + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi + +if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix +fi + +if test "$echo_cflags" = "yes"; then + if test "$includedir" != "/usr/include" ; then + echo -I$includedir + fi +fi + +if test "$echo_libs" = "yes"; then + if test @libdir@ != /usr/lib ; then + my_linker_flags="-L@libdir@" + fi + echo ${my_linker_flags} -lqpidcommon +fi + + + + -- cgit v1.2.1