diff options
Diffstat (limited to 'acinclude.m4.in')
| -rw-r--r-- | acinclude.m4.in | 421 |
1 files changed, 279 insertions, 142 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in index b41ecaf..c75d383 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -256,9 +256,9 @@ configure. AC_DEFUN([KDE_TQTMOC_ERROR_MESSAGE], [ - AC_MSG_ERROR([No Trinity TQt meta object compiler (tmoc) found! + AC_MSG_ERROR([No Trinity TQt meta object compiler (tqmoc) found! Please check whether you installed the Trinity TQt Interface correctly. -You need to have a running tmoc binary. +You need to have a running tqmoc binary. configure tried to run $ac_cv_path_moc and the test didn't succeed. If configure shouldn't have tried this one, set the environment variable TQTMOC to the right one before running @@ -270,7 +270,7 @@ AC_DEFUN([KDE_UIC_ERROR_MESSAGE], [ AC_MSG_WARN([No TQt ui compiler (tquic) found! Please check whether you installed TQt correctly. -You need to have a running uic binary. +You need to have a running tquic binary. configure tried to run $ac_cv_path_uic and the test didn't succeed. If configure shouldn't have tried this one, set the environment variable UIC to the right one before running @@ -281,7 +281,7 @@ configure. AC_DEFUN([KDE_CHECK_UIC_FLAG], [ - AC_MSG_CHECKING([whether uic supports -$1 ]) + AC_MSG_CHECKING([whether tquic supports -$1 ]) kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'` AC_CACHE_VAL(kde_cv_prog_uic_$kde_cache, [ @@ -319,7 +319,7 @@ AC_DEFUN([AC_PATH_TQT_MOC_UIC], AC_REQUIRE([KDE_CHECK_PERL]) tqt_bindirs="" for dir in $kde_tqt_dirs; do - tqt_bindirs="$tqt_bindirs $dir/bin $dir/src/moc" + tqt_bindirs="$tqt_bindirs $dir/bin $dir/src/tqmoc" done tqt_bindirs="$tqt_bindirs /usr/bin /usr/X11R6/bin /usr/local/tqt/bin" if test ! "$ac_tqt_bindir" = "NO"; then @@ -333,7 +333,7 @@ AC_DEFUN([AC_PATH_TQT_MOC_UIC], KDE_FIND_PATH(tqmoc, MOC, [$tqt_bindirs], [KDE_MOC_ERROR_MESSAGE]) if test -z "$UIC_NOT_NEEDED"; then if test $kde_tqtver = 3; then - KDE_FIND_PATH(uic-tqt, UIC_PATH, [$tqt_bindirs], [UIC_PATH=""]) + KDE_FIND_PATH(tquic, UIC_PATH, [$tqt_bindirs], [UIC_PATH=""]) fi if test -z "$UIC_PATH" ; then KDE_UIC_ERROR_MESSAGE @@ -354,7 +354,7 @@ AC_DEFUN([AC_PATH_TQT_MOC_UIC], fi fi else - UIC="echo uic not available: " + UIC="echo tquic not available: " fi AC_SUBST(MOC) @@ -714,9 +714,6 @@ support]) # more headers that need to be explicitly included on darwin AC_CHECK_HEADERS(sys/types.h stdint.h) - # sys/bitypes.h is needed for uint32_t and friends on Tru64 - AC_CHECK_HEADERS(sys/bitypes.h) - # darwin requires a poll emulation library AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll") @@ -779,29 +776,6 @@ AH_VERBATIM(_AIX_STRINGS_H_BZERO, AC_CHECK_FUNCS([vsnprintf snprintf]) -AH_VERBATIM(_TRU64,[ -/* - * On HP-UX, the declaration of vsnprintf() is needed every time ! - */ - -#if !defined(HAVE_VSNPRINTF) || defined(hpux) -#if __STDC__ -#include <stdarg.h> -#include <stdlib.h> -#else -#include <varargs.h> -#endif -#ifdef __cplusplus -extern "C" -#endif -int vsnprintf(char *str, size_t n, char const *fmt, va_list ap); -#ifdef __cplusplus -extern "C" -#endif -int snprintf(char *str, size_t n, char const *fmt, ...); -#endif -]) - ]) dnl ------------------------------------------------------------------------ @@ -987,8 +961,8 @@ fi LIB_XEXT="-lXext" TQTE_NORTTI="" -CFLAGS="$CFLAGS -I/usr/include/tqt" -CXXFLAGS="$CXXFLAGS -I/usr/include/tqt" +CFLAGS="$CFLAGS -I/usr/include/tqt3 -I/usr/include/tqt" +CXXFLAGS="$CXXFLAGS -I/usr/include/tqt3 -I/usr/include/tqt" elif test "$kde_use_tqt_emb" = "yes"; then dnl We're using TQT Embedded @@ -1044,16 +1018,8 @@ if $PKG_CONFIG --exists tqt-mt ; then cat >> conftest.$ac_ext <<EOF #include <tqglobal.h> #include <tqapplication.h> -EOF -fi -fi - -if test "$kde_tqtver" = "3"; then -if $PKG_CONFIG --exists tqt-mt ; then -cat >> conftest.$ac_ext <<EOF #include <tqcursor.h> #include <tqstylefactory.h> -#include <tqucomextra_p.h> EOF fi fi @@ -1083,18 +1049,14 @@ AC_DEFUN([KDE_USE_TQT], [ kde_tqtver=0 kde_tqtsubver=0 - + + KDE_PKG_CHECK_MODULES(TQt, tqt-mt) AC_LANG_SAVE AC_LANG_CPLUSPLUS ac_cxxflags_safe="$CXXFLAGS" - CXXFLAGS="-I/usr/include/tqt" + CXXFLAGS="$CXXFLAGS $TQt_CFLAGS" AC_TRY_COMPILE([ - #define TQT_VERSION_ONLY - #include <tqt.h> - #undef TQT_VERSION_ONLY - #ifdef USE_QT4 - choke me - #endif + #include <tqglobal.h> ], , kde_tqtver=3, ) @@ -1286,7 +1248,6 @@ fi dnl ------------------------------------------------------------ dnl If we got --enable-embedded then adjust the TQt library name. -dnl Also TQt4 uses a different library name dnl ------------------------------------------------------------ if test "$kde_tqtver" = "3"; then if test "x$kde_use_tqt_emb" = "xyes"; then @@ -1386,17 +1347,13 @@ if test "$PKG_CONFIG" != "no" ; then tqt_incdirs="$tqt_incdirs `$PKG_CONFIG --variable=includedir tqt-mt`" fi fi -tqt_incdirs="$TQTINC $tqt_incdirs /usr/include/tqt3 /usr/include /usr/X11R6/include/X11/tqt /usr/X11R6/include/tqt $x_includes" +tqt_incdirs="$TQTINC $tqt_incdirs /usr/include/tqt3 /usr/include/tqt /usr/include /usr/X11R6/include/X11/tqt /usr/X11R6/include/tqt $x_includes" if test ! "$ac_tqt_includes" = "NO"; then tqt_incdirs="$ac_tqt_includes $tqt_incdirs" fi -kde_tqt_header=ntqstyle.h - +kde_tqt_header=tqstyle.h AC_FIND_FILE($kde_tqt_header, $tqt_incdirs, tqt_incdir) -if test "$tqt_incdir" = "NO"; then - AC_FIND_FILE($kde_tqt_header, $tqt_incdirs, tqt_incdir) -fi ac_tqt_includes="$tqt_incdir" tqt_libdirs="" @@ -1529,9 +1486,9 @@ KDE_CHECK_TQT KDE_CHECK_TQT_JPEG if test "x$kde_use_tqt_emb" != "xyes" && test "x$kde_use_tqt_mac" != "xyes"; then -LIB_TQT="$kde_int_tqt $LIBJPEG_TQT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) $(LIBTQT_LDFLAGS)' +LIB_TQT="$kde_int_tqt $LIBJPEG_TQT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' else -LIB_TQT="$kde_int_tqt $LIBJPEG_TQT "'$(LIBZ) $(LIBPNG) $(LIBTQT_LDFLAGS)' +LIB_TQT="$kde_int_tqt $LIBJPEG_TQT "'$(LIBZ) $(LIBPNG)' fi test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS" for a in $tqt_libdir/lib`echo ${kde_int_tqt} | sed 's,^-l,,'`_incremental.*; do @@ -1571,9 +1528,12 @@ cat > actest.ui << EOF </property> </widget> </widget> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> EOF - + kde_cv_uic_plugins=no @@ -2469,7 +2429,7 @@ AC_CACHE_VAL(kde_cv_tqt, AC_LANG_SAVE AC_LANG_CPLUSPLUS ac_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS $LIBTQT -ltqt" +LIBS="$all_libraries $USER_LDFLAGS $LIBTQT" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" if test "$kde_tqtver" -gt "2"; then @@ -2490,23 +2450,10 @@ if eval "test ! \"`echo $kde_cv_tqt`\" = no"; then AC_MSG_RESULT(no) dnl AC_MSG_ERROR([You are attempting to compile Trinity without the Trinity TQt Interface installed. Please install libtqtinterface-dev and try again!]) AC_MSG_WARN([You are attempting to compile Trinity without the Trinity TQt Interface installed. Please install libtqtinterface-dev and try again!]) - TQTMOC="\$PATH=\$PATH:\$(srcdir)/ tmoc" - LIBTQT_LDFLAGS="-ltqt" - AC_SUBST(LIBTQT_LDFLAGS) - tqtlib="$tqtlib $LIBTQT_LDFLAGS" + TQTMOC="\$PATH=\$PATH:\$(srcdir)/ tqmoc" else AC_MSG_RESULT(yes) - LIBTQT_LDFLAGS="-ltqt" - AC_SUBST(LIBTQT_LDFLAGS) -dnl all_libraries="$all_libraries $LIBTQT_LDFLAGS" - TQT_LDFLAGS="$TQT_LDFLAGS $LIBTQT_LDFLAGS" - AC_SUBST(TQT_LDFLAGS) - tqtlib="$tqtlib $LIBTQT_LDFLAGS" - LIBTQT_CXXFLAGS="-include tqt.h" - all_includes="$all_includes $LIBTQT_CXXFLAGS" - TQT_INCLUDES="$TQT_INCLUDES $LIBTQT_CXXFLAGS" - - KDE_FIND_PATH(tmoc, TQTMOC, [$tqt_bindirs], [KDE_TQTMOC_ERROR_MESSAGE]) + KDE_FIND_PATH(tqmoc, TQTMOC, [$tqt_bindirs], [KDE_TQTMOC_ERROR_MESSAGE]) AC_SUBST(TQTMOC) KDE_FIND_PATH(dcopidl, TQTDCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)]) @@ -2552,8 +2499,8 @@ fi LIBS="$ac_save_LIBS" CXXFLAGS="$ac_save_CXXFLAGS" AC_LANG_RESTORE -fi ]) +fi if eval "test ! \"`echo $kde_cv_tqt_jpeg`\" = no"; then AC_MSG_RESULT(yes) @@ -2623,9 +2570,7 @@ else LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm" fi kde_save_CXXFLAGS="$CXXFLAGS" -kde_save_LDFLAGS="$LDFLAGS" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" -LDFLAGS="$LDFLAGS -ltqt" AC_TRY_LINK(dnl [ @@ -2640,7 +2585,6 @@ AC_TRY_LINK(dnl LIBS="$kde_save_LIBS" CXXFLAGS="$kde_save_CXXFLAGS" -LDFLAGS="$kde_save_LDFLAGS" AC_LANG_RESTORE ]) @@ -2702,8 +2646,6 @@ AC_CACHE_VAL(ac_cv_libexr, AC_LANG_SAVE AC_LANG_CPLUSPLUS kde_save_CXXFLAGS="$CXXFLAGS" - kde_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LFLAGS -ltqt" EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR` CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS" @@ -2721,7 +2663,6 @@ AC_CACHE_VAL(ac_cv_libexr, ) LIBS="$kde_save_LIBS" CXXFLAGS="$kde_save_CXXFLAGS" - LDFLAGS="$kde_save_LDFLAGS" AC_LANG_RESTORE ])dnl if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then @@ -3126,7 +3067,7 @@ AC_DEFUN([AC_CHECK_COMPILERS], case $host in *-*-linux-gnu) CFLAGS="-W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_DEFAULT_SOURCE $CFLAGS" - CXXFLAGS="-ansi -D_DEFAULT_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS" + CXXFLAGS="-D_DEFAULT_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS" KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"]) KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"]) ;; @@ -3304,7 +3245,7 @@ AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG], std::string s("blafasel"); return 0; } - ], [/* elvis is alive */], + ], [/* Elvis is not dead, he just went home! (Men In Black, 1997) */], kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes) CXXFLAGS=$safe_CXXFLAGS @@ -3370,11 +3311,11 @@ if $PKG_CONFIG --exists tqt-mt ; then AC_TRY_COMPILE( [ #include <tqglobal.h> -#if Q_EXPORT - 0 != 0 -/* if this compiles, then Q_EXPORT is undefined */ -/* if Q_EXPORT is nonempty, this will break compilation */ +#if TQ_EXPORT - 0 != 0 +/* if this compiles, then TQ_EXPORT is undefined */ +/* if TQ_EXPORT is nonempty, this will break compilation */ #endif - ], [/* elvis is alive */], + ], [/* Elvis is not dead, he just went home! (Men In Black, 1997) */], kde_cv_val_tqt_gcc_visibility_patched=no, kde_cv_val_tqt_gcc_visibility_patched=yes) fi fi @@ -3388,7 +3329,7 @@ fi CXXFLAGS="$CXXFLAGS -fvisibility=hidden" KDE_CHECK_VISIBILITY_GCC_BUG HAVE_GCC_VISIBILITY=1 - AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported]) + AC_DEFINE_UNQUOTED(__TDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported]) fi ]) fi @@ -3482,7 +3423,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/opt/trinity}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -3571,8 +3512,6 @@ AC_DEFUN([AC_CHECK_SOCKLEN_T], fi AC_DEFINE_UNQUOTED(kde_socklen_t, $kde_cv_socklen_t_equiv, [type to use in place of socklen_t if not defined]) - AC_DEFINE_UNQUOTED(ksize_t, $kde_cv_socklen_t_equiv, - [type to use in place of socklen_t if not defined (deprecated, use kde_socklen_t)]) ]) dnl This is a merge of some macros out of the gettext aclocal.m4 @@ -4300,23 +4239,11 @@ AC_DEFUN([KDE_CHECK_LIBPTHREAD], fi fi - dnl Is this test really needed, in the face of the Tru64 test below? + dnl Is this test really needed? if test -z "$LIBPTHREAD"; then AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"]) fi - dnl This is a special Tru64 check, see BR 76171 issue #18. - if test -z "$LIBPTHREAD" ; then - AC_MSG_CHECKING([for pthread_create in -lpthread]) - kde_safe_libs=$LIBS - LIBS="$LIBS -lpthread" - AC_TRY_LINK([#include <pthread.h>],[(void)pthread_create(0,0,0,0);],[ - AC_MSG_RESULT(yes) - LIBPTHREAD="-lpthread"],[ - AC_MSG_RESULT(no)]) - LIBS=$kde_safe_libs - fi - dnl Un-special-case for FreeBSD. if test "x$LIBPTHREAD" = "xPTHREAD" ; then LIBPTHREAD="" @@ -4462,12 +4389,18 @@ AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) AC_REQUIRE([KDE_CHECK_PYTHON_DIR]) if test -z "$1"; then - version="1.5" + version="3.0" else version="$1" fi -AC_MSG_CHECKING([for Python$version]) +AC_PATH_PROG([PYTHON],[python$version]) + +if test -n "$PYTHON"; then + abiflags=$($PYTHON -c 'import sys; print(sys.abiflags)') +else + abiflags="" +fi python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes" AC_FIND_FILE(Python.h, $python_incdirs, python_incdir) @@ -4483,13 +4416,13 @@ PYTHONINC=-I$python_incdir python_multiarch_libdirs="`find /usr/lib/ -maxdepth 1 -type d | xargs echo`" python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $python_multiarch_libdirs $kde_extra_libs" -AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) -if test ! -r $python_libdir/libpython$version.so; then - AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) - if test ! -r $python_libdir/libpython$version.a; then - AC_FIND_FILE(python$version/config/libpython$version.a, $python_libdirs, python_libdir) +AC_FIND_FILE(libpython$version$abiflags.so, $python_libdirs, python_libdir) +if test ! -r $python_libdir/libpython$version$abiflags.so; then + AC_FIND_FILE(libpython$version$abiflags.a, $python_libdirs, python_libdir) + if test ! -r $python_libdir/libpython$version$abiflags.a; then + AC_FIND_FILE(python$version/config/libpython$version$abiflags.a, $python_libdirs, python_libdir) python_libdir=$python_libdir/python$version/config - if test ! -r $python_libdir/libpython$version.a; then + if test ! -r $python_libdir/libpython$version$abiflags.a; then python_libdir=no fi fi @@ -4498,7 +4431,7 @@ fi PYTHONLIB=-L$python_libdir kde_orig_LIBPYTHON=$LIBPYTHON if test -z "$LIBPYTHON"; then - LIBPYTHON=-lpython$version + LIBPYTHON=-lpython$version$abiflags fi AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir) @@ -4509,7 +4442,10 @@ fi PYTHONMODDIR=$python_moddir -AC_MSG_RESULT(header $python_incdir library $python_libdir modules $python_moddir) +AC_MSG_RESULT([\ + header $python_incdir, + library $python_libdir, + modules $python_moddir]) if test x$python_incdir = xno || test x$python_libdir = xno || test x$python_moddir = xno; then LIBPYTHON=$kde_orig_LIBPYTHON @@ -4550,22 +4486,12 @@ fi AC_DEFUN([KDE_CHECK_PYTHON], [ - KDE_CHECK_PYTHON_INTERN("2.7", - [KDE_CHECK_PYTHON_INTERN("2.6", - [KDE_CHECK_PYTHON_INTERN("2.5", - [KDE_CHECK_PYTHON_INTERN("2.4", - [KDE_CHECK_PYTHON_INTERN("2.3", - [KDE_CHECK_PYTHON_INTERN("2.2", - [KDE_CHECK_PYTHON_INTERN("2.1", - [KDE_CHECK_PYTHON_INTERN("2.0", - [KDE_CHECK_PYTHON_INTERN($1, $2) ]) - ]) - ]) - ]) - ]) - ]) - ]) - ]) + for PYTHON_VER_TEST in 3.{13,12,11,10,9,8,7,6,5,4,3,2,1,0}; do + KDE_CHECK_PYTHON_INTERN("$PYTHON_VER_TEST") + if test -n "$PYTHONLIB"; then + break + fi + done ]) AC_DEFUN([KDE_CHECK_STL], @@ -4825,7 +4751,7 @@ AC_LANG_RESTORE ]) dnl ------------------------------------------------------------------------ -dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure@kde.org +dnl Check for S_ISSOCK macro dnl ------------------------------------------------------------------------ dnl AC_DEFUN([AC_CHECK_S_ISSOCK], @@ -4900,7 +4826,7 @@ AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAX AC_DEFUN([KDE_CHECK_HEADER], [ kde_safe_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt" + CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt3 -I/usr/include/tqt" AC_LANG_SAVE AC_LANG_CPLUSPLUS AC_CHECK_HEADER([$1], [$2], [$3], [$4]) @@ -4913,7 +4839,7 @@ AC_DEFUN([KDE_CHECK_HEADERS], AH_CHECK_HEADERS_TDE([$1]) AC_LANG_SAVE kde_safe_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt" + CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt3 -I/usr/include/tqt" AC_LANG_CPLUSPLUS AC_CHECK_HEADERS([$1], [$2], [$3], [$4]) CPPFLAGS=$kde_safe_cppflags @@ -4944,12 +4870,12 @@ AC_DEFUN([KDE_CONF_FILES], dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. -dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde +dnl It only looks at --prefix, TDEDIR and falls back to /opt/trinity AC_DEFUN([KDE_SET_PREFIX_CORE], [ unset CDPATH dnl make $TDEDIR the default for the installation - AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) + AC_PREFIX_DEFAULT(${TDEDIR:-/opt/trinity}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -5121,7 +5047,6 @@ AC_DEFUN([KDE_CHECK_LIB], kde_save_LDFLAGS="$LDFLAGS" dnl AC_CHECK_LIB modifies LIBS, so save it here kde_save_LIBS="$LIBS" - LDFLAGS="$LDFLAGS $all_libraries -ltqt" case $host_os in aix*) LDFLAGS="-brtl $LDFLAGS" test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" @@ -5554,7 +5479,7 @@ if test "${with_tqt_dir+set}" = set; then kde_tqtdir="$with_tqt_dir" fi -AC_FIND_FILE(qsql.html, [ $kde_tqtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/tqt3/html /usr/lib/tqt3/doc /usr/lib/tqt3/doc/html /usr/doc/tqt3/html /usr/doc/tqt3 /usr/share/doc/tqt3-doc /usr/share/tqt3/doc/html /usr/X11R6/share/doc/tqt/html ], TQTDOCDIR) +AC_FIND_FILE(tqsql.html, [ $kde_tqtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/tqt3/html /usr/lib/tqt3/doc /usr/lib/tqt3/doc/html /usr/doc/tqt3/html /usr/doc/tqt3 /usr/share/doc/tqt3-doc /usr/share/tqt3/doc/html /usr/X11R6/share/doc/tqt/html ], TQTDOCDIR) AC_MSG_RESULT($TQTDOCDIR) AC_SUBST(TQTDOCDIR) @@ -5575,7 +5500,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME) AC_SUBST(DOXYGEN_PROJECT_NUMBER) KDE_HAS_DOXYGEN=no -if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/qsql.html; then +if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/tqsql.html; then KDE_HAS_DOXYGEN=yes fi AC_SUBST(KDE_HAS_DOXYGEN) @@ -6391,7 +6316,7 @@ AC_DEFUN([AC_SQLITE3], [ AC_MSG_ERROR(TQTDIR not set) fi AC_MSG_RESULT($TQTDIR) - ac_qmake=${TQTDIR}/bin/qmake + ac_qmake=${TQTDIR}/bin/tqmake AC_ARG_WITH(qmake, AC_HELP_STRING([--with-qmake=PATH],[which version of QMake to use ]), [ ac_qmake="$withval" ]) @@ -6450,3 +6375,215 @@ EOF AC_SUBST(LIBSQLITE3) fi ]) +# =========================================================================== +# +# SYNOPSIS +# +# TDE_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) +# +# DESCRIPTION +# +# Check for baseline language coverage in the compiler for the specified +# version of the C++ standard. If necessary, add switches to CXX and +# CXXCPP to enable support. VERSION may be '11' (for the C++11 standard) +# or '14' (for the C++14 standard). +# +# The second argument, if specified, indicates whether you insist on an +# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. +# -std=c++11). If neither is specified, you get whatever works, with +# preference for no added switch, and then for an extended mode. +# +# The third argument, if specified 'mandatory' or if left unspecified, +# indicates that baseline support for the specified C++ standard is +# required and that the macro should error out if no mode with that +# support is found. If specified 'optional', then configuration proceeds +# regardless, after defining HAVE_CXX${VERSION} if and only if a +# supporting mode is found. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com> +# Copyright (c) 2012 Zack Weinberg <zackw@panix.com> +# Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu> +# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com> +# Copyright (c) 2015 Paul Norman <penorman@mac.com> +# Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu> +# Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com> +# Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com> +# Copyright (c) 2020 Jason Merrill <jason@redhat.com> +# Copyright (c) 2021 Slávek Banko <slavek.banko@axis.cz> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +dnl This macro is simplified version of the macro AX_CXX_COMPILE_STDCXX + +AC_DEFUN([TDE_CXX_COMPILE_STDCXX], [dnl + m4_if([$1], [11], [tde_cxx_compile_alternatives="11 0x"], + [$1], [14], [tde_cxx_compile_alternatives="14 1y"], + [$1], [17], [tde_cxx_compile_alternatives="17 1z"], + [m4_fatal([invalid first argument `$1' to TDE_CXX_COMPILE_STDCXX])])dnl + m4_if([$2], [], [], + [$2], [ext], [], + [$2], [noext], [], + [m4_fatal([invalid second argument `$2' to TDE_CXX_COMPILE_STDCXX])])dnl + m4_if([$3], [], [tde_cxx_compile_cxx$1_required=true], + [$3], [mandatory], [tde_cxx_compile_cxx$1_required=true], + [$3], [optional], [tde_cxx_compile_cxx$1_required=false], + [m4_fatal([invalid third argument `$3' to TDE_CXX_COMPILE_STDCXX])]) + AC_LANG_PUSH([C++])dnl + ac_success=no + + m4_if([$2], [], [dnl + AC_CACHE_CHECK(whether $CXX supports C++$1 features by default, + tde_cv_cxx_compile_cxx$1, + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_TDE_CXX_COMPILE_STDCXX_testbody_$1])], + [tde_cv_cxx_compile_cxx$1=yes], + [tde_cv_cxx_compile_cxx$1=no])]) + if test x$tde_cv_cxx_compile_cxx$1 = xyes; then + ac_success=yes + fi]) + + m4_if([$2], [noext], [], [dnl + if test x$ac_success = xno; then + for alternative in ${tde_cxx_compile_alternatives}; do + switch="-std=gnu++${alternative}" + cachevar=AS_TR_SH([tde_cv_cxx_compile_cxx$1_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_TDE_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + fi]) + + m4_if([$2], [ext], [], [dnl + if test x$ac_success = xno; then + dnl HP's aCC needs +std=c++11 according to: + dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf + dnl Cray's crayCC needs "-h std=c++11" + for alternative in ${tde_cxx_compile_alternatives}; do + for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do + cachevar=AS_TR_SH([tde_cv_cxx_compile_cxx$1_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_TDE_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + if test x$ac_success = xyes; then + break + fi + done + fi]) + AC_LANG_POP([C++]) + if test x$tde_cxx_compile_cxx$1_required = xtrue; then + if test x$ac_success = xno; then + AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.]) + fi + fi + if test x$ac_success = xno; then + HAVE_CXX$1=0 + AC_MSG_NOTICE([No compiler with C++$1 support was found]) + else + HAVE_CXX$1=1 + AC_DEFINE(HAVE_CXX$1,1, + [define if the compiler supports basic C++$1 syntax]) + fi + AC_SUBST(HAVE_CXX$1) +]) + + +dnl Test body for checking C++11 support + +m4_define([_TDE_CXX_COMPILE_STDCXX_testbody_11], + _TDE_CXX_COMPILE_STDCXX_testbody_new_in_11 +) + + +dnl Test body for checking C++14 support + +m4_define([_TDE_CXX_COMPILE_STDCXX_testbody_14], + _TDE_CXX_COMPILE_STDCXX_testbody_new_in_11 + _TDE_CXX_COMPILE_STDCXX_testbody_new_in_14 +) + +m4_define([_TDE_CXX_COMPILE_STDCXX_testbody_17], + _TDE_CXX_COMPILE_STDCXX_testbody_new_in_11 + _TDE_CXX_COMPILE_STDCXX_testbody_new_in_14 + _TDE_CXX_COMPILE_STDCXX_testbody_new_in_17 +) + +dnl Tests for new features in C++11 + +m4_define([_TDE_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#endif // __cplusplus >= 201103L + +]]) + + +dnl Tests for new features in C++14 + +m4_define([_TDE_CXX_COMPILE_STDCXX_testbody_new_in_14], [[ + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201402L + +#error "This is not a C++14 compiler" + +#endif // __cplusplus >= 201402L + +]]) + + +dnl Tests for new features in C++17 + +m4_define([_TDE_CXX_COMPILE_STDCXX_testbody_new_in_17], [[ + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201703L + +#error "This is not a C++17 compiler" + +#endif // __cplusplus >= 201703L + +]]) |