travis: try one after another

[awesomized/libmemcached] / m4 / bottom.m4

diff --git a/m4/bottom.m4 b/m4/bottom.m4
index 798ff2c4541f8f81621abf2e68d47561ffd84bdc..d2252ac743a35cc259ab60a3466e5f6592364be2 100644 (file)
--- a/m4/bottom.m4
+++ b/m4/bottom.m4
@@ -5,37 +5,27 @@ AH_TOP([
 
 /* _SYS_FEATURE_TESTS_H is Solaris, _FEATURES_H is GCC */
 #if defined( _SYS_FEATURE_TESTS_H) || defined(_FEATURES_H)
-#error "You should include config.h as your first include file"
+#error "You should include mem_config.h as your first include file"
 #endif
 
 ])
 
 AH_BOTTOM([
 
+#ifndef __STDC_FORMAT_MACROS
+#  define __STDC_FORMAT_MACROS
+#endif
+ 
 #if defined(__cplusplus) 
-#include CSTDINT_H 
-#include CINTTYPES_H 
+#  include CINTTYPES_H 
 #else 
-#include <stdint.h> 
-#include <inttypes.h> 
+#  include <inttypes.h> 
 #endif
 
 #if !defined(HAVE_ULONG) && !defined(__USE_MISC)
 # define HAVE_ULONG 1
 typedef unsigned long int ulong;
 #endif 
- 
- 
-#if defined(RMEMCACHED_PACKAGE) 
-#undef VERSION 
-#define VERSION VERSION_NUMBER
-#endif
-
-#if defined(RMEMCACHED_PACKAGE)
-#undef PACKAGE
-#define PACKAGE RMEMCACHED_PACKAGE
-#endif
-
 
 ])