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

List:       kde-commits
Subject:    kdepim/kpilot
From:       Adriaan de Groot <groot () kde ! org>
Date:       2004-12-11 20:01:25
Message-ID: 20041211200125.9F9BF1BAEB () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

For George: notice that old pilot-link versions are being deprecated, and a configure \
check _anyway_ for pi-notepad.h


  M +8 -0      configure.in.bot   1.2
  M +22 -1     configure.in.in   1.32
  M +3 -2      conduits/Makefile.am   1.56
  M +12 -0     conduits/configure.in.in   1.23
  M +8 -2      lib/options.h   1.58


--- kdepim/kpilot/configure.in.bot  #1.1:1.2
@@ -4,3 +4,11 @@
         echo ""
         all_tests=bad
+else
+        if test "x$HAVE_BAD_PISOCK" = "xYES" ; then
+                echo ""
+                echo "You have a version of pilot-link < 0.11.8."
+                echo "This version is deprecated an KPilot will soon stop"
+                echo "working with it."
+                echo ""
+        fi
 fi

--- kdepim/kpilot/configure.in.in  #1.31:1.32
@@ -36,4 +36,6 @@
 
 HAVE_PISOCK=0
+HAVE_BAD_PISOCK=NO
+
 PISOCK_LIB=""
 PISOCK_INCLUDE=""
@@ -98,5 +100,5 @@
         ]
         ,
-        [AC_MSG_RESULT([pilot-link version 0.10 or 0.11 found])],
+        [AC_MSG_RESULT([pilot-link version >= 0.9.5 found])],
         [AC_MSG_RESULT([Your version of pilot-link won't work with KPilot])]
         HAVE_PISOCK="0"
@@ -106,4 +108,23 @@
         ])
 fi
+if test "$HAVE_PISOCK" = "1" ; then
+        AC_MSG_CHECKING([deprecated pilot-link version])
+        AC_TRY_RUN([
+        #include <pi-version.h>
+        int main()
+        { if (PILOT_LINK_VERSION==0) {
+            if ((PILOT_LINK_MAJOR<11)) return (0);
+            if ((PILOT_LINK_MAJOR==11) && (PILOT_LINK_MINOR<8)) return (0);
+          }
+          return (1);
+        }
+        ]
+        ,
+        [AC_MSG_RESULT([yes])
+        HAVE_BAD_PISOCK=YES
+        ],
+        [AC_MSG_RESULT([no])]
+        )
+fi
 
 if test "$HAVE_PISOCK" = "1" ; then

--- kdepim/kpilot/conduits/Makefile.am  #1.55:1.56
@@ -23,6 +23,7 @@
 endif
 
-#NOTEPAD_SUBDIR = notepadconduit
-NOTEPAD_SUBDIR=
+if include_notepad
+NOTEPAD_SUBDIR = notepadconduit
+endif
 
 SUBDIRS = \

--- kdepim/kpilot/conduits/configure.in.in  #1.22:1.23
@@ -179,4 +179,16 @@
 dnl ----------------------------------------------------------------------------
 dnl
+dnl                     checks for the notepad conduit
+dnl
+dnl ----------------------------------------------------------------------------
+
+AC_DEFUN([KPILOT_CHECK_NOTEPAD],[HAVE_NOTEPAD=0
+KDE_CHECK_HEADER(pi-notepad.h,HAVE_NOTEPAD=1,
+        AC_MSG_WARN([KPILOT: No notepad.h for pilot-link. Your pilot-link is too \
old.])) +AM_CONDITIONAL(include_notepad, test "$HAVE_NOTEPAD" = 1)
+])
+
+dnl ----------------------------------------------------------------------------
+dnl
 dnl                     checks for embedded language conduits
 dnl

--- kdepim/kpilot/lib/options.h  #1.57:1.58
@@ -42,6 +42,6 @@
 // #define QT_NO_ASCII_CAST             (1)
 // #define QT_NO_CAST_ASCII             (1)
-#define DEBUG                   (1)
-#define DEBUG_CERR                      (1)
+// #define DEBUG                        (1)
+// #define DEBUG_CERR                   (1)
 
 #include "config.h"
@@ -71,6 +72,11 @@
 #define PILOT_LINK_0_10_0       (1000)
 #define PILOT_LINK_0_11_0       (1100)
+#define PILOT_LINK_0_11_8       (1108)
 #define PILOT_LINK_0_12_0       (1200)
 
+#if PILOT_LINK_NUMBER < PILOT_LINK_0_11_8
+#warning "You need at least pilot-link version 0.11.8 for modern devices"
+#endif
+
 #if PILOT_LINK_NUMBER < PILOT_LINK_0_12_0
 #define PI_SIZE_T int


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