ncurses 6.0 - patch 20170812

[ncurses.git] / include / edit_cfg.sh

diff --git a/include/edit_cfg.sh b/include/edit_cfg.sh
index ef9694cb83ee8762cf8a52b5db674da2c1a694ed..5b2e4fba734dec87e000e30752bf4f73ac587516 100755 (executable)
--- a/include/edit_cfg.sh
+++ b/include/edit_cfg.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# $Id: edit_cfg.sh,v 1.10 2000/09/09 20:29:58 tom Exp $
+# $Id: edit_cfg.sh,v 1.13 2017/08/12 12:22:06 tom Exp $
 ##############################################################################
-# Copyright (c) 1998,2000 Free Software Foundation, Inc.                     #
+# Copyright (c) 2000,2001,2017 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -38,7 +38,7 @@
 #
 BAK=save$$
 TMP=edit$$
-trap "rm -f $BAK $TMP" 0 1 2 5 15
+trap "rm -f $BAK $TMP" 0 1 2 3 15
 for name in \
        HAVE_TCGETATTR \
        HAVE_TERMIOS_H \
@@ -48,18 +48,20 @@ do
        mv $2 $BAK
        if ( grep "[    ]$name[         ]" $1 2>&1 >$TMP )
        then
-               sed -e 's@#define '$name'.*$@'"`cat $TMP`@" $BAK >$2
-       elif test "$name" = "NCURSES_CONST" ; then
-               sed -e 's/define '$name'.*$/define '$name' \/\*nothing\*\//' $BAK >$2
+               value=1
        else
-               sed -e 's/define '$name'.*$/define '$name' 0/' $BAK >$2
+               value=0
        fi
+       echo '** edit: '$name $value
+       sed \
+               -e "s@#define ${name}.*\$@#define $name $value@" \
+               -e "s@#if $name\$@#if $value /* $name */@" \
+               -e "s@#if !$name\$@#if $value /* !$name */@" \
+               $BAK >$2
        if (cmp -s $2 $BAK)
        then
-               echo '** same: '$name
                mv $BAK $2
        else
-               echo '** edit: '$name
                rm -f $BAK
        fi
 done