7190N/AThis ensures that Mozilla nss/nspr libraries are placed last in

7190N/Aflags/libraries so that the sqlite3 library found in /usr/lib is preferred

7190N/Aover the one found in /usr/lib/mps.

7190N/A

7190N/AWe need to fix Solaris to not have conflicting sqlite3 libraries, instead

7190N/Aof forcing upstream to hack around this.

7190N/A

7190N/A--- evolution-data-server-3.16.2/configure.ac 2015-07-16 12:48:00.510697572 -0700

7190N/A+++ evolution-data-server-3.16.2/configure.ac 2015-07-16 12:47:38.408295304 -0700

7190N/A@@ -1452,8 +1452,8 @@

7190N/A dnl ******************************

7190N/A AC_DEFUN([EVO_SET_COMPILE_FLAGS], [

7190N/A PKG_CHECK_MODULES([$1], [$2])

7190N/A- $1_CFLAGS="[$]$1_CFLAGS $3 "

7190N/A- $1_LIBS="[$]$1_LIBS $4 "

7190N/A+ $1_CFLAGS="$3 [$]$1_CFLAGS "

7190N/A+ $1_LIBS="$4 [$]$1_LIBS "

7190N/A ])

7190N/A

7190N/A dnl ******************************

7190N/A@@ -1626,7 +1626,7 @@

7190N/A

7190N/A AM_CONDITIONAL(ENABLE_LARGEFILE, [test "x$enable_largefile" = "xyes"])

7190N/A

7190N/A-EVO_SET_COMPILE_FLAGS(CAMEL, gio-2.0 gmodule-2.0 $mozilla_nss $mozilla_nspr sqlite3 >= sqlite_minimum_version, $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $MANUAL_NSPR_CFLAGS $LARGEFILE_CFLAGS $ICU_CFLAGS, -lz $KRB5_LIBS $MANUAL_NSS_LIBS $MANUAL_NSPR_LIBS $ICU_LIBS)

7190N/A+EVO_SET_COMPILE_FLAGS(CAMEL, gio-2.0 gmodule-2.0 $mozilla_nss $mozilla_nspr, $SQLITE3_CFLAGS $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $MANUAL_NSPR_CFLAGS $LARGEFILE_CFLAGS $ICU_CFLAGS, $SQLITE3_LIBS -lz $KRB5_LIBS $MANUAL_NSS_LIBS $MANUAL_NSPR_LIBS $ICU_LIBS)

7190N/A AC_SUBST(CAMEL_CFLAGS)

7190N/A AC_SUBST(CAMEL_LIBS)

7190N/A