diff options
| author | Peter Rosin <peda@lysator.liu.se> | 2011-05-04 16:34:28 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-04 16:18:46 -0400 |
| commit | 274dd0369afa57448369ee4f85fb7e24883f5172 (patch) | |
| tree | 59d0a90c66d02e9ee2efa16043ba03e04ffb8255 | |
| parent | d11e9e0f71072ab9e51de47ee805697782ae84ac (diff) | |
| download | libevent-274dd0369afa57448369ee4f85fb7e24883f5172.tar.gz | |
libssl depends on libcrypto, not the other way around.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | libevent_openssl.pc.in | 2 | ||||
| -rw-r--r-- | sample/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index c3aba0c9..4ed82b6f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -201,7 +201,7 @@ libevent_extra_la_LDFLAGS = $(GENERIC_LDFLAGS) if OPENSSL libevent_openssl_la_SOURCES = bufferevent_openssl.c -libevent_openssl_la_LIBADD = $(MAYBE_CORE) -lcrypto -lssl +libevent_openssl_la_LIBADD = $(MAYBE_CORE) -lssl -lcrypto libevent_openssl_la_LDFLAGS = $(GENERIC_LDFLAGS) endif diff --git a/libevent_openssl.pc.in b/libevent_openssl.pc.in index 0fe7cb60..9624cf24 100644 --- a/libevent_openssl.pc.in +++ b/libevent_openssl.pc.in @@ -11,6 +11,6 @@ Version: @VERSION@ Requires: libevent Conflicts: Libs: -L${libdir} -levent_openssl -Libs.private: @LIBS@ -lcrypto -lssl +Libs.private: @LIBS@ -lssl -lcrypto Cflags: -I${includedir} diff --git a/sample/Makefile.am b/sample/Makefile.am index 86f4811d..09464273 100644 --- a/sample/Makefile.am +++ b/sample/Makefile.am @@ -15,7 +15,7 @@ http_server_sources = http-server.c if OPENSSL noinst_PROGRAMS += le-proxy le_proxy_sources = le-proxy.c -le_proxy_LDADD = $(LDADD) ../libevent_openssl.la -lcrypto -lssl +le_proxy_LDADD = $(LDADD) ../libevent_openssl.la -lssl -lcrypto endif verify: diff --git a/test/Makefile.am b/test/Makefile.am index 64bca720..cf5431ae 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -60,7 +60,7 @@ regress_LDFLAGS = $(PTHREAD_CFLAGS) if OPENSSL regress_SOURCES += regress_ssl.c -regress_LDADD += ../libevent_openssl.la -lcrypto -lssl +regress_LDADD += ../libevent_openssl.la -lssl -lcrypto endif bench_SOURCES = bench.c |