X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640..refs/heads/wip:/admin/make-emacs

diff --git a/admin/make-emacs b/admin/make-emacs
index b21dcad5f3..17d1cdc239 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -2,7 +2,7 @@
 # Build Emacs with various options for profiling, debugging,
 # with and without warnings enabled etc.
 
-# Copyright (C) 2001-2011  Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -21,6 +21,8 @@
 
 
 require 5;
+use strict;
+use warnings;
 use Getopt::Long;
 use File::Basename;
 use Cwd;
@@ -42,7 +44,7 @@ $rc = GetOptions ("help" => \$help,
 		  "check-marked" => \$check_marked,
 		  "all" => \$all,
 		  "no-optim" => \$no_optim,
-		  "union-type" => \$union_type,
+		  "check-lisp-type" => \$check_lisp_type,
 		  "gprof" => \$profile,
 		  "malloc-check" => \$malloc_check,
 		  "no-mcheck" => \$no_mcheck,
@@ -70,9 +72,9 @@ Build Emacs.
  --check-marked		GC_CHECK_MARKED_OBJECTS=1
  --optim		no debug defines
  --gprof		make Emacs for profiling
- --union-type		define USE_LISP_UNION_TYPE (bad for GDB)
+ --check-lisp-type	define CHECK_LISP_OBJECT_TYPE
  --malloc-check		define GC_MALLOC_CHECK
- --no-mcheck		dont define GC_MCHECK
+ --no-mcheck		don't define GC_MCHECK
  --wall			compile with -Wall
  --gcc3			use GCC 3.0 (30% slower compilation, slower code)
  --trace-selection	print traces in xselect.c
@@ -140,7 +142,7 @@ else
       }
   }
 
-$defs = "$defs -DUSE_LISP_UNION_TYPE" if $union_type;
+$defs = "$defs -DCHECK_LISP_OBJECT_TYPE" if $check_lisp_type;
 $defs = "$defs -DGC_MALLOC_CHECK=1 -DGC_PROTECT_MALLOC_STATE=1" if $malloc_check;
 $defs = "$defs -DGC_MCHECK=1" unless $no_mcheck;