X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Ada95%2Fsrc%2Flibrary-cfg.sh;h=005979f44467b1eaf7dcd005320761de60329d9c;hp=47470d46d1b8e6f8c4296ddb4ff3e2be8aa3acf6;hb=119b5a6788c26bf7dcc99fcfd54e072946352a93;hpb=e33150410925e7858dacebb585a9bd90db683d86

diff --git a/Ada95/src/library-cfg.sh b/Ada95/src/library-cfg.sh
old mode 100644
new mode 100755
index 47470d46..005979f4
--- a/Ada95/src/library-cfg.sh
+++ b/Ada95/src/library-cfg.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##############################################################################
-# Copyright (c) 2016,2018 Free Software Foundation, Inc.                     #
+# Copyright (c) 2016-2018,2019 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"), #
@@ -27,7 +27,7 @@
 # authorization.                                                             #
 ##############################################################################
 #
-# $Id: library-cfg.sh,v 1.3 2018/01/15 14:32:47 tom Exp $
+# $Id: library-cfg.sh,v 1.6 2019/09/07 20:27:26 tom Exp $
 #
 # Work around incompatible behavior introduced with gnat6, which causes
 # gnatmake to attempt to compile all of the C objects which might be part of
@@ -40,17 +40,33 @@ shift 1
 param=
 while test $# != 0
 do
-	test -n "$param" && param="$param,"
-	param="$param\"$1\""
+	case "x$1" in
+	*-[OgDIWf]*)
+		test -n "$param" && param="$param,"
+		param="$param\"$1\""
+		;;
+	*)
+		echo "${0##*/}: ignored option $1" >&2
+		;;
+	esac
 	shift 1
 done
 
 SHARE="-- "
 test "x$model" = "xdynamic" && SHARE=
 
-sed \
-	-e '/for Library_Options use /s,-- ,'"$SHARE"',' \
-	-e '/for Default_Switches ("C") use/s,-- ,,' \
-	-e '/for Default_Switches ("C") use/s% use .*'%" use($param);"% \
-	$input
-exit 0
+SCRIPT=library-cfg.tmp
+cat >$SCRIPT <<EOF
+/for Library_Options use /{
+	s,-- ,$SHARE,
+}
+/for Default_Switches ("C") use/{
+	s,-- ,,
+	s% use .*% use($param);%
+}
+EOF
+
+sed -f $SCRIPT $input
+rc=$?
+rm -f $SCRIPT
+exit $?