patch-configure 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. --- mozilla-2.0.orig/configure 2011-03-19 00:48:56.000000000 +0100
  2. +++ mozilla-2.0/configure 2011-04-07 18:48:49.000000000 +0200
  3. @@ -1588,7 +1588,7 @@ test -n "$HOST_CXX" || HOST_CXX=""""
  4. HOST_CXXFLAGS="$CXXFLAGS"
  5. fi
  6. if test -z "$HOST_LDFLAGS"; then
  7. - HOST_LDFLAGS="$LDFLAGS"
  8. + HOST_LDFLAGS="$LDFLAGS_FOR_BUILD"
  9. fi
  10. if test -z "$HOST_AR_FLAGS"; then
  11. HOST_AR_FLAGS="$AR_FLAGS"
  12. @@ -22573,15 +22573,6 @@ if test "${with_libIDL+set}" = set; then
  13. fi
  14. -if test -z "$CROSS_COMPILE"; then
  15. - if test -z "$HOST_LIBIDL_CONFIG"; then
  16. - HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
  17. - fi
  18. - if test -z "$HOST_LIBIDL_PREFIX"; then
  19. - HOST_LIBIDL_PREFIX="$LIBIDL_PREFIX"
  20. - fi
  21. -fi
  22. -
  23. if test "$SKIP_IDL_CHECK" = "no"
  24. then
  25. _LIBIDL_FOUND=
  26. @@ -22788,6 +22779,7 @@ fi
  27. fi
  28. fi
  29. +
  30. # Check whether --with-glib-prefix or --without-glib-prefix was given.
  31. if test "${with_glib_prefix+set}" = set; then
  32. withval="$with_glib_prefix"
  33. @@ -23542,6 +23534,9 @@ else
  34. LIBIDL_LIBS="$HOST_LIBIDL_LIBS"
  35. fi
  36. +HOST_LIBIDL_CFLAGS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --cflags`
  37. +HOST_LIBIDL_LIBS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --libs`
  38. +
  39. if test -z "$SKIP_PATH_CHECKS"; then
  40. if test -z "${GLIB_CFLAGS}" -o -z "${GLIB_LIBS}" ; then
  41. if test "$MOZ_ENABLE_GTK2" -o "$USE_ELF_DYNSTR_GC" ; then