cirros-testvm/src-cirros/buildroot-2015.05/package/czmq/0001-Simply-configure.ac-to-prevent-contradictory-discove.patch

   1 From 23591404610b1eeffb69712d93c77c2327b9ef7a Mon Sep 17 00:00:00 2001
   2 From: Phillip Mienk <mienkphi@gmail.com>
   3 Date: Fri, 31 Oct 2014 00:55:35 -0700
   4 Subject: [PATCH] Simply configure.ac to prevent contradictory discovery of
   5  libzmq.
   6
   7 [Romain: rebase on top of 3.0.0]
   8 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
   9 ---
  10  Makefile.am                   |  3 ++-
  11  addons/Makefile.am.supplement |  3 ++-
  12  configure.ac                  | 46 ++-----------------------------------------
  13  model/build-autoconf.gsl      | 28 ++++++++++++++++++++++++++
  14  model/project.xml             |  3 +++
  15  src/Makefile.am.supplement    | 12 ++++++++++-
  16  6 files changed, 48 insertions(+), 47 deletions(-)
  17
  18 diff --git a/Makefile.am b/Makefile.am
  19 index 10f21fb..187c62b 100644
  20 --- a/Makefile.am
  21 +++ b/Makefile.am
  22 @@ -1,7 +1,8 @@
  23  ACLOCAL_AMFLAGS = -I config
  24
  25  AM_CPPFLAGS = \
  26 -    -I$(srcdir)/include
  27 +       ${zmq_CFLAGS} \
  28 +       -I$(srcdir)/include
  29
  30  EXTRA_DIST = \
  31         version.sh \
  32 diff --git a/addons/Makefile.am.supplement b/addons/Makefile.am.supplement
  33 index 8800db4..74f0c60 100644
  34 --- a/addons/Makefile.am.supplement
  35 +++ b/addons/Makefile.am.supplement
  36 @@ -4,7 +4,8 @@ EXTRA_DIST += \
  37  bin_PROGRAMS += makecert
  38
  39  makecert_LDADD = \
  40 -    libczmq.la
  41 +    libczmq.la \
  42 +    ${zmq_LIBS}
  43
  44  makecert_SOURCES = \
  45      addons/makecert.c
  46 diff --git a/configure.ac b/configure.ac
  47 index 1a4667e..1ccae06 100755
  48 --- a/configure.ac
  49 +++ b/configure.ac
  50 @@ -74,50 +74,8 @@ if test "x${CZMQ_GCOV}" == "xyes"; then
  51      fi
  52  fi
  53
  54 -# Check for libzmq library
  55 -libzmq_prefix=detect
  56 -AC_ARG_WITH([libzmq],
  57 -    [AS_HELP_STRING([--with-libzmq=PREFIX],
  58 -        [build with ZeroMQ library installed in PREFIX [default=autodetect]])],
  59 -    [case "x$withval" in
  60 -        xno)
  61 -            AC_MSG_ERROR([CZMQ requires the ZeroMQ library])
  62 -            ;;
  63 -        xyes|x)
  64 -            ;;
  65 -        *)
  66 -            CPPFLAGS="$CPPFLAGS -I${withval}/include"
  67 -            LDFLAGS="$LDFLAGS -L${withval}/lib"
  68 -            zeromq_prefix=${withval}
  69 -            ;;
  70 -    esac ]
  71 -)
  72 -if test "x$libzmq_prefix" = "xdetect"; then
  73 -    PKG_CHECK_MODULES(
  74 -        [ZeroMQ], [libzmq], [libzmq_prefix=pkgconfig], [libzmq_prefix=])
  75 -        if test "x$libzmq_prefix" = "xpkgconfig"; then
  76 -            CPPFLAGS="$CPPFLAGS ${ZeroMQ_CFLAGS}"
  77 -            LDFLAGS="$LDFLAGS ${ZeroMQ_LIBS}"
  78 -        fi
  79 -fi
  80 -
  81 -if test "x$czmq_search_libzmq" = "xyes"; then
  82 -    if test -r "${with_libzmq}/include/zmq.h"; then
  83 -        CFLAGS="-I${with_libzmq}/include ${CFLAGS}"
  84 -        LDFLAGS="-L${with_libzmq}/lib ${LDFLAGS}"
  85 -    fi
  86 -fi
  87 -
  88 -AC_CHECK_HEADER([zmq.h], [], [AC_MSG_ERROR([cannot find zmq.h])])
  89 -
  90 -AC_CHECK_LIB(zmq, zmq_init, ,[AC_MSG_ERROR([cannot link with -lzmq, install libzmq.])])
  91 -
  92 -AC_MSG_CHECKING([whether libzmq installation works])
  93 -AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <zmq.h>],
  94 -                                [zmq_init(1);])
  95 -               ],
  96 -               [AC_MSG_RESULT([yes])],
  97 -               [AC_MSG_ERROR([no. Please specify libzmq installation prefix using --with-libzmq])])
  98 +# Check for libzmq
  99 +PKG_CHECK_MODULES([zmq], [libzmq])
 100
 101  # Platform specific checks
 102  czmq_on_mingw32="no"
 103 diff --git a/model/build-autoconf.gsl b/model/build-autoconf.gsl
 104 index d012a3c..30aff14 100644
 105 --- a/model/build-autoconf.gsl
 106 +++ b/model/build-autoconf.gsl
 107 @@ -46,12 +46,39 @@ lib$(project.name)_la_SOURCES = \\
 108
 109  bin_PROGRAMS = $(project.name)_selftest
 110
 111 +$(project.name)_selftest_CPPFLAGS = \\
 112 +.for package_dependency where defined (package_dependency.for_test)
 113 +    \${$(package_dependency.name)_CFLAGS} \\
 114 +.endfor
 115 +    \${lib$(project.name)_la_CFLAGS}
 116 +
 117  $(project.name)_selftest_LDADD = \\
 118 +.if count (package_dependency, defined (count.for_lib) | defined (count.for_test) | defined (count.for_all)) > 0
 119 +    lib$(project.name).la \\
 120 +.else
 121      lib$(project.name).la
 122 +.endif
 123 +.for package_dependency where defined (package_dependency.for_lib) | defined (package_dependency.for_test) | defined (package_dependency.for_all)
 124 +.   if last()
 125 +    \${$(package_dependency.name)_LIBS}
 126 +.   else
 127 +    \${$(package_dependency.name)_LIBS} \\
 128 +.endif
 129 +.endfor
 130
 131  $(project.name)_selftest_SOURCES = \\
 132      src/$(project.name)_selftest.c
 133
 134 +lib$(project.name)_la_CPPFLAGS = \\
 135 +.for package_dependency where defined (package_dependency.for_lib)
 136 +.   if last()
 137 +    \${$(package_dependency.name)_CFLAGS}
 138 +.   else
 139 +    \${$(package_dependency.name)_CFLAGS} \\
 140 +.   endif
 141 +.endfor
 142 +    ${AM_CPPFLAGS}
 143 +
 144  lib$(project.name)_la_LDFLAGS = \\
 145      -version-info @LTVER@
 146
 147 @@ -62,6 +89,7 @@ lib$(project.name)_la_LDFLAGS += \\
 148  endif
 149
 150  TESTS = $(project.name)_selftest
 151 +
 152  .for model
 153  .   if first ()
 154
 155 diff --git a/model/project.xml b/model/project.xml
 156 index 91306cf..b7bab4a 100644
 157 --- a/model/project.xml
 158 +++ b/model/project.xml
 159 @@ -2,6 +2,9 @@
 160      name = "czmq"
 161      script = "project.gsl"
 162      >
 163 +
 164 +    <package_dependency name="zmq" pkg_name="libzmq" for_all="1" />
 165 +
 166      <header name = "czmq" />
 167      <header name = "czmq_prelude" />
 168
 169 diff --git a/src/Makefile.am.supplement b/src/Makefile.am.supplement
 170 index 91e5b62..929aa07 100644
 171 --- a/src/Makefile.am.supplement
 172 +++ b/src/Makefile.am.supplement
 173 @@ -95,12 +95,19 @@ libczmq_la_SOURCES = \
 174
 175  bin_PROGRAMS = czmq_selftest
 176
 177 +czmq_selftest_CPPFLAGS = \
 178 +    ${src_libczmq_la_CFLAGS}
 179 +
 180  czmq_selftest_LDADD = \
 181 -    libczmq.la
 182 +    libczmq.la \
 183 +    ${zmq_LIBS}
 184
 185  czmq_selftest_SOURCES = \
 186      src/czmq_selftest.c
 187
 188 +libczmq_la_CPPFLAGS = \
 189 +    ${AM_CPPFLAGS}
 190 +
 191  libczmq_la_LDFLAGS = \
 192      -version-info @LTVER@
 193
 194 @@ -112,6 +119,9 @@ endif
 195
 196  TESTS = czmq_selftest
 197
 198 +# define custom target for all products of /src
 199 +src: src/libczmq.la src/czmq_selftest
 200 +
 201  # Produce generated models; do this manually in src directory
 202  code:
 203         gsl -q src/sockopts.xml
 204 --
 205 1.9.3
 206