comparison nt/configure.bat @ 91073:4bc33ffdda1a

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 902-908) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 131-137) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 261-262) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
author Miles Bader <miles@gnu.org>
date Sat, 27 Oct 2007 09:12:07 +0000
parents 42ccab68ba53 8435ae48d810
children 606f2d163a64
comparison
equal deleted inserted replaced
91072:74ab3ea909f9 91073:4bc33ffdda1a
82 set nodebug=N 82 set nodebug=N
83 set noopt=N 83 set noopt=N
84 set nocygwin=N 84 set nocygwin=N
85 set COMPILER= 85 set COMPILER=
86 set usercflags= 86 set usercflags=
87 set docflags=
87 set userldflags= 88 set userldflags=
89 set doldflags=
88 set sep1= 90 set sep1=
89 set sep2= 91 set sep2=
90 92
91 rem ---------------------------------------------------------------------- 93 rem ----------------------------------------------------------------------
92 rem Handle arguments. 94 rem Handle arguments.
480 if not "(%mf%)" == "()" echo MCPU_FLAG=%mf%>>config.settings 482 if not "(%mf%)" == "()" echo MCPU_FLAG=%mf%>>config.settings
481 if (%nodebug%) == (Y) echo NODEBUG=1 >>config.settings 483 if (%nodebug%) == (Y) echo NODEBUG=1 >>config.settings
482 if (%noopt%) == (Y) echo NOOPT=1 >>config.settings 484 if (%noopt%) == (Y) echo NOOPT=1 >>config.settings
483 if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings 485 if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings
484 if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix%>>config.settings 486 if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix%>>config.settings
485 if not "(%usercflags%)" == "()" echo USER_CFLAGS=%usercflags%>>config.settings 487 rem We go thru docflags because usercflags could be "-DFOO=bar" -something
486 if not "(%userldflags%)" == "()" echo USER_LDFLAGS=%userldflags%>>config.settings 488 rem and the if command cannot cope with this
489 for %%v in (%usercflags%) do if not (%%v)==() set docflags=Y
490 if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags%>>config.settings
491 for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y
492 if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags%>>config.settings
487 if (%usefontbackend%) == (Y) echo USE_FONTBACKEND=1 >>config.settings 493 if (%usefontbackend%) == (Y) echo USE_FONTBACKEND=1 >>config.settings
488 echo # End of settings from configure.bat>>config.settings 494 echo # End of settings from configure.bat>>config.settings
489 echo. >>config.settings 495 echo. >>config.settings
490 496
491 copy config.nt config.tmp 497 copy config.nt config.tmp
492 echo. >>config.tmp 498 echo. >>config.tmp
493 echo /* Start of settings from configure.bat. */ >>config.tmp 499 echo /* Start of settings from configure.bat. */ >>config.tmp
494 if not "(%usercflags%)" == "()" echo #define USER_CFLAGS " %usercflags%">>config.tmp 500 if (%docflags%) == (Y) echo #define USER_CFLAGS " %usercflags%">>config.tmp
495 if not "(%userldflags%)" == "()" echo #define USER_LDFLAGS " %userldflags%">>config.tmp 501 if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %userldflags%">>config.tmp
496 if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>config.tmp 502 if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>config.tmp
497 if not "(%HAVE_JPEG%)" == "()" echo #define HAVE_JPEG 1 >>config.tmp 503 if not "(%HAVE_JPEG%)" == "()" echo #define HAVE_JPEG 1 >>config.tmp
498 if not "(%HAVE_GIF%)" == "()" echo #define HAVE_GIF 1 >>config.tmp 504 if not "(%HAVE_GIF%)" == "()" echo #define HAVE_GIF 1 >>config.tmp
499 if not "(%HAVE_TIFF%)" == "()" echo #define HAVE_TIFF 1 >>config.tmp 505 if not "(%HAVE_TIFF%)" == "()" echo #define HAVE_TIFF 1 >>config.tmp
500 if not "(%HAVE_XPM%)" == "()" echo #define HAVE_XPM 1 >>config.tmp 506 if not "(%HAVE_XPM%)" == "()" echo #define HAVE_XPM 1 >>config.tmp
604 set noopt= 610 set noopt=
605 set nocygwin= 611 set nocygwin=
606 set COMPILER= 612 set COMPILER=
607 set MAKECMD= 613 set MAKECMD=
608 set usercflags= 614 set usercflags=
615 set docflags=
609 set userldflags= 616 set userldflags=
617 set doldflags=
610 set mingwflag= 618 set mingwflag=
611 set mf= 619 set mf=
612 620
613 goto skipArchTag 621 goto skipArchTag
614 arch-tag: 300d20a4-1675-4e75-b615-7ce1a8c5376c 622 arch-tag: 300d20a4-1675-4e75-b615-7ce1a8c5376c