diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2013-09-29 06:49:23 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2013-09-29 06:49:23 -0700 |
| commit | 68651275513c6d49a1a50ed2a1f7ef5d5f0e760e (patch) | |
| tree | 67f8f34ba616df2b68d13725b1814bcd6cb70588 /src/m4/bitcoin_subdir_to_include.m4 | |
| parent | 75d31c84dba2e5280341b756aa9dc39a345dfffd (diff) | |
| parent | 5ceb9c963700d4639fb3210b98aa028113e2a9c4 (diff) | |
| download | bitcoin-68651275513c6d49a1a50ed2a1f7ef5d5f0e760e.tar.xz | |
Merge pull request #3015 from theuni/win32-version-info
Win32 version info
Diffstat (limited to 'src/m4/bitcoin_subdir_to_include.m4')
| -rw-r--r-- | src/m4/bitcoin_subdir_to_include.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/m4/bitcoin_subdir_to_include.m4 b/src/m4/bitcoin_subdir_to_include.m4 index 9b37a75ef0..66f106c7d4 100644 --- a/src/m4/bitcoin_subdir_to_include.m4 +++ b/src/m4/bitcoin_subdir_to_include.m4 @@ -5,8 +5,10 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[ AC_MSG_RESULT([default]) else echo "#include <$2$3.h>" >conftest.cpp - newinclpath=`${CXXCPP} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`] + newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`] AC_MSG_RESULT([${newinclpath}]) - eval "$1=\"\$$1\"' -I${newinclpath}'" + if test "x${newinclpath}" != "x"; then + eval "$1=\"\$$1\"' -I${newinclpath}'" + fi fi ]) |