From 57c7976a96e56fd97880f8ecd3e1faee1839104a Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Fri, 29 Aug 2008 21:27:27 +0000 Subject: [PATCH] use libcurl on all platforms git-svn-id: https://zeitsenke.de/svn/SyncEvolution/trunk@742 15ad00c4-1369-45f4-8270-35d70d36bdcd --- HACKING | 4 +++- configure-pre.in | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/HACKING b/HACKING index 4ffb58ec..ccbfccad 100644 --- a/HACKING +++ b/HACKING @@ -205,6 +205,7 @@ Compiling for Mac OS X /configure --with-sync4j-src= \ --enable-addressbook \ SYNCEVOLUTION_CXXFLAGS="-Wall -Werror -Wno-unknown-pragmas" \ + LDFLAGS="-framework Addressbook -framework CoreServices" \ CXXFLAGS=-g \ CFLAGS=-g @@ -214,7 +215,8 @@ Compiling for Mac OS X ./configure --enable-addressbook \ CXXFLAGS="-O -g -arch i386 -arch ppc" \ CFLAGS="-O -g -arch i386 -arch ppc" \ - LDFLAGS="-arch i386 -arch ppc" --disable-dependency-tracking + LDFLAGS="-arch i386 -arch ppc -framework Addressbook -framework CoreServices" \ + --disable-dependency-tracking make BINSUFFIX=mac-os-x distbin Fine-grained memory checking: diff --git a/configure-pre.in b/configure-pre.in index 6a53e1ad..db1e177e 100644 --- a/configure-pre.in +++ b/configure-pre.in @@ -194,7 +194,7 @@ if test ! "$FUNAMBOL"; then # to check with autoconf for the right flags... FUNAMBOL_LIB_SHARED_FLAGS="-DPIC -fPIC" fi - if (set -x; mkdir -p $FUNAMBOL_SUBDIR && cd $FUNAMBOL_SUBDIR && $CLIENT_CONFIGURE --build=$build_alias --host=$host_alias --target=$target_alias --disable-shared CFLAGS="$CFLAGS $FUNAMBOL_LIB_SHARED_FLAGS" CXXFLAGS="$CXXFLAGS $FUNAMBOL_LIB_SHARED_FLAGS" $cxx_lib_args); then true; else + if (set -x; mkdir -p $FUNAMBOL_SUBDIR && cd $FUNAMBOL_SUBDIR && $CLIENT_CONFIGURE --build=$build_alias --host=$host_alias --target=$target_alias --disable-shared --with-transport-agent=curl CFLAGS="$CFLAGS $FUNAMBOL_LIB_SHARED_FLAGS" CXXFLAGS="$CXXFLAGS $FUNAMBOL_LIB_SHARED_FLAGS" $cxx_lib_args); then true; else AC_MSG_ERROR( [configuring client library failed] ) fi else