ObjXMPP  Check-in [f9ba7ce6ec]

Overview
Comment:Install an objfw-config package
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: f9ba7ce6ec5ac1bbc8a7f8fe96b3a50b648b28deed3dfd733c9197ba6272f528
User & Date: js on 2019-01-20 12:45:48
Other Links: manifest | tags
Context
2019-01-23
20:23
Fix compilation with GCC check-in: 9b61e47762 user: js tags: trunk
2019-01-20
12:45
Install an objfw-config package check-in: f9ba7ce6ec user: js tags: trunk
12:38
Make use of objfw-config's new package support check-in: 874510053a user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified Makefile from [09054376de] to [1c03c2eef3]. 

1
2
3
4
5
























SUBDIRS = src tests

tests: src

include buildsys.mk





























>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>

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

SUBDIRS = src tests

tests: src

include buildsys.mk
include extra.mk

install-extra:
	i=ObjXMPP.oc; \
	packagesdir="${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)"; \
	${INSTALL_STATUS}; \
	if ${MKDIR_P} $$packagesdir && ${INSTALL} -m 644 $$i $$packagesdir/$$i; then \
		${INSTALL_OK}; \
	else \
		${INSTALL_FAILED}; \
	fi

uninstall-extra:
	i=ObjXMPP.oc; \
	packagesdir="${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)"; \
	if test -f $$packagesdir/$$i; then \
		if rm -f $$packagesdir/$$i; then \
			${DELETE_OK}; \
		else \
			${DELETE_FAILED}; \
		fi \
	fi; \
	rmdir $$packagesdir >/dev/null 2>&1 || true

Added ObjXMPP.oc version [ecbe635ebf].

Modified configure.ac from [43d965a587] to [715942c71b].

︙︙
23
24
25
26
27
28
29
30
31
32
33
34
35
36

37
38
39
40
41
42
43

AS_IF([$OBJFW_CONFIG --package ObjOpenSSL 2>/dev/null], [
	AC_MSG_RESULT(yes)
], [
	AC_MSG_RESULT(no)
	AC_MSG_ERROR(You need ObjOpenSSL installed!)
])

OBJFW_CONFIG="$OBJFW_CONFIG --package ObjOpenSSL"
CPP="$OBJCPP"
CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG --cppflags)"
OBJCFLAGS="$OBJCFLAGS -Wall $($OBJFW_CONFIG --objcflags)"
LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --ldflags)"
AC_SUBST(OBJFW_LIBS, "$LIBS $($OBJFW_CONFIG --libs)")
AC_SUBST(OBJFW_FRAMEWORK_LIBS, "$LIBS $($OBJFW_CONFIG --framework-libs)")


AX_CHECK_COMPILER_FLAGS(-Watomic-properties,
	[OBJCFLAGS="$OBJCFLAGS -Watomic-properties"])
AX_CHECK_COMPILER_FLAGS(-Wdocumentation,
	[OBJCFLAGS="$OBJCFLAGS -Wdocumentation"])

AC_ARG_ENABLE(shared,








|

|
|
|
|
|
>








23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44

AS_IF([$OBJFW_CONFIG --package ObjOpenSSL 2>/dev/null], [
	AC_MSG_RESULT(yes)
], [
	AC_MSG_RESULT(no)
	AC_MSG_ERROR(You need ObjOpenSSL installed!)
])

packages="--package ObjOpenSSL"
CPP="$OBJCPP"
CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG $packages --cppflags)"
OBJCFLAGS="$OBJCFLAGS -Wall $($OBJFW_CONFIG $packages --objcflags)"
LDFLAGS="$LDFLAGS $($OBJFW_CONFIG $packages --ldflags)"
AC_SUBST(OBJFW_LIBS, "$LIBS $($OBJFW_CONFIG $packages --libs)")
AC_SUBST(OBJFW_FRAMEWORK_LIBS,
	"$LIBS $($OBJFW_CONFIG $packages --framework-libs)")

AX_CHECK_COMPILER_FLAGS(-Watomic-properties,
	[OBJCFLAGS="$OBJCFLAGS -Watomic-properties"])
AX_CHECK_COMPILER_FLAGS(-Wdocumentation,
	[OBJCFLAGS="$OBJCFLAGS -Wdocumentation"])

AC_ARG_ENABLE(shared,
︙︙

Modified extra.mk.in from [cee810e87f] to [94b2ea70f3]. 

1
2
3
4

5
6
7
8

OBJXMPP_SHARED_LIB = @OBJXMPP_SHARED_LIB@
OBJXMPP_STATIC_LIB = @OBJXMPP_STATIC_LIB@
OBJXMPP_FRAMEWORK = @OBJXMPP_FRAMEWORK@


OBJFW_FRAMEWORK_LIBS = @OBJFW_FRAMEWORK_LIBS@
OBJFW_LIBS = @OBJFW_LIBS@
OBJOPENSSL_FRAMEWORK_LIBS = @OBJOPENSSL_FRAMEWORK_LIBS@
OBJOPENSSL_LIBS = @OBJOPENSSL_LIBS@





>





1
2
3
4
5
6
7
8
9

OBJXMPP_SHARED_LIB = @OBJXMPP_SHARED_LIB@
OBJXMPP_STATIC_LIB = @OBJXMPP_STATIC_LIB@
OBJXMPP_FRAMEWORK = @OBJXMPP_FRAMEWORK@

OBJFW_CONFIG = @OBJFW_CONFIG@
OBJFW_FRAMEWORK_LIBS = @OBJFW_FRAMEWORK_LIBS@
OBJFW_LIBS = @OBJFW_LIBS@
OBJOPENSSL_FRAMEWORK_LIBS = @OBJOPENSSL_FRAMEWORK_LIBS@
OBJOPENSSL_LIBS = @OBJOPENSSL_LIBS@