diff options
| -rwxr-xr-x | cmake/basictest | 1 | ||||
| -rw-r--r-- | cmake/configure.cmake | 20 |
2 files changed, 9 insertions, 12 deletions
diff --git a/cmake/basictest b/cmake/basictest index 56b530de..575f1c87 100755 --- a/cmake/basictest +++ b/cmake/basictest @@ -2,6 +2,7 @@ export PATH=$PATH:/c/MinGW/msys/1.0/bin TESTHOME=$(dirname ${0})/../test +export AWKPATH=${TESTHOME} export AWKLIBPATH=$(dirname ${1})/extension/ export LANG=C # Is this shell running in a native MinGW shell (MSYS) ? diff --git a/cmake/configure.cmake b/cmake/configure.cmake index ddb54b99..7bc27be6 100644 --- a/cmake/configure.cmake +++ b/cmake/configure.cmake @@ -179,22 +179,19 @@ DefineHFileIfAvailable(sys/termios.h HAVE_TERMIOS_H) DefineHFileIfAvailable(stropts.h HAVE_STROPTS_H) DefineHFileIfAvailable(wchar.h HAVE_WCHAR_H) DefineHFileIfAvailable(wctype.h HAVE_WCTYPE_H) -#DefineTypeIfAvailable("long long int" HAVE_LONG_LONG_INT) -#add_definitions(-D HAVE_UNSIGNED_LONG_LONG_INT) +DefineTypeIfAvailable("long long int" HAVE_LONG_LONG_INT) +DefineTypeIfAvailable("unsigned long long int" HAVE_UNSIGNED_LONG_LONG_INT) DefineTypeIfAvailable(intmax_t INTMAX_T) DefineTypeIfAvailable(uintmax_t UINTMAX_T) # Some of these dont work, maybe CheckCSourceCompiles would be better. DefineTypeIfAvailable("time_t" TIME_T_IN_SYS_TYPES_H) DefineTypeIfAvailable("wctype_t" WCTYPE_T) -add_definitions(-D WINT_T) -#DefineTypeIfAvailable("wint_t" WINT_T) -add_definitions(-D HAVE_SOCKADDR_STORAGE) -#DefineTypeIfAvailable("struct sockaddr_storage" SOCKADDR_STORAGE) -add_definitions(-D HAVE_STRUCT_STAT_ST_BLKSIZE) -#DefineStructHasMemberIfAvailable("struct stat" st_blksize bits/stat.h HAVE_STRUCT_STAT_ST_BLKSIZE) -add_definitions(-D HAVE_ST_BLKSIZE) -#DefineStructHasMemberIfAvailable("struct stat" st_blksize bits/stat.h HAVE_ST_BLKSIZE) +#add_definitions(-D WINT_T) +DefineTypeIfAvailable("wint_t" WINT_T) +DefineStructHasMemberIfAvailable("struct sockaddr_storage" ss_family sys/socket.h HAVE_SOCKADDR_STORAGE) +DefineStructHasMemberIfAvailable("struct stat" st_blksize sys/stat.h HAVE_STRUCT_STAT_ST_BLKSIZE) +DefineStructHasMemberIfAvailable("struct stat" st_blksize sys/stat.h HAVE_ST_BLKSIZE) DefineStructHasMemberIfAvailable("struct tm" tm_zone time.h HAVE_TM_ZONE) DefineStructHasMemberIfAvailable("struct tm" tm_zone time.h HAVE_STRUCT_TM_TM_ZONE) @@ -204,8 +201,7 @@ DefineFunctionIfAvailable(mktime HAVE_MKTIME) DefineFunctionIfAvailable(getaddrinfo HAVE_GETADDRINFO) DefineFunctionIfAvailable(atexit HAVE_ATEXIT) DefineFunctionIfAvailable(btowc HAVE_BTOWC) -add_definitions(-D HAVE_FMOD) -#DefineFunctionIfAvailable(fmod HAVE_FMOD) +DefineFunctionIfAvailable(fmod HAVE_FMOD) DefineFunctionIfAvailable(isinf HAVE_ISINF) DefineFunctionIfAvailable(ismod HAVE_ISMOD) DefineFunctionIfAvailable(getgrent HAVE_GETGRENT) |