Regenerate configure, src/config.in.
This commit is contained in:
Glenn Morris
parent
fa5e317ac0
commit
ede4834a2f
2 changed files with 122 additions and 29 deletions
147
configure
vendored
147
configure
vendored
|
|
@ -703,6 +703,8 @@ INSTALL_INFO
|
|||
GZIP_PROG
|
||||
MAKEINFO
|
||||
LIB_MATH
|
||||
C_SWITCH_MACHINE
|
||||
C_SWITCH_SYSTEM
|
||||
CRT_DIR
|
||||
LIBSOUND
|
||||
PKG_CONFIG
|
||||
|
|
@ -711,6 +713,8 @@ ALSA_LIBS
|
|||
CFLAGS_SOUND
|
||||
SET_MAKE
|
||||
XMKMF
|
||||
LD_SWITCH_X_SITE_AUX
|
||||
LD_SWITCH_X_SITE_AUX_RPATH
|
||||
NS_OBJ
|
||||
NS_SUPPORT
|
||||
HAVE_XSERVER
|
||||
|
|
@ -775,11 +779,8 @@ archlibdir
|
|||
bitmapdir
|
||||
gamedir
|
||||
gameuser
|
||||
c_switch_system
|
||||
c_switch_machine
|
||||
unexec
|
||||
LD_SWITCH_X_SITE
|
||||
LD_SWITCH_X_SITE_AUX
|
||||
C_SWITCH_X_SITE
|
||||
C_SWITCH_X_SYSTEM
|
||||
X_TOOLKIT_TYPE
|
||||
|
|
@ -806,6 +807,7 @@ LIBX_OTHER
|
|||
CYGWIN_OBJ
|
||||
PRE_ALLOC_OBJ
|
||||
POST_ALLOC_OBJ
|
||||
LD_SWITCH_SYSTEM_TEMACS
|
||||
LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
ac_user_opts='
|
||||
|
|
@ -5866,15 +5868,7 @@ echo '
|
|||
#ifndef LIBS_SYSTEM
|
||||
#define LIBS_SYSTEM
|
||||
#endif
|
||||
#ifndef C_SWITCH_SYSTEM
|
||||
#define C_SWITCH_SYSTEM
|
||||
#endif
|
||||
#ifndef C_SWITCH_MACHINE
|
||||
#define C_SWITCH_MACHINE
|
||||
#endif
|
||||
configure___ libsrc_libs=LIBS_SYSTEM
|
||||
configure___ c_switch_system=C_SWITCH_SYSTEM
|
||||
configure___ c_switch_machine=C_SWITCH_MACHINE
|
||||
|
||||
configure___ LIBX=-lX11
|
||||
|
||||
|
|
@ -5908,10 +5902,6 @@ configure___ use_mmap_for_buffers=no
|
|||
#define LD_SWITCH_SYSTEM
|
||||
#endif
|
||||
|
||||
#ifndef LD_SWITCH_X_SITE_AUX
|
||||
#define LD_SWITCH_X_SITE_AUX
|
||||
#endif
|
||||
|
||||
configure___ ld_switch_system=LD_SWITCH_SYSTEM
|
||||
|
||||
#ifdef THIS_IS_CONFIGURE
|
||||
|
|
@ -5952,12 +5942,98 @@ rm ${tempcname}
|
|||
|
||||
ac_link="$ac_link $ld_switch_system"
|
||||
|
||||
|
||||
C_SWITCH_MACHINE=
|
||||
if test "$machine" = "alpha"; then
|
||||
{ $as_echo "$as_me:$LINENO: checking whether __ELF__ is declared" >&5
|
||||
$as_echo_n "checking whether __ELF__ is declared... " >&6; }
|
||||
if test "${ac_cv_have_decl___ELF__+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
int
|
||||
main ()
|
||||
{
|
||||
#ifndef __ELF__
|
||||
(void) __ELF__;
|
||||
#endif
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo") >&5
|
||||
(eval "$ac_compile") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then
|
||||
ac_cv_have_decl___ELF__=yes
|
||||
else
|
||||
$as_echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_have_decl___ELF__=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___ELF__" >&5
|
||||
$as_echo "$ac_cv_have_decl___ELF__" >&6; }
|
||||
|
||||
if test "$ac_cv_have_decl___ELF__" = "yes"; then
|
||||
## With ELF, make sure that all common symbols get allocated to in the
|
||||
## data section. Otherwise, the dump of temacs may miss variables in
|
||||
## the shared library that have been initialized. For example, with
|
||||
## GNU libc, __malloc_initialized would normally be resolved to the
|
||||
## shared library's .bss section, which is fatal.
|
||||
if test "x$GCC" = "xyes"; then
|
||||
C_SWITCH_MACHINE="-fno-common"
|
||||
else
|
||||
{ { $as_echo "$as_me:$LINENO: error: What gives? Fix me if DEC Unix supports ELF now." >&5
|
||||
$as_echo "$as_me: error: What gives? Fix me if DEC Unix supports ELF now." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
C_SWITCH_SYSTEM=
|
||||
## Some programs in src produce warnings saying certain subprograms
|
||||
## are too complex and need a MAXMEM value greater than 2000 for
|
||||
## additional optimization. --nils@exp-math.uni-essen.de
|
||||
test "$opsys" = "aix4.2" && test "x$GCC" = "xyes" && \
|
||||
C_SWITCH_SYSTEM="-ma -qmaxmem=4000"
|
||||
## gnu-linux might need -D_BSD_SOURCE on old libc5 systems.
|
||||
## It is redundant in glibc2, since we define _GNU_SOURCE.
|
||||
|
||||
|
||||
|
||||
### Make sure subsequent tests use flags consistent with the build flags.
|
||||
|
||||
if test x"${OVERRIDE_CPPFLAGS}" != x; then
|
||||
CPPFLAGS="${OVERRIDE_CPPFLAGS}"
|
||||
else
|
||||
CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS"
|
||||
CPPFLAGS="$C_SWITCH_SYSTEM $C_SWITCH_MACHINE $CPPFLAGS"
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -9728,17 +9804,19 @@ fi
|
|||
## Workaround for bug in autoconf <= 2.62.
|
||||
## http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01551.html
|
||||
## No need to do anything special for these standard directories.
|
||||
## This is an experiment, take it out if it causes problems.
|
||||
if test -n "${x_libraries}" && test x"${x_libraries}" != xNONE; then
|
||||
|
||||
x_libraries=`echo :${x_libraries}: | sed -e 's|:/usr/lib64:|:|g' -e 's|:/lib64:|:|g' -e 's|^:||' -e 's|:$||'`
|
||||
|
||||
fi
|
||||
|
||||
LD_SWITCH_X_SITE_AUX=
|
||||
LD_SWITCH_X_SITE_AUX_RPATH=
|
||||
if test "${x_libraries}" != NONE; then
|
||||
if test -n "${x_libraries}"; then
|
||||
LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
|
||||
LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"`
|
||||
LD_SWITCH_X_SITE_AUX_RPATH=`echo ${LD_SWITCH_X_SITE_AUX} | sed -e 's/-R/-Wl,-rpath,/'`
|
||||
fi
|
||||
x_default_search_path=""
|
||||
x_search_path=${x_libraries}
|
||||
|
|
@ -9761,6 +9839,9 @@ ${x_library}/X11/%T/%N%S"
|
|||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test "${x_includes}" != NONE && test -n "${x_includes}"; then
|
||||
C_SWITCH_X_SITE=-I`echo ${x_includes} | sed -e "s/:/ -I/g"`
|
||||
fi
|
||||
|
|
@ -25987,9 +26068,6 @@ fi
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -26036,11 +26114,6 @@ cat >>confdefs.h <<_ACEOF
|
|||
_ACEOF
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define LD_SWITCH_X_SITE_AUX ${LD_SWITCH_X_SITE_AUX}
|
||||
_ACEOF
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define C_SWITCH_X_SITE ${C_SWITCH_X_SITE}
|
||||
_ACEOF
|
||||
|
|
@ -26189,6 +26262,30 @@ fi
|
|||
|
||||
|
||||
|
||||
case "$opsys" in
|
||||
aix4-2) LD_SWITCH_SYSTEM_TEMACS="-Wl,-bnodelcsect" ;;
|
||||
|
||||
darwin)
|
||||
## The -headerpad option tells ld (see man page) to leave room at the
|
||||
## end of the header for adding load commands. Needed for dumping.
|
||||
## 0x690 is the total size of 30 segment load commands (at 56
|
||||
## each); under Cocoa 31 commands are required.
|
||||
if test "$HAVE_NS" = "yes"; then
|
||||
libs_nsgui="-framework AppKit"
|
||||
headerpad_extra=6C8
|
||||
else
|
||||
libs_nsgui=
|
||||
headerpad_extra=690
|
||||
fi
|
||||
LD_SWITCH_SYSTEM_TEMACS="-prebind $libs_nsgui -Xlinker -headerpad -Xlinker $headerpad_extra"
|
||||
;;
|
||||
|
||||
*) LD_SWITCH_SYSTEM_TEMACS= ;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -807,10 +807,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|||
its own, you might want to add "-L/..." or something similar. */
|
||||
#undef LD_SWITCH_X_SITE
|
||||
|
||||
/* Define LD_SWITCH_X_SITE_AUX with an -R option in case it's needed (for
|
||||
Solaris, for example). */
|
||||
#undef LD_SWITCH_X_SITE_AUX
|
||||
|
||||
/* Define to 1 if localtime caches TZ. */
|
||||
#undef LOCALTIME_CACHE
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue