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

List:       kde-core-devel
Subject:    Patch for acinclude.m4.in
From:       Frerich Raabe <frerich.raabe () gmx ! de>
Date:       2003-05-22 7:46:16
[Download RAW message or body]

Moin,

right now sed possibly gets called with an empty first regexp when checking 
for whether Qt needs libjpeg. This is not allowed and will cause an error 
message. It's fixed in HEAD but not in the KDE_3_1_BRANCH. The attached patch 
is to be applied to kde-common/admin/acinclude.m4.in in the KDE_3_1_BRANCH.

- Frerich

["acinclude.m4.diff" (text/x-diff)]

Index: acinclude.m4.in
===================================================================
RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v
retrieving revision 2.302.2.26
diff -u -r2.302.2.26 acinclude.m4.in
--- acinclude.m4.in	19 May 2003 13:27:16 -0000	2.302.2.26
+++ acinclude.m4.in	22 May 2003 07:42:25 -0000
@@ -2425,6 +2425,7 @@
 
 AC_DEFUN(KDE_CHECK_QT_JPEG,
 [
+if test -n "$LIBJPEG"; then
 AC_MSG_CHECKING([if Qt needs $LIBJPEG])
 AC_CACHE_VAL(kde_cv_qt_jpeg,
 [
@@ -2446,6 +2447,7 @@
 LIBS="$ac_save_LIBS"
 CXXFLAGS="$ac_save_CXXFLAGS"
 AC_LANG_RESTORE
+fi
 ])
 
 if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then


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