Mercurial > mxe-octave

comparison configure.ac @ 4319:79bddf470912

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix 64-bit --enable feature options
author John W. Eaton <jwe@octave.org>
date Wed, 04 Jan 2017 21:11:58 -0500
parents d15e1b63b01f
children 26e2e3ace9e6
comparison
equal deleted inserted replaced
4318:d24939e55111 4319:79bddf470912
72 mkdir -p "$PKG_DIR" 72 mkdir -p "$PKG_DIR"
73 fi 73 fi
74 PKG_DIR=`(cd "$PKG_DIR"; pwd)` 74 PKG_DIR=`(cd "$PKG_DIR"; pwd)`
75 AC_SUBST(PKG_DIR) 75 AC_SUBST(PKG_DIR)
76 76
77 USE_CCACHE=no
78 AC_ARG_WITH([ccache], 77 AC_ARG_WITH([ccache],
79 [AS_HELP_STRING([--with-ccache], [use ccache (default: no)])], 78 [AS_HELP_STRING([--with-ccache], [use ccache (default: no)])],
80 [if test "$withval" = yes; then USE_CCACHE=yes; fi], []) 79 [case $withval in
80 no) USE_CCACHE=no ;;
81 yes) USE_CCACHE=yes ;;
82 *) AC_MSG_ERROR([bad value $enableval for --with-ccache]) ;;
83 esac], [USE_CCACHE=no])
81 AC_SUBST(USE_CCACHE) 84 AC_SUBST(USE_CCACHE)
82 85
83 ENABLE_WINDOWS_64=yes
84 AC_ARG_ENABLE(windows-64, 86 AC_ARG_ENABLE(windows-64,
85 [AS_HELP_STRING([--disable-windows-64], 87 [AS_HELP_STRING([--disable-windows-64],
86 [don't build a Windows 64 cross compiler])], 88 [don't build a Windows 64 cross compiler])],
87 [if test "$enableval" = no; then ENABLE_WINDOWS_64=no; fi], []) 89 [case $enableval in
88 90 no) ENABLE_WINDOWS_64=no ;;
89 ENABLE_64=yes 91 yes) ENABLE_WINDOWS_64=yes ;;
92 *) AC_MSG_ERROR([bad value $enableval for --enable-windows-64]) ;;
93 esac], [ENABLE_WINDOWS_64=yes])
94
90 AC_ARG_ENABLE(64, 95 AC_ARG_ENABLE(64,
91 [AS_HELP_STRING([--disable-64], 96 [AS_HELP_STRING([--enable-64],
92 [don't use 64-bit integers for array dimensions and indexing])], 97 [use 64-bit integers for array dimensions and indexing])],
93 [if test "$enableval" = no; then ENABLE_64=no; fi], []) 98 [case $enableval in
94 99 no) ENABLE_64=no ;;
95 ENABLE_FORTRAN_INT64=no 100 yes) ENABLE_64=yes ;;
96 AC_ARG_ENABLE(FORTRAN_INT64, 101 *) AC_MSG_ERROR([bad value $enableval for --enable-64]) ;;
102 esac], [ENABLE_64=unknown])
103
104 if test "$ENABLE_64" = unknown; then
105 ENABLE_64="$ENABLE_WINDOWS_64"
106 fi
107
108 AC_ARG_ENABLE(fortran-int64,
97 [AS_HELP_STRING([--enable-fortran-int64], 109 [AS_HELP_STRING([--enable-fortran-int64],
98 [use 64-bit integers for fortran (and other) numerical library code])], 110 [use 64-bit integers for fortran (and other) numerical library code])],
99 [if test "$enableval" = yes; then ENABLE_FORTRAN_INT64=yes; fi], []) 111 [case $enableval in
112 no) ENABLE_FORTRAN_INT64=no ;;
113 yes) ENABLE_FORTRAN_INT64=yes ;;
114 *) AC_MSG_ERROR([bad value $enableval for --enable-fortran-int64]) ;;
115 esac], [ENABLE_FORTRAN_INT64=no])
100 116
101 if test "$ENABLE_64" = yes || test "$ENABLE_FORTRAN_INT64" = yes; then 117 if test "$ENABLE_64" = yes || test "$ENABLE_FORTRAN_INT64" = yes; then
102 if test "$ENABLE_WINDOWS_64" = no; then 118 if test "$ENABLE_WINDOWS_64" = no; then
103 AC_MSG_WARN([--enable-64 or --enable-fortran-int64 implies --enable-windows-64]) 119 AC_MSG_ERROR([--enable-fortran-int64 and --enable-64 both require --enable-windows-64])
104 ENABLE_WINDOWS_64=yes
105 fi 120 fi
106 fi 121 fi
107 122
108 AC_SUBST(ENABLE_64) 123 AC_SUBST(ENABLE_64)
109 AC_SUBST(ENABLE_FORTRAN_INT64) 124 AC_SUBST(ENABLE_FORTRAN_INT64)