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

List:       koffice-devel
Subject:    koffice/kexi
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2003-11-14 23:11:25
[Download RAW message or body]

CVS commit by goutte: 

Make compile KOffice CVS HEAD again without problem on KDE 3.1.x.
(If the needed library is not found, Kexi is simply not compiled.)
Also: PORTABILITY: use = not == with test for testing strings
CCMAIL:koffice-devel@kde.org


  A            configure.in.bot   1.1
  M +7 -3      configure.in.in   1.9


--- koffice/kexi/configure.in.in  #1.8:1.9
@@ -37,11 +37,15 @@
 #       AC_FIND_FILE($kexi_compat_qextmdi_lib, $kde_libdirs, \
                kexi_compat_qextmdi_dir)
         if test ! -r "$kexi_compat_qextmdi_dir/$kexi_compat_qextmdi_lib"; then
-                AC_MSG_ERROR([No $kexi_compat_qextmdi_lib found in $kde_libraries !
+                AC_MSG_WARN([No $kexi_compat_qextmdi_lib found in $kde_libraries !
                 $kexi_compat_qextmdi_errmsg])
+                use_kexi_compat_qextmdi="do_not_compile"
+                DO_NOT_COMPILE="$DO_NOT_COMPILE kexi"
         fi
         AC_FIND_FILE(dockmainwindow_compat.h, $kde_includes/kexi/compat/qextmdi, \
kexi_compat_qextmdi_includes)  if test ! -r "$kexi_compat_qextmdi_includes"; then
-                AC_MSG_ERROR([No kexi/compat/qextmdi includes found in $kde_includes \
! +                AC_MSG_WARN([No kexi/compat/qextmdi includes found in \
$kde_includes !  $kexi_compat_qextmdi_errmsg])
+                use_kexi_compat_qextmdi="do_not_compile"
+                DO_NOT_COMPILE="$DO_NOT_COMPILE kexi"
         fi
         
@@ -56,5 +60,5 @@
 AC_LANG_RESTORE
 
-AM_CONDITIONAL(use_kexi_compat_qextmdi, test "$use_kexi_compat_qextmdi" == "yes")
+AM_CONDITIONAL(use_kexi_compat_qextmdi, test "$use_kexi_compat_qextmdi" = "yes")
 
 # -- End KDE 3.1 check ----------------------------------------------


_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel


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