ObjMatrix  Check-in [290e327bab]

Overview
Comment:Fix adding flags for dependencies
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 290e327bab4027fd83c4b695626ad7e19ce905eccfce26b59af6828d1efb290d
User & Date: js on 2020-10-03 00:07:21
Other Links: manifest | tags
Context
2020-10-03
09:51
Add README.md check-in: f9a9730cbd user: js tags: trunk
00:07
Fix adding flags for dependencies check-in: 290e327bab user: js tags: trunk
2020-10-02
23:52
Add .fossil-settings check-in: 6a909b9759 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified configure.ac from [0ac1af7ab0] to [9275954693].

︙
11
12
13
14
15
16
17











18
19
20
21
22
23
24
25
26
27
28
29
30
31
32






33
34
35
36
37
38
39

11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38





39
40
41
42
43
44
45
46
47
48
49
50
51








+
+
+
+
+
+
+
+
+
+
+










-
-
-
-
-
+
+
+
+
+
+









BUILDSYS_INIT

AC_CHECK_TOOL(OBJFW_CONFIG, objfw-config)
AS_IF([test x"$OBJFW_CONFIG" = x""], [
	AC_MSG_ERROR(You need ObjFW and objfw-config installed!)
])

AS_IF([$OBJFW_CONFIG --package ObjOpenSSL], [
	OBJFW_CONFIG_FLAGS="$OBJFW_CONFIG_FLAGS --package ObjOpenSSL"
], [
	AC_MSG_ERROR(ObjOpenSSL not found!)
])
AS_IF([$OBJFW_CONFIG --package ObjSQLite3], [
	OBJFW_CONFIG_FLAGS="$OBJFW_CONFIG_FLAGS --package ObjSQLite3"
], [
	AC_MSG_ERROR(ObjSQLite3 not found!)
])

test x"$OBJC" = x"" && OBJC="$($OBJFW_CONFIG --objc)"

AC_LANG([Objective C])
AC_PROG_OBJC
AC_PROG_OBJCPP
AC_PROG_LN_S
AC_PROG_INSTALL

CPP="$OBJCPP"
CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG --cppflags)"
OBJCFLAGS="$OBJCFLAGS $($OBJFW_CONFIG --objcflags)"
LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --ldflags)"
LIBS="$($OBJFW_CONFIG --libs) $LIBS"
FRAMEWORK_LIBS="$($OBJFW_CONFIG --framework-libs) $LIBS"
CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS"
CPPFLAGS="$CPPFLAGS $($OBJFW_CONFIG $OBJFW_CONFIG_FLAGS --cppflags)"
OBJCFLAGS="$OBJCFLAGS $($OBJFW_CONFIG $OBJFW_CONFIG_FLAGS --objcflags)"
LDFLAGS="$LDFLAGS $($OBJFW_CONFIG $OBJFW_CONFIG_FLAGS --ldflags)"
FRAMEWORK_LIBS="$($OBJFW_CONFIG $OBJFW_CONFIG_FLAGS --framework-libs) $LIBS"
LIBS="$($OBJFW_CONFIG $OBJFW_CONFIG_FLAGS --libs) $LIBS"

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

AC_CHECK_TOOL(AR, ar)
AC_PROG_RANLIB
AC_ARG_ENABLE(shared,
︙
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121

98
99
100
101
102
103
104






















105
106
107
108
109
110
111








-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-








		AC_MSG_RESULT(no)
	], [
		AC_MSG_RESULT(yes)
		OBJCFLAGS="$old_OBJCFLAGS"
	])
])

AS_IF([$OBJFW_CONFIG --package ObjOpenSSL], [
	CPPFLAGS="$CPPFLAGS $($OBJFW_CONFIG --package ObjOpenSSL --cppflags)"
	OBJCFLAGS="$OBJCFLAGS $($OBJFW_CONFIG --package ObjOpenSSL --objcflags)"
	LIBS="$($OBJFW_CONFIG --package ObjOpenSSL --libs) $LIBS"
	LDFLAGS="$($OBJFW_CONFIG --package ObjOpenSSL --ldflags) $LDFLAGS"
	x="$($OBJFW_CONFIG --package ObjOpenSSL --framework-libs)"
	FRAMEWORK_LIBS="$x $FRAMEWORK_LIBS"
], [
	AC_MSG_ERROR(ObjOpenSSL not found!)
])

AS_IF([$OBJFW_CONFIG --package ObjSQLite3], [
	CPPFLAGS="$CPPFLAGS $($OBJFW_CONFIG --package ObjSQLite3 --cppflags)"
	OBJCFLAGS="$OBJCFLAGS $($OBJFW_CONFIG --package ObjSQLite3 --objcflags)"
	LIBS="$($OBJFW_CONFIG --package ObjSQLite3 --libs) $LIBS"
	LDFLAGS="$($OBJFW_CONFIG --package ObjSQLite3 --ldflags) $LDFLAGS"
	x="$($OBJFW_CONFIG --package ObjSQLite3 --framework-libs)"
	FRAMEWORK_LIBS="$x $FRAMEWORK_LIBS"
], [
	AC_MSG_ERROR(ObjSQLite3 not found!)
])

AS_IF([test x"$cross_compiling" = x"yes"], [
	case "$host" in
		i?86-*-mingw*)
			AC_CHECK_PROG(WINE, wine, wine)
			;;
		x86_64-*-mingw*)
			AC_CHECK_PROG(WINE, wine64, wine64)
︙