@@ -28,8 +28,8 @@ include_HEADERS = strophe.h strophepp.h EXTRA_DIST = README.txt CHANGES.txt Doxyfile GPL-LICENSE.txt LICENSE.txt MIT-LICENSE.txt docs vs2008 -libstrophe_la_CFLAGS=$(STROPHE_FLAGS) $(PARSER_CFLAGS) $(openssl_CFLAGS) $(AM_CFLAGS) -libstrophe_la_LIBADD = $(PARSER_LIBS) $(openssl_LIBS) +libstrophe_la_CFLAGS=$(STROPHE_FLAGS) $(PARSER_CFLAGS) $(AM_CFLAGS) +libstrophe_la_LIBADD = $(PARSER_LIBS) -lssl libstrophe_la_SOURCES = src/auth.c src/conn.c src/ctx.c \ src/event.c src/handler.c src/hash.c \ src/jid.c src/md5.c src/sasl.c src/sha1.c \ Makefile.am @@ -5,7 +5,7 @@ AC_PROG_LIBTOOL AC_PROG_CC -PKG_CHECK_MODULES([openssl],[libssl], [], [AC_MSG_ERROR([couldn't find openssl headers, openssl required])]) +AC_CHECK_HEADER(openssl/ssl.h, [], [AC_MSG_ERROR([couldn't find openssl headers, openssl required])]) # check for 'check' unit-testing framework PKG_CHECK_MODULES([check], [check >= 0.9.4], [HAVE_CHECK=yes], [ configure.ac @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libstrophe Description: XMPP client library Version: @VERSION@ -Requires.private: @LIBXML2_REQUIRE@ libssl +Requires.private: @LIBXML2_REQUIRE@ Libs: -L${libdir} -lstrophe -Libs.private: @LIBS@ +Libs.private: -lssl @LIBS@ Cflags: -I${includedir} libstrophe.pc.in 79ca3223d5df415329855b9c0274506618cf7185 Aliaksey Kandratsenka alk@tut.by http://github.com/dustin/libstrophe/commit/27825d0b83ef55719256adbd1b5480c2cfb07bf1 27825d0b83ef55719256adbd1b5480c2cfb07bf1 2009-10-02T03:52:05-07:00 2009-10-02T03:52:05-07:00 Revert "use openssl via pkg-config so that static linking without libtool really works" This reverts commit 2d7b310516b3201e506b60d560ef78b7bace77ae. We loose only the ability to link openssl statically, which is pretty unimportant, and in return we avoid issues on platforms that do not ship libssl.pc. 2d5c55a4e1d57e8fa313cc5a75f988ce8aa6a7ad Aliaksey Kandratsenka alk@tut.by