Download as
Browse Code »

Commit cc57b4fbfd1a8c841689f563ed9f78903659eda4

Authored by Perry Werneck
1 parent c6eb5985
Exists in master and in 1 other branch develop

Fixing SSL detection.

Showing 3 changed files with 15 additions and 2 deletions   Show diff stats
Makefile.in
  Diff comments   View file @cc57b4f
... ... @@ -101,7 +101,8 @@ CFLAGS= \
101 101 -DBUILD_DATE=`date +%Y%m%d` \
102 102 @LIB3270_CFLAGS@ \
103 103 @GTK_CFLAGS@ \
104   - @GLIB_CFLAGS@
  104 + @GLIB_CFLAGS@ \
  105 + @LIBSSL_CFLAGS@
105 106  
106 107 LIBS= \
107 108 @LIBS@ \
... ... @@ -109,7 +110,8 @@ LIBS= \
109 110 @GLIB_LIBS@ \
110 111 @LIBICONV@ \
111 112 @INTL_LIBS@ \
112   - @LIB3270_LIBS@
  113 + @LIB3270_LIBS@ \
  114 + @LIBSSL_LIBS@
113 115  
114 116 #---[ Debug Rules ]----------------------------------------------------------------------
115 117  
... ...
configure.ac
  Diff comments   View file @cc57b4f
... ... @@ -175,6 +175,16 @@ dnl ---------------------------------------------------------------------------
175 175 AC_SEARCH_LIBS( [sin], [m], AC_DEFINE(HAVE_LIBM), AC_MSG_ERROR([libm not present.]))
176 176  
177 177 dnl ---------------------------------------------------------------------------
  178 +dnl Check for SSL
  179 +dnl ---------------------------------------------------------------------------
  180 +
  181 +PKG_CHECK_MODULES( [LIBSSL], [libssl libcrypto], AC_DEFINE(HAVE_LIBSSL), AC_MSG_NOTICE([libssl not present.]) )
  182 +
  183 +AC_SUBST(LIBSSL_LIBS)
  184 +AC_SUBST(LIBSSL_CFLAGS)
  185 +
  186 +
  187 +dnl ---------------------------------------------------------------------------
178 188 dnl Check for libintl
179 189 dnl ---------------------------------------------------------------------------
180 190  
... ...
src/include/config.h.in
  Diff comments   View file @cc57b4f
... ... @@ -38,5 +38,6 @@
38 38 #undef HAVE_LIBM
39 39 #undef HAVE_GNOME
40 40 #undef HAVE_GTKMAC
  41 + #undef HAVE_LIBSSL
41 42  
42 43 #endif /* LIBV3270_CONFIG_INCLUDED */
... ...