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

List:       kde-bugs-dist
Subject:    [Bug 74004] bash shell syntax that is incompatible with bourne
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2004-02-03 17:11:12
Message-ID: 20040203171112.29041.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
      
http://bugs.kde.org/show_bug.cgi?id=74004      
nicolasg@snafu.de changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From nicolasg@snafu.de  2004-02-03 18:10 -------
Subject: KOFFICE_1_3_BRANCH: koffice

CVS commit by goutte: 

Better check for KDE 3.1 (central and portable)
(Backport but uses AC_TRY_COMPILE instead of AC_COMPILE_IFELSE)
CCMAIL:74004-close@bugs.kde.org


  M +32 -0     configure.in.in   1.40.2.3
  M +1 -1      kugar/Makefile.am   1.13.2.1
  M +1 -1      mimetypes/Makefile.am   1.3.2.1
  R            kugar/configure.in.in   1.1
  R            mimetypes/configure.in.in   1.2


--- koffice/mimetypes/Makefile.am  #1.3:1.3.2.1
@@ -1,3 +1,3 @@
-if compile_mimetypes_kde31
+if need_kde31_compatibility
   KDE31MIMEDIR = kde31
 endif

--- koffice/kugar/Makefile.am  #1.13:1.13.2.1
@@ -1,4 +1,4 @@
 #SUBDIRS = lib part shell samples kudesigner
-if compile_mimetypes_kde31
+if need_kde31_compatibility
     KDE31MIMEDIR = kde31
 endif

--- koffice/configure.in.in  #1.40.2.2:1.40.2.3
@@ -113,2 +113,34 @@
   fi
 ])
+
+# --- Check for KDE 3.1 ---
+
+AC_MSG_CHECKING([for KDE newer than 3.1.x])
+
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+kdeversion_save_CXXFLAGS="$CXXFLAGS"
+kdeversion_safe_LIBS="$LIBS"
+LIBS="$LIBS $X_EXTRA_LIBS"
+CXXFLAGS="$CXXFLAGS $all_includes"
+
+AC_TRY_COMPILE([
+#include <kdeversion.h>
+#if ! ( KDE_IS_VERSION( 3, 1, 90 ) )
+#error KDE 3.1
+#endif
+],
+[],
+        old_kde_version="no"
+        AC_MSG_RESULT(yes)
+,
+        old_kde_version="yes"
+        AC_MSG_RESULT(no)
+)
+CXXFLAGS="$kdeversion_save_CXXFLAGS"
+LIBS="$kdeversion_safe_LIBS"
+AC_LANG_RESTORE
+
+AM_CONDITIONAL(need_kde31_compatibility, test "$old_kde_version" = "yes")
+
+# --- End KDE 3.1 check ---
[prev in list] [next in list] [prev in thread] [next in thread]