Commit ae629dae authored by Glenn Morris's avatar Glenn Morris
Browse files

Auto-commit of generated files.

parent 290af740
......@@ -488,8 +488,7 @@ LD_FIRSTFLAG = @LD_FIRSTFLAG@
LD_SWITCH_SYSTEM = @LD_SWITCH_SYSTEM@
LD_SWITCH_SYSTEM_TEMACS = @LD_SWITCH_SYSTEM_TEMACS@
LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@
LD_SWITCH_X_SITE_AUX = @LD_SWITCH_X_SITE_AUX@
LD_SWITCH_X_SITE_AUX_RPATH = @LD_SWITCH_X_SITE_AUX_RPATH@
LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@
LIBGIF = @LIBGIF@
LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
......
......@@ -474,9 +474,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `mail' library (-lmail). */
#undef HAVE_LIBMAIL
/* Define to 1 if you have the `ncurses' library (-lncurses). */
#undef HAVE_LIBNCURSES
/* Define to 1 if using libotf. */
#undef HAVE_LIBOTF
......
......@@ -1164,8 +1164,7 @@ LIB_STANDARD
NS_OBJC_OBJ
NS_OBJ
TEMACS_LDFLAGS2
LD_SWITCH_X_SITE_AUX_RPATH
LD_SWITCH_X_SITE_AUX
LD_SWITCH_X_SITE_RPATH
XMKMF
DEPFLAGS
MKDEPDIR
......@@ -8359,7 +8358,7 @@ esac
 
ac_link="$ac_link $LD_SWITCH_SYSTEM"
 
## This setting of LD_SWITCH_SYSTEM references LD_SWITCH_X_SITE_AUX,
## This setting of LD_SWITCH_SYSTEM references LD_SWITCH_X_SITE_RPATH,
## which has not been defined yet. When this was handled with cpp,
## it was expanded to null when configure sourced the s/*.h file.
## Thus LD_SWITCH_SYSTEM had different values in configure and the Makefiles.
......@@ -8371,8 +8370,7 @@ ac_link="$ac_link $LD_SWITCH_SYSTEM"
## LD_SWITCH_SYSTEM_TEMACS.
case "$opsys" in
netbsd|openbsd)
## _AUX_RPATH is like _AUX, but uses -rpath instead of -R.
LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_AUX_RPATH) $LD_SWITCH_SYSTEM" ;;
LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_RPATH) $LD_SWITCH_SYSTEM" ;;
esac
 
 
......@@ -10253,13 +10251,11 @@ else
window_system=x11
fi
 
LD_SWITCH_X_SITE_AUX=
LD_SWITCH_X_SITE_AUX_RPATH=
LD_SWITCH_X_SITE_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,/'`
LD_SWITCH_X_SITE_RPATH=-Wl,-rpath,`echo ${x_libraries} | sed -e "s/:/ -Wl,-rpath,/g"`
fi
x_default_search_path=""
x_search_path=${x_libraries}
......@@ -10284,7 +10280,6 @@ ${x_library}/X11/%T/%N%S"
fi
 
 
if test "${x_includes}" != NONE && test -n "${x_includes}"; then
C_SWITCH_X_SITE="$isystem"`echo ${x_includes} | sed -e "s/:/ $isystem/g"`
fi
......@@ -11089,9 +11084,9 @@ if test "${HAVE_X11}" = "yes"; then
CPPFLAGS="$C_SWITCH_X_SITE $CPPFLAGS"
 
# On Solaris, arrange for LD_RUN_PATH to point to the X libraries for tests.
# This is handled by LD_SWITCH_X_SITE_AUX during the real build,
# but it's more convenient here to set LD_RUN_PATH
# since this also works on hosts that don't understand LD_SWITCH_X_SITE_AUX.
# This is handled by LD_SWITCH_X_SITE_RPATH during the real build,
# but it's more convenient here to set LD_RUN_PATH since this
# also works on hosts that don't understand LD_SWITCH_X_SITE_RPATH.
if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then
LD_RUN_PATH=$x_libraries${LD_RUN_PATH+:}$LD_RUN_PATH
export LD_RUN_PATH
......@@ -14818,7 +14813,7 @@ $as_echo_n "checking for library containing tputs... " >&6; }
 
# Maybe curses should be tried earlier?
# See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35
for tputs_library in '' ncurses terminfo termcap curses; do
for tputs_library in '' tinfo ncurses terminfo termcap curses; do
OLIBS=$LIBS
if test -z "$tputs_library"; then
LIBS_TERMCAP=
......@@ -14879,42 +14874,28 @@ done
$as_echo "$msg" >&6; }
if test "X$msg" = Xno; then
as_fn_error "The required function \`tputs' was not found in any library.
These libraries were tried: libncurses, libterminfo, libtermcap, libcurses.
The following libraries were tried (in order):
libtinfo, libncurses, libterminfo, libtermcap, libcurses
Please try installing whichever of these libraries is most appropriate
for your system, together with its header files.
For example, a libncurses-dev(el) or similar package." "$LINENO" 5
fi
# Must define this when any termcap library is found.
$as_echo "#define HAVE_LIBNCURSES 1" >>confdefs.h
 
