On Thu, May 24, 2007 at 09:22:53AM +0200, Tobias Oetiker wrote:
>Hi Berhard,
>
>oh there is already a convention for this ...
>
>development versions are
>
>1.2.999yymmddhh
>
>I fixed it
Ah, ok. Thanks.
- use proper preprocessor directives for the config-checks.
Please apply.
Index: configure.ac
===================================================================
--- configure.ac (revision 1082)
+++ configure.ac (working copy)
@@ -54,15 +54,15 @@ AH_TOP([
AH_BOTTOM([
/* make sure that we pickup the correct stuff from all headers */
#define _XOPEN_SOURCE 600
-#if HAVE_FEATURES_H
+#ifdef HAVE_FEATURES_H
# include <features.h>
#endif
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#if HAVE_SYS_PARAM_H
+#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifndef MAXPATH
@@ -77,11 +77,11 @@ AH_BOTTOM([
# endif
#endif
-#if HAVE_ERRNO_H
+#ifdef HAVE_ERRNO_H
# include <errno.h>
#endif
-#if HAVE_SYS_MMAN_H
+#ifdef HAVE_SYS_MMAN_H
# include <sys/mman.h>
#endif
#if !defined HAVE_MADVISE && defined HAVE_POSIX_MADVISE
@@ -97,7 +97,7 @@ AH_BOTTOM([
# define USE_MADVISE 1
#endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
@@ -106,26 +106,26 @@ AH_BOTTOM([
#include <fcntl.h>
#endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#if TIME_WITH_SYS_TIME
+#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
-# if HAVE_SYS_TIME_H
+# ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif
-#if HAVE_SYS_TIMES_H
+#ifdef HAVE_SYS_TIMES_H
# include <sys/times.h>
#endif
-#if HAVE_SYS_RESOURCE_H
+#ifdef HAVE_SYS_RESOURCE_H
# include <sys/resource.h>
#if (defined(__svr4__) && defined(__sun__))
/* Solaris headers (pre 2.6) don't have a getrusage prototype.
@@ -162,31 +162,31 @@ char *strchr (), *strrchr ();
# include <malloc/malloc.h>
#endif
-#if HAVE_STDIO_H
+#ifdef HAVE_STDIO_H
# include <stdio.h>
#endif
-#if HAVE_STDLIB_H
+#ifdef HAVE_STDLIB_H
# include <stdlib.h>
#endif
-#if HAVE_CTYPE_H
+#ifdef HAVE_CTYPE_H
# include <ctype.h>
#endif
-#if HAVE_DIRENT_H
+#ifdef HAVE_DIRENT_H
# include <dirent.h>
# define NAMLEN(dirent) strlen((dirent)->d_name)
#else
# define dirent direct
# define NAMLEN(dirent) (dirent)->d_namlen
-# if HAVE_SYS_NDIR_H
+# ifdef HAVE_SYS_NDIR_H
# include <sys/ndir.h>
# endif
-# if HAVE_SYS_DIR_H
+# ifdef HAVE_SYS_DIR_H
# include <sys/dir.h>
# endif
-# if HAVE_NDIR_H
+# ifdef HAVE_NDIR_H
# include <ndir.h>
# endif
#endif
@@ -383,7 +383,7 @@ if test "x$enable_mmap" = "xyes"; then
AC_CHECK_HEADERS(sys/mman.h)
AC_FUNC_MMAP
AC_CHECK_FUNCS(mmap munmap)
- AC_CHECK_DECLS(madvise, [], [], [#if HAVE_SYS_MMAN_H
+ AC_CHECK_DECLS(madvise, [], [], [#ifdef HAVE_SYS_MMAN_H
# include <sys/mman.h>
#endif])
if test "x$ac_cv_have_decl_madvise" = "xyes";
_______________________________________________
rrd-developers mailing list
[email protected]
https://lists.oetiker.ch/cgi-bin/listinfo/rrd-developers
