ObjOpenSSL  Diff

Annotate Patch Unified Diff

Differences From Artifact [66416e9578]:

To Artifact [03f212863f]:

︙︙
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60

AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static library]))
AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [
	AC_PATH_TOOL(AR, ar)
	AC_PROG_RANLIB
	AC_SUBST(OBJOPENSSL_STATIC_LIB, "libobjopenssl.a")
])

AC_CHECK_LIB(ssl, main, [LIBS="$LIBS -lssl"], [
	AC_MSG_ERROR(No libssl found! Please install OpenSSL!)
])
AC_CHECK_LIB(crypto, main, [LIBS="$LIBS -lcrypto"], [
	AC_MSG_ERROR(No libcrypto found! Please install OpenSSL!)
])
AC_CHECK_LIB(z, main, [LIBS="$LIBS -lz"], [
	AC_MSG_ERROR(No libz found! Please install zlib!)
])

AS_IF([test x"$GOBJC" = x"yes"], [
	OBJCFLAGS="$OBJCFLAGS -Wwrite-strings -Wpointer-arith"
	dnl We need -Wno-deprecated-declarations as OpenSSL is deprecated on
	dnl OS X.
	OBJCFLAGS="$OBJCFLAGS -Wno-deprecated-declarations"
])

BUILDSYS_INIT

dnl We don't call AC_PROG_CPP, but only AC_PROG_OBJCPP and set CPP to OBJCPP
dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
AC_SUBST(CPP)








|
|
<
|
<
|
<
|



|
<
<
<








32
33
34
35
36
37
38
39
40

41

42

43
44
45
46
47



48
49
50
51
52
53
54

AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static library]))
AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [
	AC_PATH_TOOL(AR, ar)
	AC_PROG_RANLIB
	AC_SUBST(OBJOPENSSL_STATIC_LIB, "libobjopenssl.a")
])

PKG_CHECK_MODULES(openssl, [openssl >= 1.0.2], [
	CPPFLAGS="$CPPFLAGS $openssl_CFLAGS"

	LIBS="$LIBS $openssl_LIBS"

], [

	AC_MSG_ERROR(You need openssl >= 1.0.2 installed!)
])

AS_IF([test x"$GOBJC" = x"yes"], [
	OBJCFLAGS="$OBJCFLAGS -Wwrite-strings -Wpointer-arith -Werror"



])

BUILDSYS_INIT

dnl We don't call AC_PROG_CPP, but only AC_PROG_OBJCPP and set CPP to OBJCPP
dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
AC_SUBST(CPP)
︙︙