Merge branch 'master' of https://github.com/strophe/libstrophe

Conflicts: configure.ac
2014-09-25 23:50:29 +02:00 · 2014-08-26 22:14:04 +02:00 · 2014-08-26 22:13:12 +02:00 · 2014-08-26 21:46:56 +02:00 · 2014-08-26 21:12:23 +02:00 · 2014-08-08 21:23:06 +02:00
3 changed files with 6 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ tests/test_hash
 tests/test_jid
 tests/test_sasl
 tests/test_sock
+m4/
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS = subdir-objects

+ACLOCAL_AMFLAGS = -I m4
 AM_CFLAGS = -g -Wall

 PARSER_CFLAGS=@PARSER_CFLAGS@
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,5 @@
 AC_INIT([libstrophe], [0.8.7], [jack@metajack.im])
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT([dlopen])

@@ -11,7 +12,9 @@ AS_CASE([$host_os],
  [freebsd*], [PLATFORM="freebsd"],
  [PLATFORM="nix"])

-PKG_CHECK_MODULES([openssl], [openssl], [], [AC_MSG_ERROR([openssl not found; openssl required])])
+PKG_CHECK_MODULES([openssl], [openssl], [],
+            [AC_CHECK_HEADER(openssl/ssl.h, [openssl_LIBS="-lssl -lcrypto"], [AC_MSG_ERROR([openssl not found; openssl required])])])
+
 PKG_CHECK_MODULES([check], [check >= 0.9.4], [], [AC_MSG_WARN([libcheck not found; unit tests will not be compilable])])

 AC_ARG_WITH([libxml2],
Author	SHA1	Message	Date
Fabian Freyer	d8a9e9f915	Merge branch 'master' of https://github.com/strophe/libstrophe Conflicts: configure.ac	2014-09-25 23:50:29 +02:00
Fabian Freyer	a0efdd1314	Merge branch 'master' of https://github.com/strophe/libstrophe	2014-08-26 22:14:04 +02:00
Fabian Freyer	1aa45c0f19	Removed m4 mkdir and added m4/ to .gitignore	2014-08-26 22:13:12 +02:00
Fabian Freyer	84e67d02b4	Added m4 subdir	2014-08-26 21:46:56 +02:00
Fabian Freyer	96ced6699d	Added -lcrypto as needed in #32	2014-08-26 21:12:23 +02:00
Fabian Freyer	328bf3626f	autotools: check for ssl.h if pkg-config failed Some distros provides libssl without openssl.pc.	2014-08-08 21:23:06 +02:00