Changeset: 0a9af9489573 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a9af9489573 Modified Files: MonetDB/Makefile.ag MonetDB/configure.ag MonetDB/sysdefs.h.in MonetDB4/configure.ag MonetDB5/configure.ag clients/configure.ag geom/configure.ag pathfinder/configure.ag sql/configure.ag template/configure.ag Branch: default Log Message:
sysdefs.h.in: remove sysdefs.h.in seems to contain static knowledge that is no longer necessary at least on our setups. The include gives problems because there is no pkg-config thing for it. If it is necessary, we should add it to e.g. mutils instead of putting it here. diffs (149 lines): diff -r 4c8019a7fa69 -r 0a9af9489573 MonetDB/Makefile.ag --- a/MonetDB/Makefile.ag Tue Nov 02 13:43:26 2010 +0100 +++ b/MonetDB/Makefile.ag Tue Nov 02 15:11:00 2010 +0100 @@ -17,9 +17,6 @@ SUBDIRS = src conf -EXTRA_DIST = configure.ag rpm.mk.in sysdefs.h.in \ - MonetDB.spec MonetDB.spec +EXTRA_DIST = configure.ag rpm.mk.in MonetDB.spec EXTRA_DIST_DIR = NT debian - -EXTRA_HEADERS = sysdefs.h diff -r 4c8019a7fa69 -r 0a9af9489573 MonetDB/configure.ag --- a/MonetDB/configure.ag Tue Nov 02 13:43:26 2010 +0100 +++ b/MonetDB/configure.ag Tue Nov 02 15:11:00 2010 +0100 @@ -27,7 +27,6 @@ AC_CONFIG_AUX_DIR(conf) AC_CANONICAL_HOST AC_CANONICAL_TARGET -AH_TOP([#include "sysdefs.h"]) AH_BOTTOM([#include "stddef.h"]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/gdk/gdk.mx]) diff -r 4c8019a7fa69 -r 0a9af9489573 MonetDB/sysdefs.h.in --- a/MonetDB/sysdefs.h.in Tue Nov 02 13:43:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* - * The contents of this file are subject to the MonetDB Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - * License for the specific language governing rights and limitations - * under the License. - * - * The Original Code is the MonetDB Database System. - * - * The Initial Developer of the Original Code is CWI. - * Portions created by CWI are Copyright (C) 1997-July 2008 CWI. - * Copyright August 2008-2010 MonetDB B.V. - * All Rights Reserved. - */ - -#if (!defined __GNUC__) && defined __INTEL_COMPILER && __INTEL_COMPILER >= 800 -/* - * With "-no-gcc", icc 8.0 does not predefine __GNUC__, and hence __REDIRECT - * is not defined in /usr/include/sys/cdefs.h; which in turn causes readdir to - * be defined as readdir64 in /usr/include/dirent.h . - * To prevent the latter, we ensure here that __REDIRECT is defined also for - * icc 8.0 with "-no-gcc". - */ -# define __REDIRECT(name, proto, alias) name proto __asm__ (__ASMNAME (#alias)) -# ifdef __cplusplus -# define __REDIRECT_NTH(name, proto, alias) \ - name proto __THROW __asm__ (__ASMNAME (#alias)) -# else -# define __REDIRECT_NTH(name, proto, alias) \ - name proto __asm__ (__ASMNAME (#alias)) __THROW -# endif -# define __ASMNAME(cname) __ASMNAME2 (__USER_LABEL_PREFIX__, cname) -# define __ASMNAME2(prefix, cname) __STRING (prefix) cname -# define __interface -/* work around bug in glibc header files */ -#ifndef __GLIBC_HAVE_LONG_LONG -#define __GLIBC_HAVE_LONG_LONG 1 -#endif -#endif diff -r 4c8019a7fa69 -r 0a9af9489573 MonetDB4/configure.ag --- a/MonetDB4/configure.ag Tue Nov 02 13:43:26 2010 +0100 +++ b/MonetDB4/configure.ag Tue Nov 02 15:11:00 2010 +0100 @@ -26,7 +26,6 @@ AC_CONFIG_AUX_DIR(conf) AC_CANONICAL_HOST AC_CANONICAL_TARGET -AH_TOP([#include "sysdefs.h"]) AH_BOTTOM([#include "stddef.h"]) dnl ---------------------- diff -r 4c8019a7fa69 -r 0a9af9489573 MonetDB5/configure.ag --- a/MonetDB5/configure.ag Tue Nov 02 13:43:26 2010 +0100 +++ b/MonetDB5/configure.ag Tue Nov 02 15:11:00 2010 +0100 @@ -27,7 +27,6 @@ AC_CONFIG_AUX_DIR(conf) AC_CANONICAL_HOST AC_CANONICAL_TARGET -AH_TOP([#include "sysdefs.h"]) AH_BOTTOM([#include "stddef.h"]) dnl ---------------------- diff -r 4c8019a7fa69 -r 0a9af9489573 clients/configure.ag --- a/clients/configure.ag Tue Nov 02 13:43:26 2010 +0100 +++ b/clients/configure.ag Tue Nov 02 15:11:00 2010 +0100 @@ -28,7 +28,6 @@ AC_CONFIG_AUX_DIR(conf) AC_CANONICAL_HOST AC_CANONICAL_TARGET -dnl AH_TOP([#include "sysdefs.h"]) AH_BOTTOM([#include "stddef.h"]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/mapilib/Mapi.mx]) diff -r 4c8019a7fa69 -r 0a9af9489573 geom/configure.ag --- a/geom/configure.ag Tue Nov 02 13:43:26 2010 +0100 +++ b/geom/configure.ag Tue Nov 02 15:11:00 2010 +0100 @@ -24,7 +24,6 @@ AC_CONFIG_AUX_DIR(conf) AC_CANONICAL_HOST AC_CANONICAL_TARGET -AH_TOP([#include "sysdefs.h"]) AH_BOTTOM([#include "stddef.h"]) dnl ---------------------- diff -r 4c8019a7fa69 -r 0a9af9489573 pathfinder/configure.ag --- a/pathfinder/configure.ag Tue Nov 02 13:43:26 2010 +0100 +++ b/pathfinder/configure.ag Tue Nov 02 15:11:00 2010 +0100 @@ -33,7 +33,6 @@ AC_CONFIG_AUX_DIR(conf) AC_CANONICAL_HOST AC_CANONICAL_TARGET -dnl AH_TOP([#include "sysdefs.h"]) AH_BOTTOM([#include "stddef.h"]) dnl ---------------------- diff -r 4c8019a7fa69 -r 0a9af9489573 sql/configure.ag --- a/sql/configure.ag Tue Nov 02 13:43:26 2010 +0100 +++ b/sql/configure.ag Tue Nov 02 15:11:00 2010 +0100 @@ -27,7 +27,6 @@ AC_CONFIG_AUX_DIR(conf) AC_CANONICAL_HOST AC_CANONICAL_TARGET -AH_TOP([#include "sysdefs.h"]) AH_BOTTOM([#include "stddef.h"]) dnl ---------------------- diff -r 4c8019a7fa69 -r 0a9af9489573 template/configure.ag --- a/template/configure.ag Tue Nov 02 13:43:26 2010 +0100 +++ b/template/configure.ag Tue Nov 02 15:11:00 2010 +0100 @@ -24,7 +24,6 @@ AC_CONFIG_AUX_DIR(conf) AC_CANONICAL_HOST AC_CANONICAL_TARGET -AH_TOP([#include "sysdefs.h"]) AH_BOTTOM([#include "stddef.h"]) dnl ---------------------- _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
