Attachment 902 Details for Bug 1271 – Patch to fix configure/cmake to build against opensync 0.22 or 0.3x

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Patch to fix configure/cmake to build against opensync 0.22 or 0.3x

tdepim-opensync.diff (text/plain), 1.83 KB, created by Darrell on 2012-10-15 16:38:54 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2012-10-15 16:38:54 CDT

Size: 1.83 KB

patch

obsolete

>diff -urN tdepim/kitchensync/configure.in.in tdepim.new/kitchensync/configure.in.in
>--- tdepim/kitchensync/configure.in.in	2012-09-14 18:01:26.000000000 -0500
>+++ tdepim.new/kitchensync/configure.in.in	2012-10-14 22:42:40.000000000 -0500
>@@ -31,7 +31,11 @@
> HAVE_OPENSYNC=0
> HAVE_OPENSYNC_ENGINE=0
> PKG_CHECK_MODULES(OPENSYNC, opensync-1.0 >= 0.19, HAVE_OPENSYNC=1,HAVE_OPENSYNC=0)
>-PKG_CHECK_MODULES(OPENSYNCENGINE, osengine-1.0 >= 0.19, HAVE_OPENSYNC_ENGINE=1, HAVE_OPENSYNC_ENGINE=0)
>+if test "$HAVE_OPENSYNC" = 1; then
>+  PKG_CHECK_MODULES(OPENSYNCENGINE, osengine-1.0 >= 0.19, HAVE_OPENSYNC_ENGINE=1, HAVE_OPENSYNC_ENGINE=0)
>+else
>+  PKG_CHECK_MODULES(OPENSYNC, libopensync >= 0.19, HAVE_OPENSYNC=1,HAVE_OPENSYNC=0)
>+fi
> PKG_CHECK_MODULES(LIBXML,   libxml-2.0, , HAVE_OPENSYNC=0)
> PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6, , HAVE_OPENSYNC=0)
> 
>diff -urN tdepim/kitchensync/libqopensync/ConfigureChecks.cmake tdepim.new/kitchensync/libqopensync/ConfigureChecks.cmake
>--- tdepim/kitchensync/libqopensync/ConfigureChecks.cmake	2012-09-14 18:01:26.000000000 -0500
>+++ tdepim.new/kitchensync/libqopensync/ConfigureChecks.cmake	2012-10-14 22:39:45.000000000 -0500
>@@ -13,10 +13,13 @@
> 
> pkg_search_module( OPENSYNC opensync-1.0 )
> if( NOT OPENSYNC_FOUND )
>-  tde_message_fatal( "opensync-1.0 is requested, but was not found on your system" )
>-endif( )
>-
>-pkg_search_module( OSENGINE osengine-1.0 )
>-if( NOT OSENGINE_FOUND )
>-  tde_message_fatal( "osengine-1.0 is requested, but was not found on your system" )
>+  pkg_search_module( OPENSYNC libopensync )
>+  if( NOT OPENSYNC_FOUND )
>+    tde_message_fatal( "libopensync is requested, but was not found on your system" )
>+  endif( )
>+else()
>+  pkg_search_module( OSENGINE osengine-1.0 )
>+  if( NOT OSENGINE_FOUND )
>+    tde_message_fatal( "osengine-1.0 is requested, but was not found on your system" )
>+  endif( )
> endif( )

Actions: View | Diff

Attachments on bug 1271: 902