Show
Ignore:
Timestamp:
2008年04月04日 22時04分40秒 (8 months ago)
Author:
miyoshi
Message:

Sync up with Emacs22.2.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/configure.in

    r4210 r4220  
    44dnl in the directory containing this script. 
    55dnl 
    6 dnl  Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 
    7 dnl  Free Software Foundation, Inc. 
     6dnl  Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 
     7dnl    2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc. 
    88dnl 
    99dnl  This file is part of GNU Emacs. 
    …… 
    1111dnl  GNU Emacs is free software; you can redistribute it and/or modify 
    1212dnl  it under the terms of the GNU General Public License as published by 
    13 dnl  the Free Software Foundation; either version 2, or (at your option) 
     13dnl  the Free Software Foundation; either version 3, or (at your option) 
    1414dnl  any later version. 
    1515dnl 
    …… 
    242242    case "${canonical}" in 
    243243      alpha*-*-freebsd*)        machine=alpha ;; 
     244      arm*-*-freebsd*)          machine=arm ;; 
    244245      ia64-*-freebsd*)          machine=ia64 ;; 
    245246      sparc64-*-freebsd*)       machine=sparc ;; 
    …… 
    247248      i[3456]86-*-freebsd*)     machine=intel386 ;; 
    248249      amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;; 
     250    esac 
     251  ;; 
     252 
     253  ## FreeBSD kernel + glibc based userland 
     254  *-*-kfreebsd*gnu* ) 
     255    opsys=gnu-kfreebsd 
     256    case "${canonical}" in 
     257      alpha*-*-kfreebsd*)       machine=alpha ;; 
     258      ia64-*-kfreebsd*)         machine=ia64 ;; 
     259      sparc64-*-kfreebsd*)      machine=sparc ;; 
     260      powerpc-*-kfreebsd*)      machine=macppc ;; 
     261      i[3456]86-*-kfreebsd*)    machine=intel386 ;; 
     262      amd64-*-kfreebsd*|x86_64-*-kfreebsd*) machine=amdx86-64 ;; 
    249263    esac 
    250264  ;; 
    …… 
    11971211 
    11981212  ## Tensilica Xtensa Linux-based GNU system     
    1199   xtensa-*-linux-gnu* ) 
     1213  xtensa*-*-linux-* ) 
    12001214    machine=xtensa opsys=gnu-linux 
    12011215    ;; 
    …… 
    12441258fi 
    12451259 
     1260### Tests for sytems that we beleive are obsolete and should be desupported. 
     1261 
     1262case "${machine}" in 
     1263     pmax | hp9000s300 | ibm370aix | ncr386 | ews4800 | mips-siemens | powerpcle | tandem-s2 ) 
     1264          echo "The system that you are configuring on: ${canonical} is considered to be obsolete" 
     1265          echo "and it is planned to be desupported in the next version of Emacs" 
     1266          echo "Please email emacs-devel@gnu.org as soon as possible if this system is still in use." 
     1267          echo "The code is still functional, but you need to edit the 'configure' script and remove the" 
     1268          echo "exit 33 line.  After that you can run configure again and 'complete' the build." 
     1269          exit 33 
     1270          ;; 
     1271esac 
     1272 
     1273case "${opsys}" in 
     1274     bsd386 | bsdos2-1 |  bsdos2 | bsdos3 | bsdos4 | bsd4-1 | bsd4-2 | bsd4-3 | usg5-0 | usg5-2-2 | usg5-2 | usg5-3 | ultrix4-3 | 386bsd | hpux | hpux8 | hpux9 | hpux9shr | hpux10 | hpux10-20 | aix3-1 | aix3-2-5 | aix3-2 | aix4-1 | nextstep | ux4800 | uxpds | uxpv ) 
     1275          echo "The system that you are configuring on: ${canonical} is considered to be obsolete" 
     1276          echo "and it is planned to be desupported in the next version of Emacs" 
     1277          echo "Please email emacs-devel@gnu.org as soon as possible if this system is still in use." 
     1278          echo "The code is still functional, but you need to edit the 'configure' script and remove the" 
     1279          echo "'exit 44' line.  After that you can run 'configure' again and complete the build." 
     1280          exit 44 
     1281          ;; 
     1282esac 
     1283 
    12461284] 
    12471285dnl quotation ends 
    …… 
    15201558### be located in either /usr/lib64 or /usr/lib. 
    15211559case "${canonical}" in 
    1522   x86_64-*-linux-gnu* ) 
     1560  x86_64-*-linux-gnu* | s390x-*-linux-gnu* ) 
    15231561    if test -d /usr/lib64; then 
    15241562      AC_DEFINE(HAVE_X86_64_LIB64_DIR, 1, 
    …… 
    21012139    AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); 
    21022140  fi 
    2103   GLIB_REQUIRED=2.4 
    2104   GTK_REQUIRED=2.4 
     2141  GLIB_REQUIRED=2.6 
     2142  GTK_REQUIRED=2.6 
    21052143  GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" 
    21062144 
    …… 
    21662204    fi 
    21672205    if test "$HAVE_GTK_AND_PTHREAD" = yes; then 
    2168       GTK_LIBS="$GTK_LIBS -lpthread" 
     2206      case "${canonical}" in 
     2207        *-hpux*) ;; 
     2208        *) GTK_LIBS="$GTK_LIBS -lpthread" ;; 
     2209      esac 
    21692210      AC_DEFINE(HAVE_GTK_AND_PTHREAD, 1, 
    21702211               [Define to 1 if you have GTK and pthread (-lpthread).]) 
    …… 
    29392980 
    29402981AH_TOP([/* GNU Emacs site configuration template file. 
    2941    Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007 
    2942              Free Software Foundation, Inc. 
     2982   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 
     2983     2006, 2007, 2008  Free Software Foundation, Inc. 
    29432984 
    29442985This file is part of GNU Emacs. 
    …… 
    29462987GNU Emacs is free software; you can redistribute it and/or modify 
    29472988it under the terms of the GNU General Public License as published by 
    2948 the Free Software Foundation; either version 2, or (at your option) 
     2989the Free Software Foundation; either version 3, or (at your option) 
    29492990any later version. 
    29502991