diff options
-rw-r--r-- | Doxyfile.am | 5 | ||||
-rw-r--r-- | Doxyfile.global | 2 | ||||
-rw-r--r-- | acinclude.m4.in | 421 | ||||
-rw-r--r-- | am_edit | 22 | ||||
-rwxr-xr-x | compile | 9 | ||||
-rwxr-xr-x | config.guess | 112 | ||||
-rwxr-xr-x | config.sub | 58 | ||||
-rw-r--r-- | configure.in.min | 1 | ||||
-rw-r--r-- | cvs.sh | 4 | ||||
-rwxr-xr-x | depcomp | 67 | ||||
-rwxr-xr-x | detect-autoconf.pl | 2 | ||||
-rwxr-xr-x | doxygen.sh | 8 | ||||
-rwxr-xr-x | install-sh | 7 | ||||
-rw-r--r-- | libtool.m4.in | 273 | ||||
-rw-r--r-- | ltmain.sh | 60 | ||||
-rwxr-xr-x | missing | 7 | ||||
-rwxr-xr-x | mkinstalldirs | 9 | ||||
-rwxr-xr-x | ylwrap | 9 |
18 files changed, 319 insertions, 757 deletions
diff --git a/Doxyfile.am b/Doxyfile.am index 420b411..f227912 100644 --- a/Doxyfile.am +++ b/Doxyfile.am @@ -95,8 +95,3 @@ install-apidox-recurse: install-apidox .PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox apidox-am-toplevel-no apidox-am-toplevel-yes - - -# Local Variables: -# mode: makefile -# End: diff --git a/Doxyfile.global b/Doxyfile.global index 5c41093..9d8dbf5 100644 --- a/Doxyfile.global +++ b/Doxyfile.global @@ -1282,7 +1282,7 @@ INCLUDE_FILE_PATTERNS = PREDEFINED = TQT_VERSION=320 \ __cplusplus \ - Q_WS_X11 + TQ_WS_X11 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. 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 + +]]) @@ -229,7 +229,7 @@ sub processMakefile ($) local $allidls = ""; local $idl_output = "";# lists all idl generated files for cleantarget - local $ui_output = "";# lists all uic generated files for cleantarget + local $ui_output = "";# lists all tquic generated files for cleantarget local $kcfg_output = "";# lists all kcfg generated files for cleantarget local %dependmocs = (); @@ -820,7 +820,6 @@ sub tag_FINAL() $handling .= "\trm -f $program.all_$suffix.files $program.all_$suffix.final; \\\n"; $handling .= "\techo \"#define KDE_USE_FINAL 1\" >> $program.all_$suffix.final; \\\n"; $handling .= "\tfor file in " . $sourcelist{$suffix} . "; do \\\n"; -# $handling .= "\t tqt-replace \$\(srcdir\)/\$\$file; \\\n"; $handling .= "\t echo \"#include \\\"\$\$file\\\"\" >> $program.all_$suffix.files; \\\n"; $handling .= "\t test ! -f \$\(srcdir\)/\$\$file || egrep '^#pragma +implementation' \$\(srcdir\)/\$\$file >> $program.all_$suffix.final; \\\n"; $handling .= "\tdone; \\\n"; @@ -873,9 +872,9 @@ sub tag_TDEINIT() $lines .= "\techo 'int main(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${tdeinit}.la.$cxxsuffix\n"; $lines .= "\n${tdeinit}_dummy.$cxxsuffix:\n"; - $lines .= "\techo '#include <kdemacros.h>' > ${tdeinit}_dummy.$cxxsuffix; \\\n"; + $lines .= "\techo '#include <tdemacros.h>' > ${tdeinit}_dummy.$cxxsuffix; \\\n"; $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' >> ${tdeinit}_dummy.$cxxsuffix; \\\n"; - $lines .= "\techo 'extern \"C\" KDE_EXPORT int tdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${tdeinit}_dummy.$cxxsuffix\n"; + $lines .= "\techo 'extern \"C\" TDE_EXPORT int tdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${tdeinit}_dummy.$cxxsuffix\n"; push(@cleanfiles, "${tdeinit}.la.$cxxsuffix"); push(@cleanfiles, "${tdeinit}_dummy.$cxxsuffix"); @@ -1262,9 +1261,8 @@ sub tag_IDLFILES () } if ($allidls !~ /$source\_kidl/) { - - $use_ng = ($MakefileData =~ /\n$source\_DCOPIDLNG\s*=\s*(\S+)\n/); - $dcopidl = $use_ng ? "KDECONFIG=\"\$(KDECONFIG)\" \$(TQTDCOPIDLNG)" : " \$(TQTDCOPIDL)"; + + $dcopidl = "KDECONFIG=\"\$(KDECONFIG)\" \$(TQTDCOPIDLNG)"; $dep_lines .= "$source.kidl: $sourcedir$source.h \$(DCOP_DEPENDENCIES)\n"; $dep_lines .= "\t$dcopidl $sourcedir$source.h > $source.kidl || ( rm -f $source.kidl ; false )\n"; @@ -1367,7 +1365,7 @@ sub tag_UIFILES () my ($mangled_source) = $source; $mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n"; - $dep_lines .= "\t\$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" $source.$cxxsuffix.temp | \$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" | \$(PERL) -pe \"s,image([0-9][0-9]*)_data,img\\\$\$1_" . $mangled_source . ",g\" | \$(PERL) -pe \"s,: TQWizard\\(,: KWizard(,g; s,: QWizard\\(,: KWizard(,g;\" >> $source.$cxxsuffix ;\\\n"; + $dep_lines .= "\t\$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\" ),TQString::null,g\" $source.$cxxsuffix.temp | \$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),TQString::null,g\" | \$(PERL) -pe \"s,image([0-9][0-9]*)_data,img\\\$\$1_" . $mangled_source . ",g\" | \$(PERL) -pe \"s,: T?QWizard\\(,: KWizard(,g;\" >> $source.$cxxsuffix ;\\\n"; $dep_lines .= "\trm -f $source.$cxxsuffix.temp ;\\\n"; } else { $dep_lines .= "\t\$(UIC) -i $source.h $sourcedir$source.ui > $source.$cxxsuffix; ret=\$\$?; \\\n"; @@ -1376,7 +1374,7 @@ sub tag_UIFILES () $dep_lines .= "$source.h: $sourcedir$source.ui\n"; $dep_lines .= "\trm -rf $source.h;\n"; if (!$kdeopts{"tqtonly"}) { - $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pe \"s,public TQWizard,public KWizard,g; s,#include <ntqwizard.h>,#include <kwizard.h>,g; s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n"; + $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pe \"s,public T?QWizard,public KWizard,g; s,#include <(n?t)?qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n"; } else { $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n"; } @@ -2117,10 +2115,8 @@ sub findMocCandidates () seek(HFIN, 0, 0); read HFIN, $hfData, $hfsize; close HFIN; - # push (@list, $hf) if(index($hfData, "Q_OBJECT") >= 0); ### fast but doesn't handle //Q_OBJECT - # handle " { friend class blah; Q_OBJECT ", but don't match antlarr_Q_OBJECT (\b). - if ( $hfData =~ /{([^}]*)\bQ_OBJECT/s ) { - push (@list, $hf) unless $1 =~ m://[^\n]*Q_OBJECT[^\n]*$:s; ## reject "// Q_OBJECT" + if ( $hfData =~ /{([^}]*)\bT?Q_OBJECT/s ) { + push (@list, $hf) unless $1 =~ m://[^\n]*T?Q_OBJECT[^\n]*$:s; ## reject "// (T)Q_OBJECT" } } # The assoc array of root of headerfile and header filename @@ -131,12 +131,3 @@ fi rmdir "$lockdir" exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/config.guess b/config.guess index 4f0f63f..3d45dc1 100755 --- a/config.guess +++ b/config.guess @@ -212,65 +212,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 exit ;; @@ -455,22 +396,6 @@ EOF m88k:*:3*:R3*) echo m88k-motorola-sysv3 exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -689,19 +614,6 @@ EOF *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit ;; @@ -1057,9 +969,6 @@ EOF Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 @@ -1108,20 +1017,6 @@ EOF SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says <Richard.M.Bartel@ccMail.Census.GOV> echo i586-unisys-sysv4 @@ -1455,10 +1350,3 @@ UNAME_VERSION = ${UNAME_VERSION} EOF exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: @@ -171,26 +171,6 @@ case $os in -hiux*) os=-hiuxwe2 ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -udk*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; @@ -606,10 +586,6 @@ case $basic_machine in hppa-next) os=-nextstep3 ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; hppro) basic_machine=hppa1.1-hp os=-proelf @@ -790,10 +766,6 @@ case $basic_machine in basic_machine=hppa1.1-hitachi os=-hiuxwe2 ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; pbd) basic_machine=sparc-tti ;; @@ -1168,8 +1140,8 @@ case $os in # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -*vms* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -luna* | -solaris* | -sym* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1232,12 +1204,6 @@ case $os in -wince*) os=-wince ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; -utek*) os=-bsd ;; @@ -1268,13 +1234,6 @@ case $os in -nsk*) os=-nsk ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; -tpf*) os=-tpf ;; @@ -1421,9 +1380,6 @@ case $basic_machine in *-cbm) os=-amigaos ;; - *-dg) - os=-dgux - ;; *-dolphin) os=-sysv3 ;; @@ -1520,9 +1476,6 @@ case $basic_machine in -unos*) vendor=crds ;; - -dgux*) - vendor=dg - ;; -luna*) vendor=omron ;; @@ -1566,10 +1519,3 @@ esac echo $basic_machine$os exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/configure.in.min b/configure.in.min index f14af0b..33e23dc 100644 --- a/configure.in.min +++ b/configure.in.min @@ -46,6 +46,7 @@ AC_CONFIG_HEADER(config.h) dnl at the distribution this done dnl Checks for programs. AC_PROG_CC AC_PROG_CXX +TDE_CXX_COMPILE_STDCXX(11) AC_CHECK_COMPILERS AC_ENABLE_SHARED(yes) AC_ENABLE_STATIC(no) @@ -25,7 +25,7 @@ check_autotool_versions() required_autoconf_version="2.53 or newer" AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` case $AUTOCONF_VERSION in - Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;; + Autoconf*2.5* | autoconf*2.[567]* ) : ;; "" ) echo "*** AUTOCONF NOT FOUND!." echo "*** TDE requires autoconf $required_autoconf_version" @@ -40,7 +40,7 @@ esac AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` case $AUTOHEADER_VERSION in - Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;; + Autoconf*2.5* | autoheader*2.[567]* ) : ;; "" ) echo "*** AUTOHEADER NOT FOUND!." echo "*** TDE requires autoheader $required_autoconf_version" @@ -276,64 +276,6 @@ icc) rm -f "$tmpdepfile" ;; -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mecanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -519,12 +461,3 @@ none) esac exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/detect-autoconf.pl b/detect-autoconf.pl index 5ce1a08..02e8873 100755 --- a/detect-autoconf.pl +++ b/detect-autoconf.pl @@ -252,5 +252,3 @@ export AUTOCONF AUTOHEADER AUTOM4TE AUTOMAKE ACLOCAL WHICH EOF exit 0; - -# vim: set noet ts=8 sw=4: @@ -117,8 +117,12 @@ fi ### but no recursion either). ### # top_srcdir="$1" # Already set by options processing -module_name=`basename "$top_srcdir"` -module_name=`echo "$module_name" | awk -F '-' '{print $1}'` +if test -f $top_srcdir/.tdescminfo; then + module_name=`sed -n "s|^Name: ||p" $top_srcdir/.tdescminfo | xargs -r basename` +else + module_name=`basename "$top_srcdir"` + module_name=`echo "$module_name" | awk -F '-' '{print $1}'` +fi subdir="$2" if test "x." = "x$subdir" ; then subdir="" @@ -392,10 +392,3 @@ do trap '' 0 fi done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/libtool.m4.in b/libtool.m4.in index 1e7ea47..47d1958 100644 --- a/libtool.m4.in +++ b/libtool.m4.in @@ -1316,19 +1316,6 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) rm -rf conftest* ;; -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1552,23 +1539,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=196608 ;; - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) + sysv5* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` @@ -2277,15 +2248,6 @@ m4_if([$1], [],[ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - freebsd1*) dynamic_linker=no ;; @@ -2569,17 +2531,6 @@ os2*) shlibpath_var=LIBPATH ;; -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - rdos*) dynamic_linker=no ;; @@ -2641,7 +2592,7 @@ sysv4*MP*) fi ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +sysv5* | unixware* | OpenUNIX* | sysv4*uw2*) version_type=freebsd-elf need_lib_prefix=no need_version=no @@ -2654,11 +2605,6 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac fi sys_lib_dlsearch_path_spec='/usr/lib' ;; @@ -3114,10 +3060,6 @@ openbsd*) fi ;; -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - rdos*) lt_cv_deplibs_check_method=pass_all ;; @@ -3126,7 +3068,7 @@ solaris*) lt_cv_deplibs_check_method=pass_all ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +sysv5* | unixware* | OpenUNIX* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; @@ -3197,9 +3139,8 @@ else # Check to see if the nm accepts a BSD-compat flag. # Adding the `sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break ;; @@ -3348,19 +3289,13 @@ hpux*) irix* | nonstopux*) symcode='[[BCDEGRST]]' ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; solaris*) symcode='[[BDRT]]' ;; -sco3.2v5*) - symcode='[[DT]]' - ;; sysv4.2uw2*) symcode='[[DT]]' ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) +sysv5* | unixware* | OpenUNIX*) symcode='[[ABDT]]' ;; sysv4) @@ -3580,7 +3515,7 @@ m4_if([$1], [CXX], [ esac ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux*) # PIC is the default for these OSes. ;; mingw* | cygwin* | os2* | pw32* | cegcc*) @@ -3649,19 +3584,6 @@ m4_if([$1], [CXX], [ ;; esac ;; - dgux*) - case $cc_basename in - ec++*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; @@ -3734,7 +3656,7 @@ m4_if([$1], [CXX], [ cxx*) # Compaq C++ # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. + # Linux objects are PIC. _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; @@ -3776,27 +3698,6 @@ m4_if([$1], [CXX], [ # it will coredump. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; psos*) ;; solaris*) @@ -3830,7 +3731,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + sysv5* | unixware* | OpenUNIX*) case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -3886,7 +3787,7 @@ m4_if([$1], [CXX], [ esac ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux*) # PIC is the default for these OSes. ;; @@ -4058,12 +3959,6 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ;; - osf3* | osf4* | osf5*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - rdos*) _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; @@ -4098,7 +3993,7 @@ m4_if([$1], [CXX], [ fi ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + sysv5* | unixware* | OpenUNIX*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -4477,7 +4372,7 @@ _LT_EOF fi ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + sysv5* | unixware* | OpenUNIX*) case `$LD -v 2>&1` in *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) _LT_TAGVAR(ld_shlibs, $1)=no @@ -4717,12 +4612,6 @@ _LT_EOF _LT_DARWIN_LINKER_FEATURES($1) ;; - dgux*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - freebsd1*) _LT_TAGVAR(ld_shlibs, $1)=no ;; @@ -4917,37 +4806,6 @@ _LT_EOF _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; - osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' if test "$GCC" = yes; then @@ -5042,7 +4900,7 @@ _LT_EOF fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -5057,7 +4915,7 @@ _LT_EOF fi ;; - sysv5* | sco3.2v5* | sco5v6*) + sysv5*) # Note: We can NOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would @@ -5667,24 +5525,6 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_DARWIN_LINKER_FEATURES($1) ;; - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - freebsd[[12]]*) # C++ shared libraries reported to be fairly broken before # switch to ELF @@ -6064,89 +5904,6 @@ if test "$_lt_caught_CXX_error" != yes; then fi ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - case $host in - osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - ;; - *) - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - psos*) # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6247,7 +6004,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6265,7 +6022,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - sysv5* | sco3.2v5* | sco5v6*) + sysv5*) # Note: We can NOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would @@ -88,13 +88,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then else case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh # NLS nuisances: We save the old values to restore during execute mode. # Only set LANG and LC_ALL to C if already set. # These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). +# e.g. LANG=C. lt_user_locale= lt_safe_locale= for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES @@ -2433,10 +2432,6 @@ typedef struct { runtime relocations are performed -- see ld's documentation on pseudo-relocs. */" lt_dlsym_const= ;; - *osf5*) - echo >> "$output_objdir/$my_dlsyms" "\ -/* This system does not cope well with relocations in const data */" - lt_dlsym_const= ;; *) lt_dlsym_const=const ;; esac @@ -2732,7 +2727,6 @@ if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then else case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -3476,7 +3470,6 @@ EOF XFREE (actual_cwrapper_path); XFREE (actual_cwrapper_name); - lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ lt_setenv ("DUALCASE", "1"); /* for MSK sh */ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); @@ -4539,10 +4532,6 @@ func_mode_link () deplibs="$deplibs System.ltframework" continue ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work test "X$arg" = "X-lc" && continue @@ -4565,10 +4554,8 @@ func_mode_link () continue ;; - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot) + -arch|-isysroot) compiler_flags="$compiler_flags $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -4748,12 +4735,6 @@ func_mode_link () continue ;; - # -msg_* for osf cc - -msg_*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler # -r[0-9][0-9]* specifies the processor on the SGI compiler # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler @@ -5674,7 +5655,6 @@ func_mode_link () if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; *-*-sysv4*uw2*) add_dir="-L$dir" ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ *-*-unixware7*) add_dir="-L$dir" ;; @@ -6192,7 +6172,7 @@ func_mode_link () # which has an extra 1 added just for fun # case $version_type in - darwin|linux|osf|windows|none) + darwin|linux|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age="$number_minor" @@ -6317,26 +6297,6 @@ func_mode_link () versuffix="$major.$age.$revision" ;; - osf) - func_arith $current - $age - major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - func_arith $current - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; - qnx) major=".$current" versuffix=".$current" @@ -6496,9 +6456,6 @@ func_mode_link () *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work ;; @@ -6529,9 +6486,7 @@ func_mode_link () pass_all) # Don't check for shared/static. Everything works. # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. + # whether the library exists or not. newdeplibs=$deplibs ;; test_compile) @@ -8404,10 +8359,3 @@ build_old_libs=yes # ### BEGIN LIBTOOL TAG CONFIG: disable-static build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# vi:sw=2 - @@ -344,10 +344,3 @@ WARNING: \`$1' is needed, and is $msg. esac exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/mkinstalldirs b/mkinstalldirs index 259dbfc..6ac3d96 100755 --- a/mkinstalldirs +++ b/mkinstalldirs @@ -147,12 +147,3 @@ do done exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: @@ -212,12 +212,3 @@ cd .. rm -rf $dirname exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: |