Description: handle ADAFLAGS CFLAGS CPPFLAGS
 ./configure eventually ignores them despite its claims in --help.
Author: Nicolas Boulenguez <nicolas@debian.org>
Forwarded: no

--- a/configure.in
+++ b/configure.in
@@ -57,6 +57,11 @@
 AM_PROJECTS
 AM_SYSTEM_LINK_SWITCHES
 AM_HAS_INTRINSIC_SYNC_COUNTERS
+AC_ARG_VAR(ADAFLAGS,Debugging and optimization options for the Ada compiler)
+AM_TO_GPR( $ADAFLAGS,  ADAFLAGS_GPR)
+AM_TO_GPR(   $CFLAGS,    CFLAGS_GPR)
+AM_TO_GPR( $CPPFLAGS,  CPPFLAGS_GPR)
+AM_TO_GPR(  $LDFLAGS,   LDFLAGS_GPR)
 AM_TO_GPR($GMP_CFLAGS,    GMP_CFLAGS_GPR)
 AM_TO_GPR($GMP_LIBS,      GMP_LIBS_GPR)
 AM_TO_GPR($PYTHON_LIBS,   PYTHON_LIBS_GPR)
--- a/gnatcoll_shared.gpr.in
+++ b/gnatcoll_shared.gpr.in
@@ -35,6 +35,10 @@
    type OS_Kind is ("Windows_NT", "unix");
    OS : OS_Kind := external ("OS", "unix");
 
+   Adaflags       := (@ADAFLAGS_GPR@);
+   Cppflags       := (@CPPFLAGS_GPR@);
+   Cflags         := (@CFLAGS_GPR@);
+   Ldflags        := (@LDFLAGS_GPR@);
    Python_Version := "@PYTHON_VERSION@";
    Python_Base    := "@PYTHON_BASE@";
    Python_Cflags  := (@PYTHON_CFLAGS_GPR@);
@@ -79,12 +83,15 @@
          when "no" =>
             null;
       end case;
+      for Switches ("Ada") use Compiler'Switches ("Ada") & Adaflags;
+      for Switches ("C") use Compiler'Switches ("C") & Cppflags & Cflags;
    end Compiler;
 
    --  Force Iconv_Dir first, so that on OSX we do not pick up macports
    --  broken libiconv, which prevents linking applications
    System_Linker_Flags := (Iconv_Dir) & (@EXTRA_LINK_SWITCHES@);
    package Linker is
+      for Leading_Switches ("Ada") use Ldflags;
       for Switches ("Ada") use System_Linker_Flags;
    end Linker;
 
--- a/src/gnatcoll__copy.gpr
+++ b/src/gnatcoll__copy.gpr
@@ -1,6 +1,7 @@
 with "../gnatcoll_shared";
 
 project GnatColl is
+   for Leading_Library_Options use GnatColl_Shared.Ldflags;
    for Source_Dirs     use (".", "paragraph_filling");
    for Library_Kind    use GnatColl_Shared.Library_Type;
    for Object_Dir
--- a/src/gnatcoll__gnat_util.gpr
+++ b/src/gnatcoll__gnat_util.gpr
@@ -2,6 +2,7 @@
 with "gnat_util";
 
 project GnatColl is
+   for Leading_Library_Options use GnatColl_Shared.Ldflags;
    for Source_Dirs     use (".", "paragraph_filling");
    for Library_Kind    use GnatColl_Shared.Library_Type;
    for Object_Dir
--- a/src/gnatcoll_gmp.gpr.in
+++ b/src/gnatcoll_gmp.gpr.in
@@ -16,6 +16,7 @@
 
          --  When linking a shared library (see Linker_Options below)
          for Library_Options use (@GMP_LIBS_GPR@);
+         for Leading_Library_Options use GnatColl_Shared.Ldflags;
       when "no" =>
          for Source_Dirs use ();
    end case;
--- a/src/gnatcoll_gtk.gpr
+++ b/src/gnatcoll_gtk.gpr
@@ -5,6 +5,7 @@
 
 project GnatColl_Gtk is
 
+   for Leading_Library_Options use GnatColl_Shared.Ldflags;
    for Library_Kind    use GnatColl_Shared.Library_Type;
    for Object_Dir
       use Gnatcoll_Shared'Object_Dir & "/gtk/" & Project'Library_Kind;
@@ -38,7 +39,7 @@
       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
 
       for Switches ("C") use
-        ("-g", "-O2")
+        GnatColl_Shared.Compiler'Switches ("C")
         & GnatColl_Shared.Python_Cflags
         & GnatColl_Shared.Pygtk_Include
         & GnatColl_Shared.PyGobject_Include
--- a/src/gnatcoll_iconv.gpr
+++ b/src/gnatcoll_iconv.gpr
@@ -4,6 +4,7 @@
 project GnatColl_Iconv is
    Name := "iconv";
 
+   for Leading_Library_Options use GnatColl_Shared.Ldflags;
    for Library_Kind    use GnatColl_Shared.Library_Type;
    for Object_Dir
       use Gnatcoll_Shared'Object_Dir & "/" & Name & "/" & Project'Library_Kind;
--- a/src/gnatcoll_postgres.gpr
+++ b/src/gnatcoll_postgres.gpr
@@ -3,6 +3,7 @@
 
 project GnatColl_Postgres is
 
+   for Leading_Library_Options use GnatColl_Shared.Ldflags;
    for Library_Kind    use GnatColl_Shared.Library_Type;
    for Object_Dir
       use Gnatcoll_Shared'Object_Dir & "/postgres/" & Project'Library_Kind;
--- a/src/gnatcoll_python.gpr.in
+++ b/src/gnatcoll_python.gpr.in
@@ -12,6 +12,7 @@
 
    --  When linking a shared library (see Linker_Options below in addition)
    for Library_Options use GnatColl_Shared.Python_Libs;
+   for Leading_Library_Options use GnatColl_Shared.Ldflags;
 
    case GnatColl_Shared.Python is
       when "yes" =>
@@ -30,7 +31,7 @@
         GnatColl_Shared.Compiler'Switches ("Ada");
 
       for Switches ("C") use
-        ("-g", "-O2") & GnatColl_Shared.Python_Cflags;
+        GnatColl_Shared.Compiler'Switches ("C") & GnatColl_Shared.Python_Cflags;
    end Compiler;
 
    package Linker is
--- a/src/gnatcoll_readline.gpr.in
+++ b/src/gnatcoll_readline.gpr.in
@@ -11,6 +11,7 @@
          for Source_Dirs use ("readline", "readline/no_readline");
    end case;
 
+   for Leading_Library_Options use GnatColl_Shared.Ldflags;
    for Library_Kind    use GnatColl_Shared.Library_Type;
    for Library_Dir     use "lib/readline/" & Project'Library_Kind;
    for Object_Dir      use "obj/readline/" & Project'Library_Kind;
--- a/src/gnatcoll_sqlite.gpr
+++ b/src/gnatcoll_sqlite.gpr
@@ -4,6 +4,7 @@
 
 project GnatColl_Sqlite is
 
+   for Leading_Library_Options use GnatColl_Shared.Ldflags;
    for Library_Kind    use GnatColl_Shared.Library_Type;
    for Object_Dir
       use Gnatcoll_Shared'Object_Dir & "/sqlite/" & Project'Library_Kind;