7034218 iiimf is linked with unnecessary libraries such as libssl.so.0.9.8
authoryukie_es
Fri, 08 Apr 2011 10:05:48 +0900
changeset 671 c54711cbeeb7
parent 670 b987f5fc543e
child 672 b638b2a52a6f
7034218 iiimf is linked with unnecessary libraries such as libssl.so.0.9.8
iiim/build/src/im-sdk/ChangeLog
iiim/build/src/im-sdk/acfiles/check_sys.m4
iiim/build/src/im-sdk/iiimsf/configure.ac
iiim/build/src/im-sdk/lib/iiimp/configure.ac
--- a/iiim/build/src/im-sdk/ChangeLog	Mon Mar 07 14:33:55 2011 +0100
+++ b/iiim/build/src/im-sdk/ChangeLog	Fri Apr 08 10:05:48 2011 +0900
@@ -1,3 +1,9 @@
+2011-04-07 Yukie Azuma <[email protected]>
+	iiim/build/src/im-sdk/acfiles/check_sys.m4
+	iiim/build/src/im-sdk/iiimsf/configure.ac
+	iiim/build/src/im-sdk/lib/iiimp/configure.ac
+	Removing OpenSSL dependency from iiim(See bugid#7034218).
+
 2011-02-11 Kazuhiko Maekawa <[email protected]>
 	leif/hangul/src/leif/ime_module.c
 	leif/hangul/src/input_methods/hangul/hangul_im.c 
--- a/iiim/build/src/im-sdk/acfiles/check_sys.m4	Mon Mar 07 14:33:55 2011 +0100
+++ b/iiim/build/src/im-sdk/acfiles/check_sys.m4	Fri Apr 08 10:05:48 2011 +0900
@@ -133,24 +133,6 @@
 	fi
 ])
 
-AC_DEFUN([IM_CHECK_TLS],
-[
-	AC_ARG_ENABLE(openssl,
-	[  --disable-openssl	disable openssl support],
-	[ enable_openssl="${enableval}";],
-	[ enable_openssl="yes";])
-	if test "X${enable_openssl}" = "Xyes" ; then
-		AC_CHECK_HEADERS(openssl/ssl.h, [ HAVE_OPENSSL_H="yes" ])
-		AC_CHECK_LIB(ssl, SSL_new, [ HAVE_LIBSSL="yes" ])
-		if test "X${HAVE_OPENSSL_H}" = "Xyes" -a "X${HAVE_LIBSSL}" = "Xyes" ; then
-			AC_DEFINE(HAVE_TLS, 1, [ Define to 1 if you have openssl library ])
-			HAVE_TLS="yes"
-			TLS_CFLAGS=""
-			TLS_LIBS="-lssl -lcrypto"
-		fi
-	fi
-])
-
 AC_DEFUN([IM_CONSTRUCT_FLAGS],
 [
 	COMMON_CXX_CFLAGS="-I${srcdir} -I${IM_INCLUDEDIR} -DARCH=\\\"${ARCH}\\\" -DHAVE_CONFIG_H"
--- a/iiim/build/src/im-sdk/iiimsf/configure.ac	Mon Mar 07 14:33:55 2011 +0100
+++ b/iiim/build/src/im-sdk/iiimsf/configure.ac	Fri Apr 08 10:05:48 2011 +0900
@@ -211,15 +211,6 @@
  [ if test $tcpd_enable = "yes" ; then AC_DEFINE(HAVE_LIBWRAP) fi ],
  [ tcpd_enable="no" ])
 
-# Checks the OpenSSL library.
-IM_CHECK_TLS
-# Some distos has openssl-devel 0.9.6 which does not include
-# openssl.pc.
-#PKG_CHECK_MODULES(TLS, openssl, AC_DEFINE(HAVE_TLS, 1, 
-#                  [ Define to 1 if you have openssl library ]),)
-#AC_SUBST(TLS_LIBS)
-#AC_SUBST(TLS_CFLAGS)
-
 # Checks libxml library.
 PKG_CHECK_MODULES(XML, libxml-2.0)
 AC_SUBST(XML_CFLAGS)
--- a/iiim/build/src/im-sdk/lib/iiimp/configure.ac	Mon Mar 07 14:33:55 2011 +0100
+++ b/iiim/build/src/im-sdk/lib/iiimp/configure.ac	Fri Apr 08 10:05:48 2011 +0900
@@ -53,15 +53,6 @@
    AC_MSG_ERROR("Fail to find socket().")
 fi
 
-# Checks the OpenSSL library.
-IM_CHECK_TLS
-# Some distos has openssl-devel 0.9.6 which does not include
-# openssl.pc.
-#PKG_CHECK_MODULES(TLS, openssl, AC_DEFINE(HAVE_TLS, 1, 
-#                  [ Define to 1 if you have openssl library ]),)
-#AC_SUBST(TLS_LIBS)
-#AC_SUBST(TLS_CFLAGS)
-
 dnl --------------------------------------------------------------------------------
 dnl                      Section 5: compilation options
 dnl --------------------------------------------------------------------------------