devs/libstrophe-gh-mirror
2
0
Fork 0
mirror of https://github.com/strophe/libstrophe.git synced 2026-08-05 03:16:21 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

Compare commits

base: devs:0.8.8
Branches Tags
devs:master devs:scram-channel-binding devs:next devs:fix-compile-with-c23 devs:generic-settings-api devs:control-auth-options devs:tls-securetransport devs:cafile devs:unify-errors devs:xep-0198 devs:conn-addrinfo devs:ext-auth devs:server devs:tls-cert
devs:0.14.0 devs:0.13.1 devs:0.13.0 devs:0.12.3 devs:0.12.2 devs:0.12.1 devs:0.12.0 devs:0.11.0 devs:0.10.1 devs:0.10.0 devs:0.9.3 devs:0.9.2 devs:0.9.1 devs:0.9.0 devs:0.8.8 devs:0.8.7 devs:wip-fbsd-port devs:0.8.6 devs:0.8.5
...
compare: devs:wip-fbsd-port
Branches Tags
devs:scram-channel-binding devs:next devs:master devs:fix-compile-with-c23 devs:generic-settings-api devs:control-auth-options devs:tls-securetransport devs:cafile devs:unify-errors devs:xep-0198 devs:conn-addrinfo devs:ext-auth devs:server devs:tls-cert
devs:0.14.0 devs:0.13.1 devs:0.13.0 devs:0.12.3 devs:0.12.2 devs:0.12.1 devs:0.12.0 devs:0.11.0 devs:0.10.1 devs:0.10.0 devs:0.9.3 devs:0.9.2 devs:0.9.1 devs:0.9.0 devs:0.8.8 devs:0.8.7 devs:wip-fbsd-port devs:0.8.6 devs:0.8.5

6 Commits
0.8.8 ... wip-fbsd-p

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
3 changed files with 6 additions and 1 deletions
Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -42,3 +42,4 @@ tests/test_hash
tests/test_jid tests/test_jid
tests/test_sasl tests/test_sasl
tests/test_sock tests/test_sock
m4/

1
Makefile.am
View File

@@ -1,5 +1,6 @@
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = -g -Wall AM_CFLAGS = -g -Wall
PARSER_CFLAGS=@PARSER_CFLAGS@ PARSER_CFLAGS=@PARSER_CFLAGS@

5
configure.ac
View File

@@ -1,4 +1,5 @@
AC_INIT([libstrophe], [0.8.7], [jack@metajack.im]) AC_INIT([libstrophe], [0.8.7], [jack@metajack.im])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign]) AM_INIT_AUTOMAKE([foreign])
LT_INIT([dlopen]) LT_INIT([dlopen])
@@ -11,7 +12,9 @@ AS_CASE([$host_os],
[freebsd*], [PLATFORM="freebsd"], [freebsd*], [PLATFORM="freebsd"],
[PLATFORM="nix"]) [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])]) PKG_CHECK_MODULES([check], [check >= 0.9.4], [], [AC_MSG_WARN([libcheck not found; unit tests will not be compilable])])
AC_ARG_WITH([libxml2], AC_ARG_WITH([libxml2],