aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-04-30 20:56:47 -0400
committerGlenn Morris2012-04-30 20:56:47 -0400
commit3ba0a545ecf6e8385ffb65033015be0b16e0226f (patch)
tree432b598a7ac08350c0e9d7d79515e63732255198
parente3da5b1949267a54568b330186b7931da26fc482 (diff)
downloademacs-3ba0a545ecf6e8385ffb65033015be0b16e0226f.tar.gz
emacs-3ba0a545ecf6e8385ffb65033015be0b16e0226f.zip
* configure.in: Combine adjacent $opsys case blocks.
-rw-r--r--ChangeLog2
-rw-r--r--configure.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 08c264b68dd..137248c0d89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
12012-05-01 Glenn Morris <rgm@gnu.org> 12012-05-01 Glenn Morris <rgm@gnu.org>
2 2
3 * configure.in: Combine adjacent $opsys case blocks.
4
3 * configure.in (LIBS_TERMCAP): Remove unreachable branch for sol2. 5 * configure.in (LIBS_TERMCAP): Remove unreachable branch for sol2.
4 6
5 * configure.in: Invert the TERMINFO logic, 7 * configure.in: Invert the TERMINFO logic,
diff --git a/configure.in b/configure.in
index 76d267577f4..42a6b3364c9 100644
--- a/configure.in
+++ b/configure.in
@@ -2932,9 +2932,8 @@ fail;
2932 fi 2932 fi
2933 ;; 2933 ;;
2934 2934
2935esac 2935 openbsd) LIBS_TERMCAP="-lncurses" ;;
2936 2936
2937case "$opsys" in
2938 ## hpux: Make sure we get select from libc rather than from libcurses 2937 ## hpux: Make sure we get select from libc rather than from libcurses
2939 ## because libcurses on HPUX 10.10 has a broken version of select. 2938 ## because libcurses on HPUX 10.10 has a broken version of select.
2940 ## We used to use -lc -lcurses, but this may be cleaner. 2939 ## We used to use -lc -lcurses, but this may be cleaner.
@@ -2942,7 +2941,6 @@ case "$opsys" in
2942 # set that way, now it uses the default). Isn't this a contradiction? 2941 # set that way, now it uses the default). Isn't this a contradiction?
2943 hpux*) LIBS_TERMCAP="-ltermcap" ;; 2942 hpux*) LIBS_TERMCAP="-ltermcap" ;;
2944 2943
2945 openbsd) LIBS_TERMCAP="-lncurses" ;;
2946esac 2944esac
2947 2945
2948TERMCAP_OBJ=tparam.o 2946TERMCAP_OBJ=tparam.o