travis: try one after another

[awesomized/libmemcached] / m4 / bottom.m4

diff --git a/m4/bottom.m4 b/m4/bottom.m4
index 303aaf7a6cc7d614c0088362f4a85ddbeb5333fc..d2252ac743a35cc259ab60a3466e5f6592364be2 100644 (file)
--- a/m4/bottom.m4
+++ b/m4/bottom.m4
@@ -5,14 +5,16 @@ 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([
 
-#define __STDC_FORMAT_MACROS
+#ifndef __STDC_FORMAT_MACROS
+#  define __STDC_FORMAT_MACROS
+#endif
  
 #if defined(__cplusplus) 
 #  include CINTTYPES_H 
@@ -25,10 +27,6 @@ AH_BOTTOM([
 typedef unsigned long int ulong;
 #endif 
 
-#define RPACKAGE "memcached" 
- 
-#define RVERSION "1.4.13"
- 
 ])
 
 ])dnl CONFIG_EXTRA