Dominique Leuenberger
376a80452b
Copy from home:dimstar:branches:GNOME:Factory/evolution via accept of submit request 27037 revision 7. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/27037 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=53
25 lines
917 B
Diff
25 lines
917 B
Diff
Index: evolution-2.29.3.1/configure.ac
|
|
===================================================================
|
|
--- evolution-2.29.3.1.orig/configure.ac
|
|
+++ evolution-2.29.3.1/configure.ac
|
|
@@ -722,8 +722,8 @@ if test "x$enable_pilot_conduits" = "xye
|
|
|
|
CFLAGS_save="$CFLAGS"
|
|
CFLAGS="$CFLAGS $GNOME_PILOT_CFLAGS"
|
|
- LDFLAGS_save="$LDFLAGS"
|
|
- LDFLAGS="$GNOME_PILOT_LIBS $LDFLAGS"
|
|
+ LIBS_save="$LIBS"
|
|
+ LIBS="$LIBS $GNOME_PILOT_LIBS $LDFLAGS"
|
|
|
|
AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions],[ac_cv_pilot_link_utf8],
|
|
AC_RUN_IFELSE([AC_LANG_SOURCE(
|
|
@@ -743,7 +743,7 @@ if test "x$enable_pilot_conduits" = "xye
|
|
)],[ac_cv_pilot_link_utf8=yes],[ac_cv_pilot_link_utf8=no],[ac_cv_pilot_link_utf8=no]))
|
|
|
|
CFLAGS="$CFLAGS_save"
|
|
- LDFLAGS="$LDFLAGS_save"
|
|
+ LIBS="$LIBS_save"
|
|
|
|
if test "$ac_cv_pilot_link_utf8" = no; then
|
|
AC_MSG_ERROR([evolution requires pilot-link to have working UTF-8 conversion routines])
|