Changeset: 7b6ac277c634 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b6ac277c634
Modified Files:
NT/monetdb_config.h.in
configure.ag
gdk/gdk_posix.c
gdk/gdk_utils.c
Branch: default
Log Message:
Configure cleanup: remove some obsolete tests (including MinGW support).
diffs (truncated from 587 to 300 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -202,12 +202,6 @@
/* Define to 1 if you have the `getopt_long' function. */
/* #undef HAVE_GETOPT_LONG */
-/* Define to 1 if you have the `getrlimit' function. */
-/* #undef HAVE_GETRLIMIT */
-
-/* Define to 1 if you have the `GetSystemInfo' function. */
-/* #undef HAVE_GETSYSTEMINFO */
-
/* Define to 1 if you have the `gettimeofday' function. */
/* #undef HAVE_GETTIMEOFDAY */
@@ -216,9 +210,6 @@
#define HAVE__GET_TIMEZONE 1
#endif
-/* Define if you have the gsl library */
-/* #undef HAVE_GSL */
-
/* Define to 1 if you have the `getuid' function. */
/* #undef HAVE_GETUID */
@@ -246,9 +237,6 @@
#define HAVE_ISINF 1
#endif
-/* Define to 1 if you have the `kill' function. */
-/* #undef HAVE_KILL */
-
/* Define to 1 if you have the <kvm.h> header file. */
/* #undef HAVE_KVM_H */
@@ -363,9 +351,6 @@
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
-/* Define if the microhttpd server is to be enabled */
-/* #undef HAVE_MICROHTTPD */
-
/* Define to 1 if you have the `mremap' function. */
/* #undef HAVE_MREMAP */
@@ -404,8 +389,6 @@
/* Define to 1 if you have the <perfmon/pfmlib.h> header file. */
/* #undef HAVE_PERFMON_PFMLIB_H */
-/* Define to 1 if you have the `pipe' function. */
-#define HAVE_PIPE 1
#ifdef pipe
#undef pipe
#endif
@@ -432,12 +415,6 @@
/* Define if you have the pthread_kill function */
/* #undef HAVE_PTHREAD_KILL */
-/* Define if you have the pthread_kill_other_threads_np function */
-/* #undef HAVE_PTHREAD_KILL_OTHER_THREADS_NP */
-
-/* Define if you have the pthread_setschedprio function */
-/* #undef HAVE_PTHREAD_SETSCHEDPRIO */
-
/* Define if you have the pthread_sigmask function */
/* #undef HAVE_PTHREAD_SIGMASK */
@@ -450,18 +427,12 @@
/* Define to 1 if you have the <pwd.h> header file. */
/* #undef HAVE_PWD_H */
-/* Define to 1 if you have the <regex.h> header file. */
-/* #undef HAVE_REGEX_H */
-
/* Define if the compiler supports the restrict keyword */
/* #undef HAVE_RESTRICT */
/* Define to 1 if you have the `RIPEMD160' function. */
#define HAVE_RIPEMD160 1
-/* Define to 1 if you have the <rlimit.h> header file. */
-/* #undef HAVE_RLIMIT_H */
-
/* Define to 1 if you have the `round' function. */
#if !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_ROUND 1
@@ -473,9 +444,6 @@
/* Define to 1 if you have the <samtools/kstring.h> header file. */
/* #undef HAVE_SAMTOOLS_KSTRING_H */
-/* Define to 1 if you have the `sbrk' function. */
-/* #undef HAVE_SBRK */
-
/* Define to 1 if you have the <sched.h> header file. */
/* #undef HAVE_SCHED_H */
@@ -515,9 +483,6 @@
/* Define to 1 if you have the <signal.h> header file. */
#define HAVE_SIGNAL_H 1
-/* Define if your mallinfo struct has signed elements */
-/* #undef HAVE_SIGNED_MALLINFO */
-
/* Define to 1 if the system has the type `socklen_t'. */
#define HAVE_SOCKLEN_T 1
@@ -604,9 +569,6 @@
#endif
#endif
-/* Define if you have struct mallinfo */
-/* #undef HAVE_STRUCT_MALLINFO */
-
/* Define to 1 if you have the `sysconf' function. */
/* #undef HAVE_SYSCONF */
@@ -689,9 +651,6 @@
/* Define if you have mallinfo */
/* #undef HAVE_USEFUL_MALLINFO */
-/* Define to 1 if you have the <utime.h> header file. */
-/* #undef HAVE_UTIME_H */
-
/* Define if you have the LibUriParser library */
/* #undef HAVE_URIPARSER */
@@ -709,17 +668,9 @@
#define HAVE__WFOPEN 1
#endif
-/* Define to 1 if you have the <winsock2.h> header file. */
-#define HAVE_WINSOCK2_H 1
-
/* Define to 1 if you have the <winsock.h> header file. */
#define HAVE_WINSOCK_H 1
-/* Define to 1 if you have the <xmmintrin.h> header file. */
-#if !defined(_MSC_VER) || _MSC_VER > 1600
-#define HAVE_XMMINTRIN_H 1
-#endif
-
/* Define to 1 if the system has the type `_Bool'. */
/* #undef HAVE__BOOL */
@@ -852,24 +803,21 @@
#define SIZEOF_LONG_LONG 8
#endif
-/* The size of `ptrdiff_t', as computed by sizeof. */
-#ifdef _WIN64
-#define SIZEOF_PTRDIFF_T 8
-#else
-#define SIZEOF_PTRDIFF_T 4
-#endif
-
/* The size of `short', as computed by sizeof. */
#define SIZEOF_SHORT 2
/* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T SIZEOF_PTRDIFF_T
+#ifdef _WIN64
+#define SIZEOF_SIZE_T 8
+#else
+#define SIZEOF_SIZE_T 4
+#endif
/* The size of `ssize_t', as computed by sizeof. */
-#define SIZEOF_SSIZE_T SIZEOF_PTRDIFF_T
+#define SIZEOF_SSIZE_T SIZEOF_SIZE_T
/* The size of `void *', as computed by sizeof. */
-#define SIZEOF_VOID_P SIZEOF_PTRDIFF_T
+#define SIZEOF_VOID_P SIZEOF_SIZE_T
/* The size of `__int64', as computed by sizeof. */
#define SIZEOF___INT64 8
@@ -1104,10 +1052,7 @@ typedef __uint128_t uhge;
#define ULLFMT "%I64u"
/* define printf formats for printing size_t and ssize_t variables */
-#if defined(__MINGW32__)
-# define SZFMT "%u"
-# define SSZFMT "%ld"
-#elif SIZEOF_SIZE_T == SIZEOF_INT
+#if SIZEOF_SIZE_T == SIZEOF_INT
# define SZFMT "%u"
# define SSZFMT "%d"
#elif SIZEOF_SIZE_T == SIZEOF_LONG
@@ -1120,15 +1065,7 @@ typedef __uint128_t uhge;
# error no definition for SZFMT/SSZFMT
#endif
-#if SIZEOF_PTRDIFF_T == SIZEOF_INT
-#define PDFMT "%d"
-#elif SIZEOF_PTRDIFF_T == SIZEOF_LONG
-#define PDFMT "%ld"
-#elif SIZEOF_PTRDIFF_T == SIZEOF_LONG_LONG || SIZEOF_PTRDIFF_T ==
SIZEOF___INT64
-#define PDFMT LLFMT
-#else
-#error no definition for PDFMT
-#endif
+#define PDFMT SSZFMT
#define PTRFMT "%p"
#define PTRFMTCAST
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -251,13 +251,6 @@ if test "x$enable_embedded_r" != xno; th
AC_DEFINE(HAVE_EMBEDDED_R, 1, [Support for MonetDB as a library for R])
fi
-dft_microhttpd=no
-AC_ARG_ENABLE(microhttpd,
- AS_HELP_STRING([--enable-microhttpd],
- [enable support for the builtin MircoHTTPD daemon]),
- enable_microhttpd=$enableval,
- enable_microhttpd=$dft_microhttpd)
-
dft_gsl=auto
AC_ARG_ENABLE(gsl,
AS_HELP_STRING([--enable-gsl],
@@ -1540,12 +1533,6 @@ mac*)
QDIRSEP=':'
AC_ERROR([mac not supported])
;;
-*mingw*)
- DIRSEP='\'
- QDIRSEP='\\'
- PATHSEP=';'
- SOEXT='-0.dll'
- ;;
*cygwin*)
DIRSEP='/'
QDIRSEP='/'
@@ -1857,20 +1844,8 @@ esac
if test "x$have_pthread" != xno; then
save_CPPFLAGS="$CPPFLAGS"
- case $host_os in
- *mingw*)
- PTHREAD_EXTRA="-D_DDL"
- CPPFLAGS="$CPPFLAGS $PTHREAD_INCS/pthread
$PTHREAD_EXTRA"
- AC_CHECK_HEADER(pthread.h,[AC_DEFINE(HAVE_PTHREAD_H, 1,
- [Define if you
have the pthread.h])
- AC_CHECK_HEADERS(pthread.h semaphore.h
sched.h)
- PTHREAD_INCS="$PTHREAD_INCS/pthread"])
- ;;
- *)
- CPPFLAGS="$CPPFLAGS $PTHREAD_INCS $PTHREAD_EXTRA"
- AC_CHECK_HEADERS(pthread.h semaphore.h sched.h)
- ;;
- esac
+ CPPFLAGS="$CPPFLAGS $PTHREAD_INCS $PTHREAD_EXTRA"
+ AC_CHECK_HEADERS(pthread.h semaphore.h sched.h)
CPPFLAGS="$save_CPPFLAGS"
save_LIBS="$LIBS"
@@ -1938,12 +1913,6 @@ if test "x$have_pthread" != xno; then
AC_SEARCH_LIBS(pthread_sigmask, ,
AC_DEFINE(HAVE_PTHREAD_SIGMASK, 1,
[Define if you have the pthread_sigmask function]))
- AC_SEARCH_LIBS(pthread_kill_other_threads_np, ,
- AC_DEFINE(HAVE_PTHREAD_KILL_OTHER_THREADS_NP, 1,
- [Define if you have the pthread_kill_other_threads_np
function]))
- AC_SEARCH_LIBS(pthread_setschedprio, ,
- AC_DEFINE(HAVE_PTHREAD_SETSCHEDPRIO, 1,
- [Define if you have the pthread_setschedprio function]))
dnl this function very ugly is overloaded with semaphore stuff
dnl so we DO need to check for it, for platforms which have it
dnl in a separate lib, like Solaris
@@ -2578,30 +2547,30 @@ if test "x$have_samtools" != xno; then
[ why_have_samtools="bam.h header not found" ])
if test -n "$why_have_samtools"; then
AC_CHECK_HEADER(bam/bam.h,
- [ why_have_samtools=; AC_DEFINE([HAVE_BAM_BAM_H], 1,
[Define to 1 if you have the <samtools/bam.h> header file.]) ],
- [ why_have_samtools="Neither bam/bam.h or bam/bam.h
header not found" ])
+ [ why_have_samtools=; AC_DEFINE([HAVE_BAM_BAM_H], 1,
[Define to 1 if you have the <bam/bam.h> header file.]) ],
+ [ why_have_samtools="Neither samtools/bam.h nor
bam/bam.h header found" ])
fi
if test -z "$why_have_samtools"; then
AC_CHECK_HEADER(samtools/sam.h,
[ why_have_samtools=; AC_DEFINE([HAVE_SAMTOOLS_SAM_H],
1, [Define to 1 if you have the <samtools/sam.h> header file.]) ],
- [ why_have_samtools="sam.h header not found" ])
+ [ why_have_samtools="samtools/sam.h header not found" ])
fi
if test -n "$why_have_samtools"; then
AC_CHECK_HEADER(bam/sam.h,
[ why_have_samtools=; AC_DEFINE([HAVE_BAM_SAM_H], 1,
[Define to 1 if you have the <bam/sam.h> header file.]) ],
- [ why_have_samtools="Neither samtools/sam.h or
bam/sam.h header not found" ])
+ [ why_have_samtools="Neither samtools/sam.h nor
bam/sam.h header found" ])
fi
if test -z "$why_have_samtools"; then
AC_CHECK_HEADER(samtools/bgzf.h,
[ why_have_samtools=; AC_DEFINE([HAVE_SAMTOOLS_BGZF_H],
1, [Define to 1 if you have the <samtools/bgzf.h> header file.]) ],
- [ why_have_samtools="bgzf.h header not found" ])
+ [ why_have_samtools="samtools/bgzf.h header not found"
])
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
