Wed Nov 7 05:32:49 PST 2007 Duncan Coutts <du...@ha...>
* Use precise package versions when building and in package registration
Previously we were being sloppy and allowing any version in the registration
so there was no guarantee that the version we built against was the same as
the version that would get used when the package was installed. Similarly
we could build against packages that were registered per-user which would
then fail if we did a global install. Now it only looks for global packages
unless you ./configure --with-user-pkgconf
hunk ./Makefile.am 129
-tools_c2hs_c2hsLocal_EXTERNALDEPS += pretty containers array
+tools_c2hs_c2hsLocal_EXTERNALDEPS += pretty containers array
hunk ./Makefile.am 365
-libHSgtk_a_EXTERNALDEPS += containers array
+libHSgtk_a_EXTERNALDEPS += containers-$(PKG_CONTAINERS_VERSION) array-$(PKG_ARRAY_VERSION)
hunk ./Makefile.am 368
-libHSgtk_a_EXTERNALDEPS += mtl
+libHSgtk_a_EXTERNALDEPS += mtl-$(PKG_MTL_VERSION)
hunk ./Makefile.am 1245
-libHScairo_a_EXTERNALDEPS += mtl
+libHScairo_a_EXTERNALDEPS += mtl-$(PKG_MTL_VERSION)
+endif
+if HAVE_SPLIT_BASE
+libHScairo_a_EXTERNALDEPS += bytestring-$(PKG_BYTESTRING_VERSION)
hunk ./Makefile.am 1382
-libHSsvgcairo_a_EXTERNALDEPS += mtl
+libHSsvgcairo_a_EXTERNALDEPS += mtl-$(PKG_MTL_VERSION)
hunk ./Makefile.am 1601
-libHSsoegtk_a_EXTERNALDEPS += old-time
+libHSsoegtk_a_EXTERNALDEPS += old-time-$(PKG_OLDTIME_VERSION)
hunk ./Makefile.am 1616
-libHSsoegtk_a_EXTERNALDEPS += mtl
+libHSsoegtk_a_EXTERNALDEPS += mtl-$(PKG_MTL_VERSION)
hunk ./acinclude.m4 95
-if ${GHCPKG} --simple-output list $1 > /dev/null 2> /dev/null
+if test "$USERPKGCONF" = "yes"; then
+ C=$(${GHCPKG} list $1 | sed -e '/package.conf:/d')
+else
+ C=$(${GHCPKG} list $1 | sed -e '1d;/package.conf:/,$d')
+fi
+if echo "${C}" | ${GREP} $1 > /dev/null 2> /dev/null
hunk ./acinclude.m4 102
- AC_MSG_RESULT(yes)
+ if test "$USE_NEW_PKG_FORMAT" = "yes"; then
+ $2=$(echo "${C}" | sed -e 's/,/\n/g' -e 's/[[(), ]]//g' | grep -v '^$' | sed -e 's/[[A-Za-z-]]*//' | sort -r -n | head -n1)
+ AC_MSG_RESULT([yes, version $$2])
+ else
+ AC_MSG_RESULT(yes)
+ fi
hunk ./acinclude.m4 110
-Missing GHC package "$1". Install "$1" and re-run ./configure])
+Missing GHC package "$1". Install "$1" and re-run ./configure
+If $1 is actually installed but per-user rather than globally and
+you want to do a per-user install of gtk2hs then use:
+./configure --with-user-pkgconf --prefix=$HOME/some/path])
hunk ./configure.ac 152
-dnl check for a recent ghc-6.7 or later as a proxy for the base package split
-GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.7.20070912, [
+dnl check for ghc-6.8 or later as a proxy for the base package split
+GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.8, [
hunk ./configure.ac 234
-GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -gt, 6.4.0, [GHC_PKG_CHECK(mtl)])
+GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.4, [GHC_PKG_CHECK(mtl,PKG_MTL_VERSION)])
+AC_SUBST(PKG_MTL_VERSION)
+
+GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.8, [
+ GHC_PKG_CHECK(bytestring,PKG_BYTESTRING_VERSION)
+ CAIRO_SPLITBASE_DEPENDS="bytestring-${PKG_BYTESTRING_VERSION}"
+ GHC_PKG_CHECK(containers, [PKG_CONTAINERS_VERSION])
+ GHC_PKG_CHECK(array, [PKG_ARRAY_VERSION])
+ GHC_PKG_CHECK(old-time, [PKG_OLDTIME_VERSION])
+ GTK_SPLITBASE_DEPENDS="containers-${PKG_CONTAINERS_VERSION} array-${PKG_ARRAY_VERSION}"
+ SOEGTK_SPLITBASE_DEPENDS="old-time-${PKG_OLDTIME_VERSION}"
+])
+AC_SUBST(PKG_BYTESTRING_VERSION)
+AC_SUBST(PKG_CONTAINERS_VERSION)
+AC_SUBST(PKG_ARRAY_VERSION)
+AC_SUBST(PKG_OLDTIME_VERSION)
+AC_SUBST(CAIRO_SPLITBASE_DEPENDS)
+AC_SUBST(GTK_SPLITBASE_DEPENDS)
+AC_SUBST(SOEGTK_SPLITBASE_DEPENDS)
hunk ./gtk/gtk.package.conf.in 16
-depends: base mtl glib-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
+depends: base mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@ @GTK_SPLITBASE_DEPENDS@
hunk ./soegtk/soegtk.package.conf.in 13
-depends: base gtk-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
+depends: base mtl-@PKG_MTL_VERSION@ gtk-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@ @SOEGTK_SPLITBASE_DEPENDS@
hunk ./svgcairo/svgcairo.package.conf.in 18
-depends: base mtl glib-@PACKAGE_VERSION@ cairo-@PACKAGE_VERSION@
+depends: base mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ cairo-@PACKAGE_VERSION@
|
