X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=dc0dc0231d4d54078881be01b6f5775d1cb0dd55;hb=bd23a6c64e8ccff9a666441958e34793748ebd3a;hp=e6b9211c87a76ecf44884768b8c446a7f2cbf768;hpb=0614a2e61ccbf150cc51d4fd3073b285983417c5;p=urcu.git

diff --git a/configure.ac b/configure.ac
index e6b9211..dc0dc02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,9 +6,9 @@ dnl Process this file with autoconf to produce a configure script.
 
 # Project version information
 m4_define([urcu_version_major], [0])
-m4_define([urcu_version_minor], [12])
+m4_define([urcu_version_minor], [13])
 m4_define([urcu_version_patch], [0])
-m4_define([urcu_version_dev_stage], [])
+m4_define([urcu_version_dev_stage], [-pre])
 m4_define([urcu_version], urcu_version_major[.]urcu_version_minor[.]urcu_version_patch[]urcu_version_dev_stage)
 
 # Library version information of "liburcu"
@@ -118,7 +118,7 @@ AC_PROG_AWK
 AC_PROG_GREP
 AC_PROG_MAKE_SET
 AC_CHECK_PROGS(NPROC, [nproc gnproc])
-AC_CHECK_PROG(GETCONF, [getconf])
+AC_CHECK_PROGS(GETCONF, [getconf])
 AS_IF([test "x$NPROC" != "x"],
 	[NPROC_CMD=$NPROC],
 	[AS_IF([test "x$GETCONF" != "x"],
@@ -238,7 +238,10 @@ AC_SUBST([URCU_LIBRARY_VERSION], [urcu_lib_version])
 
 AC_SUBST(LT_NO_UNDEFINED)
 
-AM_CPPFLAGS="-include config.h"
+# The order in which the include folders are searched is important.
+# The top_builddir should always be searched first in the event that a build
+# time generated file is included.
+AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -include config.h"
 AC_SUBST(AM_CPPFLAGS)
 
 AM_CFLAGS="-Wall -Wextra -Wno-unused-parameter $PTHREAD_CFLAGS"