comparison configure.ac @ 3710:1220a9158bc1

make building 64-bit Windows binaries independent from enabling 64-bit indexing in Octave
author John W. Eaton <jwe@octave.org>
date Sun, 07 Sep 2014 06:42:40 -0400
parents 902562ce85fc
children 89d99c28a6a1
comparison
equal deleted inserted replaced
3709:c8546fe79bc9 3710:1220a9158bc1
51 SHELL=$with_shell 51 SHELL=$with_shell
52 ;; 52 ;;
53 esac 53 esac
54 AC_SUBST(SHELL) 54 AC_SUBST(SHELL)
55 55
56 ### If possible, use a 64-bit integer type for array dimensions and indexing. 56 ENABLE_WINDOWS_64=no
57 AC_ARG_ENABLE(windows-64,
58 [AS_HELP_STRING([--enable-windows-64],
59 [build a Windows 64 cross compiler; resulting build will work only on 64-bit Windows systems])],
60 [if test "$enableval" = yes; then ENABLE_WINDOWS_64=yes; fi], [])
57 61
58 ENABLE_64=no 62 ENABLE_64=no
59 AC_ARG_ENABLE(64, 63 AC_ARG_ENABLE(64,
60 [AS_HELP_STRING([--enable-64], 64 [AS_HELP_STRING([--enable-64],
61 [(EXPERIMENTAL) use 64-bit integers for array dimensions and indexing])], 65 [(EXPERIMENTAL) use 64-bit integers for array dimensions and indexing])],
62 [if test "$enableval" = yes; then ENABLE_64=yes; fi], []) 66 [if test "$enableval" = yes; then ENABLE_64=yes; fi], [])
67
68 if test "$ENABLE_64" = yes && test "$ENABLE_WINDOWS_64" = no; then
69 AC_MSG_WARN([--enable-64 implies --enable-windows-64])
70 ENABLE_WINDOWS_64=yes
71 fi
72
63 AC_SUBST(ENABLE_64) 73 AC_SUBST(ENABLE_64)
74 AC_SUBST(ENABLE_WINDOWS_64)
64 75
65 BUILD_SHARED=yes 76 BUILD_SHARED=yes
66 AC_ARG_ENABLE(shared, 77 AC_ARG_ENABLE(shared,
67 [AS_HELP_STRING([--disable-shared], [Disable shared libraries])], 78 [AS_HELP_STRING([--disable-shared], [Disable shared libraries])],
68 [if test "$enableval" = no; then BUILD_SHARED=no; fi], []) 79 [if test "$enableval" = no; then BUILD_SHARED=no; fi], [])