The clients and test programs should not be compiled with MEMCACHED_INTERNAL defined

diff --git a/configure.ac b/configure.ac
index 515502f10d212c150958a2f8569ff3bd80358255..03f9f58cabac3bce9866aac54fa2a16c8e37b90c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,6 @@ sinclude(config/memcached.m4)
 sinclude(config/setsockopt.m4)
 
 # We only support GCC and Sun's forte at the moment
-CFLAGS="-DMEMCACHED_INTERNAL $CFLAGS"
 if test "$GCC" = "yes"
 then
   #CFLAGS="-W -std=iso9899:1999 -Wall -Wextra -Wstrict-aliasing -pedantic -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -O3 $CFLAGS"

diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index 8e5f85c51e1df2a42614dcc57dcc953448d51a81..74a5bbe2e5a81e5c0b0d6bb8ef1de0e0e64e52ba 100644 (file)
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -67,6 +67,7 @@ if BUILD_BYTEORDER
 libmemcached_la_SOURCES += byteorder.c
 endif
 
+AM_CFLAGS = -DMEMCACHED_INTERNAL
 libmemcached_la_DEPENDENCIES = @DTRACE_OBJ@
 libmemcached_la_LIBADD = @DTRACE_OBJ@
 libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION)