[patch] kdm.patch

kdm.patch (text/plain), 1.75 KB, created by Donnie Berkholz (RETIRED) on 2005-08-16 19:43:19 UTC

configure.in.in
------------------------------------------------------------------------
r449842 | qbast | 2005-08-16 23:20:47 +0200 (wto, 16 sie 2005) | 3 lines

imake is not used anyway. Removing check fixes compilation with X11R7


------------------------------------------------------------------------



Index: configure.in.in
===================================================================
--- configure.in.in     (wersja 449841)
+++ configure.in.in     (wersja 449842)
@@ -9,40 +9,9 @@
 AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory])
 AC_SUBST(KDE_BINDIR)

-KDE_FIND_PATH(xmkmf, XMKMF, [], [AC_MSG_ERROR([xmkmf/imake not found. Please make sure it's in PATH!])])
-
 dnl ask imake about various X settings
 AC_MSG_CHECKING([X paths])
 imkv=8
-test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
-AC_CACHE_VAL(kde_cv_defines_imake, [
-  rm -fr conftestdir
-  if mkdir conftestdir; then
-    cd conftestdir
-    cat > Imakefile <<'EOF'[
-
-acimake:
-       @echo "XBINDIR=\"$(BINDIR)\" XLIBDIR=\"$(LIBDIR)\""
-
-]EOF
-    if $XMKMF >&5 2>&1 && test -f Makefile; then
-       kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
-       kde_cv_defines_imake_version=$imkv
-    else
-        AC_MSG_RESULT([failed])
-       AC_MSG_ERROR([$XMKMF (imake) failed.
-Make sure you have all necessary X development packages installed.
-On some systems a missing /lib/cpp symlink is at fault.])
-    fi
-    cd ..
-    rm -fr conftestdir
-  else
-    AC_MSG_RESULT([failed])
-    AC_MSG_ERROR([cannot create temporary directory])
-  fi
-])
-AC_MSG_RESULT([done])
-eval "$kde_cv_defines_imake"
 AC_DEFINE_UNQUOTED(XBINDIR, "$XBINDIR", [X binaries directory])
 AC_DEFINE_UNQUOTED(XLIBDIR, "$XLIBDIR", [X libraries directory])