From: bfernhomberg <bfernhomberg>
Date: Wed, 13 Apr 2005 10:21:09 +0000 (+0000)
Subject: -fix admin-group configure option
X-Git-Tag: netatalk-2-0-3~15
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c925fe83b8b8c18c4c439a4802b921dfb46f65a6;p=netatalk.git

-fix admin-group configure option
-fix atalk_addr check

merge from branch-netatalk-afp-3x-dev
---

diff --git a/configure.in b/configure.in
index a5e666db..bed9a6ef 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.179.2.3.2.37.2.3 2004-11-09 23:07:03 didg Exp $
+dnl $Id: configure.in,v 1.179.2.3.2.37.2.4 2005-04-13 10:21:09 bfernhomberg Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -183,19 +183,20 @@ dnl --------------------------------------------------------------------------
 dnl specific configuration comes in here:
 dnl --------------------------------------------------------------------------
 
-AC_DEFINE(ADMIN_GRP, 1, [Define if the admin group should be enabled])
 
 netatalk_cv_admin_group=yes
 AC_MSG_CHECKING([for administrative group support])
-AC_ARG_WITH(admin-group,
+AC_ARG_ENABLE(admin-group,
  	[  --disable-admin-group   disable admin group],[
-        if test "$enableval" = "no"; then
+        if test x"$enableval" = x"no"; then
 		AC_DEFINE(ADMIN_GRP, 0, [Define if the admin group should be enabled])
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
 		netatalk_cv_admin_group=no
+		AC_MSG_RESULT([no])
+	else
+		AC_DEFINE(ADMIN_GRP, 1, [Define if the admin group should be enabled])
+		AC_MSG_RESULT([yes])
         fi],[
+		AC_DEFINE(ADMIN_GRP, 1, [Define if the admin group should be enabled])
 		AC_MSG_RESULT([yes])
 	]
 )
@@ -672,14 +673,10 @@ dnl	AC_COMPILE_IFELSE([
 #include <sys/socket.h>
 #include <asm/types.h>
 #include <linux/atalk.h>
-],
-[
-int main() {
-	struct atalk_addr foo;
 
-	return 0;
-}
-	], [
+	struct atalk_addr foo;
+],
+[ ], [
 		ac_have_atalk_addr=yes
 		AC_MSG_RESULT([yes])
 	], [