mozilla-disable-javaxpcom.patch
changeset 78 e0271a18500f
equal deleted inserted replaced
77:f2df98836e17 78:e0271a18500f
       
     1 diff --git a/configure.in b/configure.in
       
     2 --- a/configure.in
       
     3 +++ b/configure.in
       
     4 @@ -5760,24 +5760,26 @@ fi
       
     5  
       
     6  AC_SUBST(MOZ_IPDL_TESTS)
       
     7  
       
     8  dnl ========================================================
       
     9  dnl = Disable plugin support
       
    10  dnl ========================================================
       
    11  MOZ_ARG_DISABLE_BOOL(plugins,
       
    12  [  --disable-plugins       Disable plugins support],
       
    13 -    MOZ_PLUGINS=,)
       
    14 +    MOZ_PLUGINS=,
       
    15 +    MOZ_PLUGINS=1)
       
    16  
       
    17  dnl ========================================================
       
    18  dnl = Disable building dbm
       
    19  dnl ========================================================
       
    20  MOZ_ARG_DISABLE_BOOL(dbm,
       
    21  [  --disable-dbm       Disable building dbm],
       
    22 -    NSS_DISABLE_DBM=1,)
       
    23 +    NSS_DISABLE_DBM=1,
       
    24 +    NSS_DISABLE_DBM=)
       
    25  
       
    26  dnl bi-directional support always on
       
    27  IBMBIDI=1
       
    28  AC_DEFINE(IBMBIDI)
       
    29  
       
    30  dnl ========================================================
       
    31  dnl view source support on by default
       
    32  dnl ========================================================
       
    33 @@ -5817,17 +5819,18 @@ if test "$MOZ_JSLOADER"; then
       
    34      AC_DEFINE(MOZ_JSLOADER)
       
    35  fi
       
    36  
       
    37  dnl ========================================================
       
    38  dnl Disable printing
       
    39  dnl ========================================================
       
    40  MOZ_ARG_DISABLE_BOOL(printing,
       
    41  [  --disable-printing      Disable printing support],
       
    42 -    NS_PRINTING=,)
       
    43 +    NS_PRINTING=,
       
    44 +    NS_PRINTING=1)
       
    45  
       
    46  if test "$MOZ_WIDGET_TOOLKIT" = "qt"; then
       
    47      AC_MSG_WARN([Printing does not work with Qt at this time. Omitting printing support.])
       
    48      NS_PRINTING=
       
    49  fi
       
    50  
       
    51  if test "$NS_PRINTING"; then
       
    52      AC_DEFINE(NS_PRINTING)
       
    53 @@ -5876,17 +5879,18 @@ if test -n "$MOZ_NO_FAST_LOAD"; then
       
    54      AC_DEFINE(MOZ_NO_FAST_LOAD)
       
    55  fi
       
    56  
       
    57  dnl ========================================================
       
    58  dnl = Disable Ogg Codecs
       
    59  dnl ========================================================
       
    60  MOZ_ARG_DISABLE_BOOL(ogg,
       
    61  [  --disable-ogg           Disable support for OGG media (Theora video and Vorbis audio)],
       
    62 -    MOZ_OGG=,)
       
    63 +    MOZ_OGG=,
       
    64 +    MOZ_OGG=1)
       
    65  
       
    66  if test -n "$MOZ_OGG"; then
       
    67      AC_DEFINE(MOZ_OGG)
       
    68      MOZ_SYDNEYAUDIO=1
       
    69      MOZ_MEDIA=1
       
    70      MOZ_VORBIS=1
       
    71  
       
    72      dnl Checks for __attribute__(aligned()) directive
       
    73 @@ -5967,17 +5971,18 @@ if test -n "$MOZ_WEBM"; then
       
    74      fi
       
    75  fi
       
    76  
       
    77  dnl ========================================================
       
    78  dnl = Disable Wave decoder support
       
    79  dnl ========================================================
       
    80  MOZ_ARG_DISABLE_BOOL(wave,
       
    81  [  --disable-wave          Disable Wave decoder support],
       
    82 -    MOZ_WAVE=,)
       
    83 +    MOZ_WAVE=,
       
    84 +    MOZ_WAVE=1)
       
    85  
       
    86  if test -n "$MOZ_WAVE"; then
       
    87      AC_DEFINE(MOZ_WAVE)
       
    88      MOZ_SYDNEYAUDIO=1
       
    89      MOZ_MEDIA=1
       
    90  fi
       
    91  
       
    92  dnl ========================================================
       
    93 @@ -6077,17 +6082,18 @@ case "${target}" in
       
    94  *-wince*)
       
    95      MOZ_JAVAXPCOM=
       
    96      ;;
       
    97  esac
       
    98  
       
    99  MOZ_ARG_ENABLE_BOOL(javaxpcom,
       
   100  [  --enable-javaxpcom
       
   101                            Enable Java-XPCOM bridge],
       
   102 -    MOZ_JAVAXPCOM=1,)
       
   103 +    MOZ_JAVAXPCOM=1,
       
   104 +    MOZ_JAVAXPCOM=)
       
   105  
       
   106  case "$host_os" in
       
   107    cygwin*|msvc*|mks*)
       
   108      if test -n "$JAVA_HOME"; then
       
   109        JAVA_HOME=`cygpath -u \`cygpath -m -s "$JAVA_HOME"\``
       
   110      fi
       
   111      ;;
       
   112    *mingw*)
       
   113 @@ -6154,17 +6160,18 @@ i?86-*-linux*|x86_64-*-linux*|arm-*-linu
       
   114    ;;
       
   115  *solaris*)
       
   116    MOZ_CRASHREPORTER=1
       
   117    ;;
       
   118  esac
       
   119  
       
   120  MOZ_ARG_DISABLE_BOOL(crashreporter,
       
   121  [  --disable-crashreporter Disable breakpad crash reporting],
       
   122 -    MOZ_CRASHREPORTER=,)
       
   123 +    MOZ_CRASHREPORTER=,
       
   124 +    MOZ_CRASHREPORTER=1)
       
   125  
       
   126  if test -n "$MOZ_CRASHREPORTER"; then
       
   127     AC_DEFINE(MOZ_CRASHREPORTER)
       
   128  
       
   129    if (test "$OS_ARCH" = "Linux" || test "$OS_ARCH" = "SunOS") && \
       
   130      test -z "$SKIP_LIBRARY_CHECKS"; then
       
   131      PKG_CHECK_MODULES(MOZ_GTHREAD, gthread-2.0)
       
   132      AC_SUBST(MOZ_GTHREAD_CFLAGS)
       
   133 @@ -6431,17 +6438,18 @@ dnl ====================================
       
   134  case "$target_os" in
       
   135      aix*|solaris*|linux*|msvc*|mks*|cygwin*|mingw*|os2*|wince*|winmo*)
       
   136          MOZ_INSTALLER=1
       
   137          ;;
       
   138  esac
       
   139  
       
   140  MOZ_ARG_DISABLE_BOOL(installer,
       
   141  [  --disable-installer     Disable building of installer],
       
   142 -    MOZ_INSTALLER=,)
       
   143 +    MOZ_INSTALLER=,
       
   144 +    MOZ_INSTALLER=1)
       
   145  if test -n "$MOZ_INSTALLER" -a "$OS_ARCH" = "WINNT"; then
       
   146      # Disable installer for Windows builds that use the new toolkit if NSIS
       
   147      # isn't in the path.
       
   148      MOZ_PATH_PROGS(MAKENSIS, makensis)
       
   149      if test -z "$MAKENSIS" || test "$MAKENSIS" = ":"; then
       
   150          AC_MSG_ERROR([To build the installer makensis is required in your path. To build without the installer reconfigure using --disable-installer.])
       
   151      fi
       
   152      # The Windows build for NSIS requires the iconv command line utility to
       
   153 @@ -8482,17 +8490,18 @@ if test "$NECKO_DISK_CACHE"; then
       
   154      AC_DEFINE(NECKO_DISK_CACHE)
       
   155  fi
       
   156  
       
   157  dnl
       
   158  dnl option to disable necko's wifi scanner
       
   159  dnl
       
   160  MOZ_ARG_DISABLE_BOOL(necko-wifi,
       
   161  [  --disable-necko-wifi    Disable necko wifi scanner],
       
   162 -    NECKO_WIFI=,)
       
   163 +    NECKO_WIFI=,
       
   164 +    NECKO_WIFI=1)
       
   165  
       
   166  if test "$OS_ARCH" = "OS2"; then
       
   167    dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
       
   168    NECKO_WIFI=
       
   169  fi
       
   170  if test "$NECKO_WIFI" -a \
       
   171          "$OS_ARCH" != "Linux" -a \
       
   172          "$OS_ARCH" != "Darwin" -a \