applied_patches/0208-cws-moz2seamonkey01-configure.diff

   1 Index: configure.in
   2 ===================================================================
   3 --- configure.in        (.../tags/DEV300_m41/configure.in)      (revision 269003)
   4 +++ configure.in        (.../cws/moz2seamonkey01/configure.in)  (revision 269003)
   5 @@ -1733,12 +1733,15 @@
   6                         AC_MSG_RESULT([found Compiler version $CCNUMVER.])
   7                         if test "$CCNUMVER" -ge "001500000000"; then
   8                                 COMEX=12
   9 +                               MSVSVER=2008
  10                                 AC_MSG_RESULT([found .NET 2008 / VS 9.0.])
  11                         elif test "$CCNUMVER" -ge "001400000000"; then
  12                                 COMEX=11
  13 +                               MSVSVER=2005
  14                                 AC_MSG_RESULT([found .NET 2005.])
  15                         elif test "$CCNUMVER" -ge "001300102240"; then
  16                                 COMEX=10
  17 +                               MSVSVER=2003
  18                                 AC_MSG_RESULT([found .NET 2003.])
  19                         else
  20                                 AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler.])
  21 @@ -4097,9 +4100,14 @@
  22
  23  AC_MSG_CHECKING([for toolkit mozilla should use])
  24  if test -z "$with_mozilla_toolkit"; then
  25 -   if test "$_os" != "WINNT"; then
  26 -      MOZILLA_TOOLKIT=gtk2
  27 -      AC_MSG_RESULT([gtk2])
  28 +   if test "$_os" != "WINNT" ; then
  29 +      if test "$_os" = "Darwin" ; then
  30 +         MOZILLA_TOOLKIT=mac
  31 +         AC_MSG_RESULT([mac])
  32 +      else
  33 +         MOZILLA_TOOLKIT=gtk2
  34 +         AC_MSG_RESULT([gtk2])
  35 +      fi
  36     fi
  37  else
  38     MOZILLA_TOOLKIT=$with_mozilla_toolkit
  39 @@ -4121,7 +4129,7 @@
  40        enable_build_mozilla=
  41  fi
  42
  43 -AC_MSG_CHECKING([whether to build Mozilla])
  44 +AC_MSG_CHECKING([whether to build Mozilla/SeaMonkey])
  45  if test -n "$enable_build_mozilla"; then
  46     BUILD_MOZAB="TRUE"
  47     AC_MSG_RESULT([yes])
  48 @@ -4131,17 +4139,25 @@
  49  fi
  50
  51  if test "$BUILD_MOZAB" = "TRUE"; then
  52 +  if test "$_os" = "WINNT"; then
  53 +    if test "$WITH_MINGWIN" != "yes"; then
  54 +      # compiling with MSVC. Only supported platform here is MSVS2005 at the moment.
  55 +      if test "$MSVSVER" != "2005"; then
  56 +        AC_MSG_ERROR([Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only.])
  57 +      fi
  58 +    else
  59 +      AC_MSG_WARN([Building SeaMonkey with mingwin is not tested, and likely to break.])
  60 +      echo "Building SeaMonkey with mingwin is not tested, and likely to break." >> warn
  61 +    fi
  62 +  fi
  63 +
  64     if test -z "$MOZILLA_VERSION"; then
  65 -      MOZILLA_VERSION=1.7.5
  66 +      MOZILLA_VERSION=1.1.13
  67     fi
  68 -   if test "$MOZILLA_VERSION" = "1.7b" ; then
  69 -      MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source"
  70 -   else
  71 -      MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}"
  72 -   fi
  73 +   MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
  74     for e in gz bz2; do
  75        AC_MSG_CHECKING([for $MOZILLA_SOURCE_VERSION.tar.$e])
  76 -      if test ! -e "./moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
  77 +      if test ! -e "moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
  78           AC_MSG_RESULT([not found])
  79           HAVE_MOZILLA_TARBALL=n
  80        else
  81 @@ -4150,22 +4166,16 @@
  82        fi
  83     done
  84     if test "$HAVE_MOZILLA_TARBALL" != "y"; then
  85 -         AC_MSG_ERROR([Mozilla source archive not found.
  86 +         AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found.
  87  Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/.
  88  The archives can be found here:
  89 -http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$MOZILLA_VERSION/source/])
  90 +http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/])
  91     fi
  92     if test "$_os" = "WINNT"; then
  93 -      AC_MSG_CHECKING([for glib and libIDL binaries])
  94 -      if test ! -e "./moz/download/vc71-glib-1.2.10-bin.zip" \
  95 -           -o ! -e "./moz/download/vc71-libIDL-0.6.8-bin.zip" \
  96 -           -o ! -e "./moz/download/wintools.zip" ; then
  97 -AC_MSG_ERROR([One or more of the following archives is missing in moz/download/
  98 -  vc71-glib-1.2.10-bin.zip
  99 -  vc71-libIDL-0.6.8-bin.zip
 100 -(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc71/)
 101 -  wintools.zip
 102 -(from http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/wintools.zip)])
 103 +      AC_MSG_CHECKING([for moztools binaries])
 104 +      if test ! -e "moz/download/vc8-moztools.zip" ; then
 105 +        AC_MSG_ERROR([The following file is missing in moz/download: vc8-moztools.zip
 106 +(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)])
 107        else
 108           AC_MSG_RESULT([ok])
 109        fi