| ff7202f0 | 2014-12-06 16:10:43 | Timothy Pearson |
Fix inability to apply theme due to erroneous SAK configuration default Properly disable module when loaded by non-root user Remove uneeded files |
||
|
M src/tdmtheme.cpp R acinclude.m4 R config.h.in R configure.in |
||
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index fdf3fa1..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,11638 +0,0 @@
-## -*- autoconf -*-
-
-dnl This file is part of the KDE libraries/packages
-dnl Copyright (C) 1997 Janos Farkas (chexum@...)
-dnl (C) 1997,98,99 Stephan Kulow (coolo@...)
-
-dnl This file is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Library General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2 of the License, or (at your option) any later version.
-
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Library General Public License for more details.
-
-dnl You should have received a copy of the GNU Library General Public License
-dnl along with this library; see the file COPYING.LIB. If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-dnl Boston, MA 02110-1301, USA.
-
-dnl IMPORTANT NOTE:
-dnl Please do not modify this file unless you expect your modifications to be
-dnl carried into every other module in the repository.
-dnl
-dnl Single-module modifications are best placed in configure.in for tdelibs
-dnl and tdebase or configure.in.in if present.
-
-# KDE_PATH_X_DIRECT
-dnl Internal subroutine of AC_PATH_X.
-dnl Set ac_x_includes and/or ac_x_libraries.
-AC_DEFUN([KDE_PATH_X_DIRECT],
-[
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-if test "$ac_x_includes" = NO; then
- # Guess where to find include files, by looking for this one X11 .h file.
- test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
- # First, try using that file with no special directory specified.
-AC_TRY_CPP([#include <$x_direct_test_include>],
-[# We can compile using X headers with no special include directory.
-ac_x_includes=],
-[# Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
- for ac_dir in \
- /usr/X11/include \
- /usr/X11R6/include \
- /usr/X11R5/include \
- /usr/X11R4/include \
- \
- /usr/include/X11 \
- /usr/include/X11R6 \
- /usr/include/X11R5 \
- /usr/include/X11R4 \
- \
- /usr/local/X11/include \
- /usr/local/X11R6/include \
- /usr/local/X11R5/include \
- /usr/local/X11R4/include \
- \
- /usr/local/include/X11 \
- /usr/local/include/X11R6 \
- /usr/local/include/X11R5 \
- /usr/local/include/X11R4 \
- \
- /usr/X386/include \
- /usr/x386/include \
- /usr/XFree86/include/X11 \
- \
- /usr/include \
- /usr/local/include \
- /usr/unsupported/include \
- /usr/athena/include \
- /usr/local/x11r5/include \
- /usr/lpp/Xamples/include \
- \
- /usr/openwin/include \
- /usr/openwin/share/include \
- ; \
- do
- if test -r "$ac_dir/$x_direct_test_include"; then
- ac_x_includes=$ac_dir
- break
- fi
- done])
-fi # $ac_x_includes = NO
-
-if test "$ac_x_libraries" = NO; then
- # Check for the libraries.
-
- test -z "$x_direct_test_library" && x_direct_test_library=Xt
- test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-
- # See if we find them without any special options.
- # Don't add to $LIBS permanently.
- ac_save_LIBS="$LIBS"
- LIBS="-l$x_direct_test_library $LIBS"
-AC_TRY_LINK([#include <X11/Intrinsic.h>], [${x_direct_test_function}(1)],
-[LIBS="$ac_save_LIBS"
-# We can link X programs with no special library path.
-ac_x_libraries=],
-[LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
- /usr/X11/lib${tdelibsuff} \
- /usr/X11R6/lib${tdelibsuff} \
- /usr/X11R5/lib${tdelibsuff} \
- /usr/X11R4/lib${tdelibsuff} \
- \
- /usr/lib${tdelibsuff}/X11 \
- /usr/lib${tdelibsuff}/X11R6 \
- /usr/lib${tdelibsuff}/X11R5 \
- /usr/lib${tdelibsuff}/X11R4 \
- \
- /usr/local/X11/lib${tdelibsuff} \
- /usr/local/X11R6/lib${tdelibsuff} \
- /usr/local/X11R5/lib${tdelibsuff} \
- /usr/local/X11R4/lib${tdelibsuff} \
- \
- /usr/local/lib${tdelibsuff}/X11 \
- /usr/local/lib${tdelibsuff}/X11R6 \
- /usr/local/lib${tdelibsuff}/X11R5 \
- /usr/local/lib${tdelibsuff}/X11R4 \
- \
- /usr/X386/lib${tdelibsuff} \
- /usr/x386/lib${tdelibsuff} \
- /usr/XFree86/lib${tdelibsuff}/X11 \
- \
- /usr/lib${tdelibsuff} \
- /usr/local/lib${tdelibsuff} \
- /usr/unsupported/lib${tdelibsuff} \
- /usr/athena/lib${tdelibsuff} \
- /usr/local/x11r5/lib${tdelibsuff} \
- /usr/lpp/Xamples/lib${tdelibsuff} \
- /lib/usr/lib${tdelibsuff}/X11 \
- \
- /usr/openwin/lib${tdelibsuff} \
- /usr/openwin/share/lib${tdelibsuff} \
- ; \
-do
-dnl Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
- if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
- ac_x_libraries=$ac_dir
- break 2
- fi
- done
-done])
-fi # $ac_x_libraries = NO
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find a file (or one of more files in a list of dirs)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_FIND_FILE],
-[
-$3=NO
-for i in $2;
-do
- for j in $1;
- do
- echo "configure: __oline__: $i/$j" >&AC_FD_CC
- if test -r "$i/$j"; then
- echo "taking that" >&AC_FD_CC
- $3=$i
- break 2
- fi
- done
-done
-])
-
-dnl KDE_FIND_PATH(program-name, variable-name, list-of-dirs,
-dnl if-not-found, test-parameter, prepend-path)
-dnl
-dnl Look for program-name in list-of-dirs+$PATH.
-dnl If prepend-path is set, look in $PATH+list-of-dirs instead.
-dnl If found, $variable-name is set. If not, if-not-found is evaluated.
-dnl test-parameter: if set, the program is executed with this arg,
-dnl and only a successful exit code is required.
-AC_DEFUN([KDE_FIND_PATH],
-[
- AC_MSG_CHECKING([for $1])
- if test -n "$$2"; then
- kde_cv_path="$$2";
- else
- kde_cache=`echo $1 | sed 'y%./+-%__p_%'`
-
- AC_CACHE_VAL(kde_cv_path_$kde_cache,
- [
- kde_cv_path="NONE"
- kde_save_IFS=$IFS
- IFS=':'
- dirs=""
- for dir in $PATH; do
- dirs="$dirs $dir"
- done
- if test -z "$6"; then dnl Append dirs in PATH (default)
- dirs="$3 $dirs"
- else dnl Prepend dirs in PATH (if 6th arg is set)
- dirs="$dirs $3"
- fi
- IFS=$kde_save_IFS
-
- for dir in $dirs; do
- if test -x "$dir/$1"; then
- if test -n "$5"
- then
- evalstr="$dir/$1 $5 2>&1 "
- if eval $evalstr; then
- kde_cv_path="$dir/$1"
- break
- fi
- else
- kde_cv_path="$dir/$1"
- break
- fi
- fi
- done
-
- eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
- ])
-
- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
- fi
-
- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
- AC_MSG_RESULT(not found)
- $4
- else
- AC_MSG_RESULT($kde_cv_path)
- $2=$kde_cv_path
-
- fi
-])
-
-AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
-[
- AC_MSG_ERROR([No Qt meta object compiler (moc) found!
** Diff limit reached (max: 250 lines) **
|
||