diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-19 19:03:33 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-19 19:03:33 +0000 |
| commit | e69e8b1d09fb579316595b4e6a850e717358a8b1 (patch) | |
| tree | a24fc20865f65772f530d16177520190594ffdd2 /kviewshell/plugins/djvu/libdjvu/configure.in.in | |
| parent | eecec9afb81fdebb0f22e9da22635874c403f854 (diff) | |
| download | tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.tar.gz tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.zip | |
TQt4 port kdegraphics
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kviewshell/plugins/djvu/libdjvu/configure.in.in')
| -rw-r--r-- | kviewshell/plugins/djvu/libdjvu/configure.in.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kviewshell/plugins/djvu/libdjvu/configure.in.in b/kviewshell/plugins/djvu/libdjvu/configure.in.in index c2a1d2b6..9af3757d 100644 --- a/kviewshell/plugins/djvu/libdjvu/configure.in.in +++ b/kviewshell/plugins/djvu/libdjvu/configure.in.in @@ -217,7 +217,7 @@ AC_REQUIRE([AC_CANONICAL_HOST]) acx_pthread_ok=no # First, check if the POSIX threads header, pthread.h, is available. # If it isn't, don't bother looking for the threads libraries. -AC_CHECK_HEADER(pthread.h, , acx_pthread_ok=noheader) +KDE_CHECK_HEADER(pthread.h, , acx_pthread_ok=noheader) # We must check for the threads library under a number of different # names; the ordering is very important because some systems # (e.g. DEC) have both -lpthread and -lpthreads, where one of the @@ -378,10 +378,13 @@ fi if test x$acx_cothread != xno ; then AC_MSG_CHECKING([whether libgcc contains the cothread patch]) AC_LANG_PUSH([C++]) + kde_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $qt_includes" AC_TRY_LINK([extern "C" { void *(*__get_eh_context_ptr)(); void *__new_eh_context(void); }], [ __get_eh_context_ptr = &__new_eh_context;], [acx_cothread_patch=yes], [acx_cothread_patch=no]) + CXXFLAGS="$kde_save_CXXFLAGS" AC_LANG_POP([C++]) AC_MSG_RESULT($acx_cothread_patch) if test x$acx_cothread_patch = xno ; then @@ -560,8 +563,8 @@ AC_HEADER_STDC AC_HEADER_DIRENT AC_HEADER_TIME AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(wchar.h wctype.h sys/mman.h iconv.h) -AC_CHECK_HEADERS(stdint.h sys/ipc.h sys/shm.h) +KDE_CHECK_HEADERS(wchar.h wctype.h sys/mman.h iconv.h) +KDE_CHECK_HEADERS(stdint.h sys/ipc.h sys/shm.h) # ---------------------------------------- # Types |