Permalink
Browse files

- Fix build with Automake 1.12.

Signed-off-by: Stanislav Sedov <stas@FreeBSD.org>
  • Loading branch information...
1 parent f2d406b commit c20f4e0469c31f446666a045fbcec602b4dedd27 @stass committed Sep 19, 2012
Showing with 6 additions and 5 deletions.
  1. +5 −5 Makefile.am
  2. +1 −0 configure.ac
View
@@ -9,16 +9,16 @@ OPT ?= -O2 -DNDEBUG # (A) Production use (optimized mode)
# TODO maybe support android & chromium platforms via automake too?
-CFLAGS = -I$(srcdir)/include $(OPT) -pthread -fno-builtin-memcmp -DLEVELDB_PLATFORM_POSIX
+AM_CFLAGS = -I$(srcdir)/include $(OPT) -pthread -fno-builtin-memcmp -DLEVELDB_PLATFORM_POSIX
-CXXFLAGS = -I$(srcdir)/include $(OPT) -pthread -fno-builtin-memcmp -DLEVELDB_PLATFORM_POSIX
+AM_CXXFLAGS = -I$(srcdir)/include $(OPT) -pthread -fno-builtin-memcmp -DLEVELDB_PLATFORM_POSIX
if CSTDATOMIC
-CXXFLAGS += -DLEVELDB_CSTDATOMIC_PRESENT -std=c++0x
+AM_CXXFLAGS += -DLEVELDB_CSTDATOMIC_PRESENT -std=c++0x
endif
-LDFLAGS = -pthread
+AM_LDFLAGS = -pthread
if WITH_TCMALLOC
-LDFLAGS += -ltcmalloc
+AM_LDFLAGS += -ltcmalloc
endif
# items will be appended to this
View
@@ -9,6 +9,7 @@ AC_CONFIG_FILES([
Makefile
])
AC_PROG_RANLIB
+AM_PROG_AR
AC_MSG_CHECKING(whether compiler supports C++11 cstdatomic)
OLD_CXXFLAGS="$CXXFLAGS"

0 comments on commit c20f4e0

Please sign in to comment.