Mercurial > emacs

comparison configure.in @ 108882:3ff97bad1c47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move UNEXEC definition to autoconf. * configure.in (unxec): Do not define and substitute. (UNEXEC_OBJ): New output variable, replaces cpp UNEXEC. * msdos/sed1v2.inp (UNEXEC_OBJ): Use UNEXEC_OBJ instead of unexec. * src/s/usg5-4.h (UNEXEC): Remove, move to configure.in. * src/s/sol2-10.h (UNEXEC): * src/s/irix6-5.h (UNEXEC): * src/s/hpux10-20.h (UNEXEC): * src/s/gnu-linux.h (UNEXEC): * src/s/darwin.h (UNEXEC): * src/s/cygwin.h (UNEXEC): * src/s/bsd-common.h (UNEXEC): * src/s/aix4-2.h (UNEXEC): * src/m/alpha.h (UNEXEC): Likewise. * src/Makefile.in (UNEXEC_OBJ): Define using @UNEXEC_OBJ@.
author Dan Nicolaescu <dann@ics.uci.edu>
date Thu, 03 Jun 2010 15:16:02 -0700
parents 4e8dcb0d6fe0
children 2f67737b7fe5
comparison
equal deleted inserted replaced
108881:5582106cddf0 108882:3ff97bad1c47
852 #include "'${srcdir}'/src/'${opsysfile}'" 852 #include "'${srcdir}'/src/'${opsysfile}'"
853 #include "'${srcdir}'/src/'${machfile}'" 853 #include "'${srcdir}'/src/'${machfile}'"
854 854
855 configure___ LIBX=-lX11 855 configure___ LIBX=-lX11
856 856
857 configure___ unexec=UNEXEC
858
859 #ifdef CANNOT_DUMP 857 #ifdef CANNOT_DUMP
860 configure___ cannot_dump=yes 858 configure___ cannot_dump=yes
861 #else 859 #else
862 configure___ cannot_dump=no 860 configure___ cannot_dump=no
863 #endif 861 #endif
923 rm ${tempcname} 921 rm ${tempcname}
924 922
925 923
926 AC_SUBST(cannot_dump) 924 AC_SUBST(cannot_dump)
927 925
926 UNEXEC_OBJ=unexelf.o
927 case "$opsys" in
928 aix4-2)
929 UNEXEC_OBJ=unexaix.o
930 ;;
931 cygwin)
932 UNEXEC_OBJ=unexcw.o
933 ;;
934 darwin)
935 UNEXEC_OBJ=unexmacosx.o
936 ;;
937 hpux10-20 | hpux11)
938 UNEXEC_OBJ=unexhp9k800.o
939 ;;
940 sol2-10)
941 # Use the Solaris dldump() function, called from unexsol.c, to dump
942 # emacs, instead of the generic ELF dump code found in unexelf.c.
943 # The resulting binary has a complete symbol table, and is better
944 # for debugging and other observability tools (debuggers, pstack, etc).
945 #
946 # If you encounter a problem using dldump(), please consider sending
947 # a message to the OpenSolaris tools-linking mailing list:
948 # http://mail.opensolaris.org/mailman/listinfo/tools-linking
949 #
950 # It is likely that dldump() works with older Solaris too, but this has
951 # not been tested, so for now this change is for Solaris 10 or newer.
952 UNEXEC_OBJ=unexsol.o
953 ;;
954 esac
928 955
929 LD_SWITCH_SYSTEM= 956 LD_SWITCH_SYSTEM=
930 case "$opsys" in 957 case "$opsys" in
931 freebsd) 958 freebsd)
932 ## Let `ld' find image libs and similar things in /usr/local/lib. 959 ## Let `ld' find image libs and similar things in /usr/local/lib.
983 if test "x$GCC" = "xyes"; then 1010 if test "x$GCC" = "xyes"; then
984 C_SWITCH_MACHINE="-fno-common" 1011 C_SWITCH_MACHINE="-fno-common"
985 else 1012 else
986 AC_MSG_ERROR([What gives? Fix me if DEC Unix supports ELF now.]) 1013 AC_MSG_ERROR([What gives? Fix me if DEC Unix supports ELF now.])
987 fi 1014 fi
1015 else
1016 UNEXEC_OBJ=unexalpha.o
988 fi 1017 fi
989 fi 1018 fi
990 AC_SUBST(C_SWITCH_MACHINE) 1019 AC_SUBST(C_SWITCH_MACHINE)
991 1020
1021 AC_SUBST(UNEXEC_OBJ)
992 1022
993 C_SWITCH_SYSTEM= 1023 C_SWITCH_SYSTEM=
994 ## Some programs in src produce warnings saying certain subprograms 1024 ## Some programs in src produce warnings saying certain subprograms
995 ## are too complex and need a MAXMEM value greater than 2000 for 1025 ## are too complex and need a MAXMEM value greater than 2000 for
996 ## additional optimization. --nils@exp-math.uni-essen.de 1026 ## additional optimization. --nils@exp-math.uni-essen.de
3080 AC_SUBST(archlibdir) 3110 AC_SUBST(archlibdir)
3081 AC_SUBST(docdir) 3111 AC_SUBST(docdir)
3082 AC_SUBST(bitmapdir) 3112 AC_SUBST(bitmapdir)
3083 AC_SUBST(gamedir) 3113 AC_SUBST(gamedir)
3084 AC_SUBST(gameuser) 3114 AC_SUBST(gameuser)
3085 AC_SUBST(unexec)
3086 ## FIXME? Nothing uses @LD_SWITCH_X_SITE@. 3115 ## FIXME? Nothing uses @LD_SWITCH_X_SITE@.
3087 ## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the 3116 ## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the
3088 ## end of LIBX_BASE, but nothing ever set it. 3117 ## end of LIBX_BASE, but nothing ever set it.
3089 AC_SUBST(LD_SWITCH_X_SITE) 3118 AC_SUBST(LD_SWITCH_X_SITE)
3090 AC_SUBST(C_SWITCH_X_SITE) 3119 AC_SUBST(C_SWITCH_X_SITE)