From 65468dcf249c846b0be16979ddffe2b23ac5a167 Mon Sep 17 00:00:00 2001 From: mlaurent Date: Sat, 27 Jan 2007 16:01:10 +0000 Subject: [PATCH] Not necessary now git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdeartwork@627662 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kscreensaver/kxsconfig/configure.in.bot | 9 ---- kscreensaver/kxsconfig/configure.in.in | 79 --------------------------------- 2 files changed, 88 deletions(-) delete mode 100644 kscreensaver/kxsconfig/configure.in.bot delete mode 100644 kscreensaver/kxsconfig/configure.in.in diff --git a/kscreensaver/kxsconfig/configure.in.bot b/kscreensaver/kxsconfig/configure.in.bot deleted file mode 100644 index d35afee0..00000000 --- a/kscreensaver/kxsconfig/configure.in.bot +++ /dev/null @@ -1,9 +0,0 @@ -if test "x$with_xscreensaver" = xcheck && test "$XSCREENSAVER" = "NO"; then - echo "" - echo "xscreensaver could not be detected on your system." - echo "Check www.jwz.org/xscreensaver if you're loving to" - echo "have tons of screensavers in KDE" - echo "" - all_tests=bad -fi - diff --git a/kscreensaver/kxsconfig/configure.in.in b/kscreensaver/kxsconfig/configure.in.in deleted file mode 100644 index f598ee98..00000000 --- a/kscreensaver/kxsconfig/configure.in.in +++ /dev/null @@ -1,79 +0,0 @@ -AC_DEFUN([KDE_CHECK_XSREENSAVER], -[ - XSCREENSAVER_CONFIG=NO - AC_FIND_FILE($1/flame.xml, [ $xscreensaver_prefixes ], XSCREENSAVER_CONFIG) - if test "$XSCREENSAVER_CONFIG" != NO; then - XSCREENSAVER_CONFIG="$XSCREENSAVER_CONFIG/$1" - fi -]) - - -xscreensaver_prefixes="$exec_prefix $prefix /usr /usr/local /opt/local /usr/X11R6 /usr/X11R6 /opt/kde /opt/kde3 /usr/kde /usr/local/kde /usr/local/xscreensaver /usr/openwin/lib/xscreensaver /etc" - -old_IFS=$IFS -IFS=: -for path in $PATH; do - case $path in - */bin) - path=`echo $path | sed -e 's,/bin$,,'` - xscreensaver_prefixes="$path $xscreensaver_prefixes" - ;; - esac -done -IFS=$old_IFS - -AC_ARG_WITH(xscreensaver, - [AS_HELP_STRING(--with-xscreensaver, - [enable support for xscreensaver @<:@default=check@:>@])], - [], with_xscreensaver=check) - -XSCREENSAVER=NO -if test "x$with_xscreensaver" != xno; then - KDE_FIND_PATH(lib$kdelibsuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ], - [ - KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ], - [ - KDE_FIND_PATH(bin/xscreensaver-hacks/flame, XSCREENSAVER, - [ $xscreensaver_prefixes ], - [ - KDE_FIND_PATH(hacks/flame, XSCREENSAVER, - [ $xscreensaver_prefixes ], - [ - XSCREENSAVER=NO - ]) - ]) - ]) - ]) - - if test "x$with_xscreensaver" != xcheck && test "x$XSCREENSAVER" = xNO; then - AC_MSG_FAILURE([--with-xscreensaver was given, but test for xscreensaver failed]) - fi -fi - -XSCREENSAVER_HACKS_DIR= - -if test "$XSCREENSAVER" != "NO"; then - XSCREENSAVER_HACKS_DIR=`echo $XSCREENSAVER | sed -e 's,/flame$,,'` - AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks]) - - AC_MSG_CHECKING([for flame.xml]) - for subdir in lib/xscreensaver/config \ - lib/X11/xscreensaver/config \ - share/control-center/screensavers \ - share/control-center/screensavers \ - share/xscreensaver/config \ - xscreensaver \ - config/control-center-2.0; do - KDE_CHECK_XSREENSAVER($subdir) - if test "$XSCREENSAVER_CONFIG" != NO; then - break - fi - done - AC_MSG_RESULT([$XSCREENSAVER_CONFIG]) - AC_DEFINE_UNQUOTED(XSCREENSAVER_CONFIG_DIR, "$XSCREENSAVER_CONFIG", - [Defines where xscreensaver stores it's config files]) -fi - -AM_CONDITIONAL(include_XSCREENSAVER, test "$XSCREENSAVER" != "NO") -AC_SUBST(XSCREENSAVER_HACKS_DIR) - -- 2.11.4.GIT