X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=configure.in;h=1c5b44f84d03e86dec3956484b2e9d5743c62ca6;hp=48b2139f0c6d8f32ab14bec1b6c32ac073cb53a2;hb=9776951416d7fb862b9dca1f4c9f8031a5c9059b;hpb=c340bf75caa7aabe7db96787961e151e70ddff08

diff --git a/configure.in b/configure.in
index 48b2139f..1c5b44f8 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
+dnl Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl copy of this software and associated documentation files (the            *
@@ -28,14 +28,14 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.514 2010/11/28 00:12:45 tom Exp $
+dnl $Id: configure.in,v 1.517 2011/03/19 17:49:19 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl See http://invisible-island.net/autoconf/ for additional information.
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.13.20020210)
-AC_REVISION($Revision: 1.514 $)
+AC_REVISION($Revision: 1.517 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1593,7 +1593,19 @@ dnl At the moment we support no other Ada95 compiler.
 	if test "$cf_with_ada" != "no" ; then
 		CF_PROG_GNAT
 		if test	"$cf_cv_prog_gnat_correct" = yes; then
-			CF_ADD_ADAFLAGS(-O3 -gnatpn)
+			CF_ADD_ADAFLAGS(-gnatpn)
+
+			# make ADAFLAGS consistent with CFLAGS
+			case "$CFLAGS" in
+			*-g*)
+				CF_ADD_ADAFLAGS(-g)
+				;;
+			esac
+			case "$CFLAGS" in
+			*-O*)
+				CF_ADD_ADAFLAGS(-O3)
+				;;
+			esac
 
 			CF_GNAT_PRAGMA_UNREF
 
@@ -1898,6 +1910,9 @@ else
 fi
 AC_SUBST(MAKE_TESTS)
 
+ADAHTML_DIR=../../doc/html/ada
+AC_SUBST(ADAHTML_DIR)
+
 SUB_SCRIPTS=
 case $cf_cv_system_name in #(vi
 *mingw32*) #(vi