comparison configure.ac @ 4320:26e2e3ace9e6

handle unknown/unspecified AC_ARG options consistently
author John W. Eaton <jwe@octave.org>
date Wed, 04 Jan 2017 21:29:05 -0500
parents 79bddf470912
children ce2a3053aabc
comparison
equal deleted inserted replaced
4319:79bddf470912 4320:26e2e3ace9e6
77 AC_ARG_WITH([ccache], 77 AC_ARG_WITH([ccache],
78 [AS_HELP_STRING([--with-ccache], [use ccache (default: no)])], 78 [AS_HELP_STRING([--with-ccache], [use ccache (default: no)])],
79 [case $withval in 79 [case $withval in
80 no) USE_CCACHE=no ;; 80 no) USE_CCACHE=no ;;
81 yes) USE_CCACHE=yes ;; 81 yes) USE_CCACHE=yes ;;
82 *) AC_MSG_ERROR([bad value $enableval for --with-ccache]) ;; 82 *) AC_MSG_ERROR([bad value "$enableval" for --with-ccache]) ;;
83 esac], [USE_CCACHE=no]) 83 esac], [USE_CCACHE=no])
84 AC_SUBST(USE_CCACHE) 84 AC_SUBST(USE_CCACHE)
85 85
86 AC_ARG_ENABLE(windows-64, 86 AC_ARG_ENABLE([windows-64],
87 [AS_HELP_STRING([--disable-windows-64], 87 [AS_HELP_STRING([--disable-windows-64],
88 [don't build a Windows 64 cross compiler])], 88 [don't build a Windows 64 cross compiler])],
89 [case $enableval in 89 [case $enableval in
90 no) ENABLE_WINDOWS_64=no ;; 90 no) ENABLE_WINDOWS_64=no ;;
91 yes) ENABLE_WINDOWS_64=yes ;; 91 yes) ENABLE_WINDOWS_64=yes ;;
92 *) AC_MSG_ERROR([bad value $enableval for --enable-windows-64]) ;; 92 *) AC_MSG_ERROR([bad value "$enableval" for --enable-windows-64]) ;;
93 esac], [ENABLE_WINDOWS_64=yes]) 93 esac], [ENABLE_WINDOWS_64=yes])
94 94
95 AC_ARG_ENABLE(64, 95 AC_ARG_ENABLE([64],
96 [AS_HELP_STRING([--enable-64], 96 [AS_HELP_STRING([--enable-64],
97 [use 64-bit integers for array dimensions and indexing])], 97 [use 64-bit integers for array dimensions and indexing])],
98 [case $enableval in 98 [case $enableval in
99 no) ENABLE_64=no ;; 99 no) ENABLE_64=no ;;
100 yes) ENABLE_64=yes ;; 100 yes) ENABLE_64=yes ;;
101 *) AC_MSG_ERROR([bad value $enableval for --enable-64]) ;; 101 *) AC_MSG_ERROR([bad value "$enableval" for --enable-64]) ;;
102 esac], [ENABLE_64=unknown]) 102 esac], [ENABLE_64=unknown])
103 103
104 if test "$ENABLE_64" = unknown; then 104 if test "$ENABLE_64" = unknown; then
105 ENABLE_64="$ENABLE_WINDOWS_64" 105 ENABLE_64="$ENABLE_WINDOWS_64"
106 fi 106 fi
107 107
108 AC_ARG_ENABLE(fortran-int64, 108 AC_ARG_ENABLE([fortran-int64],
109 [AS_HELP_STRING([--enable-fortran-int64], 109 [AS_HELP_STRING([--enable-fortran-int64],
110 [use 64-bit integers for fortran (and other) numerical library code])], 110 [use 64-bit integers for fortran (and other) numerical library code])],
111 [case $enableval in 111 [case $enableval in
112 no) ENABLE_FORTRAN_INT64=no ;; 112 no) ENABLE_FORTRAN_INT64=no ;;
113 yes) ENABLE_FORTRAN_INT64=yes ;; 113 yes) ENABLE_FORTRAN_INT64=yes ;;
114 *) AC_MSG_ERROR([bad value $enableval for --enable-fortran-int64]) ;; 114 *) AC_MSG_ERROR([bad value "$enableval" for --enable-fortran-int64]) ;;
115 esac], [ENABLE_FORTRAN_INT64=no]) 115 esac], [ENABLE_FORTRAN_INT64=no])
116 116
117 if test "$ENABLE_64" = yes || test "$ENABLE_FORTRAN_INT64" = yes; then 117 if test "$ENABLE_64" = yes || test "$ENABLE_FORTRAN_INT64" = yes; then
118 if test "$ENABLE_WINDOWS_64" = no; then 118 if test "$ENABLE_WINDOWS_64" = no; then
119 AC_MSG_ERROR([--enable-fortran-int64 and --enable-64 both require --enable-windows-64]) 119 AC_MSG_ERROR([--enable-fortran-int64 and --enable-64 both require --enable-windows-64])
122 122
123 AC_SUBST(ENABLE_64) 123 AC_SUBST(ENABLE_64)
124 AC_SUBST(ENABLE_FORTRAN_INT64) 124 AC_SUBST(ENABLE_FORTRAN_INT64)
125 AC_SUBST(ENABLE_WINDOWS_64) 125 AC_SUBST(ENABLE_WINDOWS_64)
126 126
127 BUILD_SHARED=yes 127 AC_ARG_ENABLE([shared],
128 AC_ARG_ENABLE(shared,
129 [AS_HELP_STRING([--disable-shared], [Disable shared libraries])], 128 [AS_HELP_STRING([--disable-shared], [Disable shared libraries])],
130 [if test "$enableval" = no; then BUILD_SHARED=no; fi], []) 129 [case "$enableval" in
130 no) BUILD_SHARED=no ;;
131 yes) BUILD_SHARED=yes ;;
132 *) AC_MSG_ERROR([bad value "$enableval" for --enable-shared]) ;;
133 esac], [BUILD_SHARED=yes])
131 AC_SUBST(BUILD_SHARED) 134 AC_SUBST(BUILD_SHARED)
132 135
133 BUILD_STATIC=no 136 AC_ARG_ENABLE([static],
134 AC_ARG_ENABLE(static,
135 [AS_HELP_STRING([--enable-static], [Enable static libraries])], 137 [AS_HELP_STRING([--enable-static], [Enable static libraries])],
136 [if test "$enableval" = yes; then BUILD_STATIC=yes; fi], []) 138 [case "$enableval" in
139 no) BUILD_STATIC=no ;;
140 yes) BUILD_STATIC=yes ;;
141 *) AC_MSG_ERROR([bad value "$enableval" for --enable-static]) ;;
142 esac], [BUILD_STATIC=no])
137 AC_SUBST(BUILD_STATIC) 143 AC_SUBST(BUILD_STATIC)
138 144
139 ENABLE_JIT=no
140 AC_ARG_ENABLE([jit], 145 AC_ARG_ENABLE([jit],
141 [AS_HELP_STRING([--enable-jit], [Enable Octave JIT compiler])], 146 [AS_HELP_STRING([--enable-jit], [Enable Octave JIT compiler])],
142 [if test "$enableval" = yes; then ENABLE_JIT=yes; fi], []) 147 [case "$enableval" in
148 no) ENABLE_JIT=no ;;
149 yes) ENABLE_JIT=yes ;;
150 *) AC_MSG_ERROR([bad value "$enableval" for --enable-jit]) ;;
151 esac], [ENABLE_JIT=no])
143 AC_SUBST(ENABLE_JIT) 152 AC_SUBST(ENABLE_JIT)
144 153
145 ENABLE_JAVA=yes
146 AC_ARG_ENABLE([java], 154 AC_ARG_ENABLE([java],
147 [AS_HELP_STRING([--disable-java], [Disable Java/Octave interface])], 155 [AS_HELP_STRING([--disable-java], [Disable Java/Octave interface])],
148 [if test "$enableval" = no; then ENABLE_JAVA=no; fi], []) 156 [case "$enableval" in
157 no) ENABLE_JAVA=no ;;
158 yes) ENABLE_JAVA=yes ;;
159 *) AC_MSG_ERROR([bad value "$enableval" for --enable-java]) ;;
160 esac], [ENABLE_JAVA=yes])
149 AC_SUBST(ENABLE_JAVA) 161 AC_SUBST(ENABLE_JAVA)
150 162
151 ENABLE_DOCS=yes 163 AC_ARG_ENABLE([[docs]],
152 AC_ARG_ENABLE([docs],
153 [AS_HELP_STRING([--disable-docs], [Disable building Octave documentation])], 164 [AS_HELP_STRING([--disable-docs], [Disable building Octave documentation])],
154 [if test "$enableval" = no; then ENABLE_DOCS=no; fi], []) 165 [case "$enableval" in
166 no) ENABLE_DOCS=no ;;
167 yes) ENABLE_DOCS=yes ;;
168 *) AC_MSG_ERROR([bad value "$enableval" for --enable-[docs]]) ;;
169 esac], [ENABLE_DOCS=yes])
155 AC_SUBST(ENABLE_DOCS) 170 AC_SUBST(ENABLE_DOCS)
156 171
157 MXE_NATIVE_BUILD=no 172 AC_ARG_ENABLE([[native-build]],
158 AC_ARG_ENABLE([native-build],
159 [AS_HELP_STRING([--enable-native-build], 173 [AS_HELP_STRING([--enable-native-build],
160 [Enable native build (default is cross compile)])], 174 [Enable native build (default is cross compile)])],
161 [if test "$enableval" = yes; then MXE_NATIVE_BUILD=yes; fi], []) 175 [case "$enableval" in
176 no) MXE_NATIVE_BUILD=no ;;
177 yes) MXE_NATIVE_BUILD=yes ;;
178 *) AC_MSG_ERROR([bad value "$enableval" for --enable-[native-build]]) ;;
179 esac], [MXE_NATIVE_BUILD=no])
162 AC_SUBST(MXE_NATIVE_BUILD) 180 AC_SUBST(MXE_NATIVE_BUILD)
163 181
164 USE_SYSTEM_FONTCONFIG=$MXE_NATIVE_BUILD
165 AC_ARG_ENABLE([system-fontconfig], 182 AC_ARG_ENABLE([system-fontconfig],
166 [AS_HELP_STRING([--enable-system-fontconfig], 183 [AS_HELP_STRING([--enable-system-fontconfig],
167 [Use fontconfig already installed on system])], 184 [Use fontconfig already installed on system])],
168 [if test "$enableval" = yes; then USE_SYSTEM_FONTCONFIG=yes; else USE_SYSTEM_FONTCONFIG=no; fi], []) 185 [case "$enableval" in
186 no) USE_SYSTEM_FONTCONFIG=no ;;
187 yes) USE_SYSTEM_FONTCONFIG=yes ;;
188 *) AC_MSG_ERROR([bad value "$enableval" for --enable-system-fontconfig]) ;;
189 esac], [USE_SYSTEM_FONTCONFIG=$MXE_NATIVE_BUILD])
169 AC_SUBST(USE_SYSTEM_FONTCONFIG) 190 AC_SUBST(USE_SYSTEM_FONTCONFIG)
170 191
171 USE_SYSTEM_X11_LIBS=$MXE_NATIVE_BUILD
172 AC_ARG_ENABLE([system-x11-libs], 192 AC_ARG_ENABLE([system-x11-libs],
173 [AS_HELP_STRING([--enable-system-x11-libs], 193 [AS_HELP_STRING([--enable-system-x11-libs],
174 [Use X11 libraries already installed on system])], 194 [Use X11 libraries already installed on system])],
175 [if test "$enableval" = yes; then USE_SYSTEM_X11_LIBS=yes; else USE_SYSTEM_X11_LIBS=no; fi], []) 195 [case "$enableval" in
196 no) USE_SYSTEM_X11_LIBS=no ;;
197 yes) USE_SYSTEM_X11_LIBS=yes ;;
198 *) AC_MSG_ERROR([bad value "$enableval" for --enable-system-x11-libs]) ;;
199 esac], [USE_SYSTEM_X11_LIBS=$MXE_NATIVE_BUILD])
176 AC_SUBST(USE_SYSTEM_X11_LIBS) 200 AC_SUBST(USE_SYSTEM_X11_LIBS)
177 201
178 USE_SYSTEM_GCC=$MXE_NATIVE_BUILD
179 AC_ARG_ENABLE([system-gcc], 202 AC_ARG_ENABLE([system-gcc],
180 [AS_HELP_STRING([--enable-system-gcc], 203 [AS_HELP_STRING([--enable-system-gcc],
181 [Use GCC already installed on system])], 204 [Use GCC already installed on system])],
182 [if test "$enableval" = yes; then USE_SYSTEM_GCC=yes; else USE_SYSTEM_GCC=no; fi], []) 205 [case "$enableval" in
206 no) USE_SYSTEM_GCC=no ;;
207 yes) USE_SYSTEM_GCC=yes ;;
208 *) AC_MSG_ERROR([bad value "$enableval" for --enable-system-gcc]) ;;
209 esac], [USE_SYSTEM_GCC=$MXE_NATIVE_BUILD])
183 AC_SUBST(USE_SYSTEM_GCC) 210 AC_SUBST(USE_SYSTEM_GCC)
184 211
185 ENABLE_LIB64_DIRECTORY=no 212 AC_ARG_ENABLE([lib64-directory],
186 AC_ARG_ENABLE(lib64-directory,
187 [AS_HELP_STRING([--enable-lib64-directory], 213 [AS_HELP_STRING([--enable-lib64-directory],
188 [Search lib64 directory for libraries])], 214 [Search lib64 directory for libraries])],
189 [if test "$enableval" = yes; then ENABLE_LIB64_DIRECTORY=yes; fi], []) 215 [case "$enableval" in
216 no) ENABLE_LIB64_DIRECTORY=no ;;
217 yes) ENABLE_LIB64_DIRECTORY=yes ;;
218 *) AC_MSG_ERROR([bad value "$enableval" for --enable-lib64-directory]) ;;
219 esac], [ENABLE_LIB64_DIRECTORY=no])
190 AC_SUBST(ENABLE_LIB64_DIRECTORY) 220 AC_SUBST(ENABLE_LIB64_DIRECTORY)
191 221
192 USE_PIC_FLAG=no
193 AC_ARG_ENABLE([pic-flag], 222 AC_ARG_ENABLE([pic-flag],
194 [AS_HELP_STRING([--enable-pic-flag], [Compile with PIC flag])], 223 [AS_HELP_STRING([--enable-pic-flag], [Compile with PIC flag])],
195 [if test "$enableval" = yes; then USE_PIC_FLAG=yes; fi], []) 224 [case "$enableval" in
225 no) USE_PIC_FLAG=no ;;
226 yes) USE_PIC_FLAG=yes ;;
227 *) AC_MSG_ERROR([bad value "$enableval" for --enable-pic-flag]) ;;
228 esac], [USE_PIC_FLAG=no])
196 AC_SUBST(USE_PIC_FLAG) 229 AC_SUBST(USE_PIC_FLAG)
197 230
198 STRIP_DIST_FILES=yes
199 AC_ARG_ENABLE([strip-dist-files], 231 AC_ARG_ENABLE([strip-dist-files],
200 [AS_HELP_STRING([--disable-strip-dist-files], [Don't strip distributed files])], 232 [AS_HELP_STRING([--disable-strip-dist-files], [Don't strip distributed files])],
201 [if test "$enableval" = no; then STRIP_DIST_FILES=no; fi], []) 233 [case "$enableval" in
234 no) STRIP_DIST_FILES=no ;;
235 yes) STRIP_DIST_FILES=yes ;;
236 *) AC_MSG_ERROR([bad value "$enableval" for --enable-strip-dist-files]) ;;
237 esac], [STRIP_DIST_FILES=yes])
202 AC_SUBST(STRIP_DIST_FILES) 238 AC_SUBST(STRIP_DIST_FILES)
203 239
204 ENABLE_OPENBLAS=yes
205 AC_ARG_ENABLE([openblas], 240 AC_ARG_ENABLE([openblas],
206 [AS_HELP_STRING([--disable-openblas], 241 [AS_HELP_STRING([--disable-openblas],
207 [Disable use of OpenBLAS in Octave])], 242 [Disable use of OpenBLAS in Octave])],
208 [if test "$enableval" = no; then ENABLE_OPENBLAS=no; fi], []) 243 [case "$enableval" in
244 no) ENABLE_OPENBLAS=no ;;
245 yes) ENABLE_OPENBLAS=yes ;;
246 *) AC_MSG_ERROR([bad value "$enableval" for --enable-openblas]) ;;
247 esac], [ENABLE_OPENBLAS=yes])
209 AC_SUBST(ENABLE_OPENBLAS) 248 AC_SUBST(ENABLE_OPENBLAS)
210 249
211 ENABLE_QHULL_NO_STRICT_ALIASING_FLAG=no
212 AC_ARG_ENABLE([qhull-no-strict-aliasing-flag], 250 AC_ARG_ENABLE([qhull-no-strict-aliasing-flag],
213 [AS_HELP_STRING([--enable-qhull-no-strict-aliasing-flag], 251 [AS_HELP_STRING([--enable-qhull-no-strict-aliasing-flag],
214 [Compile Qhull with -fno-strict-aliasing flag])], 252 [Compile Qhull with -fno-strict-aliasing flag])],
215 [if test "$enableval" = yes; then 253 [case "$enableval" in
216 ENABLE_QHULL_NO_STRICT_ALIASING_FLAG=yes; 254 no) ENABLE_QHULL_NO_STRICT_ALIASING_FLAG=no ;;
217 fi], []) 255 yes) ENABLE_QHULL_NO_STRICT_ALIASING_FLAG=yes ;;
256 *) AC_MSG_ERROR([bad value "$enableval" for --enable-qhull-no-strict-aliasing-flag]) ;;
257 esac], [ENABLE_QHULL_NO_STRICT_ALIASING_FLAG=no])
218 AC_SUBST(ENABLE_QHULL_NO_STRICT_ALIASING_FLAG) 258 AC_SUBST(ENABLE_QHULL_NO_STRICT_ALIASING_FLAG)
219 259
220 ENABLE_OCTAVE=stable
221 AC_ARG_ENABLE([octave], 260 AC_ARG_ENABLE([octave],
222 [AS_HELP_STRING([--enable-octave=stable], 261 [AS_HELP_STRING([--enable-octave=stable],
223 [Enable a specific build of Octave (stable, alpha, default)])], 262 [Enable a specific build of Octave (stable, alpha, default)])],
224 [], [enableval=$ENABLE_OCTAVE]) 263 [case $enableval in
225 264 stable) ENABLE_OCTAVE="stable-" ;;
226 case $enableval in 265 alpha) ENABLE_OCTAVE="" ;;
227 stable) 266 default) ENABLE_OCTAVE="default-" ;;
228 ENABLE_OCTAVE="stable-" 267 *) AC_MSG_ERROR([bad value "$enableval" for --enable-octave]) ;;
229 ;; 268 esac], [ENABLE_OCTAVE="stable-"])
230 alpha)
231 ENABLE_OCTAVE=""
232 ;;
233 default)
234 ENABLE_OCTAVE="default-"
235 ;;
236 *)
237 ENABLE_OCTAVE="stable-"
238 AC_MSG_WARN([Unknown octave type $enableval - using enable-octave=stable])
239 ;;
240 esac
241
242 AC_SUBST(ENABLE_OCTAVE) 269 AC_SUBST(ENABLE_OCTAVE)
243 270
244 ENABLE_BINARY_PACKAGES=no
245 AC_ARG_ENABLE([binary-packages], 271 AC_ARG_ENABLE([binary-packages],
246 [AS_HELP_STRING([--enable-binary-packages], 272 [AS_HELP_STRING([--enable-binary-packages],
247 [Enable creating binary Octave Forge packages])], 273 [Enable creating binary Octave Forge packages])],
248 [if test "$enableval" = yes; then ENABLE_BINARY_PACKAGES=yes; fi], []) 274 [case "$enableval" in
275 no) ENABLE_BINARY_PACKAGES=no ;;
276 yes) ENABLE_BINARY_PACKAGES=yes ;;
277 *) AC_MSG_ERROR([bad value "$enableval" for --enable-binary-packages]) ;;
278 esac], [ENABLE_BINARY_PACKAGES=no])
249 AC_SUBST(ENABLE_BINARY_PACKAGES) 279 AC_SUBST(ENABLE_BINARY_PACKAGES)
250 280
251 ENABLE_DEVEL_TOOLS=no
252 AC_ARG_ENABLE([devel-tools], 281 AC_ARG_ENABLE([devel-tools],
253 [AS_HELP_STRING([--enable-devel-tools], 282 [AS_HELP_STRING([--enable-devel-tools],
254 [Enable creating developer tools such as gdb])], 283 [Enable creating developer tools such as gdb])],
255 [if test "$enableval" = yes; then ENABLE_DEVEL_TOOLS=yes; fi], []) 284 [case "$enableval" in
285 no) ENABLE_DEVEL_TOOLS=no ;;
286 yes) ENABLE_DEVEL_TOOLS=yes ;;
287 *) AC_MSG_ERROR([bad value "$enableval" for --enable-devel-tools]) ;;
288 esac], [ENABLE_DEVEL_TOOLS=no])
256 AC_SUBST(ENABLE_DEVEL_TOOLS) 289 AC_SUBST(ENABLE_DEVEL_TOOLS)
257 290
258 ENABLE_QT5=no
259 AC_ARG_ENABLE([qt5], 291 AC_ARG_ENABLE([qt5],
260 [AS_HELP_STRING([--enable-qt5], 292 [AS_HELP_STRING([--enable-qt5],
261 [Enable compile of GNU octave using Qt5 (Experimental)])], 293 [Enable compile of GNU octave using Qt5 (Experimental)])],
262 [if test "$enableval" = yes; then ENABLE_QT5=yes; fi], []) 294 [case "$enableval" in
295 no) ENABLE_QT5=no ;;
296 yes) ENABLE_QT5=yes ;;
297 *) AC_MSG_ERROR([bad value "$enableval" for --enable-qt5]) ;;
298 esac], [ENABLE_QT5=no])
263 AC_SUBST(ENABLE_QT5) 299 AC_SUBST(ENABLE_QT5)
264 300
265 # install dependancy package docs (or not to save space) 301 # install dependancy package docs (or not to save space)
266 ENABLE_DEP_DOCS=no
267 AC_ARG_ENABLE([dep-docs], 302 AC_ARG_ENABLE([dep-docs],
268 [AS_HELP_STRING([--enable-dep-docs], 303 [AS_HELP_STRING([--enable-dep-docs],
269 [Enable install of dependancy package dos])], 304 [Enable install of dependancy package dos])],
270 [if test "$enableval" = yes; then ENABLE_DEP_DOCS=yes; fi], []) 305 [case "$enableval" in
306 no) ENABLE_DEP_DOCS=no ;;
307 yes) ENABLE_DEP_DOCS=yes ;;
308 *) AC_MSG_ERROR([bad value "$enableval" for --enable-dep-docs]) ;;
309 esac], [ENABLE_DEP_DOCS=no])
271 AC_SUBST(ENABLE_DEP_DOCS) 310 AC_SUBST(ENABLE_DEP_DOCS)
272
273 311
274 ### Default is to cross compile for mingw. 312 ### Default is to cross compile for mingw.
275 313
276 echo $host_alias 314 echo $host_alias
277 if test -n "$host_alias"; then 315 if test -n "$host_alias"; then