From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Sat, 12 Apr 2008 09:29:10 +0000 (+0000)
Subject: alter order of header inclusion for FreeBSD 4.8 compatibility
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b9c34e444f5531a5437a973014e71fbb1d0d97b9;p=rrdtool-all.git

alter order of header inclusion for FreeBSD 4.8 compatibility


git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1324 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/program/MakeMakefile b/program/MakeMakefile
index ba642cf9..057c6296 100755
--- a/program/MakeMakefile
+++ b/program/MakeMakefile
@@ -33,7 +33,7 @@ then
   else
     automake=automake-1.9
     aclocal="aclocal-1.9"
-    for d in /usr/pack/automake-1.9.5-to/share/aclocal-1.9 /usr/share/aclocal-1.9 /usr/pack/rrdtool-1.3svn-to/share/aclocal /usr/pack/intltool-0.37.0-to/share/aclocal ; do
+    for d in /usr/pack/automake-1.9.5-to/share/aclocal-1.9 /usr/share/aclocal-1.9 /usr/share/aclocal /usr/pack/rrdtool-1.3svn-to/share/aclocal /usr/pack/intltool-0.37.0-to/share/aclocal ; do
       [ -d $d ] && aclocal="$aclocal -I $d"
     done
   fi
diff --git a/program/configure.ac b/program/configure.ac
index 48c03c64..a0bd9550 100644
--- a/program/configure.ac
+++ b/program/configure.ac
@@ -68,6 +68,11 @@ AH_BOTTOM([
 # include <features.h>
 #endif
 
+/* FreeBSD 4.8 wants this included BEFORE sys/types.h */
+#ifdef HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+#endif
+
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
@@ -91,10 +96,6 @@ AH_BOTTOM([
 # include <errno.h>
 #endif
 
-#ifdef HAVE_SYS_MMAN_H
-# include <sys/mman.h>
-#endif
-
 #if !defined HAVE_MADVISE && defined HAVE_POSIX_MADVISE
 /* use posix_madvise family */
 # define madvise posix_madvise