Mon, 01 Dec 2025 20:32:12 +0100
fix help text and config summary generated even when there are no variables
fixes #765
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | #!/bin/sh |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | |
|
116
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
3 | |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
4 | # some utility functions |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
5 | isplatform() |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
6 | { |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
7 | for p in $PLATFORM |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
8 | do |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
9 | if [ "$p" = "$1" ]; then |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
10 | return 0 |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
11 | fi |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
12 | done |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
13 | return 1 |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
14 | } |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
15 | notisplatform() |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
16 | { |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
17 | for p in $PLATFORM |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
18 | do |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
19 | if [ "$p" = "$1" ]; then |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
20 | return 1 |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
21 | fi |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
22 | done |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
23 | return 0 |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
24 | } |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
25 | istoolchain() |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
26 | { |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
27 | for t in $TOOLCHAIN |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
28 | do |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
29 | if [ "$t" = "$1" ]; then |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
30 | return 0 |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
31 | fi |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
32 | done |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
33 | return 1 |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
34 | } |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
35 | notistoolchain() |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
36 | { |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
37 | for t in $TOOLCHAIN |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
38 | do |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
39 | if [ "$t" = "$1" ]; then |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
40 | return 1 |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
41 | fi |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
42 | done |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
43 | return 0 |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
44 | } |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
45 | |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
46 | # clean abort |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
47 | abort_configure() |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
48 | { |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
49 | rm -Rf "$TEMP_DIR" |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
50 | exit 1 |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
51 | } |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
52 | |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
53 | # Test for availability of pkg-config |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
54 | PKG_CONFIG=`command -v pkg-config` |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
55 | : ${PKG_CONFIG:="false"} |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
56 | |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
57 | # Simple uname based platform detection |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
58 | # $PLATFORM is used for platform dependent dependency selection |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
59 | OS=`uname -s` |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
60 | OS_VERSION=`uname -r` |
|
146
d27511c87b70
add libdir detection for some special cases - partially resolves issue #440
Mike Becker <universe@uap-core.de>
parents:
145
diff
changeset
|
61 | ARCH=`uname -m` |
|
116
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
62 | printf "detect platform... " |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
63 | if [ "$OS" = "SunOS" ]; then |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
64 | PLATFORM="solaris sunos unix svr4" |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
65 | elif [ "$OS" = "Linux" ]; then |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
66 | PLATFORM="linux unix" |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
67 | elif [ "$OS" = "FreeBSD" ]; then |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
68 | PLATFORM="freebsd bsd unix" |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
69 | elif [ "$OS" = "OpenBSD" ]; then |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
70 | PLATFORM="openbsd bsd unix" |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
71 | elif [ "$OS" = "NetBSD" ]; then |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
72 | PLATFORM="netbsd bsd unix" |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
73 | elif [ "$OS" = "Darwin" ]; then |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
74 | PLATFORM="macos osx bsd unix" |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
75 | elif echo "$OS" | grep -i "MINGW" > /dev/null; then |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
76 | PLATFORM="windows mingw" |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
77 | fi |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
78 | : ${PLATFORM:="unix"} |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
79 | |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
80 | PLATFORM_NAME=`echo "$PLATFORM" | cut -f1 -d' ' -` |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
81 | echo "$PLATFORM_NAME" |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
82 | |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
83 | |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
84 | # help text |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
85 | printhelp() |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
86 | { |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
87 | echo "Usage: $0 [OPTIONS]..." |
|
175
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
88 | if [ $has_config_vars__ -eq 1 ] ; then |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
89 | echo |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
90 | echo "Configuration:" |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
91 | fi |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
92 | if true \ |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
93 | ; then |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
94 | : |
|
175
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
95 | if [ -z "$prefix__described__" ] ; then |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
96 | prefix__described__=1 |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
97 | cat << '__EOF__' |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
98 | --prefix path prefix for architecture-independent files [/usr] |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
99 | __EOF__ |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
100 | fi |
|
175
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
101 | if [ -z "$exec_prefix__described__" ] ; then |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
102 | exec_prefix__described__=1 |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
103 | cat << '__EOF__' |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
104 | --exec-prefix path prefix for architecture-dependent files [PREFIX] |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
105 | __EOF__ |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
106 | fi |
|
175
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
107 | if [ -z "$libdir__described__" ] ; then |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
108 | libdir__described__=1 |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
109 | cat << '__EOF__' |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
110 | --libdir object code libraries [EPREFIX/lib] |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
111 | __EOF__ |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
112 | fi |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
113 | fi |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
114 | if true \ |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
115 | && notisplatform "mingw" \ |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
116 | ; then |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
117 | : |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
118 | fi |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
119 | if true \ |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
120 | && isplatform "mingw" \ |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
121 | ; then |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
122 | : |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
123 | fi |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
124 | cat << '__EOF__' |
|
116
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
125 | |
|
128
22f7262475e7
fixes debug/release options only showing when other options are specified - fixes #528
Mike Becker <universe@uap-core.de>
parents:
127
diff
changeset
|
126 | Build Types: |
| 136 | 127 | --debug add extra compile flags for debug builds |
| 128 | --release add extra compile flags for release builds | |
|
128
22f7262475e7
fixes debug/release options only showing when other options are specified - fixes #528
Mike Becker <universe@uap-core.de>
parents:
127
diff
changeset
|
129 | |
|
116
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
130 | Optional Features: |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
131 | --disable-pg |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
132 | |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
133 | __EOF__ |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
134 | abort_configure |
|
116
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
135 | } |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
136 | |
|
52
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
137 | # create temporary directory |
|
53
704368f1bb23
revert command substitution syntax change (relates to #283)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
138 | TEMP_DIR=".tmp-`uname -n`" |
|
52
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
139 | rm -Rf "$TEMP_DIR" |
|
60
43d6680e6410
update reference configure scripts
Mike Becker <universe@uap-core.de>
parents:
54
diff
changeset
|
140 | if mkdir -p "$TEMP_DIR"; then |
|
43d6680e6410
update reference configure scripts
Mike Becker <universe@uap-core.de>
parents:
54
diff
changeset
|
141 | : |
|
43d6680e6410
update reference configure scripts
Mike Becker <universe@uap-core.de>
parents:
54
diff
changeset
|
142 | else |
|
52
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
143 | echo "Cannot create tmp dir $TEMP_DIR" |
|
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
144 | echo "Abort" |
|
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
145 | exit 1 |
|
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
146 | fi |
|
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
147 | touch "$TEMP_DIR/options" |
|
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
148 | touch "$TEMP_DIR/features" |
|
7
686991ae6e2f
add configureable make variables
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
6
diff
changeset
|
149 | |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
150 | # config variables |
|
175
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
151 | has_config_vars__=0 |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
152 | if true \ |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
153 | ; then |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
154 | : |
|
175
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
155 | if [ -z "$prefix__initialized__" ] ; then |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
156 | has_config_vars__=1 |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
157 | prefix__initialized__=1 |
|
172
3ffb04ba3f41
do not evaluate variables when initializing config vars
Mike Becker <universe@uap-core.de>
parents:
171
diff
changeset
|
158 | prefix='/usr' |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
159 | fi |
|
175
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
160 | if [ -z "$exec_prefix__initialized__" ] ; then |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
161 | has_config_vars__=1 |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
162 | exec_prefix__initialized__=1 |
|
172
3ffb04ba3f41
do not evaluate variables when initializing config vars
Mike Becker <universe@uap-core.de>
parents:
171
diff
changeset
|
163 | exec_prefix='' |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
164 | fi |
|
175
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
165 | if [ -z "$libdir__initialized__" ] ; then |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
166 | has_config_vars__=1 |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
167 | libdir__initialized__=1 |
|
172
3ffb04ba3f41
do not evaluate variables when initializing config vars
Mike Becker <universe@uap-core.de>
parents:
171
diff
changeset
|
168 | libdir='' |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
169 | fi |
|
175
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
170 | if [ -z "$HOST__initialized__" ] ; then |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
171 | has_config_vars__=1 |
|
171
9e4fd0d54ade
fix that only overridable vars were initialized
Mike Becker <universe@uap-core.de>
parents:
169
diff
changeset
|
172 | HOST__initialized__=1 |
|
9e4fd0d54ade
fix that only overridable vars were initialized
Mike Becker <universe@uap-core.de>
parents:
169
diff
changeset
|
173 | HOST=`uname -n` |
|
9e4fd0d54ade
fix that only overridable vars were initialized
Mike Becker <universe@uap-core.de>
parents:
169
diff
changeset
|
174 | fi |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
175 | fi |
|
116
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
176 | if true \ |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
177 | && notisplatform "mingw" \ |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
178 | ; then |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
179 | : |
|
175
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
180 | if [ -z "$PWD__initialized__" ] ; then |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
181 | has_config_vars__=1 |
|
171
9e4fd0d54ade
fix that only overridable vars were initialized
Mike Becker <universe@uap-core.de>
parents:
169
diff
changeset
|
182 | PWD__initialized__=1 |
|
172
3ffb04ba3f41
do not evaluate variables when initializing config vars
Mike Becker <universe@uap-core.de>
parents:
171
diff
changeset
|
183 | PWD='pwd' |
|
171
9e4fd0d54ade
fix that only overridable vars were initialized
Mike Becker <universe@uap-core.de>
parents:
169
diff
changeset
|
184 | fi |
|
116
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
185 | fi |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
186 | if true \ |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
187 | && isplatform "mingw" \ |
|
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
188 | ; then |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
189 | : |
|
175
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
190 | if [ -z "$PWD__initialized__" ] ; then |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
191 | has_config_vars__=1 |
|
171
9e4fd0d54ade
fix that only overridable vars were initialized
Mike Becker <universe@uap-core.de>
parents:
169
diff
changeset
|
192 | PWD__initialized__=1 |
|
172
3ffb04ba3f41
do not evaluate variables when initializing config vars
Mike Becker <universe@uap-core.de>
parents:
171
diff
changeset
|
193 | PWD='pwd -W' |
|
171
9e4fd0d54ade
fix that only overridable vars were initialized
Mike Becker <universe@uap-core.de>
parents:
169
diff
changeset
|
194 | fi |
|
116
41981a23aff8
add platform attributes to config element
Mike Becker <universe@uap-core.de>
parents:
115
diff
changeset
|
195 | fi |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
196 | |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
197 | # features |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
198 | FEATURE_PG=auto |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
199 | |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
200 | # |
|
34
4486849e6a6c
fixes several minor potential issues in configure script
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
201 | # parse arguments |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
202 | # |
|
51
5c12e9e29733
add debug/release options - fixes #285
Mike Becker <universe@uap-core.de>
parents:
47
diff
changeset
|
203 | BUILD_TYPE="default" |
|
34
4486849e6a6c
fixes several minor potential issues in configure script
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
204 | for ARG in "$@" |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
205 | do |
|
16
4fac0e25ee04
improve posix shell compatibility
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
15
diff
changeset
|
206 | case "$ARG" in |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
207 | "--prefix="*) prefix=${ARG#--prefix=} ;; |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
208 | "--exec-prefix="*) exec_prefix=${ARG#--exec-prefix=} ;; |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
209 | "--libdir="*) libdir=${ARG#--libdir=} ;; |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
210 | "--help"*) printhelp ;; |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
211 | "--debug") BUILD_TYPE="debug" ;; |
|
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
212 | "--release") BUILD_TYPE="release" ;; |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
213 | "--enable-pg") FEATURE_PG=on ;; |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
214 | "--disable-pg") unset FEATURE_PG ;; |
|
52
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
215 | "-"*) echo "unknown option: $ARG"; abort_configure ;; |
|
34
4486849e6a6c
fixes several minor potential issues in configure script
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
216 | esac |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
217 | done |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
218 | |
|
168
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
219 | # toolchain detection utilities |
|
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
220 | . make/toolchain.sh |
|
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
221 | |
|
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
222 | # check languages |
|
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
223 | lang_c= |
|
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
224 | lang_cpp= |
|
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
225 | if detect_cpp_compiler ; then |
|
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
226 | lang_cpp=1 |
|
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
227 | fi |
|
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
228 | if detect_c_compiler ; then |
|
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
229 | lang_c=1 |
|
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
230 | fi |
|
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
231 | |
|
52
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
232 | |
|
88
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
233 | |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
234 | # set defaults for dir variables |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
235 | : ${exec_prefix:="$prefix"} |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
236 | : ${bindir:='${exec_prefix}/bin'} |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
237 | : ${sbindir:='${exec_prefix}/sbin'} |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
238 | : ${libdir:='${exec_prefix}/lib'} |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
239 | : ${libexecdir:='${exec_prefix}/libexec'} |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
240 | : ${datarootdir:='${prefix}/share'} |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
241 | : ${datadir:='${datarootdir}'} |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
242 | : ${sharedstatedir:='${prefix}/com'} |
|
159
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
243 | if [ -z "$sysconfdir" ]; then |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
244 | if [ "$prefix" = '/usr' ]; then |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
245 | sysconfdir='/etc' |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
246 | else |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
247 | sysconfdir='${prefix}/etc' |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
248 | fi |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
249 | fi |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
250 | if [ -z "$localstatedir" ]; then |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
251 | if [ "$prefix" = '/usr' ]; then |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
252 | localstatedir='/var' |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
253 | else |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
254 | localstatedir='${prefix}/var' |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
255 | fi |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
256 | fi |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
257 | if [ -z "$runstatedir" ]; then |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
258 | if [ "$prefix" = '/usr' ]; then |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
259 | runstatedir='/var/run' |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
260 | else |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
261 | runstatedir='${prefix}/var' |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
262 | fi |
|
b0344d89ade6
add special treatment of sysconfdir, localstatedir, and runstatedir even when no config.site exists
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
263 | fi |
|
88
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
264 | : ${includedir:='${prefix}/include'} |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
265 | : ${infodir:='${datarootdir}/info'} |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
266 | : ${mandir:='${datarootdir}/man'} |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
267 | : ${localedir:='${datarootdir}/locale'} |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
268 | |
|
168
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
269 | |
|
88
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
270 | # check if a config.site exists and load it |
|
169
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
271 | CONFIG_SITE_OK=0 |
|
88
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
272 | if [ -n "$CONFIG_SITE" ]; then |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
273 | # CONFIG_SITE may contain space separated file names |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
274 | for cs in $CONFIG_SITE; do |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
275 | printf "loading defaults from $cs... " |
|
169
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
276 | if [ -f "$cs" ]; then |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
277 | . "$cs" |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
278 | echo ok |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
279 | CONFIG_SITE_OK=1 |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
280 | break |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
281 | else |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
282 | echo "not found" |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
283 | fi |
|
88
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
284 | done |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
285 | elif [ -f "$prefix/share/config.site" ]; then |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
286 | printf "loading site defaults... " |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
287 | . "$prefix/share/config.site" |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
288 | echo ok |
|
169
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
289 | CONFIG_SITE_OK=1 |
|
88
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
290 | elif [ -f "$prefix/etc/config.site" ]; then |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
291 | printf "loading site defaults... " |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
292 | . "$prefix/etc/config.site" |
|
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
293 | echo ok |
|
169
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
294 | CONFIG_SITE_OK=1 |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
295 | fi |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
296 | |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
297 | if [ $CONFIG_SITE_OK -eq 0 ]; then |
|
146
d27511c87b70
add libdir detection for some special cases - partially resolves issue #440
Mike Becker <universe@uap-core.de>
parents:
145
diff
changeset
|
298 | # try to detect the correct libdir on our own, except it was changed by the user |
|
169
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
299 | if [ "$libdir" = '${exec_prefix}/lib' ] ; then |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
300 | if [ "$TOOLCHAIN_WSIZE" = "64" ] ; then |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
301 | if [ "$OS" = "SunOS" ]; then |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
302 | [ -d "${exec_prefix}/lib/64" ] && libdir='${exec_prefix}/lib/64' |
|
146
d27511c87b70
add libdir detection for some special cases - partially resolves issue #440
Mike Becker <universe@uap-core.de>
parents:
145
diff
changeset
|
303 | else |
|
169
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
304 | [ -d "${exec_prefix}/lib64" ] && libdir='${exec_prefix}/lib64' |
|
146
d27511c87b70
add libdir detection for some special cases - partially resolves issue #440
Mike Becker <universe@uap-core.de>
parents:
145
diff
changeset
|
305 | fi |
|
169
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
306 | elif [ "$TOOLCHAIN_WSIZE" = "32" ] ; then |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
307 | if [ "$OS" = "SunOS" ]; then |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
308 | [ -d "${exec_prefix}/lib/32" ] && libdir='${exec_prefix}/lib/32' |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
309 | else |
|
a85cb6c4275d
improve libdir detection + don't chicken out when a specified config site does not exist
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
310 | [ -d "${exec_prefix}/lib32" ] && libdir='${exec_prefix}/lib32' |
|
168
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
311 | fi |
|
146
d27511c87b70
add libdir detection for some special cases - partially resolves issue #440
Mike Becker <universe@uap-core.de>
parents:
145
diff
changeset
|
312 | fi |
|
d27511c87b70
add libdir detection for some special cases - partially resolves issue #440
Mike Becker <universe@uap-core.de>
parents:
145
diff
changeset
|
313 | fi |
|
88
0a663c3692a0
add support for config.site - fixes #313
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
314 | fi |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
315 | |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
316 | |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
317 | # generate vars.mk |
|
52
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
318 | cat > "$TEMP_DIR/vars.mk" << __EOF__ |
|
114
0fa5a6f08245
remove unnecessary double-quotes in vars.mk - fixes #370
Mike Becker <universe@uap-core.de>
parents:
106
diff
changeset
|
319 | prefix=$prefix |
|
0fa5a6f08245
remove unnecessary double-quotes in vars.mk - fixes #370
Mike Becker <universe@uap-core.de>
parents:
106
diff
changeset
|
320 | exec_prefix=$exec_prefix |
|
0fa5a6f08245
remove unnecessary double-quotes in vars.mk - fixes #370
Mike Becker <universe@uap-core.de>
parents:
106
diff
changeset
|
321 | libdir=$libdir |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
322 | HOST=$HOST |
|
171
9e4fd0d54ade
fix that only overridable vars were initialized
Mike Becker <universe@uap-core.de>
parents:
169
diff
changeset
|
323 | PWD=$PWD |
|
173
16324bb74fb1
fix missing blank line after config vars in config.mk
Mike Becker <universe@uap-core.de>
parents:
172
diff
changeset
|
324 | |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
325 | __EOF__ |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
326 | |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
327 | |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
328 | # |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
329 | # DEPENDENCIES |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
330 | # |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
331 | |
|
168
4cd9757c1ad9
run compiler detection before trying to correct libdir + check TOOLCHAIN_WSIZE before setting 64bit libdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
167
diff
changeset
|
332 | |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
333 | |
|
52
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
334 | # create buffer for make variables required by dependencies |
|
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
335 | echo > "$TEMP_DIR/make.mk" |
|
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
336 | |
|
63
ac47c2fb2c4a
fix bogus version constraint test - relates to #294
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
337 | test_pkg_config() |
|
ac47c2fb2c4a
fix bogus version constraint test - relates to #294
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
338 | { |
|
ac47c2fb2c4a
fix bogus version constraint test - relates to #294
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
339 | if "$PKG_CONFIG" --exists "$1" ; then : |
|
ac47c2fb2c4a
fix bogus version constraint test - relates to #294
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
340 | else return 1 ; fi |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
341 | if [ -z "$2" ] || "$PKG_CONFIG" --atleast-version="$2" "$1" ; then : |
|
63
ac47c2fb2c4a
fix bogus version constraint test - relates to #294
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
342 | else return 1 ; fi |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
343 | if [ -z "$3" ] || "$PKG_CONFIG" --exact-version="$3" "$1" ; then : |
|
63
ac47c2fb2c4a
fix bogus version constraint test - relates to #294
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
344 | else return 1 ; fi |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
345 | if [ -z "$4" ] || "$PKG_CONFIG" --max-version="$4" "$1" ; then : |
|
63
ac47c2fb2c4a
fix bogus version constraint test - relates to #294
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
346 | else return 1 ; fi |
|
ac47c2fb2c4a
fix bogus version constraint test - relates to #294
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
347 | return 0 |
|
ac47c2fb2c4a
fix bogus version constraint test - relates to #294
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
348 | } |
|
ac47c2fb2c4a
fix bogus version constraint test - relates to #294
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
349 | |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
350 | print_check_msg() |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
351 | { |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
352 | if [ -z "$1" ]; then |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
353 | shift |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
354 | printf "$@" |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
355 | fi |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
356 | } |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
357 | |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
358 | dependency_error_cpp() |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
359 | { |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
360 | print_check_msg "$dep_checked_cpp" "checking for cpp... " |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
361 | # dependency cpp |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
362 | while true |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
363 | do |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
364 | if [ -z "$lang_cpp" ] ; then |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
365 | break |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
366 | fi |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
367 | print_check_msg "$dep_checked_cpp" "yes\n" |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
368 | dep_checked_cpp=1 |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
369 | return 1 |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
370 | done |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
371 | |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
372 | print_check_msg "$dep_checked_cpp" "no\n" |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
373 | dep_checked_cpp=1 |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
374 | return 0 |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
375 | } |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
376 | dependency_error_libpq() |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
377 | { |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
378 | print_check_msg "$dep_checked_libpq" "checking for libpq... " |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
379 | # dependency libpq |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
380 | while true |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
381 | do |
|
9
ebdecbbb2f79
fix incompatibility with some unix systems
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
8
diff
changeset
|
382 | if [ -z "$PKG_CONFIG" ]; then |
|
34
4486849e6a6c
fixes several minor potential issues in configure script
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
383 | break |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
384 | fi |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
385 | if test_pkg_config "libpq" "" "" "" ; then |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
386 | TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags libpq`" |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
387 | TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs libpq`" |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
388 | else |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
389 | break |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
390 | fi |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
391 | print_check_msg "$dep_checked_libpq" "yes\n" |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
392 | dep_checked_libpq=1 |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
393 | return 1 |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
394 | done |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
395 | |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
396 | print_check_msg "$dep_checked_libpq" "no\n" |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
397 | dep_checked_libpq=1 |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
398 | return 0 |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
399 | } |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
400 | dependency_error_openssl() |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
401 | { |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
402 | print_check_msg "$dep_checked_openssl" "checking for openssl... " |
|
106
7aa59deee50c
recreate test script with newest uwproj version
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
403 | # dependency openssl toolchain="clang" |
|
103
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
404 | while true |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
405 | do |
|
106
7aa59deee50c
recreate test script with newest uwproj version
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
406 | if notistoolchain "clang"; then |
|
7aa59deee50c
recreate test script with newest uwproj version
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
407 | break |
|
7aa59deee50c
recreate test script with newest uwproj version
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
408 | fi |
|
103
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
409 | if [ -z "$lang_c" ] ; then |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
410 | break |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
411 | fi |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
412 | if [ -z "$PKG_CONFIG" ]; then |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
413 | break |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
414 | fi |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
415 | if test_pkg_config "openssl" "" "" "" ; then |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
416 | TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags openssl`" |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
417 | TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs openssl`" |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
418 | else |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
419 | break |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
420 | fi |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
421 | TEMP_CFLAGS="$TEMP_CFLAGS -DOPENSSL_CLANG" |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
422 | print_check_msg "$dep_checked_openssl" "yes\n" |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
423 | dep_checked_openssl=1 |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
424 | return 1 |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
425 | done |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
426 | |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
427 | # dependency openssl platform="bsd" |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
428 | while true |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
429 | do |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
430 | if notisplatform "bsd"; then |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
431 | break |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
432 | fi |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
433 | TEMP_LDFLAGS="$TEMP_LDFLAGS -lssl -lcrypto" |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
434 | print_check_msg "$dep_checked_openssl" "yes\n" |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
435 | dep_checked_openssl=1 |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
436 | return 1 |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
437 | done |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
438 | |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
439 | # dependency openssl |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
440 | while true |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
441 | do |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
442 | if [ -z "$lang_c" ] ; then |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
443 | break |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
444 | fi |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
445 | if [ -z "$PKG_CONFIG" ]; then |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
446 | break |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
447 | fi |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
448 | if test_pkg_config "openssl" "" "" "" ; then |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
449 | TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags openssl`" |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
450 | TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs openssl`" |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
451 | else |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
452 | break |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
453 | fi |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
454 | print_check_msg "$dep_checked_openssl" "yes\n" |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
455 | dep_checked_openssl=1 |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
456 | return 1 |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
457 | done |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
458 | |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
459 | print_check_msg "$dep_checked_openssl" "no\n" |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
460 | dep_checked_openssl=1 |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
461 | return 0 |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
462 | } |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
463 | dependency_error_libxml2() |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
464 | { |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
465 | print_check_msg "$dep_checked_libxml2" "checking for libxml2... " |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
466 | # dependency libxml2 platform="macos" |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
467 | while true |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
468 | do |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
469 | if notisplatform "macos"; then |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
470 | break |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
471 | fi |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
472 | if tmp_flags=`xml2-config --cflags` ; then |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
473 | TEMP_CFLAGS="$TEMP_CFLAGS $tmp_flags" |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
474 | else |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
475 | break |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
476 | fi |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
477 | if tmp_flags=`xml2-config --libs` ; then |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
478 | TEMP_LDFLAGS="$TEMP_LDFLAGS $tmp_flags" |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
479 | else |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
480 | break |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
481 | fi |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
482 | print_check_msg "$dep_checked_libxml2" "yes\n" |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
483 | dep_checked_libxml2=1 |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
484 | return 1 |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
485 | done |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
486 | |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
487 | # dependency libxml2 |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
488 | while true |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
489 | do |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
490 | if [ -z "$PKG_CONFIG" ]; then |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
491 | break |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
492 | fi |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
493 | if test_pkg_config "libxml-2.0" "" "" "" ; then |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
494 | TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags libxml-2.0`" |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
495 | TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs libxml-2.0`" |
|
60
43d6680e6410
update reference configure scripts
Mike Becker <universe@uap-core.de>
parents:
54
diff
changeset
|
496 | else |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
497 | break |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
498 | fi |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
499 | print_check_msg "$dep_checked_libxml2" "yes\n" |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
500 | dep_checked_libxml2=1 |
|
60
43d6680e6410
update reference configure scripts
Mike Becker <universe@uap-core.de>
parents:
54
diff
changeset
|
501 | return 1 |
|
4
6bf4c948d0ba
make targets without name and prefix possible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
3
diff
changeset
|
502 | done |
|
34
4486849e6a6c
fixes several minor potential issues in configure script
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
503 | |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
504 | print_check_msg "$dep_checked_libxml2" "no\n" |
|
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
505 | dep_checked_libxml2=1 |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
506 | return 0 |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
507 | } |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
508 | |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
509 | # start collecting dependency information |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
510 | echo > "$TEMP_DIR/flags.mk" |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
511 | |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
512 | DEPENDENCIES_FAILED= |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
513 | ERROR=0 |
|
52
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
514 | # unnamed dependencies |
|
130
424a0fb2c64f
fix that predefined CFLAGS etc. are ignored
Mike Becker <universe@uap-core.de>
parents:
128
diff
changeset
|
515 | TEMP_CFLAGS="$CFLAGS" |
|
424a0fb2c64f
fix that predefined CFLAGS etc. are ignored
Mike Becker <universe@uap-core.de>
parents:
128
diff
changeset
|
516 | TEMP_CXXFLAGS="$CXXFLAGS" |
|
424a0fb2c64f
fix that predefined CFLAGS etc. are ignored
Mike Becker <universe@uap-core.de>
parents:
128
diff
changeset
|
517 | TEMP_LDFLAGS="$LDFLAGS" |
|
2
14a4b7f0bc74
add element for adding make code for dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
518 | while true |
|
14a4b7f0bc74
add element for adding make code for dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
519 | do |
|
5
895bf81d3b6e
add missing source changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
520 | while true |
|
895bf81d3b6e
add missing source changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
521 | do |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
522 | if [ -z "$lang_c" ] ; then |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
523 | ERROR=1 |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
524 | break |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
525 | fi |
|
34
4486849e6a6c
fixes several minor potential issues in configure script
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
526 | |
|
2
14a4b7f0bc74
add element for adding make code for dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
527 | break |
|
14a4b7f0bc74
add element for adding make code for dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
528 | done |
|
14a4b7f0bc74
add element for adding make code for dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
529 | break |
|
14a4b7f0bc74
add element for adding make code for dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
530 | done |
|
103
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
531 | while true |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
532 | do |
|
106
7aa59deee50c
recreate test script with newest uwproj version
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
533 | if notistoolchain "gcc"; then |
|
7aa59deee50c
recreate test script with newest uwproj version
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
534 | break |
|
7aa59deee50c
recreate test script with newest uwproj version
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
535 | fi |
|
103
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
536 | while true |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
537 | do |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
538 | |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
539 | TEMP_CFLAGS="$TEMP_CFLAGS -DTOOLCHAIN_GCC" |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
540 | break |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
541 | done |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
542 | break |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
543 | done |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
544 | while true |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
545 | do |
|
106
7aa59deee50c
recreate test script with newest uwproj version
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
546 | if notistoolchain "clang"; then |
|
7aa59deee50c
recreate test script with newest uwproj version
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
547 | break |
|
7aa59deee50c
recreate test script with newest uwproj version
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
548 | fi |
|
103
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
549 | while true |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
550 | do |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
551 | |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
552 | TEMP_CFLAGS="$TEMP_CFLAGS -DTOOLCHAIN_CLANG" |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
553 | break |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
554 | done |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
555 | break |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
556 | done |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
557 | while true |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
558 | do |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
559 | if isplatform "gcc" || istoolchain "gcc"; then |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
560 | break |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
561 | fi |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
562 | while true |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
563 | do |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
564 | |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
565 | TEMP_CFLAGS="$TEMP_CFLAGS -DNOT_TOOLCHAIN_GCC" |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
566 | break |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
567 | done |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
568 | break |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
569 | done |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
570 | while true |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
571 | do |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
572 | if isplatform "clang" || istoolchain "clang"; then |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
573 | break |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
574 | fi |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
575 | while true |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
576 | do |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
577 | |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
578 | TEMP_CFLAGS="$TEMP_CFLAGS -DNOT_TOOLCHAIN_CLANG" |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
579 | break |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
580 | done |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
581 | break |
|
01ec9f32835e
add toolchain attribute - relates to #346
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
582 | done |
|
2
14a4b7f0bc74
add element for adding make code for dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
583 | |
|
134
95ae5973c142
move debug/release flags from target to general flags, fixes #571
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
584 | # build type |
|
95ae5973c142
move debug/release flags from target to general flags, fixes #571
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
585 | if [ "$BUILD_TYPE" = "debug" ]; then |
|
145
1d2ac6c76bfd
revert last commit, because it reverted bug fix #570
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
586 | TEMP_CFLAGS="\${DEBUG_CFLAGS} $TEMP_CFLAGS" |
|
1d2ac6c76bfd
revert last commit, because it reverted bug fix #570
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
587 | TEMP_CXXFLAGS="\${DEBUG_CXXFLAGS} $TEMP_CXXFLAGS" |
|
134
95ae5973c142
move debug/release flags from target to general flags, fixes #571
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
588 | fi |
|
95ae5973c142
move debug/release flags from target to general flags, fixes #571
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
589 | if [ "$BUILD_TYPE" = "release" ]; then |
|
145
1d2ac6c76bfd
revert last commit, because it reverted bug fix #570
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
590 | TEMP_CFLAGS="\${RELEASE_CFLAGS} $TEMP_CFLAGS" |
|
1d2ac6c76bfd
revert last commit, because it reverted bug fix #570
Mike Becker <universe@uap-core.de>
parents:
144
diff
changeset
|
591 | TEMP_CXXFLAGS="\${RELEASE_CXXFLAGS} $TEMP_CXXFLAGS" |
|
134
95ae5973c142
move debug/release flags from target to general flags, fixes #571
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
592 | fi |
|
95ae5973c142
move debug/release flags from target to general flags, fixes #571
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
593 | |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
594 | # add general dependency flags to flags.mk |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
595 | echo "# general flags" >> "$TEMP_DIR/flags.mk" |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
596 | if [ -n "${TEMP_CFLAGS}" ] && [ -n "$lang_c" ]; then |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
597 | echo "CFLAGS += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk" |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
598 | fi |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
599 | if [ -n "${TEMP_CXXFLAGS}" ] && [ -n "$lang_cpp" ]; then |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
600 | echo "CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk" |
|
2
14a4b7f0bc74
add element for adding make code for dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
601 | fi |
|
34
4486849e6a6c
fixes several minor potential issues in configure script
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
602 | if [ -n "${TEMP_LDFLAGS}" ]; then |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
603 | echo "LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk" |
|
2
14a4b7f0bc74
add element for adding make code for dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
604 | fi |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
605 | |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
606 | # |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
607 | # OPTION VALUES |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
608 | # |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
609 | |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
610 | # |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
611 | # TARGETS |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
612 | # |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
613 | |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
614 | echo >> "$TEMP_DIR/flags.mk" |
|
83
868e0d4b0a57
fix missing error reporting when all option defaults fail - fixes #299
Mike Becker <universe@uap-core.de>
parents:
77
diff
changeset
|
615 | echo "configuring global target" |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
616 | echo "# flags for unnamed target" >> "$TEMP_DIR/flags.mk" |
|
143
90fcec3ae37e
revert previous "fix" regarding applying pre-defined flags to target flags (it was correct before)
Mike Becker <universe@uap-core.de>
parents:
142
diff
changeset
|
617 | TEMP_CFLAGS= |
|
90fcec3ae37e
revert previous "fix" regarding applying pre-defined flags to target flags (it was correct before)
Mike Becker <universe@uap-core.de>
parents:
142
diff
changeset
|
618 | TEMP_CXXFLAGS= |
|
90fcec3ae37e
revert previous "fix" regarding applying pre-defined flags to target flags (it was correct before)
Mike Becker <universe@uap-core.de>
parents:
142
diff
changeset
|
619 | TEMP_LDFLAGS= |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
620 | |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
621 | if dependency_error_libxml2; then |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
622 | DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED libxml2 " |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
623 | ERROR=1 |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
624 | fi |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
625 | if dependency_error_openssl; then |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
626 | DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED openssl " |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
627 | ERROR=1 |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
628 | fi |
|
4
6bf4c948d0ba
make targets without name and prefix possible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
3
diff
changeset
|
629 | |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
630 | # Features |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
631 | if [ -n "$FEATURE_PG" ]; then |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
632 | # check dependency |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
633 | if dependency_error_libpq ; then |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
634 | # "auto" features can fail and are just disabled in this case |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
635 | if [ "$FEATURE_PG" = "auto" ]; then |
|
68
c997c0978665
fix automatic feature disabling failed when more than one dependency is missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
636 | DISABLE_FEATURE_PG=1 |
|
c997c0978665
fix automatic feature disabling failed when more than one dependency is missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
637 | else |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
638 | DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED libpq " |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
639 | ERROR=1 |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
640 | fi |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
641 | fi |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
642 | # check dependency |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
643 | if dependency_error_cpp ; then |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
644 | # "auto" features can fail and are just disabled in this case |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
645 | if [ "$FEATURE_PG" = "auto" ]; then |
|
68
c997c0978665
fix automatic feature disabling failed when more than one dependency is missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
646 | DISABLE_FEATURE_PG=1 |
|
c997c0978665
fix automatic feature disabling failed when more than one dependency is missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
647 | else |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
648 | DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED cpp " |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
649 | ERROR=1 |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
650 | fi |
|
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
651 | fi |
|
68
c997c0978665
fix automatic feature disabling failed when more than one dependency is missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
652 | if [ -n "$DISABLE_FEATURE_PG" ]; then |
|
c997c0978665
fix automatic feature disabling failed when more than one dependency is missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
653 | unset FEATURE_PG |
|
c997c0978665
fix automatic feature disabling failed when more than one dependency is missing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
654 | fi |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
655 | fi |
|
122
5706694c17c4
fix configure not emitting target data for features - fixes #478
Mike Becker <universe@uap-core.de>
parents:
116
diff
changeset
|
656 | if [ -n "$FEATURE_PG" ]; then |
|
5706694c17c4
fix configure not emitting target data for features - fixes #478
Mike Becker <universe@uap-core.de>
parents:
116
diff
changeset
|
657 | : |
|
123
d89b75fdf0aa
add target data for disabled features - resolves #476
Mike Becker <universe@uap-core.de>
parents:
122
diff
changeset
|
658 | else |
|
d89b75fdf0aa
add target data for disabled features - resolves #476
Mike Becker <universe@uap-core.de>
parents:
122
diff
changeset
|
659 | : |
|
122
5706694c17c4
fix configure not emitting target data for features - fixes #478
Mike Becker <universe@uap-core.de>
parents:
116
diff
changeset
|
660 | fi |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
661 | |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
662 | |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
663 | if [ -n "${TEMP_CFLAGS}" ] && [ -n "$lang_c" ]; then |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
664 | echo "CFLAGS += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk" |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
665 | fi |
|
94
002497e6c27d
replace -a with && in configure
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
666 | if [ -n "${TEMP_CXXFLAGS}" ] && [ -n "$lang_cpp" ]; then |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
667 | echo "CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk" |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
668 | fi |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
669 | if [ -n "${TEMP_LDFLAGS}" ]; then |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
670 | echo "LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk" |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
671 | fi |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
672 | |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
673 | |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
674 | # final result |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
675 | if [ $ERROR -ne 0 ]; then |
|
34
4486849e6a6c
fixes several minor potential issues in configure script
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
676 | echo |
|
4486849e6a6c
fixes several minor potential issues in configure script
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
677 | echo "Error: Unresolved dependencies" |
|
4486849e6a6c
fixes several minor potential issues in configure script
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
678 | echo "$DEPENDENCIES_FAILED" |
|
52
afcb57893858
major evolution of configure template - fixes #283
Mike Becker <universe@uap-core.de>
parents:
51
diff
changeset
|
679 | abort_configure |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
680 | fi |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
681 | |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
682 | echo "configure finished" |
|
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
683 | echo |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
684 | echo "Toolchain:" |
|
138
479114bc3fac
more detailed output about build config
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
685 | echo " name: $TOOLCHAIN_NAME" |
|
479114bc3fac
more detailed output about build config
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
686 | if [ -n "$TOOLCHAIN_CC" ]; then |
|
479114bc3fac
more detailed output about build config
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
687 | echo " cc: $TOOLCHAIN_CC" |
|
479114bc3fac
more detailed output about build config
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
688 | fi |
|
479114bc3fac
more detailed output about build config
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
689 | if [ -n "$TOOLCHAIN_CXX" ]; then |
|
479114bc3fac
more detailed output about build config
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
690 | echo " cxx: $TOOLCHAIN_CXX" |
|
479114bc3fac
more detailed output about build config
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
691 | fi |
|
479114bc3fac
more detailed output about build config
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
692 | if [ -n "$TOOLCHAIN_WSIZE" ]; then |
|
479114bc3fac
more detailed output about build config
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
693 | echo " word size: $TOOLCHAIN_WSIZE bit" |
|
479114bc3fac
more detailed output about build config
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
694 | fi |
|
479114bc3fac
more detailed output about build config
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
695 | if [ -n "$TOOLCHAIN_CSTD" ]; then |
|
479114bc3fac
more detailed output about build config
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
696 | echo " default C std: $TOOLCHAIN_CSTD" |
|
479114bc3fac
more detailed output about build config
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
697 | fi |
|
175
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
698 | if [ $has_config_vars__ -eq 1 ]; then |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
699 | echo |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
700 | echo "Config:" |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
701 | if [ -n "$prefix__initialized__" ]; then |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
702 | printf ' %-16s' 'prefix:' |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
703 | echo "$prefix" |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
704 | fi |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
705 | if [ -n "$exec_prefix__initialized__" ]; then |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
706 | printf ' %-16s' 'exec-prefix:' |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
707 | echo "$exec_prefix" |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
708 | fi |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
709 | if [ -n "$libdir__initialized__" ]; then |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
710 | printf ' %-16s' 'libdir:' |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
711 | echo "$libdir" |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
712 | fi |
|
4869b7779d6d
fix help text and config summary generated even when there are no variables
Mike Becker <universe@uap-core.de>
parents:
173
diff
changeset
|
713 | fi |
|
138
479114bc3fac
more detailed output about build config
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
714 | echo |
|
47
78ee95836412
automatically disable default-features if dependencies fail
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
34
diff
changeset
|
715 | echo "Features:" |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
716 | printf ' %-16s' 'pg:' |
|
67
e43d30273f74
check compilers before any dependency checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
717 | if [ -n "$FEATURE_PG" ]; then |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
718 | echo 'on' |
|
47
78ee95836412
automatically disable default-features if dependencies fail
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
34
diff
changeset
|
719 | else |
|
165
f4f11f755ee7
add full spectrum config var configurations
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
720 | echo 'off' |
|
47
78ee95836412
automatically disable default-features if dependencies fail
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
34
diff
changeset
|
721 | fi |
|
0
38775db5fdf5
add existing source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
722 | echo |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
723 | |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
724 | # generate the config.mk file |
|
133
59b14b75f12b
add configure command line to config.mk, fixes #563
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
131
diff
changeset
|
725 | pwd=`pwd` |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
726 | cat > "$TEMP_DIR/config.mk" << __EOF__ |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
727 | # |
|
133
59b14b75f12b
add configure command line to config.mk, fixes #563
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
131
diff
changeset
|
728 | # config.mk generated by: |
|
59b14b75f12b
add configure command line to config.mk, fixes #563
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
131
diff
changeset
|
729 | # pwd: $pwd |
|
134
95ae5973c142
move debug/release flags from target to general flags, fixes #571
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
730 | # $0 $@ |
|
66
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
731 | # |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
732 | |
|
dc758dcd4645
add basic support for the lang element - fixes #284
Mike Becker <universe@uap-core.de>
parents:
63
diff
changeset
|
733 | __EOF__ |
|
71
b8d06f7b617c
fix vars.mk never appended to config.mk
Mike Becker <universe@uap-core.de>
parents:
68
diff
changeset
|
734 | write_toolchain_defaults "$TEMP_DIR/toolchain.mk" |
|
133
59b14b75f12b
add configure command line to config.mk, fixes #563
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
131
diff
changeset
|
735 | cat "$TEMP_DIR/config.mk" "$TEMP_DIR/vars.mk" "$TEMP_DIR/toolchain.mk" "$TEMP_DIR/flags.mk" "$TEMP_DIR/make.mk" > config.mk |
|
34
4486849e6a6c
fixes several minor potential issues in configure script
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
736 | rm -Rf "$TEMP_DIR" |