Show
Ignore:
Timestamp:
04/04/08 22:04:40 (8 months ago)
Author:
miyoshi
Message:

Sync up with Emacs22.2.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/nt/configure.bat

    r4207 r4220  
    33rem   Configuration script for MS Windows 95/98/Me and NT/2000/XP 
    44rem   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 
    5 rem      2006, 2007 Free Software Foundation, Inc. 
     5rem      2006, 2007, 2008 Free Software Foundation, Inc. 
    66 
    77rem   This file is part of GNU Emacs. 
    …… 
    99rem   GNU Emacs is free software; you can redistribute it and/or modify 
    1010rem   it under the terms of the GNU General Public License as published by 
    11 rem   the Free Software Foundation; either version 2, or (at your option) 
     11rem   the Free Software Foundation; either version 3, or (at your option) 
    1212rem   any later version. 
    1313 
    …… 
    8585set COMPILER= 
    8686set usercflags= 
     87set docflags= 
    8788set userldflags= 
     89set doldflags= 
    8890set sep1= 
    8991set sep2= 
    …… 
    119121echo.   --cflags FLAG           pass FLAG to compiler 
    120122echo.   --ldflags FLAG          pass FLAG to compiler when linking 
    121 echo.   --without-png           do not use libpng even if it is installed 
    122 echo.   --without-jpeg          do not use jpeg-6b even if it is installed 
    123 echo.   --without-gif           do not use libungif even if it is installed 
    124 echo.   --without-tiff          do not use libtiff even if it is installed 
    125 echo.   --without-xpm           do not use libXpm even if it is installed 
     123echo.   --without-png           do not use PNG library even if it is installed 
     124echo.   --without-jpeg          do not use JPEG library even if it is installed 
     125echo.   --without-gif           do not use GIF library even if it is installed 
     126echo.   --without-tiff          do not use TIFF library even if it is installed 
     127echo.   --without-xpm           do not use XPM library even if it is installed 
    126128goto end 
    127129rem ---------------------------------------------------------------------- 
    …… 
    474476if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings 
    475477if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix%>>config.settings 
    476 if not "(%usercflags%)" == "()" echo USER_CFLAGS=%usercflags%>>config.settings 
    477 if not "(%userldflags%)" == "()" echo USER_LDFLAGS=%userldflags%>>config.settings 
     478rem We go thru docflags because usercflags could be "-DFOO=bar" -something 
     479rem and the if command cannot cope with this 
     480for %%v in (%usercflags%) do if not (%%v)==() set docflags=Y 
     481if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags%>>config.settings 
     482for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y 
     483if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags%>>config.settings 
    478484echo # End of settings from configure.bat>>config.settings 
    479485echo. >>config.settings 
    …… 
    482488echo. >>config.tmp 
    483489echo /* Start of settings from configure.bat.  */ >>config.tmp 
    484 if not "(%usercflags%)" == "()" echo #define USER_CFLAGS " %usercflags%">>config.tmp 
    485 if not "(%userldflags%)" == "()" echo #define USER_LDFLAGS " %userldflags%">>config.tmp 
     490if (%docflags%) == (Y) echo #define USER_CFLAGS " %usercflags%">>config.tmp 
     491if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %userldflags%">>config.tmp 
    486492if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>config.tmp 
    487493if not "(%HAVE_JPEG%)" == "()" echo #define HAVE_JPEG 1 >>config.tmp