diff options
author | <shinichiro.hamaji@gmail.com> | 2009-01-22 18:22:48 +0000 |
---|---|---|
committer | <shinichiro.hamaji@gmail.com> | 2009-01-22 18:22:48 +0000 |
commit | c3441fb6bafd1646e239b9e36e84272c31f8d4b1 (patch) | |
tree | ca86a2194955c9b30ae8404577ca8176a468eb19 /configure | |
parent | e31a91b6502b3d15ecd7c2d1b518fafbc7234572 (diff) | |
download | glog-c3441fb6bafd1646e239b9e36e84272c31f8d4b1.tar.gz glog-c3441fb6bafd1646e239b9e36e84272c31f8d4b1.tar.bz2 glog-c3441fb6bafd1646e239b9e36e84272c31f8d4b1.zip |
Better Cygwin support.
- configure.ac: Add -lpthread only if acx_pthread_ok is yes. In cygwin, we use Windows' thread so that we don't need -lpthread.
- base/mutex.h: Define NOMINMAX before we include windows.h.
- glog/*.h: Make sure that dllimport doesn't appear in cygwin. Note that windows.h may define _WIN32 macro.
- utilities.h: Define OS_CYGWIN.
git-svn-id: https://google-glog.googlecode.com/svn/trunk@30 eb4d4688-79bd-11dd-afb4-1d65580434c0
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -23786,8 +23786,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -# To make libglog depend on libpthread on Linux, we need to add -# -lpthread in addition to -pthread. +if test x"$acx_pthread_ok" = x"yes"; then + # To make libglog depend on libpthread on Linux, we need to add + # -lpthread in addition to -pthread. { echo "$as_me:$LINENO: checking for pthread_self in -lpthread" >&5 echo $ECHO_N "checking for pthread_self in -lpthread... $ECHO_C" >&6; } @@ -23859,6 +23860,7 @@ _ACEOF fi +fi # Check if there is google-gflags library installed. { echo "$as_me:$LINENO: checking for main in -lgflags" >&5 |