X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=6a19cd0b201971b3a910436a3c911890f57477a1;hb=0a9f71036f5617ecd3549abff78a8d9a09c7e56e;hp=8b458fa7d3b72dd12d2f01a5284e2920aeb9d8b1;hpb=0b0b022be1c9c9139955af578fe477529d4b7b3c;p=platform%2Fupstream%2Fglog.git diff --git a/configure.ac b/configure.ac index 8b458fa..6a19cd0 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ # make sure we're interpreted by some minimal autoconf AC_PREREQ(2.57) -AC_INIT(glog, 0.3.3, opensource@google.com) +AC_INIT(glog, 0.3.5, opensource@google.com) # The argument here is just something that should be in the current directory # (for sanity checking) AC_CONFIG_SRCDIR(README) @@ -31,6 +31,7 @@ AC_HEADER_STDC AC_CHECK_HEADER(stdint.h, ac_cv_have_stdint_h=1, ac_cv_have_stdint_h=0) AC_CHECK_HEADER(sys/types.h, ac_cv_have_systypes_h=1, ac_cv_have_systypes_h=0) AC_CHECK_HEADER(inttypes.h, ac_cv_have_inttypes_h=1, ac_cv_have_inttypes_h=0) +AC_CHECK_HEADER(pwd.h, ac_cv_have_pwd_h=1, ac_cv_have_pwd_h=0) AC_CHECK_HEADERS(unistd.h, ac_cv_have_unistd_h=1, ac_cv_have_unistd_h=0) AC_CHECK_HEADERS(syscall.h) AC_CHECK_HEADERS(sys/syscall.h) @@ -47,6 +48,11 @@ AC_CHECK_HEADERS(glob.h) # For backtrace with gcc. AC_CHECK_HEADERS(unwind.h) +AC_CHECK_HEADER(windows.h, ac_cv_have_windows_h=1, ac_cv_have_windows_h=0) +if test x"$ac_cv_have_windows_h" = x"1"; then + MINGW_CFLAGS=-Isrc/windows +fi + AC_CHECK_SIZEOF(void *) # These are the types I need. We look for them in either stdint.h, @@ -58,12 +64,21 @@ AC_CHECK_TYPE(__uint16, ac_cv_have___uint16=1, ac_cv_have___uint16=0) AC_CHECK_FUNC(sigaltstack, AC_DEFINE(HAVE_SIGALTSTACK, 1, [Define if you have the `sigaltstack' function])) +AC_CHECK_FUNC(sigaction, + AC_DEFINE(HAVE_SIGACTION, 1, + [Define if you have the 'sigaction' function])) AC_CHECK_FUNC(dladdr, AC_DEFINE(HAVE_DLADDR, 1, [Define if you have the `dladdr' function])) AC_CHECK_FUNC(fcntl, AC_DEFINE(HAVE_FCNTL, 1, [Define if you have the `fcntl' function])) +AC_CHECK_FUNC(pread, + AC_DEFINE(HAVE_PREAD, 1, + [Define if you have the 'pread' function])) +AC_CHECK_FUNC(pwrite, + AC_DEFINE(HAVE_PWRITE, 1, + [Define if you have the 'pwrite' function])) AX_C___ATTRIBUTE__ # We only care about these two attributes. @@ -139,7 +154,8 @@ LIBS="$SAVE_LIBS" # once the m4 macro of Google Mocking becomes ready. # Check if there is Google Test library installed. AC_CHECK_PROG(GTEST_CONFIG, gtest-config, "yes") -if test x"$GTEST_CONFIG" = "xyes"; then +AC_CHECK_LIB(gtest, main, have_gtest_lib="yes") +if test x"$GTEST_CONFIG" = "xyes" -a x"$have_gtest_lib" = "xyes"; then GTEST_CFLAGS=`gtest-config --cppflags --cxxflags` GTEST_LIBS=`gtest-config --ldflags --libs` AC_DEFINE(HAVE_LIB_GTEST, 1, [define if you have google gtest library]) @@ -211,6 +227,7 @@ AC_SUBST(ac_cv_have_libgflags) AC_SUBST(GFLAGS_CFLAGS) AC_SUBST(GTEST_CFLAGS) AC_SUBST(GMOCK_CFLAGS) +AC_SUBST(MINGW_CFLAGS) AC_SUBST(GFLAGS_LIBS) AC_SUBST(GTEST_LIBS) AC_SUBST(GMOCK_LIBS)