ObjOpenSSL  Check-in [fb074fe047]

Overview
Comment:Install package for objfw-config
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: fb074fe047e1b4461ee429bf28b6803f7887bc172fc8e2bfa8cd72af6e862416
User & Date: js on 2019-01-17 23:12:44
Other Links: manifest | tags
Context
2019-01-20
12:20
Adjust to new objfw-config package format check-in: 2c5a2c6dd7 user: js tags: trunk
2019-01-17
23:12
Install package for objfw-config check-in: fb074fe047 user: js tags: trunk
2019-01-16
23:16
configure: Add --with-openssl=PREFIX check-in: 67a5b6b160 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified .gitignore from [bf55e62232] to [78680382b4].

︙
9
10
11
12
13
14
15


9
10
11
12
13
14
15
16








+

autom4te.cache
buildsys.mk
config.log
config.status
configure
DerivedData
extra.mk
packages/ObjOpenSSL

Modified Makefile from [ed21ec15c3] to [81e238dc9f]. 

1
2
3





















1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23




+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

SUBDIRS = src

include buildsys.mk
include extra.mk

install-extra:
	i=packages/ObjOpenSSL; \
	${INSTALL_STATUS}; \
	if ${INSTALL} -m 644 $$i ${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)/ObjOpenSSL; then \
		${INSTALL_OK}; \
	else \
		${INSTALL_FAILED}; \
	fi

uninstall-extra:
	i=packages/ObjOpenSSL; \
	if test -f ${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)/ObjOpenSSL; then \
		if rm -f ${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)/ObjOpenSSL; then \
			${DELETE_OK}; \
		else \
			${DELETE_FAILED}; \
		fi \
	fi

Modified configure.ac from [74b3799f6c] to [57a463f7cf].

︙
42
43
44
45
46
47
48
49
50
51





52
53
54

55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70



71

72

42
43
44
45
46
47
48



49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76

77
78








-
-
-
+
+
+
+
+



+
















+
+
+
-
+


	AC_PATH_TOOL(AR, ar)
	AC_PROG_RANLIB
	AC_SUBST(OBJOPENSSL_STATIC_LIB, "libobjopenssl.a")
])

AC_ARG_WITH(openssl, AS_HELP_STRING([--with-openssl=PREFIX],
	[build with OpenSSL in the specified prefix]))
AS_IF([test x"$with_openssl" != x"no"], [
       CPPFLAGS="$CPPFLAGS -I$with_openssl/include"
       LIBS="$LIBS -L$with_openssl/lib"
AS_IF([test x"$with_openssl" != x"no" -a x"$with_openssl" != x""], [
       OPENSSL_CPPFLAGS="$CPPFLAGS -I$with_openssl/include"
       OPENSSL_LIBS="$LIBS -L$with_openssl/lib"
       CPPFLAGS="$CPPFLAGS $OPENSSL_CPPFLAGS"
       LIBS="$LIBS $OPENSSL_LIBS"
])

AC_CHECK_LIB(ssl, main, [
	OPENSSL_LIBS="$OPENSSL_LIBS -lssl -lcrypto"
	LIBS="$LIBS -lssl -lcrypto"
], [
	AC_MSG_ERROR(You need openssl >= 1.0.2 installed!)
], [-lcrypto])

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)
AC_SUBST(CPPFLAGS)

AC_SUBST(OPENSSL_CPPFLAGS)
AC_SUBST(OPENSSL_LIBS)

AC_CONFIG_FILES([buildsys.mk extra.mk])
AC_CONFIG_FILES([buildsys.mk extra.mk packages/ObjOpenSSL])
AC_OUTPUT

Modified extra.mk.in from [5776c0b728] to [d0a6614d71]. 

1
2
3
4

5
6

1
2
3
4
5
6
7





+



OBJOPENSSL_SHARED_LIB = @OBJOPENSSL_SHARED_LIB@
OBJOPENSSL_STATIC_LIB = @OBJOPENSSL_STATIC_LIB@
OBJOPENSSL_FRAMEWORK = @OBJOPENSSL_FRAMEWORK@

OBJFW_CONFIG = @OBJFW_CONFIG@
OBJFW_FRAMEWORK_LIBS = @OBJFW_FRAMEWORK_LIBS@
OBJFW_LIBS = @OBJFW_LIBS@

Added packages/ObjOpenSSL.in version [dac9b47257].