Browse Source

Ticket 48825 - Configure make generate invalid makefile

Bug Description:  In some cases it was possible for configure to generate an
invalid makefile. This was in the case that systemd was enabled,

Fix Description:  Remove the optional test around the groupname check. It should
always have a default.

https://fedorahosted.org/389/ticket/48825

Author: wibrown

Review by: mreynolds (Thanks!)
William Brown 9 years ago
parent
commit
5400067e77
1 changed files with 15 additions and 17 deletions
  1. 15 17
      m4/systemd.m4

+ 15 - 17
m4/systemd.m4

@@ -103,24 +103,22 @@ if test "$with_systemd" = yes; then
     fi
     AC_SUBST(with_systemdsystemconfdir)
 
-    if test -n "$with_systemdsystemunitdir" -o -n "$with_systemdsystemconfdir" ; then
-       if test -z "$with_systemdgroupname" ; then
-          with_systemdgroupname=$PACKAGE_NAME.target
-       fi
-       AC_MSG_CHECKING(for --with-systemdgroupname)
-       AC_ARG_WITH([systemdgroupname],
-            AS_HELP_STRING([--with-systemdgroupname=NAME],
-                           [Name of group target for all instances (default: $with_systemdgroupname)])
-       )
-       if test "$with_systemdgroupname" = yes ; then
-          AC_MSG_ERROR([You must specify --with-systemdgroupname=name.of.group])
-       elif test "$with_systemdgroupname" = no ; then
-          AC_MSG_ERROR([You must specify --with-systemdgroupname=name.of.group])
-       else
-          AC_MSG_RESULT([$with_systemdgroupname])
-       fi
-       AC_SUBST(with_systemdgroupname)
+    if test -z "$with_systemdgroupname" ; then
+       with_systemdgroupname=$PACKAGE_NAME.target
     fi
+    AC_MSG_CHECKING(for --with-systemdgroupname)
+    AC_ARG_WITH([systemdgroupname],
+         AS_HELP_STRING([--with-systemdgroupname=NAME],
+                        [Name of group target for all instances (default: $with_systemdgroupname)])
+    )
+    if test "$with_systemdgroupname" = yes ; then
+       AC_MSG_ERROR([You must specify --with-systemdgroupname=name.of.group])
+    elif test "$with_systemdgroupname" = no ; then
+       AC_MSG_ERROR([You must specify --with-systemdgroupname=name.of.group])
+    else
+       AC_MSG_RESULT([$with_systemdgroupname])
+    fi
+    AC_SUBST(with_systemdgroupname)
 
 
 fi