Ensure that project used by nsis on windows is working

* take advantage of GTK_LIBS variable to avoid hardcoding of library list
* remove need for intermediate c library when installing using nsis
  (gprbuild will be used instead of gnatmake during installation)
* fix gtkada library name

Part of N617-029

Author: Nikokrock

aclocal.m4

@@ -315,7 +315,16 @@ main (int argc, char** argv)
   AC_SUBST(GTK_CFLAGS)
   AC_SUBST(GTK_LIBS)
   AM_TO_GPR($GTK_CFLAGS, GTK_CFLAGS_GPR)
-  AM_TO_GPR($GTK_LIBS,  GTK_LIBS_GPR)
+
+  dnl On windows gtk will be embedded along with gtk distrib. In that
+  dnl case we need to adjust switches so that gtkada.gpr packaged in
+  dnl lib/gnat is usable
+
+  case $build_os in
+     *mingw*) GTK_LIBS="-L../../lib $GTK_LIBS";;
+  esac
+
+  AM_TO_GPR($GTK_LIBS, GTK_LIBS_GPR)
   rm -f conf.gtktest
 ])
 

configure

@@ -3672,6 +3672,12 @@ $as_echo "yes" >&6; }
 
 
 
+
+  case $build_os in
+     *mingw*) GTK_LIBS="-L../../lib $GTK_LIBS";;
+  esac
+
+
    value=$GTK_LIBS
 
    # Special handling on darwin for gcc 4.5 and 4.7

projects/gtkada_install_dynamic.gpr.in

@@ -32,36 +32,24 @@
 project GtkAda_Install_Dynamic is
 
    for Source_Dirs use (".");
-
+   for Languages use ("Ada", "C");
    for Library_Dir use "../../bin";
    for Library_ALI_Dir use "../../lib/gtkada/relocatable";
    for Library_Kind use "relocatable";
-   for Library_Name use "gtkada-@PACKAGE_VERSION@";
-   for Library_Options use ("-L.", "-L../../bin", "-L../../lib", "-L../../lib/gtkada/relocatable",
-        "-lgtkada_c",
-        "-lgtk-3",
-        "-lgdk-3",
-        "-latk-1.0",
-        "-lgdk_pixbuf-2.0",
-        "-ljpeg",
-        "-lpng-3",
-        "-lpangocairo-1.0",
-        "-lgio-2.0",
-        "-lcairo",
-        "-lpangowin32-1.0",
-        "-lgdi32",
-        "-lpango-1.0",
-        "-lgobject-2.0",
-        "-lgmodule-2.0",
-        "-lgthread-2.0",
-	     "-lgmodule-2.0",
-        "-lglib-2.0",
-        "-lintl",
-        "-liconv",
-        "-luser32");
-
+   for Library_Name use "gtkada";
+   for Library_Options use ("-L.", "-L../../bin", "-L../../lib/gtkada/relocatable", @GTK_LIBS_GPR@);
+   
    package Compiler is
       for Default_Switches ("Ada") use ("-O2", "-gnat05");
+      for Default_Switches ("C") use ("-O2",
+                                      "-I../../include",
+                                      "-I../../include/gtk-3.0",
+                                      "-I../../include/glib-2.0",
+                                      "-I../../lib/glib-2.0/include",
+                                      "-I../../include/pango-1.0",
+                                      "-I../../include/cairo",
+                                      "-I../../include/gdk-pixbuf-2.0",
+                                      "-I../../include/atk-1.0");
    end Compiler;
 
 end GtkAda_Install_Dynamic;