| 1 |
Author: ulm |
| 2 |
Date: 2009-04-28 09:40:31 +0000 (Tue, 28 Apr 2009) |
| 3 |
New Revision: 513 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/configure.ac |
| 8 |
trunk/libs/Makefile.am |
| 9 |
trunk/libs/package-manager.bash.in |
| 10 |
Log: |
| 11 |
Add --with-pm option for configuring the preferred package manager. |
| 12 |
|
| 13 |
Modified: trunk/ChangeLog |
| 14 |
=================================================================== |
| 15 |
--- trunk/ChangeLog 2009-04-27 07:39:39 UTC (rev 512) |
| 16 |
+++ trunk/ChangeLog 2009-04-28 09:40:31 UTC (rev 513) |
| 17 |
@@ -1,3 +1,12 @@ |
| 18 |
+2009-04-28 Ulrich Mueller <ulm@g.o> |
| 19 |
+ |
| 20 |
+ * configure.ac: Add --with-pm option for configuring the preferred |
| 21 |
+ package manager. Supply a default path for portageq. |
| 22 |
+ * libs/Makefile.am (dosed): Substitute PACKAGE_MANAGER. |
| 23 |
+ * libs/package-manager.bash.in (package-manager): Return package |
| 24 |
+ manager chosen at configure time. Overriding is possible by |
| 25 |
+ environment variable ESELECT_PACKAGE_MANAGER. |
| 26 |
+ |
| 27 |
2009-04-27 Ulrich Mueller <ulm@g.o> |
| 28 |
|
| 29 |
* modules/opengl.eselect (check_version): Don't call portageq |
| 30 |
|
| 31 |
Modified: trunk/configure.ac |
| 32 |
=================================================================== |
| 33 |
--- trunk/configure.ac 2009-04-27 07:39:39 UTC (rev 512) |
| 34 |
+++ trunk/configure.ac 2009-04-28 09:40:31 UTC (rev 513) |
| 35 |
@@ -22,7 +22,7 @@ |
| 36 |
AC_MSG_ERROR([GNU sed is required]) |
| 37 |
fi |
| 38 |
|
| 39 |
-AC_PATH_PROG(PORTAGEQ, portageq) |
| 40 |
+AC_PATH_PROG(PORTAGEQ, portageq, /usr/bin/portageq) |
| 41 |
|
| 42 |
AC_PATH_PROG(READLINK, greadlink) |
| 43 |
if test x$CANONICALISE = "x" ; then |
| 44 |
@@ -57,9 +57,18 @@ |
| 45 |
AC_PATH_PROG(RST2HTML, rst2html.py) |
| 46 |
fi |
| 47 |
|
| 48 |
+AC_MSG_CHECKING([what package manager we shall use]) |
| 49 |
+AC_ARG_WITH(pm, [AS_HELP_STRING([--with-pm=PM], [use package manager PM])], |
| 50 |
+ [], [withval=portage]) |
| 51 |
+AS_CASE([x$withval], xportage,, xpaludis,, |
| 52 |
+ [AC_MSG_ERROR([package manager "$withval" not known])]) |
| 53 |
+AC_SUBST(PACKAGE_MANAGER, [$withval]) |
| 54 |
+AC_MSG_RESULT([$PACKAGE_MANAGER]) |
| 55 |
+ |
| 56 |
AC_MSG_CHECKING([whether dodgy modules should be installed]) |
| 57 |
AC_ARG_ENABLE(dodgy_modules, |
| 58 |
- [ --enable-dodgy-modules Enable experimental and incomplete modules], |
| 59 |
+ [AS_HELP_STRING([--enable-dodgy-modules], |
| 60 |
+ [enable experimental and incomplete modules])] |
| 61 |
if test x$enableval = "xyes" ; then |
| 62 |
DODGY_MODULES="yes" |
| 63 |
else |
| 64 |
|
| 65 |
Modified: trunk/libs/Makefile.am |
| 66 |
=================================================================== |
| 67 |
--- trunk/libs/Makefile.am 2009-04-27 07:39:39 UTC (rev 512) |
| 68 |
+++ trunk/libs/Makefile.am 2009-04-28 09:40:31 UTC (rev 513) |
| 69 |
@@ -32,6 +32,7 @@ |
| 70 |
|
| 71 |
dosed = @SED@ \ |
| 72 |
-e 's,\@SED\@,@SED@,g' \ |
| 73 |
+ -e 's,\@PACKAGE_MANAGER\@,@PACKAGE_MANAGER@,g' \ |
| 74 |
-e 's,\@PORTAGEQ\@,@PORTAGEQ@,g' \ |
| 75 |
-e 's,\@CANONICALISE\@,@CANONICALISE@,g' |
| 76 |
|
| 77 |
|
| 78 |
Modified: trunk/libs/package-manager.bash.in |
| 79 |
=================================================================== |
| 80 |
--- trunk/libs/package-manager.bash.in 2009-04-27 07:39:39 UTC (rev 512) |
| 81 |
+++ trunk/libs/package-manager.bash.in 2009-04-28 09:40:31 UTC (rev 513) |
| 82 |
@@ -153,26 +153,7 @@ |
| 83 |
# package-manager PRIVATE |
| 84 |
# Return the package manager we're going to use. |
| 85 |
package-manager() { |
| 86 |
- local manager |
| 87 |
- |
| 88 |
- if [[ -n ${ESELECT_PACKAGE_MANAGER} ]] ; then |
| 89 |
- echo "${ESELECT_PACKAGE_MANAGER}" |
| 90 |
- return |
| 91 |
- fi |
| 92 |
- |
| 93 |
- # Prefer paludis for now as portage is always installed |
| 94 |
- # TODO: Add an option to make it selectable by the user |
| 95 |
- # TODO: Support Pkgcore |
| 96 |
- if $(paludis_command) --list-repositories &> /dev/null ; then |
| 97 |
- manager="paludis" |
| 98 |
- else |
| 99 |
- manager="portage" |
| 100 |
- fi |
| 101 |
- |
| 102 |
- echo ${manager} |
| 103 |
- # caching doesn't really work: we are typically called with |
| 104 |
- # command substitution, i.e. in a subshell |
| 105 |
- ESELECT_PACKAGE_MANAGER=${manager} |
| 106 |
+ echo "${ESELECT_PACKAGE_MANAGER:-@PACKAGE_MANAGER@}" |
| 107 |
} |
| 108 |
|
| 109 |
# vim: set sw=4 et sts=4 tw=80 : |
Archives