patch-configure 1.2 KB

12345678910111213141516171819202122232425262728293031
  1. --- mozilla-1.9.2.orig/configure 2010-10-27 05:09:28.000000000 +0200
  2. +++ mozilla-1.9.2/configure 2010-11-25 20:36:24.969435934 +0100
  3. @@ -3970,7 +3970,7 @@ else
  4. echo "$ac_t""yes" 1>&6
  5. fi
  6. - for ac_prog in $PYTHON python2.5 python2.4 python
  7. + for ac_prog in $PYTHON python2.6 python2.5 python2.4 python
  8. do
  9. # Extract the first word of "$ac_prog", so it can be a program name with args.
  10. set dummy $ac_prog; ac_word=$2
  11. @@ -17895,7 +17895,7 @@ echo "configure:17889: checking for SQLI
  12. else
  13. if test "$cross_compiling" = yes; then
  14. - ac_cv_sqlite_secure_delete=no
  15. + ac_cv_sqlite_secure_delete=yes
  16. else
  17. cat > conftest.$ac_ext <<EOF
  18. @@ -21465,8 +21465,8 @@ if test -n "$CROSS_COMPILE"; then
  19. HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
  20. fi
  21. if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then
  22. - HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
  23. - HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
  24. + HOST_LIBIDL_CFLAGS=`PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig ${HOST_LIBIDL_CONFIG} --cflags`
  25. + HOST_LIBIDL_LIBS=`PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig ${HOST_LIBIDL_CONFIG} --libs`
  26. else
  27. HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
  28. HOST_LIBIDL_LIBS="$LIBIDL_LIBS"