consider install prefix when searching for packages, patch by Mathias

2007-03-17  Jürg Billeter  <j@bitron.ch>

	* compiler/valacompiler.vala, compiler/Makefile.am, vapi/config.vala:
	  consider install prefix when searching for packages, patch by
	  Mathias Hasselmann
	* configure.ac: add AM_PROG_CC_C_O
	* autogen.sh, MAINTAINERS: added
	* Makefile.am: dist MAINTAINERS

svn path=/trunk/; revision=243

diff --git a/vala/ChangeLog b/vala/ChangeLog
index 05cbd49..f95dd5a 100644 (file)
--- a/vala/ChangeLog
+++ b/vala/ChangeLog
@@ -1,5 +1,14 @@
 2007-03-17  Jürg Billeter  <j@bitron.ch>
 
+       * compiler/valacompiler.vala, compiler/Makefile.am, vapi/config.vala:
+         consider install prefix when searching for packages, patch by
+         Mathias Hasselmann
+       * configure.ac: add AM_PROG_CC_C_O
+       * autogen.sh, MAINTAINERS: added
+       * Makefile.am: dist MAINTAINERS
+
+2007-03-17  Jürg Billeter  <j@bitron.ch>
+
        * vala/valasemanticanalyzer.vala, vala/valacodegnerator.vala,
          vala/valaclassregisterfunction.vala,
          vala/valainterfaceregisterfunction.vala,

diff --git a/vala/MAINTAINERS b/vala/MAINTAINERS
new file mode 100644 (file)
index 0000000..a767d3f
--- /dev/null
+++ b/vala/MAINTAINERS
@@ -0,0 +1,2 @@
+Jürg Billeter <j@bitron.ch>
+Raffaele Sandrini <rasa@gmx.ch>

diff --git a/vala/Makefile.am b/vala/Makefile.am
index 0466f1d..73c8fb1 100644 (file)
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -11,4 +11,7 @@ SUBDIRS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = vala-1.0.pc
 
-EXTRA_DIST = vala-1.0.pc.in
+EXTRA_DIST = \
+       MAINTAINERS \
+       vala-1.0.pc.in \
+       $(NULL)

diff --git a/vala/autogen.sh b/vala/autogen.sh
new file mode 100755 (executable)
index 0000000..61289aa
--- /dev/null
+++ b/vala/autogen.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure "$@"

diff --git a/vala/compiler/Makefile.am b/vala/compiler/Makefile.am
index 904ee23..9cbd624 100644 (file)
--- a/vala/compiler/Makefile.am
+++ b/vala/compiler/Makefile.am
@@ -21,7 +21,9 @@ valac.vala.stamp: $(filter %.vala,$(valac_SOURCES))
        $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --pkg config $^
        touch $@
 
-valac_CPPFLAGS = -include config.h
+valac_CPPFLAGS = \
+       -include config.h \
+       -DPACKAGE_DATADIR=\"$(pkgdatadir)\"
 
 valac_LDADD = \
        $(GLIB_LIBS) \

diff --git a/vala/compiler/valacompiler.vala b/vala/compiler/valacompiler.vala
index b36090c..ac415e5 100644 (file)
--- a/vala/compiler/valacompiler.vala
+++ b/vala/compiler/valacompiler.vala
@@ -59,8 +59,8 @@ class Vala.Compiler {
        }
        
        private ref string get_package_path (string! pkg) {
-               var basename = "%s.vala".printf (pkg);
-       
+               string basename = "%s.vala".printf (pkg);
+
                if (vapi_directories != null) {
                        foreach (string vapidir in vapi_directories) {
                                var filename = Path.build_filename (vapidir, basename);
@@ -69,17 +69,22 @@ class Vala.Compiler {
                                }
                        }
                }
-               
-               var filename = Path.build_filename ("/usr/local/share/vala/vapi", basename);
+
+               string filename = Path.build_filename (Config.PACKAGE_DATADIR, "vapi", basename);
                if (File.test (filename, FileTest.EXISTS)) {
                        return filename;
                }
-               
+
+               filename = Path.build_filename ("/usr/local/share/vala/vapi", basename);
+               if (File.test (filename, FileTest.EXISTS)) {
+                       return filename;
+               }
+
                filename = Path.build_filename ("/usr/share/vala/vapi", basename);
                if (File.test (filename, FileTest.EXISTS)) {
                        return filename;
                }
-               
+
                return null;
        }
        

diff --git a/vala/configure.ac b/vala/configure.ac
index 23c4bb4..31070e0 100644 (file)
--- a/vala/configure.ac
+++ b/vala/configure.ac
@@ -5,6 +5,7 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 
 # Checks for programs.
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 

diff --git a/vala/vapi/config.vala b/vala/vapi/config.vala
index b517368..0d5b167 100644 (file)
--- a/vala/vapi/config.vala
+++ b/vala/vapi/config.vala
@@ -22,5 +22,6 @@
 
 [CCode (cprefix = "", cheader_filename = "config.h")]
 namespace Config {
-        public const string PACKAGE_VERSION;
+       public const string PACKAGE_VERSION;
+       public const string PACKAGE_DATADIR;
 }