Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

don't include strophe.j in conflate.h 'cause it's symbols are not used

This simplifies libconflate pkg-config spec writing.
  • Loading branch information...
commit 868ad04b358866da6a1c93be57f318b9b9a5e5d1 1 parent 06972c2
@alk alk authored
View
7 configure.ac
@@ -48,7 +48,7 @@ PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
AC_HEADER_STDBOOL
-PKG_CHECK_MODULES([libstrophe], [libstrophe], [pkgconfig_libstrophe_CFLAGS=$libstrophe_CFLAGS], [
+PKG_CHECK_MODULES([libstrophe], [libstrophe], [], [
libstrophe_pkg_missing=yes
])
if test "x$libstrophe_pkg_missing" = "xyes"; then
@@ -57,10 +57,6 @@ if test "x$libstrophe_pkg_missing" = "xyes"; then
AC_CONFIG_SUBDIRS([libstrophe])
libstrophe_CFLAGS="-Ilibstrophe"
libstrophe_LIBS="-Llibstrophe -lstrophe"
- dnl here we're relying on a bit of knowledge of libstrophe internals (i.e. where it installs headers)
- dnl this is required for writing correct pkgconfig spec
- dnl I think that's ok for _bundled_ libstrophe
- pkgconfig_libstrophe_CFLAGS="-I\${includedir}"
build_bundled_libstrophe=yes
else
AC_MSG_CHECKING([for old version of libstrophe])
@@ -71,7 +67,6 @@ if test "x$libstrophe_pkg_missing" = "xyes"; then
fi
fi
AM_CONDITIONAL([BUILD_BUNDLED_LIBSTROPHE], [test "x$build_bundled_libstrophe" = xyes])
-AC_SUBST([pkgconfig_libstrophe_CFLAGS])
AC_C_CONST
View
1  conflate.h
@@ -5,7 +5,6 @@
#include <sys/types.h>
#include <pthread.h>
-#include <strophe.h>
/*! \mainpage libconflate
*
View
1  conflate_internal.h
@@ -1,4 +1,5 @@
/* Internal data structures that should be opaque to outside viewers */
+#include <strophe.h>
struct _conflate_handle {
View
2  libconflate.pc.in
@@ -9,4 +9,4 @@ Version: @VERSION@
Requires.private: libstrophe
Libs: -L${libdir} -lconflate
Libs.private: @LIBS@
-Cflags: -I${includedir}/libconflate @pkgconfig_libstrophe_CFLAGS@
+Cflags: -I${includedir}/libconflate
Please sign in to comment.
Something went wrong with that request. Please try again.