## FIXME This was the cpp logic, but I am not sure it is right.
## The above test has not necessarily found libncurses.
HAVE_LIBNCURSES=yes
## Use terminfo instead of termcap?
## Note only system files NOT using terminfo are:
## freebsd < 40000, ms-w32, msdos, netbsd < 599002500, and
## darwin|gnu without ncurses.
TERMINFO=no
## Use termcap instead of terminfo?
## Only true for: freebsd < 40000, ms-w32, msdos, netbsd < 599002500.
TERMINFO=yes
## FIXME? In the cases below where we unconditionally set
## LIBS_TERMCAP="-lncurses", this overrides LIBS_TERMCAP = -ltinfo,
## if that was found above to have tputs.
## Should we use the gnu* logic everywhere?
case "$opsys" in
## cygwin: Fewer environment variables to go wrong, more terminal types.
## hpux10-20: Use the system provided termcap(3) library.
## openbsd: David Mazieres <dm@reeducation-labor.lcs.mit.edu> says this
## is necessary. Otherwise Emacs dumps core when run -nw.
aix4-2|cygwin|hpux*|irix6-5|openbsd|sol2*|unixware) TERMINFO=yes ;;
## darwin: Prevents crashes when running Emacs in Terminal.app under 10.2.
## The ncurses library has been moved out of the System framework in
## Mac OS X 10.2. So if configure detects it, set the command-line
## option to use it.
darwin|gnu*)
## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.)
if test "x$HAVE_LIBNCURSES" = "xyes"; then
TERMINFO=yes
LIBS_TERMCAP="-lncurses"
fi
;;
darwin) LIBS_TERMCAP="-lncurses" ;;
gnu*) "x$LIBS_TERMCAP" = x && LIBS_TERMCAP="-lncurses" ;;
 
freebsd)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FreeBSD is new enough to use terminfo" >&5
......@@ -14950,34 +14931,31 @@ fi
$as_echo "$emacs_cv_freebsd_terminfo" >&6; }
 
if test $emacs_cv_freebsd_terminfo = yes; then
TERMINFO=yes
LIBS_TERMCAP="-lncurses"
else
TERMINFO=no
LIBS_TERMCAP="-ltermcap"
fi
;;
 
netbsd)
if test $ac_cv_search_tputs = -lterminfo; then
TERMINFO=yes
LIBS_TERMCAP="-lterminfo"
else
TERMINFO=no
LIBS_TERMCAP="-ltermcap"
fi
;;
 
esac
openbsd) LIBS_TERMCAP="-lncurses" ;;
 
case "$opsys" in
## hpux: Make sure we get select from libc rather than from libcurses
## because libcurses on HPUX 10.10 has a broken version of select.
## We used to use -lc -lcurses, but this may be cleaner.
## FIXME? But TERMINFO = yes on hpux (it used to be explicitly
# set that way, now it uses the default). Isn't this a contradiction?
hpux*) LIBS_TERMCAP="-ltermcap" ;;
 
openbsd) LIBS_TERMCAP="-lncurses" ;;
## Must use system termcap, if we use any termcap. It does special things.
sol2*) test "$TERMINFO" != yes && LIBS_TERMCAP="-ltermcap" ;;
esac
 
TERMCAP_OBJ=tparam.o
......@@ -22854,13 +22832,14 @@ case "$opsys" in
LD_SWITCH_SYSTEM_TEMACS="-X $LD_SWITCH_SYSTEM_TEMACS"
;;
 
## LD_SWITCH_X_SITE_AUX is a -R option saying where to find X at run-time.
## When handled by cpp, this was in LD_SWITCH_SYSTEM. However, at
## the point where configure sourced the s/*.h file, LD_SWITCH_X_SITE_AUX
## LD_SWITCH_X_SITE_RPATH is a -rpath option saying where to
## find X at run-time.
## When handled by cpp, this was in LD_SWITCH_SYSTEM. However, at the
## point where configure sourced the s/*.h file, LD_SWITCH_X_SITE_RPATH
## had not yet been defined and was expanded to null. Hence LD_SWITCH_SYSTEM
## had different values in configure (in ac_link) and src/Makefile.in.
## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS.
gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_AUX_RPATH)" ;;
gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_RPATH)" ;;
 
*) LD_SWITCH_SYSTEM_TEMACS= ;;
esac
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment