[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    PATCH: freebsd and KDE 2.0.1 fixes to acinclude.m4.in
From:       Kurt Granroth <granroth () suse ! com>
Date:       2001-02-27 20:38:36
[Download RAW message or body]

Since this file affects all modules, I'm going to post this patch here
for review.  The patch does two things:

1) Adds a few more search paths for Qt and KDE includes and libraries.
   I'm told that these are needed for FreeBSD:

   /usr/X11R6/include/qt2  - for Qt
   /usr/local/include      - for KDE
   /usr/local/lib          - for KDE

2) Made searching for kde-config no longer a fatal error if it's not
   found

   This is the more important (IMO) part of the patch.  With the
   dependancy on kde-config, acinclude.m4.in becomes dependant on KDE
   2.1 (kde-config wasn't in KDE 2.0.1).  This means that kapptemplate
   (for one) can't use it anymore as we need to support KDE 2.0 apps.

   It doesn't need to be fatal in any event.  If it doesn't exist,
   then there are some reasonable defaults that work in most cases.

Any thoughts?
-- 
Kurt Granroth            | http://www.granroth.org
KDE Developer/Evangelist | SuSE Labs Open Source Developer
granroth@kde.org         | granroth@suse.com
            KDE -- Conquer Your Desktop

["acinclude.m4.in.diff" (text/plain)]

Index: acinclude.m4.in
===================================================================
RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v
retrieving revision 2.70
diff -b -u -u -r2.70 acinclude.m4.in
--- acinclude.m4.in	2001/02/18 18:57:05	2.70
+++ acinclude.m4.in	2001/02/27 20:32:41
@@ -332,7 +332,7 @@
         KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], \
                [KDE_MISSING_PROG_ERROR(mcopidl)])
         KDE_FIND_PATH(kdb2html, KDB2HTML, [$kde_default_bindirs], \
                [KDE_MISSING_PROG_ERROR(kdb2html)])
         KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], \
                [KDE_MISSING_PROG_ERROR(artsc-config)])
-        KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], \
[KDE_MISSING_PROG_ERROR(kde-config)]) +        KDE_FIND_PATH(kde-config, KDECONFIG, \
[$kde_default_bindirs])  
         DCOP_DEPENDENCIES='$(DCOPIDL)'
         AC_SUBST(DCOPIDL)
@@ -952,7 +952,7 @@
 for dir in $kde_qt_dirs; do
    qt_incdirs="$qt_incdirs $dir/include $dir"
 done
-qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include \
/usr/X11R6/include/X11/qt /usr/X11R6/include/qt $x_includes" +qt_incdirs="$QTINC $qt_incdirs \
/usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt \
/usr/X11R6/include/qt /usr/X11R6/include/qt2 $x_includes"  if test ! "$ac_qt_includes" = "NO"; \
then  qt_incdirs="$ac_qt_includes $qt_incdirs"
 fi
@@ -1154,7 +1154,7 @@
 
 if test -z "$1"; then
 
-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/kde/include /usr/include/kde \
/usr/include /opt/kde2/include /opt/kde/include $x_includes $qt_includes" \
+kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include \
/usr/include/kde /usr/include /opt/kde2/include /opt/kde/include $x_includes $qt_includes"  \
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"  \
kde_incdirs="$ac_kde_includes $kde_incdirs"  AC_FIND_FILE($kde_check_header, $kde_incdirs, \
kde_incdir) @@ -1166,7 +1166,7 @@
 So, check this please and use another prefix!])
 fi
 
-kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib \
/usr/X11R6/lib /opt/kde2/lib /opt/kde/lib /usr/X11R6/kde/lib" +kde_libdirs="/usr/lib/kde/lib \
/usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /usr/local/lib \
/opt/kde2/lib /opt/kde/lib /usr/X11R6/kde/lib"  test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib \
$KDEDIR $kde_libdirs"  kde_libdirs="$ac_kde_libraries $kde_libdirs"
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)



[prev in list] [next in list] [prev in thread] [next in thread]