patches/patch-ae

   1 $NetBSD$
   2
   3 --- configure.orig      2007-12-19 06:42:55.000000000 +0900
   4 +++ configure
   5 @@ -5736,7 +5736,7 @@ case "$host" in
   6      ;;
   7
   8  *-darwin*)
   9 -    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
  10 +    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
  11      HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
  12      HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
  13      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(DIST)/bin'
  14 @@ -6030,10 +6030,10 @@ EOF
  15      MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
  16
  17      _PEDANTIC=
  18 -    CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
  19 -    CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
  20 +    CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
  21 +    CXXFLAGS="$CXXFLAGS -no-cpp-precomp -fno-common"
  22      DLL_SUFFIX=".dylib"
  23 -    DSO_LDOPTS=''
  24 +    DSO_LDOPTS='-framework CoreFoundation'
  25      STRIP="$STRIP -x -S"
  26      _PLATFORM_DEFAULT_TOOLKIT='mac'
  27      MOZ_ENABLE_POSTSCRIPT=
  28 @@ -13560,14 +13560,14 @@ echo "configure:13556: checking for xft"
  29
  30              echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6
  31  echo "configure:13563: checking MOZ_XFT_CFLAGS" >&5
  32 -            MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"`
  33 +            MOZ_XFT_CFLAGS="`$PKG_CONFIG --cflags "freetype2"` `$PKG_CONFIG --cflags "xft"`"
  34              echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6
  35
  36              echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6
  37  echo "configure:13568: checking MOZ_XFT_LIBS" >&5
  38              ## don't use --libs since that can do evil things like add
  39              ## -Wl,--export-dynamic
  40 -            MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG --libs-only-l \"xft\"`"
  41 +            MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"freetype2\"` `$PKG_CONFIG --libs-only-l \"freetype2\"` `$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG --libs-only-l \"xft\"`"
  42              echo "$ac_t""$MOZ_XFT_LIBS" 1>&6
  43          else
  44              MOZ_XFT_CFLAGS=""