diff options
-rw-r--r-- | Makefile.am | 1 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | site.h.in | 27 |
3 files changed, 30 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 39192db672a..e4172159875 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,4 @@ +SOURCES = site.h EXTRA_DIST = autogen.sh \ COPYING-GPLV2 COPYING-LGPLV3 \ diff --git a/configure.ac b/configure.ac index a1a5b3f034b..5c52178df47 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ if libtool --help 2>&1 | grep -q quiet; then AM_LIBTOOLFLAGS="--quiet"; fi -AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_HEADERS([config.h site.h]) AC_CONFIG_FILES([Makefile libglusterfs/Makefile @@ -1534,7 +1534,7 @@ CONTRIBDIR='$(top_srcdir)/contrib' AC_SUBST(CONTRIBDIR) GF_CPPDEFINES='-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)' -GF_CPPINCLUDES='-include $(top_builddir)/config.h -I$(top_srcdir)/libglusterfs/src -I$(top_builddir)/libglusterfs/src' +GF_CPPINCLUDES='-include $(top_builddir)/config.h -include $(top_builddir)/site.h -I$(top_srcdir)/libglusterfs/src -I$(top_builddir)/libglusterfs/src' GF_CPPFLAGS="$GF_CPPFLAGS $GF_CPPDEFINES $GF_CPPINCLUDES" AC_SUBST([GF_CPPFLAGS]) diff --git a/site.h.in b/site.h.in new file mode 100644 index 00000000000..d917d78e59b --- /dev/null +++ b/site.h.in @@ -0,0 +1,27 @@ +/* + * Guidelines for using this file vs. configure.ac + * + * (1) If it already exists in configure.ac, leave it there. + * + * (2) If it needs to take effect at configure (not compile) time, it *needs* + * to go in configure.ac. + * + * (3) If it affects file paths, which are the things most likely to be based + * on an OS or distribution's generic filesystem hierarchy and not on a + * particular package's definition (e.g. an RPM specfile), it should probably + * go in configure.ac. + * + * (4) If it affects default sizes, limits, thresholds, or modes of operation + * (e.g. IPv4 vs. IPv6), it should probably go here. + * + * (5) For anything else, is it more like the things in 3 or the things in 4? + * Which approach is more convenient for the people who are likely to use the + * new option(s)? Make your best guesses, confirm with others, and go with + * what works. + */ + +/* + * This is just an example, and a way to check whether site.h is actually being + * included automatically. + */ +#define SITE_DOT_H_TEST 9987 |