projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in additional language plus some of the configure language for
[awesomized/libmemcached]
/
m4
/
pandora_have_protobuf.m4
diff --git
a/m4/pandora_have_protobuf.m4
b/m4/pandora_have_protobuf.m4
index 3b1652e9d40dddb4e1affe7c87047b1247110060..47f4cd4a4f8e363c6ad29efdbf378f34612d2f83 100644
(file)
--- a/
m4/pandora_have_protobuf.m4
+++ b/
m4/pandora_have_protobuf.m4
@@
-3,7
+3,7
@@
dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
dnl
dnl pandora-build: A pedantic build system
dnl Copyright (C) 2009 Sun Microsystems, Inc.
dnl
dnl pandora-build: A pedantic build system
dnl Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software;
the Free Software Foundation
+dnl This file is free software;
Sun Microsystems
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
@@
-23,7
+23,9
@@
AC_DEFUN([_PANDORA_SEARCH_LIBPROTOBUF],[
[#include <google/protobuf/descriptor.h>],
[google::protobuf::FileDescriptor* file;],
[system])
[#include <google/protobuf/descriptor.h>],
[google::protobuf::FileDescriptor* file;],
[system])
- CXXFLAGS="${save_CXXFLAGS}"
+ CXXFLAGS="${PTHREAD_CFLAGS} ${save_CXXFLAGS}"
+ LIBPROTOBUF="${LIBPROTOBUF} ${PTHREAD_LIBS}"
+ LTLIBPROTOBUF="${LTLIBPROTOBUF} ${PTHREAD_LIBS}"
AC_LANG_POP()
])
AC_LANG_POP()
])