comparison configure.in @ 6091:96a11041f52b

[project @ 2006-10-25 21:25:04 by jwe]
author jwe
date Wed, 25 Oct 2006 21:25:04 +0000
parents ee50f74d1dd7
children 86ee3cc8d8d2
comparison
equal deleted inserted replaced
6090:ee50f74d1dd7 6091:96a11041f52b
27 27
28 EXTERN_CFLAGS="$CFLAGS" 28 EXTERN_CFLAGS="$CFLAGS"
29 EXTERN_CXXFLAGS="$CXXFLAGS" 29 EXTERN_CXXFLAGS="$CXXFLAGS"
30 30
31 AC_INIT 31 AC_INIT
32 AC_REVISION($Revision: 1.532 $) 32 AC_REVISION($Revision: 1.533 $)
33 AC_PREREQ(2.57) 33 AC_PREREQ(2.57)
34 AC_CONFIG_SRCDIR([src/octave.cc]) 34 AC_CONFIG_SRCDIR([src/octave.cc])
35 AC_CONFIG_HEADER(config.h) 35 AC_CONFIG_HEADER(config.h)
36 36
37 OCTAVE_HOST_TYPE 37 OCTAVE_HOST_TYPE
1200 case "$canonical_host_type" in 1200 case "$canonical_host_type" in
1201 *-*-cygwin* | *-*-mingw*) 1201 *-*-cygwin* | *-*-mingw*)
1202 AC_CHECK_LIB(wsock32, gethostname) 1202 AC_CHECK_LIB(wsock32, gethostname)
1203 LIBS="$LIBS -lwsock32" 1203 LIBS="$LIBS -lwsock32"
1204 ;; 1204 ;;
1205 *-*-msdosmsvc*)
1206 LIBS="$LIBS -lws2_32 -lkernel32"
1207 ;;
1205 esac 1208 esac
1206 1209
1207 ### Type stuff. 1210 ### Type stuff.
1208 1211
1209 AC_TYPE_MODE_T 1212 AC_TYPE_MODE_T
1378 fi 1381 fi
1379 1382
1380 ## autoconf test for LoadLibrary appears broken. Bypass for cygwin/mingw 1383 ## autoconf test for LoadLibrary appears broken. Bypass for cygwin/mingw
1381 if !($dlopen_api || $shl_load_api || $loadlibrary_api || $dyld_api); then 1384 if !($dlopen_api || $shl_load_api || $loadlibrary_api || $dyld_api); then
1382 case "$canonical_host_type" in 1385 case "$canonical_host_type" in
1383 *-*-cygwin* | *-*-mingw*) 1386 *-*-cygwin* | *-*-mingw* | *-*-msdosmsvc)
1384 loadlibrary_api=true; 1387 loadlibrary_api=true;
1385 ;; 1388 ;;
1386 esac 1389 esac
1387 fi 1390 fi
1388 1391
1822 #else 1825 #else
1823 #define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT 1826 #define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT
1824 #endif 1827 #endif
1825 1828
1826 #if defined (_MSC_VER) 1829 #if defined (_MSC_VER)
1830 #define __WIN32__
1827 /* missing parameters in macros */ 1831 /* missing parameters in macros */
1828 #pragma warning (disable: 4003) 1832 #pragma warning (disable: 4003)
1829 /* missing implementations in template instantiation */ 1833 /* missing implementations in template instantiation */
1830 #pragma warning (disable: 4996) 1834 #pragma warning (disable: 4996)
1831 /* deprecated function names (FIXME?) */ 1835 /* deprecated function names (FIXME?) */