You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
103 lines
4.4 KiB
103 lines
4.4 KiB
13 years ago
|
diff -Nuar ksensors-0.7.3.ORI//configure ksensors-0.7.3.P//configure
|
||
|
|
--- ksensors-0.7.3.ORI//configure 2004-08-18 23:37:56.000000000 +0200
|
||
|
|
+++ ksensors-0.7.3.P//configure 2011-11-07 22:55:46.555892050 +0100
|
||
|
|
@@ -25119,7 +25119,7 @@
|
||
|
|
|
||
|
|
if test -z ""; then
|
||
|
|
|
||
|
|
-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/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/trinity/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"
|
||
|
|
|
||
|
|
@@ -25149,7 +25149,7 @@
|
||
|
|
{ (exit 1); exit 1; }; }
|
||
|
|
fi
|
||
|
|
|
||
|
|
-kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
|
||
|
|
+kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
|
||
|
|
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
|
||
|
|
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
|
||
|
|
|
||
|
|
@@ -25174,7 +25174,7 @@
|
||
|
|
kde_widgetdir=NO
|
||
|
|
for i in $kde_libdirs;
|
||
|
|
do
|
||
|
|
- for j in "kde3/plugins/designer/kdewidgets.la";
|
||
|
|
+ for j in "trinity/plugins/designer/kdewidgets.la";
|
||
|
|
do
|
||
|
|
echo "configure: 25179: $i/$j" >&5
|
||
|
|
if test -r "$i/$j"; then
|
||
|
|
@@ -25196,7 +25196,7 @@
|
||
|
|
{ (exit 1); exit 1; }; }
|
||
|
|
fi
|
||
|
|
|
||
|
|
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
|
||
|
|
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
|
||
|
|
{ { echo "$as_me:$LINENO: error:
|
||
|
|
I can't find the designer plugins. These are required and should have been installed
|
||
|
|
by kdelibs" >&5
|
||
|
|
@@ -25207,7 +25207,7 @@
|
||
|
|
fi
|
||
|
|
|
||
|
|
if test -n "$kde_widgetdir"; then
|
||
|
|
- kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
|
||
|
|
+ kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
|
||
|
|
fi
|
||
|
|
|
||
|
|
|
||
|
|
@@ -25428,14 +25428,14 @@
|
||
|
|
if test "$kde_qtver" = "2"; then
|
||
|
|
kde_moduledir='\${libdir}/kde2'
|
||
|
|
else
|
||
|
|
- kde_moduledir='\${libdir}/kde3'
|
||
|
|
+ kde_moduledir='\${libdir}/trinity'
|
||
|
|
fi
|
||
|
|
fi
|
||
|
|
if test -z "$kde_styledir"; then
|
||
|
|
- kde_styledir='\${libdir}/kde3/plugins/styles'
|
||
|
|
+ kde_styledir='\${libdir}/trinity/plugins/styles'
|
||
|
|
fi
|
||
|
|
if test -z "$kde_widgetdir"; then
|
||
|
|
- kde_widgetdir='\${libdir}/kde3/plugins/designer'
|
||
|
|
+ kde_widgetdir='\${libdir}/trinity/plugins/designer'
|
||
|
|
fi
|
||
|
|
if test -z "$xdg_appsdir"; then
|
||
|
|
xdg_appsdir='\${datadir}/applications'
|
||
|
|
@@ -25716,14 +25716,14 @@
|
||
|
|
if test "$kde_qtver" = "2"; then
|
||
|
|
kde_moduledir='\${libdir}/kde2'
|
||
|
|
else
|
||
|
|
- kde_moduledir='\${libdir}/kde3'
|
||
|
|
+ kde_moduledir='\${libdir}/trinity'
|
||
|
|
fi
|
||
|
|
fi
|
||
|
|
if test -z "$kde_styledir"; then
|
||
|
|
- kde_styledir='\${libdir}/kde3/plugins/styles'
|
||
|
|
+ kde_styledir='\${libdir}/trinity/plugins/styles'
|
||
|
|
fi
|
||
|
|
if test -z "$kde_widgetdir"; then
|
||
|
|
- kde_widgetdir='\${libdir}/kde3/plugins/designer'
|
||
|
|
+ kde_widgetdir='\${libdir}/trinity/plugins/designer'
|
||
|
|
fi
|
||
|
|
if test -z "$xdg_appsdir"; then
|
||
|
|
xdg_appsdir='\${datadir}/applications'
|
||
|
|
@@ -25982,7 +25982,7 @@
|
||
|
|
fi
|
||
|
|
|
||
|
|
|
||
|
|
- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
|
||
|
|
+ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
|
||
|
|
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
|
||
|
|
if test -n "$KDEDIRS"; then
|
||
|
|
kde_save_IFS=$IFS
|
||
|
|
@@ -26377,7 +26377,7 @@
|
||
|
|
|
||
|
|
|
||
|
|
if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
|
||
|
|
- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
|
||
|
|
+ kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
|
||
|
|
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
|
||
|
|
|
||
|
|
KDE_XSL_STYLESHEET=NO
|