Bug 523820 - Remove old MOZILLA_1_9_1_BRANCH ifdefs from comm-central code; (Gv1) Clean 'configure.in' up, the remaining part.
authorSerge Gautherie <sgautherie.bz@free.fr>
Sun, 03 Jan 2010 12:37:25 +0100
changeset 4614 d8a60bb40b9b8b2cb65eac6a7f33aa75ca3f3b62
parent 4613 0e0c0743080fcbcd2a15f54aee5371844ebeb252
child 4615 2303689fabf41c75c449d1bcbcc8b49d5f60d012
push idunknown
push userunknown
push dateunknown
bugs523820
Bug 523820 - Remove old MOZILLA_1_9_1_BRANCH ifdefs from comm-central code; (Gv1) Clean 'configure.in' up, the remaining part. r=Callek.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -497,40 +497,16 @@ case "$target" in
     if test -n "$GNU_CC"; then  
         WINVER=501
     else    
         WINVER=500
     fi
     ;;
 esac
 
-if test "$MOZILLA_1_9_1_BRANCH" = "1"; then
-
-MOZ_ARG_WITH_STRING(windows-version,
-[  --with-windows-version=WINVER
-                          Minimum Windows version (WINVER) to support
-                              400: Windows 95
-                              500: Windows 2000
-                              501: Windows XP],
-  WINVER=$withval)
-
-case "$WINVER" in
-400|500|501)
-    ;;
-
-*)
-    AC_MSG_ERROR([Invalid value --with-windows-version, must be 400, 500 or 501]);
-    ;;
-
-esac
-
-dnl MOZILLA_1_9_1_BRANCH.
-else
-dnl Not MOZILLA_1_9_1_BRANCH.
-
 dnl Target the Windows Vista SDK by default
 WINSDK_TARGETVER=600
 
 MOZ_ARG_WITH_STRING(windows-version,
 [  --with-windows-version=WINSDK_TARGETVER
                           Highest Windows version to target using this SDK
                               502: Windows Server 2003
                               600: Windows Vista
@@ -565,19 +541,16 @@ if test "$MOZ_WINSDK_TARGETVER" -lt "060
     AC_DEFINE(MOZ_DISABLE_VISTA_SDK_REQUIREMENTS)
     # We can't build parental controls either
     MOZ_DISABLE_PARENTAL_CONTROLS=1
 fi
 fi
 
 AC_SUBST(MOZ_DISABLE_VISTA_SDK_REQUIREMENTS)
 
-dnl Not MOZILLA_1_9_1_BRANCH.
-fi
-
 case "$target" in
 *-cygwin*|*-mingw*|*-msvc*|*-mks*|*-wince)
     if test "$GCC" != "yes"; then
         # Check to see if we are really running in a msvc environemnt
         _WIN32_MSVC=1
         AC_CHECK_PROGS(MIDL, midl)
 
         # Make sure compilers are valid
@@ -782,37 +755,31 @@ EOF
         MOZ_WINSDK_MAXVER=0x05020000
     fi # !GNU_CC
 
     AC_DEFINE_UNQUOTED(WINVER,0x$WINVER)
     AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER)
     # Require OS features provided by IE 5.0
     AC_DEFINE_UNQUOTED(_WIN32_IE,0x0500)
 
-    if test "$MOZILLA_1_9_1_BRANCH" != "1"; then
-
     # If the maximum version supported by this SDK is lower than the target
     # version, error out
     AC_MSG_CHECKING([for Windows SDK being recent enough])
     if $PERL -e "exit(0x$MOZ_WINSDK_TARGETVER > $MOZ_WINSDK_MAXVER)"; then
         AC_MSG_RESULT("yes")
     else
         AC_MSG_RESULT("no")
         AC_MSG_ERROR([You are targeting Windows version 0x$MOZ_WINSDK_TARGETVER, but your SDK only supports up to version $MOZ_WINSDK_MAXVER. Install and use an updated SDK, or target a lower version using --with-windows-version. See https://developer.mozilla.org/En/Windows_SDK_versions for more details on fixing this.])
     fi
 
     AC_DEFINE_UNQUOTED(MOZ_WINSDK_TARGETVER,0x$MOZ_WINSDK_TARGETVER)
     # Definitions matching sdkddkver.h
     AC_DEFINE_UNQUOTED(MOZ_NTDDI_WS03, 0x05020000)
     AC_DEFINE_UNQUOTED(MOZ_NTDDI_LONGHORN, 0x06000000)
     AC_DEFINE_UNQUOTED(MOZ_NTDDI_WIN7, 0x06010000)
-
-    # Not MOZILLA_1_9_1_BRANCH.
-    fi
-
     ;;
 esac
 
 dnl Test breaks icc on OS/2 && MSVC
 if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then
     AC_PROG_CC_C_O
     if grep "NO_MINUS_C_MINUS_O 1" ./confdefs.h >/dev/null; then
         USING_HCC=1
@@ -5566,48 +5533,16 @@ MOZ_ARG_DISABLE_BOOL(parental-controls,
 [  --disable-parental-controls
                            Do not build parental controls],
    MOZ_DISABLE_PARENTAL_CONTROLS=1,
    MOZ_DISABLE_PARENTAL_CONTROLS=)
 if test -n "$MOZ_DISABLE_PARENTAL_CONTROLS"; then
     AC_DEFINE(MOZ_DISABLE_PARENTAL_CONTROLS)
 fi
 
-if test "$MOZILLA_1_9_1_BRANCH" = "1"; then
-
-dnl ========================================================
-dnl Vista SDK specific api
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(vista-sdk-requirements,
-[  --disable-vista-sdk-requirements
-                           Do not build Vista SDK specific code],
-   MOZ_DISABLE_VISTA_SDK_REQUIREMENTS=1,
-   MOZ_DISABLE_VISTA_SDK_REQUIREMENTS=)
-if test -n "$COMPILE_ENVIRONMENT"; then
-if test -n "$MOZ_DISABLE_VISTA_SDK_REQUIREMENTS"; then
-    AC_MSG_WARN([Resulting builds will not be compatible with Windows Vista. (bug 428970)])
-    AC_DEFINE(MOZ_DISABLE_VISTA_SDK_REQUIREMENTS)
-    if test -z "$MOZ_DISABLE_PARENTAL_CONTROLS"; then
-        AC_DEFINE(MOZ_DISABLE_PARENTAL_CONTROLS)
-    fi
-    MOZ_DISABLE_PARENTAL_CONTROLS=1
-else
-case "$target" in
-*-mingw*|*-cygwin*|*-msvc*|*-mks*)
-    if test "$ac_cv_header_wpcapi_h" = "no"; then
-        AC_MSG_ERROR([System header wpcapi.h is not available. See updated http://developer.mozilla.org/en/docs/wpcapi.h for details on fixing this problem.])
-    fi
-    ;;
-esac
-fi
-fi
-AC_SUBST(MOZ_DISABLE_VISTA_SDK_REQUIREMENTS)
-
-dnl MOZILLA_1_9_1_BRANCH.
-fi
 AC_SUBST(MOZ_DISABLE_PARENTAL_CONTROLS)
 
 dnl ========================================================
 dnl =
 dnl = Module specific options
 dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Individual module options)