Skip to content

Commit

Permalink
Merge pull request #38 from OPENDAP/crypto-fix
Browse files Browse the repository at this point in the history
Fixed the libcrypto link error on OSX 10.13
  • Loading branch information
jgallagher59701 committed Jan 2, 2018
2 parents 3d6e9e4 + 94d649b commit 9806db1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ libdap_la_LIBADD = $(XML2_LIBS) $(PTHREAD_LIBS) gl/libgnu.la d4_ce/libd4_ce_pars
d4_function/libd4_function_parser.la libparsers.la

if DAP4_DEFINED
libdap_la_LIBADD += -lcrypto
libdap_la_LIBADD += $(CRYPTO_LIBS)
endif

libdapclient_la_SOURCES = $(CLIENT_SRC)
Expand Down
7 changes: 6 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,11 @@ AC_CHECK_LIB([uuid], [uuid_generate],
[UUID_LIBS=""])
AC_SUBST([UUID_LIBS])

AC_CHECK_LIB([crypto], [OpenSSL_add_all_algorithms],
[CRYPTO_LIBS="-lcrypto"],
[CRYPTO_LIBS=""])
AC_SUBST([CRYPTO_LIBS])

AM_PATH_CPPUNIT(1.12.0,
[AM_CONDITIONAL([CPPUNIT], [true])],
[
Expand Down Expand Up @@ -336,7 +341,7 @@ AS_IF([test x$enable_dap4 = xyes], [

AC_ARG_ENABLE([developer],
[AS_HELP_STRING([--enable-developer],
[Build a debug (-g3 -O0) version of this code and include assert() calls in the code (default is no)])],
[Build a debug (-g3 -O0) version of this code and include assert() calls in the code (default is no)])],
[build_developer=${enableval}],
[build_developer=no])

Expand Down

0 comments on commit 9806db1

Please sign in to comment.