ncurses 6.2 - patch 20201205

[ncurses.git] / Ada95 / aclocal.m4

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 9821881b6c5e086a61d9fd4c0f04c7aa5b52bd6c..4f8910bdbbffc81043de1bb5fb54c34c7bc443ae 100644 (file)
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.166 2020/11/26 22:37:55 tom Exp $
+dnl $Id: aclocal.m4,v 1.167 2020/12/05 21:44:26 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -1555,7 +1555,7 @@ AC_SUBST(cf_compile_generics)
 AC_SUBST(cf_generic_objects)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GNAT_PROJECTS version: 10 updated: 2019/12/31 08:53:54
+dnl CF_GNAT_PROJECTS version: 11 updated: 2020/12/05 16:42:18
 dnl ----------------
 dnl GNAT projects are configured with ".gpr" project files.
 dnl GNAT libraries are a further development, using the project feature.
@@ -1639,13 +1639,24 @@ then
        AC_MSG_RESULT($cf_gnat_libraries)
 fi
 
+USE_OLD_MAKERULES=""
+USE_GNAT_PROJECTS="#"
+USE_GNAT_MAKE_GPR="#"
+USE_GNAT_GPRBUILD="#"
+
 if test "$cf_gnat_projects" = yes
 then
        USE_OLD_MAKERULES="#"
        USE_GNAT_PROJECTS=""
-else
-       USE_OLD_MAKERULES=""
-       USE_GNAT_PROJECTS="#"
+       if test "$cf_cv_VERSION_GPRBUILD" != no
+       then
+               USE_GNAT_GPRBUILD=""
+       elif test "$cf_cv_VERSION_GNATMAKE" != no
+       then
+               USE_GNAT_MAKE_GPR=""
+       else
+               AC_MSG_WARN(use old makefile rules since tools are missing)
+       fi
 fi
 
 if test "$cf_gnat_libraries" = yes
@@ -1658,6 +1669,8 @@ fi
 AC_SUBST(USE_OLD_MAKERULES)
 AC_SUBST(USE_GNAT_PROJECTS)
 AC_SUBST(USE_GNAT_LIBRARIES)
+AC_SUBST(USE_GNAT_MAKE_GPR)
+AC_SUBST(USE_GNAT_GPRBUILD)
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_GNAT_SIGINT version: 1 updated: 2011/03/27 20:07:59