Commit 9d2818d6 authored by Dan Nicolaescu's avatar Dan Nicolaescu

* configure.in: Remove references to obsolete variables and

systems.
* configure: Regenerate.

* Makefile.in (NO_SHORTNAMES):
* emacsclient.c (NO_SHORTNAMES):
* fakemail.c (NO_SHORTNAMES):
* make-docfile.c (NO_SHORTNAMES):
* movemail.c (NO_SHORTNAMES):
* pop.c (NO_SHORTNAMES): Remove references to obsolete variable.

* config.nt (SHORTNAMES): Remove reference to obsolete variable.

* s/vms4-0.h:
* s/vms4-2.h:
* s/vms4-4.h:
* s/vms5-5.h: Remove, unused.

* s/irix5-2.h:
* s/irix6-0.h:
* s/riscos5.h:
* s/mach-bsd4-3.h:
* m/mips4.h: Remove files for obsolete systems

* Makefile.in:
* filelock.c:
* unexmips.c:
* m/hp9000s300.h:
* m/iris4d.h:
* s/aix3-1.h:
* s/hpux.h:
* s/msdos.h:
* s/usg5-0.h:
* s/usg5-2-2.h:
* s/usg5-2.h:
* s/usg5-3.h: Remove references to obsolete variables.

* s/irix5-0.h: Remove, move all the contents ...
* s/irix6-5.h: ... here.  Simplify.
* config.in: Regenerate.
parent 5cd53af5
2008-02-24 Dan Nicolaescu <dann@ics.uci.edu>
* configure.in: Remove references to obsolete variables and
systems.
* configure: Regenerate.
2008-02-21 Glenn Morris <rgm@gnu.org> 2008-02-21 Glenn Morris <rgm@gnu.org>
* Makefile.in (set_installuser): New. * Makefile.in (set_installuser): New.
......
...@@ -1345,7 +1345,6 @@ Optional Features: ...@@ -1345,7 +1345,6 @@ Optional Features:
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--without-gcc don't use GCC to compile Emacs even if GCC is found
--without-pop don't support POP mail retrieval with movemail --without-pop don't support POP mail retrieval with movemail
--with-kerberos support Kerberos-authenticated POP --with-kerberos support Kerberos-authenticated POP
--with-kerberos5 support Kerberos version 5 authenticated POP --with-kerberos5 support Kerberos version 5 authenticated POP
...@@ -1363,7 +1362,6 @@ Optional Packages: ...@@ -1363,7 +1362,6 @@ Optional Packages:
--without-xft don't use XFT for anti aliased fonts --without-xft don't use XFT for anti aliased fonts
--without-libotf don't use libotf for OpenType font support --without-libotf don't use libotf for OpenType font support
--without-m17n-flt don't use m17n-flt for text shaping --without-m17n-flt don't use m17n-flt for text shaping
--with-gtk use GTK toolkit
--without-toolkit-scroll-bars --without-toolkit-scroll-bars
don't use Motif or Xaw3d scroll bars don't use Motif or Xaw3d scroll bars
--without-xaw3d don't use Xaw3d --without-xaw3d don't use Xaw3d
...@@ -1372,6 +1370,7 @@ Optional Packages: ...@@ -1372,6 +1370,7 @@ Optional Packages:
--without-gpm don't use -lgpm for mouse support on a GNU/Linux --without-gpm don't use -lgpm for mouse support on a GNU/Linux
console console
--without-dbus don't compile with D-Bus support --without-dbus don't compile with D-Bus support
--with-pkg-config-prog=PATH --with-pkg-config-prog=PATH
Path to pkg-config for finding GTK and librsvg Path to pkg-config for finding GTK and librsvg
--with-x use the X Window System --with-x use the X Window System
...@@ -1852,13 +1851,6 @@ gameuser=games ...@@ -1852,13 +1851,6 @@ gameuser=games
# Check whether --with-gcc was given.
if test "${with_gcc+set}" = set; then
withval=$with_gcc;
fi
# Check whether --with-pop was given. # Check whether --with-pop was given.
if test "${with_pop+set}" = set; then if test "${with_pop+set}" = set; then
withval=$with_pop; withval=$with_pop;
...@@ -2046,14 +2038,6 @@ fi ...@@ -2046,14 +2038,6 @@ fi
# Check whether --with-gtk was given.
if test "${with_gtk+set}" = set; then
withval=$with_gtk;
else
with_gtk=no
fi
# Check whether --with-toolkit-scroll-bars was given. # Check whether --with-toolkit-scroll-bars was given.
if test "${with_toolkit_scroll_bars+set}" = set; then if test "${with_toolkit_scroll_bars+set}" = set; then
withval=$with_toolkit_scroll_bars; withval=$with_toolkit_scroll_bars;
...@@ -2104,6 +2088,28 @@ fi ...@@ -2104,6 +2088,28 @@ fi
# Check whether --with-gtk was given.
if test "${with_gtk+set}" = set; then
withval=$with_gtk; { { echo "$as_me:$LINENO: error: --with-gtk has been removed. Use --with-x-toolkit to
specify a toolkit." >&5
echo "$as_me: error: --with-gtk has been removed. Use --with-x-toolkit to
specify a toolkit." >&2;}
{ (exit 1); exit 1; }; }
fi
# Check whether --with-gcc was given.
if test "${with_gcc+set}" = set; then
withval=$with_gcc; { { echo "$as_me:$LINENO: error: --with-gcc has been removed. Set the \`CC' environment
variable to specify a compiler." >&5
echo "$as_me: error: --with-gcc has been removed. Set the \`CC' environment
variable to specify a compiler." >&2;}
{ (exit 1); exit 1; }; }
fi
# Check whether --with-pkg-config-prog was given. # Check whether --with-pkg-config-prog was given.
if test "${with_pkg_config_prog+set}" = set; then if test "${with_pkg_config_prog+set}" = set; then
withval=$with_pkg_config_prog; withval=$with_pkg_config_prog;
...@@ -2451,23 +2457,6 @@ _ACEOF ...@@ -2451,23 +2457,6 @@ _ACEOF
esac esac
;; ;;
## Alpha (DEC) machines.
alpha*-dec-osf* )
machine=alpha opsys=osf1
# This is needed to find X11R6.1 libraries for certain tests.
NON_GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
# NON_GNU_CPP is necessary on 5.0 to avoid mangling src/Makefile
# due to non-traditional preprocessing with the current compiler
# defaults. OSF 4 can also have that compiler version, and there
# seems always to have been a usable /usr/bin/cpp.
NON_GNU_CPP=/usr/bin/cpp
case "${canonical}" in
alpha*-dec-osf[5-9]*)
opsys=osf5-0 ;;
esac
;;
alpha*-*-linux-gnu* ) alpha*-*-linux-gnu* )
machine=alpha opsys=gnu-linux machine=alpha opsys=gnu-linux
;; ;;
...@@ -2513,13 +2502,6 @@ _ACEOF ...@@ -2513,13 +2502,6 @@ _ACEOF
mips-dec-ultrix* ) mips-dec-ultrix* )
machine=pmax opsys=ultrix4-3 machine=pmax opsys=ultrix4-3
;; ;;
mips-dec-osf* )
machine=pmax opsys=osf1
;;
mips-dec-mach_bsd4.3* )
machine=pmax opsys=mach-bsd4-3
;;
## HP 9000 series 200 or 300 ## HP 9000 series 200 or 300
m68*-hp-bsd* ) m68*-hp-bsd* )
machine=hp9000s300 opsys=bsd4-3 machine=hp9000s300 opsys=bsd4-3
...@@ -2644,27 +2626,6 @@ _ACEOF ...@@ -2644,27 +2626,6 @@ _ACEOF
## This is not necessarily all workstations using the MIPS processor - ## This is not necessarily all workstations using the MIPS processor -
## Irises are produced by SGI, and DECstations by DEC. ## Irises are produced by SGI, and DECstations by DEC.
## etc/MACHINES lists mips.h and mips4.h as possible machine files,
## and usg5-2-2 and bsd4-3 as possible OS files. The only guidance
## it gives for choosing between the alternatives seems to be "Use
## -machine=mips4 for RISCOS version 4; use -opsystem=bsd4-3 with
## the BSD world." I'll assume that these are instructions for
## handling two odd situations, and that every other situation
## should use mips.h and usg5-2-2, they being listed first.
mips-mips-usg* )
machine=mips4
## Fall through to the general code at the bottom to decide on the OS.
;;
mips-mips-riscos4* )
machine=mips4 opsys=bsd4-3
NON_GNU_CC="cc -systype bsd43"
NON_GNU_CPP="cc -systype bsd43 -E"
;;
mips-mips-riscos5* )
machine=mips4 opsys=riscos5
NON_GNU_CC="cc -systype bsd43"
NON_GNU_CPP="cc -systype bsd43 -E"
;;
mips-mips-bsd* ) mips-mips-bsd* )
machine=mips opsys=bsd4-3 machine=mips opsys=bsd4-3
;; ;;
...@@ -2699,20 +2660,6 @@ _ACEOF ...@@ -2699,20 +2660,6 @@ _ACEOF
NON_GNU_CPP="/lib/cpp -D_LANGUAGE_C" NON_GNU_CPP="/lib/cpp -D_LANGUAGE_C"
NON_GCC_TEST_OPTIONS="-D_LANGUAGE_C" NON_GCC_TEST_OPTIONS="-D_LANGUAGE_C"
;; ;;
mips-sgi-irix6* )
machine=iris4d opsys=irix6-0
# It's not clear whether -D_LANGUAGE_C is necessary as it is for 6.5,
# but presumably it does no harm.
NON_GNU_CPP="/lib/cpp -D_LANGUAGE_C"
# -32 probably isn't necessary in later v.6s -- anyone know which?
NON_GCC_TEST_OPTIONS=-32
;;
mips-sgi-irix5.[01]* )
machine=iris4d opsys=irix5-0
;;
mips-sgi-irix5* | mips-sgi-irix* )
machine=iris4d opsys=irix5-2
;;
## Suns ## Suns
sparc-*-linux-gnu* | sparc64-*-linux-gnu* ) sparc-*-linux-gnu* | sparc64-*-linux-gnu* )
...@@ -2805,7 +2752,6 @@ _ACEOF ...@@ -2805,7 +2752,6 @@ _ACEOF
*-darwin* ) opsys=darwin *-darwin* ) opsys=darwin
CPP="${CC-cc} -E -no-cpp-precomp" CPP="${CC-cc} -E -no-cpp-precomp"
;; ;;
*-xenix* ) opsys=xenix ;;
*-linux-gnu* ) opsys=gnu-linux ;; *-linux-gnu* ) opsys=gnu-linux ;;
*-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
*-sysv5uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; *-sysv5uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
...@@ -2906,11 +2852,6 @@ test -n "$CC" && cc_specified=yes ...@@ -2906,11 +2852,6 @@ test -n "$CC" && cc_specified=yes
# Save the value of CFLAGS that the user specified. # Save the value of CFLAGS that the user specified.
SPECIFIED_CFLAGS="$CFLAGS" SPECIFIED_CFLAGS="$CFLAGS"
case ${with_gcc} in
"yes" ) CC="gcc" GCC=yes ;;
"no" ) : ${CC=cc} ;;
* )
esac
ac_ext=c ac_ext=c
ac_cpp='$CPP $CPPFLAGS' ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
...@@ -5154,14 +5095,10 @@ configure___ c_switch_machine=C_SWITCH_MACHINE ...@@ -5154,14 +5095,10 @@ configure___ c_switch_machine=C_SWITCH_MACHINE
#define LIB_X11_LIB -lX11 #define LIB_X11_LIB -lX11
#endif #endif
#ifndef LIBX11_MACHINE
#define LIBX11_MACHINE
#endif
#ifndef LIBX11_SYSTEM #ifndef LIBX11_SYSTEM
#define LIBX11_SYSTEM #define LIBX11_SYSTEM
#endif #endif
configure___ LIBX=LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM configure___ LIBX=LIB_X11_LIB LIBX11_SYSTEM
#ifdef UNEXEC #ifdef UNEXEC
configure___ unexec=UNEXEC configure___ unexec=UNEXEC
...@@ -9272,7 +9209,7 @@ fi ...@@ -9272,7 +9209,7 @@ fi
if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then
if test "${with_carbon+set}" != set \ if test "${with_carbon+set}" != set \
&& test "${carbon_appdir_x+set}" != set; then && test "${carbon_appdir_x+set}" != set; then
for var in with_x with_x_toolkit with_gtk with_xim \ for var in with_x with_x_toolkit with_xim \
with_xpm with_jpeg with_tiff with_gif with_png; do with_xpm with_jpeg with_tiff with_gif with_png; do
if eval test \"\${$var+set}\" = set; then if eval test \"\${$var+set}\" = set; then
HAVE_CARBON=no HAVE_CARBON=no
...@@ -9295,13 +9232,7 @@ case "${window_system}" in ...@@ -9295,13 +9232,7 @@ case "${window_system}" in
gtk ) with_gtk=yes gtk ) with_gtk=yes
USE_X_TOOLKIT=none ;; USE_X_TOOLKIT=none ;;
no ) USE_X_TOOLKIT=none ;; no ) USE_X_TOOLKIT=none ;;
* ) * ) USE_X_TOOLKIT=maybe ;;
if test x"$with_gtk" = xyes; then
USE_X_TOOLKIT=none
else
USE_X_TOOLKIT=maybe
fi
;;
esac esac
;; ;;
mac | none ) mac | none )
...@@ -10267,17 +10198,6 @@ _ACEOF ...@@ -10267,17 +10198,6 @@ _ACEOF
fi fi
{ echo "$as_me:$LINENO: checking for XFree86 in /usr/X386" >&5
echo $ECHO_N "checking for XFree86 in /usr/X386... $ECHO_C" >&6; }
if test -d /usr/X386/include; then
HAVE_XFREE386=yes
: ${C_SWITCH_X_SITE="-I/usr/X386/include"}
else
HAVE_XFREE386=no
fi
{ echo "$as_me:$LINENO: result: $HAVE_XFREE386" >&5
echo "${ECHO_T}$HAVE_XFREE386" >&6; }
case ${host_os} in case ${host_os} in
aix*) aix*)
...@@ -10828,16 +10748,7 @@ fi ...@@ -10828,16 +10748,7 @@ fi
HAVE_GTK=no HAVE_GTK=no
if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then
USE_X_TOOLKIT=none
fi
if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk" || \
test "$USE_X_TOOLKIT" = "maybe"; then
if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
{ { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5
echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;}
{ (exit 1); exit 1; }; };
fi
GLIB_REQUIRED=2.6 GLIB_REQUIRED=2.6
GTK_REQUIRED=2.6 GTK_REQUIRED=2.6
GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
...@@ -18637,13 +18548,11 @@ _ACEOF ...@@ -18637,13 +18548,11 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <sys/types.h> /* for off_t */ #include <stdio.h>
#include <stdio.h>
int int
main () main ()
{ {
int (*fp) (FILE *, off_t, int) = fseeko; return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
; ;
return 0; return 0;
} }
...@@ -18683,13 +18592,11 @@ cat confdefs.h >>conftest.$ac_ext ...@@ -18683,13 +18592,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#define _LARGEFILE_SOURCE 1 #define _LARGEFILE_SOURCE 1
#include <sys/types.h> /* for off_t */ #include <stdio.h>
#include <stdio.h>
int int
main () main ()
{ {
int (*fp) (FILE *, off_t, int) = fseeko; return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
; ;
return 0; return 0;
} }
...@@ -23886,13 +23793,6 @@ cat >>confdefs.h <<\_ACEOF ...@@ -23886,13 +23793,6 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_X11 1 #define HAVE_X11 1
_ACEOF _ACEOF
fi
if test "${HAVE_XFREE386}" = "yes" ; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_XFREE386 1
_ACEOF
fi fi
if test "${HAVE_MENUS}" = "yes" ; then if test "${HAVE_MENUS}" = "yes" ; then
......
...@@ -377,23 +377,6 @@ dnl see the `changequote' comment above. ...@@ -377,23 +377,6 @@ dnl see the `changequote' comment above.
esac esac
;; ;;
## Alpha (DEC) machines.
alpha*-dec-osf* )
machine=alpha opsys=osf1
# This is needed to find X11R6.1 libraries for certain tests.
NON_GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
# NON_GNU_CPP is necessary on 5.0 to avoid mangling src/Makefile
# due to non-traditional preprocessing with the current compiler
# defaults. OSF 4 can also have that compiler version, and there
# seems always to have been a usable /usr/bin/cpp.
NON_GNU_CPP=/usr/bin/cpp
case "${canonical}" in
alpha*-dec-osf[5-9]*)
opsys=osf5-0 ;;
esac
;;
alpha*-*-linux-gnu* ) alpha*-*-linux-gnu* )
machine=alpha opsys=gnu-linux machine=alpha opsys=gnu-linux
;; ;;
...@@ -439,13 +422,6 @@ dnl see the `changequote' comment above. ...@@ -439,13 +422,6 @@ dnl see the `changequote' comment above.
mips-dec-ultrix* ) mips-dec-ultrix* )
machine=pmax opsys=ultrix4-3 machine=pmax opsys=ultrix4-3
;; ;;
mips-dec-osf* )
machine=pmax opsys=osf1
;;
mips-dec-mach_bsd4.3* )
machine=pmax opsys=mach-bsd4-3
;;
## HP 9000 series 200 or 300 ## HP 9000 series 200 or 300
m68*-hp-bsd* ) m68*-hp-bsd* )
machine=hp9000s300 opsys=bsd4-3 machine=hp9000s300 opsys=bsd4-3
...@@ -570,27 +546,6 @@ dnl see the `changequote' comment above. ...@@ -570,27 +546,6 @@ dnl see the `changequote' comment above.
## This is not necessarily all workstations using the MIPS processor - ## This is not necessarily all workstations using the MIPS processor -
## Irises are produced by SGI, and DECstations by DEC. ## Irises are produced by SGI, and DECstations by DEC.
## etc/MACHINES lists mips.h and mips4.h as possible machine files,
## and usg5-2-2 and bsd4-3 as possible OS files. The only guidance
## it gives for choosing between the alternatives seems to be "Use
## -machine=mips4 for RISCOS version 4; use -opsystem=bsd4-3 with
## the BSD world." I'll assume that these are instructions for
## handling two odd situations, and that every other situation
## should use mips.h and usg5-2-2, they being listed first.
mips-mips-usg* )
machine=mips4
## Fall through to the general code at the bottom to decide on the OS.
;;
mips-mips-riscos4* )
machine=mips4 opsys=bsd4-3
NON_GNU_CC="cc -systype bsd43"
NON_GNU_CPP="cc -systype bsd43 -E"
;;
mips-mips-riscos5* )
machine=mips4 opsys=riscos5
NON_GNU_CC="cc -systype bsd43"
NON_GNU_CPP="cc -systype bsd43 -E"
;;
mips-mips-bsd* ) mips-mips-bsd* )
machine=mips opsys=bsd4-3 machine=mips opsys=bsd4-3
;; ;;
...@@ -625,20 +580,6 @@ dnl see the `changequote' comment above. ...@@ -625,20 +580,6 @@ dnl see the `changequote' comment above.
NON_GNU_CPP="/lib/cpp -D_LANGUAGE_C" NON_GNU_CPP="/lib/cpp -D_LANGUAGE_C"
NON_GCC_TEST_OPTIONS="-D_LANGUAGE_C" NON_GCC_TEST_OPTIONS="-D_LANGUAGE_C"
;; ;;
mips-sgi-irix6* )
machine=iris4d opsys=irix6-0
# It's not clear whether -D_LANGUAGE_C is necessary as it is for 6.5,
# but presumably it does no harm.
NON_GNU_CPP="/lib/cpp -D_LANGUAGE_C"
# -32 probably isn't necessary in later v.6s -- anyone know which?
NON_GCC_TEST_OPTIONS=-32
;;
mips-sgi-irix5.[01]* )
machine=iris4d opsys=irix5-0
;;
mips-sgi-irix5* | mips-sgi-irix* )
machine=iris4d opsys=irix5-2
;;
## Suns ## Suns
sparc-*-linux-gnu* | sparc64-*-linux-gnu* ) sparc-*-linux-gnu* | sparc64-*-linux-gnu* )
...@@ -731,7 +672,6 @@ dnl see the `changequote' comment above. ...@@ -731,7 +672,6 @@ dnl see the `changequote' comment above.
*-darwin* ) opsys=darwin *-darwin* ) opsys=darwin
CPP="${CC-cc} -E -no-cpp-precomp" CPP="${CC-cc} -E -no-cpp-precomp"
;; ;;
*-xenix* ) opsys=xenix ;;
*-linux-gnu* ) opsys=gnu-linux ;; *-linux-gnu* ) opsys=gnu-linux ;;
*-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
*-sysv5uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; *-sysv5uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
...@@ -2809,17 +2749,6 @@ AH_BOTTOM([ ...@@ -2809,17 +2749,6 @@ AH_BOTTOM([
#include config_opsysfile #include config_opsysfile
#include config_machfile #include config_machfile
/* Load in the conversion definitions if this system
needs them and the source file being compiled has not
said to inhibit this. There should be no need for you
to alter these lines. */
#ifdef SHORTNAMES
#ifndef NO_SHORTNAMES
#include "../shortnames/remap.h"
#endif /* not NO_SHORTNAMES */
#endif /* SHORTNAMES */
/* If no remapping takes place, static variables cannot be dumped as /* If no remapping takes place, static variables cannot be dumped as
pure, so don't worry about the `static' keyword. */ pure, so don't worry about the `static' keyword. */
#ifdef NO_REMAP #ifdef NO_REMAP
......
2008-02-24 Dan Nicolaescu <dann@ics.uci.edu>
* Makefile.in (NO_SHORTNAMES):
* emacsclient.c (NO_SHORTNAMES):
* fakemail.c (NO_SHORTNAMES):
* make-docfile.c (NO_SHORTNAMES):
* movemail.c (NO_SHORTNAMES):
* pop.c (NO_SHORTNAMES): Remove references to obsolete variable.
2008-02-23 Jason Rumney <jasonr@gnu.org> 2008-02-23 Jason Rumney <jasonr@gnu.org>
* makefile.w32-in (MOUSE_SUPPORT): Remove duplicate tooltip.elc. * makefile.w32-in (MOUSE_SUPPORT): Remove duplicate tooltip.elc.
......
...@@ -141,7 +141,6 @@ MOVE_FLAGS= ...@@ -141,7 +141,6 @@ MOVE_FLAGS=
# ========================== start of cpp stuff ======================= # ========================== start of cpp stuff =======================
/* From here on, comments must be done in C syntax. */ /* From here on, comments must be done in C syntax. */
#define NO_SHORTNAMES
#define THIS_IS_MAKEFILE #define THIS_IS_MAKEFILE
#define NOT_C_CODE #define NOT_C_CODE
#include "../src/config.h" #include "../src/config.h"
......
...@@ -20,8 +20,6 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ...@@ -20,8 +20,6 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */ Boston, MA 02110-1301, USA. */
#define NO_SHORTNAMES
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
......
...@@ -19,7 +19,6 @@ along with GNU Emacs; see the file COPYING. If not, write to ...@@ -19,7 +19,6 @@ along with GNU Emacs; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */ Boston, MA 02110-1301, USA. */
#define NO_SHORTNAMES
#define _XOPEN_SOURCE 500 /* for cuserid */ #define _XOPEN_SOURCE 500 /* for cuserid */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
......
...@@ -35,7 +35,6 @@ Boston, MA 02110-1301, USA. */ ...@@ -35,7 +35,6 @@ Boston, MA 02110-1301, USA. */
Then comes the documentation for that function or variable. Then comes the documentation for that function or variable.
*/ */
#define NO_SHORTNAMES /* Tell config not to load remap.h */
#include <config.h> #include <config.h>
/* defined to be emacs_main, sys_fopen, etc. in config.h */ /* defined to be emacs_main, sys_fopen, etc. in config.h */
......
...@@ -55,7 +55,6 @@ Boston, MA 02110-1301, USA. */ ...@@ -55,7 +55,6 @@ Boston, MA 02110-1301, USA. */
* *
*/ */
#define NO_SHORTNAMES /* Tell config not to load remap.h */
#include <config.h> #include <config.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
......
...@@ -21,7 +21,6 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ...@@ -21,7 +21,6 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */ Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#define NO_SHORTNAMES /* Tell config not to load remap.h */
#include <config.h> #include <config.h>
#else #else
#define MAIL_USE_POP #define MAIL_USE_POP
......
2008-02-24 Dan Nicolaescu <dann@ics.uci.edu>
* config.nt (SHORTNAMES): Remove reference to obsolete variable.