diff options
author | Will Thompson <will.thompson@collabora.co.uk> | 2013-04-22 16:44:00 +0100 |
---|---|---|
committer | Will Thompson <will.thompson@collabora.co.uk> | 2013-04-22 16:44:00 +0100 |
commit | 55f8288fe6ae9a158a3a1e4b64ecc9beea3e6534 (patch) | |
tree | 80619e31368d61b81f975f5f49e571c0b0ca917f | |
parent | 9d4854585d1c2eac8a20af3b07952d43cc92cdb5 (diff) |
Drop unused build dependency on OpenSSL
Since some time ago, Idle has used GIO's TLS stuff; we should have
dropped this back then.
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | tests/Makefile.am | 6 |
3 files changed, 2 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index d3f1ca3..3573b17 100644 --- a/configure.ac +++ b/configure.ac @@ -97,8 +97,6 @@ AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_18, [Ignore post 0.18 deprecatio AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_20, [Prevent post 0.20 APIs]) PKG_CHECK_MODULES([TELEPATHY], [telepathy-glib >= 0.15.9]) -PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.7]) - dnl Check for code generation tools XSLTPROC= AC_CHECK_PROGS([XSLTPROC], [xsltproc]) diff --git a/src/Makefile.am b/src/Makefile.am index 1949a39..7326f8e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -61,7 +61,6 @@ AM_CFLAGS = \ $(ERROR_CFLAGS) \ @DBUS_CFLAGS@ \ @GLIB_CFLAGS@ \ - @OPENSSL_CFLAGS@ \ @TELEPATHY_CFLAGS@ \ -std=c99 @@ -72,7 +71,6 @@ AM_LDFLAGS = \ ALL_LIBS = \ @DBUS_LIBS@ \ @GLIB_LIBS@ \ - @OPENSSL_LIBS@ \ @TELEPATHY_LIBS@ man_MANS = telepathy-idle.8 diff --git a/tests/Makefile.am b/tests/Makefile.am index 295512a..1e84f35 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -21,8 +21,7 @@ AM_CFLAGS = \ -I $(top_builddir)/src \ @DBUS_CFLAGS@ \ @GLIB_CFLAGS@ \ - @TELEPATHY_CFLAGS@ \ - @OPENSSL_CFLAGS@ + @TELEPATHY_CFLAGS@ AM_LDFLAGS = \ $(ERROR_LDFLAGS) \ @@ -31,8 +30,7 @@ AM_LDFLAGS = \ ALL_LIBS = \ @DBUS_LIBS@ \ @GLIB_LIBS@ \ - @TELEPATHY_LIBS@ \ - @OPENSSL_LIBS@ + @TELEPATHY_LIBS@ TESTS = $(check_PROGRAMS) |