48a75e34a5
- Don't strip binaries - Remove unused build requirements - Properly configure TERMINFO (bnc#797787) OBS-URL: https://build.opensuse.org/request/show/148242 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=106
115 lines
3.9 KiB
Plaintext
115 lines
3.9 KiB
Plaintext
--- configure
|
|
+++ configure
|
|
@@ -14296,7 +14296,7 @@ $as_echo_n "checking for library contain
|
|
|
|
# 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=
|
|
@@ -14374,22 +14374,15 @@ HAVE_LIBNCURSES=yes
|
|
## Note only system files NOT using terminfo are:
|
|
## freebsd < 40000, ms-w32, msdos, netbsd < 599002500, and
|
|
## darwin|gnu without ncurses.
|
|
-TERMINFO=no
|
|
+TERMINFO=yes
|
|
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
|
|
+ if test -z "$LIBS_TERMCAP" && test "x$HAVE_LIBNCURSES" = "xyes"; then
|
|
LIBS_TERMCAP="-lncurses"
|
|
fi
|
|
;;
|
|
@@ -14428,17 +14421,16 @@ 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 "x$LIBS_TERMCAP" = "x-lterminfo"; then
|
|
- TERMINFO=yes
|
|
- else
|
|
+ if test "x$LIBS_TERMCAP" != "x-lterminfo"; then
|
|
+ TERMINFO=no
|
|
LIBS_TERMCAP="-ltermcap"
|
|
fi
|
|
;;
|
|
--- configure.in
|
|
+++ configure.in
|
|
@@ -2805,7 +2805,7 @@ AC_DEFUN([tputs_link_source], [
|
|
])
|
|
# 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=
|
|
@@ -2841,22 +2841,15 @@ HAVE_LIBNCURSES=yes
|
|
## Note only system files NOT using terminfo are:
|
|
## freebsd < 40000, ms-w32, msdos, netbsd < 599002500, and
|
|
## darwin|gnu without ncurses.
|
|
-TERMINFO=no
|
|
+TERMINFO=yes
|
|
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
|
|
+ if test -z "$LIBS_TERMCAP" && test "x$HAVE_LIBNCURSES" = "xyes"; then
|
|
LIBS_TERMCAP="-lncurses"
|
|
fi
|
|
;;
|
|
@@ -2873,17 +2866,16 @@ fail;
|
|
AC_MSG_RESULT($emacs_cv_freebsd_terminfo)
|
|
|
|
if test $emacs_cv_freebsd_terminfo = yes; then
|
|
- TERMINFO=yes
|
|
LIBS_TERMCAP="-lncurses"
|
|
else
|
|
+ TERMINFO=no
|
|
LIBS_TERMCAP="-ltermcap"
|
|
fi
|
|
;;
|
|
|
|
netbsd)
|
|
- if test "x$LIBS_TERMCAP" = "x-lterminfo"; then
|
|
- TERMINFO=yes
|
|
- else
|
|
+ if test "x$LIBS_TERMCAP" != "x-lterminfo"; then
|
|
+ TERMINFO=no
|
|
LIBS_TERMCAP="-ltermcap"
|
|
fi
|
|
;;
|