Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ee705a5c
Commit
ee705a5c
authored
Sep 22, 2010
by
Juanma Barranquero
Browse files
nt/configure.bat: Cosmetic changes.
parent
592bdb9a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
38 additions
and
2 deletions
+38
-2
nt/configure.bat
nt/configure.bat
+38
-2
No files found.
nt/configure.bat
View file @
ee705a5c
@echo
off
rem ----------------------------------------------------------------------
rem Configuration script for MS Windows
95/98/Me and NT/2000/XP
rem Configuration script for MS Windows
operating systems
rem Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
rem 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
...
...
@@ -22,7 +22,7 @@ rem along with GNU Emacs. If not, see http://www.gnu.org/licenses/.
rem ----------------------------------------------------------------------
rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
rem
rem + MS Windows 95
/98/Me or NT/2000/XP
rem + MS Windows 95
, NT or later
rem + either MSVC 2.x or later, or gcc-2.95 or later (with GNU make 3.75
rem or later) and the Mingw32 and W32 API headers and libraries.
rem + Visual Studio 2005 is not supported at this time.
...
...
@@ -116,6 +116,7 @@ if "%1" == "--without-xpm" goto withoutxpm
if
"
%
1"
==
"--with-svg"
goto
withsvg
if
"
%
1"
==
"--distfiles"
goto
distfiles
if
"
%
1"
==
""
goto
checkutils
:usage
echo
Usage
:
configure
[
options
]
echo
Options
:
...
...
@@ -137,61 +138,82 @@ echo. --without-xpm do not use XPM library even if it is installed
echo
.
--with-svg
use
the
RSVG
library
(
experimental
)
echo
.
--distfiles
path
to
files
for
make
dist
,
e
.g.
libXpm
.dll
goto
end
rem ----------------------------------------------------------------------
:setprefix
shift
set
prefix
=
%
1
shift
goto
again
rem ----------------------------------------------------------------------
:withgcc
set
COMPILER
=
gcc
shift
goto
again
rem ----------------------------------------------------------------------
:withmsvc
set
COMPILER
=
cl
shift
goto
again
rem ----------------------------------------------------------------------
:nodebug
set
nodebug
=
Y
shift
goto
again
rem ----------------------------------------------------------------------
:noopt
set
noopt
=
Y
shift
goto
again
rem ----------------------------------------------------------------------
:enablechecking
set
enablechecking
=
Y
shift
goto
again
rem ----------------------------------------------------------------------
:profile
set
profile
=
Y
shift
goto
again
rem ----------------------------------------------------------------------
:nocygwin
set
nocygwin
=
Y
shift
goto
again
rem ----------------------------------------------------------------------
:usercflags
shift
set
usercflags
=
%usercflags%%
sep1
%%
1
set
sep1
=
%nothing%
shift
goto
again
rem ----------------------------------------------------------------------
:userldflags
shift
set
userldflags
=
%userldflags%%
sep2
%%
1
set
sep2
=
%nothing%
shift
goto
again
rem ----------------------------------------------------------------------
:withoutpng
...
...
@@ -249,6 +271,7 @@ goto again
rem ----------------------------------------------------------------------
rem Check that necessary utilities (cp and rm) are present.
:checkutils
echo
Checking
for
'cp'
...
cp
configure
.bat
junk
.bat
...
...
@@ -257,9 +280,11 @@ echo Checking for 'rm'...
rm
junk
.bat
if
exist
junk
.bat
goto
needrm
goto
checkcompiler
:needcp
echo
You
need
'cp'
(
the
Unix
file
copy
program
)
to
build
Emacs
.
goto
end
:needrm
del
junk
.bat
echo
You
need
'rm'
(
the
Unix
file
delete
program
)
to
build
Emacs
.
...
...
@@ -267,6 +292,7 @@ goto end
rem ----------------------------------------------------------------------
rem Auto-detect compiler if not specified, and validate GCC if chosen.
:checkcompiler
if
(
%COMPILER%
)==(
cl
)
goto
compilercheckdone
if
(
%COMPILER%
)==(
gcc
)
goto
checkgcc
...
...
@@ -301,6 +327,7 @@ if exist junk.o set nocygwin=Y
:chkapi
echo
The
failed
program
was
:
>>
config
.log
type
junk
.c
>>
config
.log
:chkapiN
rm
-f
junk
.c
junk
.o
rem ----------------------------------------------------------------------
...
...
@@ -320,8 +347,10 @@ echo {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} >>junk.c
if
(
%nocygwin%
)
==
(
Y
)
goto
chkapi1
set
cf
=
%usercflags%
goto
chkapi2
:chkapi
1
set
cf
=
%usercflags%
-mno-cygwin
:chkapi
2
echo
on
gcc
%cf%
-c
junk
.c
...
...
@@ -357,10 +386,12 @@ type junk.c >>config.log
set
mf
=
-mcpu
=
i686
rm
-f
junk
.c
junk
.o
goto
gccdebug
:gccMtuneOk
echo
GCC
supports
-mtune
=
pentium4
>>
config
.log
set
mf
=
-mtune
=
pentium4
rm
-f
junk
.c
junk
.o
:gccdebug
rem Check for DWARF-2 debug info support, else default to stabs
echo
main
(){}
>
junk
.c
...
...
@@ -372,6 +403,7 @@ type junk.c >>config.log
set
dbginfo
=
-gstabs
+
rm
-f
junk
.c
junk
.o
goto
compilercheckdone
:gccdwarf
echo
GCC
supports
DWARF
-
2
>>
config
.log
set
dbginfo
=
-gdwarf
-
2
-g
3
...
...
@@ -565,6 +597,7 @@ goto :distfilesDone
set
fileNotFound
=
rem ----------------------------------------------------------------------
:genmakefiles
echo
Generating
makefiles
if
%COMPILER%
==
gcc
set
MAKECMD
=
gmake
...
...
@@ -619,6 +652,7 @@ fc /b config.tmp ..\src\config.h >nul 2>&1
if
errorlevel
1
goto
doCopy
fc
/b
paths
.h ..\src\epaths.h
>
nul
2
>&
1
if
errorlevel
0
goto
dontCopy
:doCopy
copy
config
.tmp ..\src\config.h
copy
paths
.h ..\src\epaths.h
...
...
@@ -648,6 +682,7 @@ fc /b foo.bar foo.bar >nul 2>&1
if
not
errorlevel
2
goto
doUpdateSubdirs
fc
/b
subdirs
.el ..\site
-lisp
\subdirs.el
>
nul
2
>&
1
if
not
errorlevel
1
goto
dontUpdateSubdirs
:doUpdateSubdirs
if
exist
..\site
-lisp
\subdirs.el
del
..\site
-lisp
\subdirs.el
copy
subdirs
.el ..\site
-lisp
\subdirs.el
...
...
@@ -716,6 +751,7 @@ goto end
echo Your environment size is too small. Please enlarge it and rerun configure.
echo For example, type "command.com /e:2048" to have 2048 bytes available.
set $foo$=
:end
set prefix=
set nodebug=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment