aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2016-01-08 00:08:58 +0200
committerSergey Poznyakoff <gray@gnu.org>2016-01-08 00:08:58 +0200
commit06499f7e23e5ba528686c6135b02eafe6cb47817 (patch)
treec37cb08d4ab1fdbf31ebc8f3f513ec8f90860aa4
parentb47dfe00a3658aa95c4ed6cf79a0e66e06eed0ff (diff)
downloadpies-06499f7e23e5ba528686c6135b02eafe6cb47817.tar.gz
pies-06499f7e23e5ba528686c6135b02eafe6cb47817.tar.bz2
Bugfixes
* bootstrap.conf (bootstrap_epilogue): Declare the package as a GNU one. * configure.ac: Require gettext 0.19 Remove useless conditional * src/ctl.c (fun_stop, fun_start): Check prog->v.p.status, not the CF_DISABLED flag.
-rw-r--r--bootstrap.conf16
-rw-r--r--configure.ac5
-rw-r--r--src/ctl.c4
3 files changed, 18 insertions, 7 deletions
diff --git a/bootstrap.conf b/bootstrap.conf
index edec854..1b1e9e2 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,5 +1,5 @@
# Bootstrap configuration for GNU Pies. -*- shell-script -*-
-# Copyright (C) 2008, 2009, 2010, 2011, 2013 Sergey Poznyakoff
+# Copyright (C) 2008-2011, 2013, 2016 Sergey Poznyakoff
#
# GNU Pies is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -58,6 +58,20 @@ if test -z "$MSGID_BUGS_ADDRESS"; then
MSGID_BUGS_ADDRESS="bug-${package}@gnu.org.ua"
fi
+bootstrap_epilogue() {
+ cat >> po/Makevars <<'EOF'
+
+# Local changes by bootstrap
+
+# The $(DOMAIN).pot-update goal in po/Makefile.in.in determines whether the
+# package is GNU by recursively grepping all files in top_srcdir for string
+# 'GNU @PACKAGE@'. This heuristics fails, because @PACKAGE@ begins with a
+# lowercase letter, whereas all sources address the package as 'GNU Pies'
+# (with a capital letter). The definition below fixes this.
+PACKAGE_GNU = pies
+EOF
+}
+
# Read local configuration file
if [ -r .bootstrap ]; then
echo "$0: Reading configuration file .bootstrap"
diff --git a/configure.ac b/configure.ac
index 2b492da..3b34059 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,7 @@ MF_PROCTITLE
# Gettext.
AM_ICONV
AM_GNU_GETTEXT([external], [need-formatstring-macros])
-AM_GNU_GETTEXT_VERSION([0.18])
+AM_GNU_GETTEXT_VERSION([0.19])
# PAM
status_pam=maybe
@@ -107,9 +107,6 @@ if test "$status_pam" != "no"; then
else
status_pam=no
fi
- if test $pam = yes && test $pam != $status_pam; then
- AC_MSG_ERROR([required module PAM cannot be built because of missing prerequisites])
- fi
fi
AM_CONDITIONAL([PAM_COND], [test $status_pam = yes])
diff --git a/src/ctl.c b/src/ctl.c
index fd32765..78490cb 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -1855,7 +1855,7 @@ fun_list (struct json_value *result, struct prog *prog)
static int
fun_stop (struct json_value *result, struct prog *prog)
{
- if (prog->v.p.comp->flags & CF_DISABLED)
+ if (prog->v.p.status == status_disabled)
{
json_object_set_string (result, "status", "ER");
json_object_set_string (result, "error_message", "already stopped");
@@ -1873,7 +1873,7 @@ fun_stop (struct json_value *result, struct prog *prog)
static int
fun_start (struct json_value *result, struct prog *prog)
{
- if (prog->v.p.comp->flags & CF_DISABLED)
+ if (prog->v.p.status == status_disabled)
{
prog->v.p.comp->flags &= ~CF_DISABLED;
prog->v.p.status = status_enabled;

Return to:

Send suggestions and report system problems to the System administrator.