| 1 |
Author: ulm |
| 2 |
Date: 2010-01-30 11:11:57 +0000 (Sat, 30 Jan 2010) |
| 3 |
New Revision: 755 |
| 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 |
Remove --with-pm configure option. |
| 12 |
|
| 13 |
Modified: trunk/ChangeLog |
| 14 |
=================================================================== |
| 15 |
--- trunk/ChangeLog 2010-01-27 21:30:30 UTC (rev 754) |
| 16 |
+++ trunk/ChangeLog 2010-01-30 11:11:57 UTC (rev 755) |
| 17 |
@@ -1,3 +1,10 @@ |
| 18 |
+2010-01-30 Ulrich Mueller <ulm@g.o> |
| 19 |
+ |
| 20 |
+ * configure.ac: Remove --with-pm configure option. |
| 21 |
+ * libs/Makefile.am (dosed): Don't substitute PACKAGE_MANAGER. |
| 22 |
+ * libs/package-manager.bash.in (package_manager): Don't hardcode |
| 23 |
+ a default, use environment variable at run time only. |
| 24 |
+ |
| 25 |
2009-12-31 Ulrich Mueller <ulm@g.o> |
| 26 |
|
| 27 |
* configure.ac: Update version to 1.2.9. |
| 28 |
|
| 29 |
Modified: trunk/configure.ac |
| 30 |
=================================================================== |
| 31 |
--- trunk/configure.ac 2010-01-27 21:30:30 UTC (rev 754) |
| 32 |
+++ trunk/configure.ac 2010-01-30 11:11:57 UTC (rev 755) |
| 33 |
@@ -57,14 +57,6 @@ |
| 34 |
AC_PATH_PROG(RST2HTML, rst2html.py) |
| 35 |
fi |
| 36 |
|
| 37 |
-AC_MSG_CHECKING([what package manager we shall use]) |
| 38 |
-AC_ARG_WITH(pm, [AS_HELP_STRING([--with-pm=PM], [use package manager PM])], |
| 39 |
- [], [withval=portage]) |
| 40 |
-AS_CASE([x$withval], xportage,, xpaludis,, |
| 41 |
- [AC_MSG_ERROR([package manager "$withval" not known])]) |
| 42 |
-AC_SUBST(PACKAGE_MANAGER, [$withval]) |
| 43 |
-AC_MSG_RESULT([$PACKAGE_MANAGER]) |
| 44 |
- |
| 45 |
# Support for Gentoo Prefix |
| 46 |
AC_MSG_CHECKING([if target installation is in an offset prefix]) |
| 47 |
EPREFIX="" |
| 48 |
|
| 49 |
Modified: trunk/libs/Makefile.am |
| 50 |
=================================================================== |
| 51 |
--- trunk/libs/Makefile.am 2010-01-27 21:30:30 UTC (rev 754) |
| 52 |
+++ trunk/libs/Makefile.am 2010-01-30 11:11:57 UTC (rev 755) |
| 53 |
@@ -28,7 +28,6 @@ |
| 54 |
|
| 55 |
dosed = @SED@ \ |
| 56 |
-e 's,\@SED\@,@SED@,g' \ |
| 57 |
- -e 's,\@PACKAGE_MANAGER\@,@PACKAGE_MANAGER@,g' \ |
| 58 |
-e 's,\@PORTAGEQ\@,@PORTAGEQ@,g' \ |
| 59 |
-e 's,\@CANONICALISE\@,@CANONICALISE@,g' |
| 60 |
|
| 61 |
|
| 62 |
Modified: trunk/libs/package-manager.bash.in |
| 63 |
=================================================================== |
| 64 |
--- trunk/libs/package-manager.bash.in 2010-01-27 21:30:30 UTC (rev 754) |
| 65 |
+++ trunk/libs/package-manager.bash.in 2010-01-30 11:11:57 UTC (rev 755) |
| 66 |
@@ -19,7 +19,7 @@ |
| 67 |
# Return the package manager we're going to use. |
| 68 |
package_manager() { |
| 69 |
local pm |
| 70 |
- case ${PACKAGE_MANAGER:-@PACKAGE_MANAGER@} in |
| 71 |
+ case ${PACKAGE_MANAGER} in |
| 72 |
portage) |
| 73 |
pm=portage ;; |
| 74 |
paludis) |
Archives