From 8b9a3f8a18429405d1194cb119518ff584474ba2 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Wed, 16 Jun 2010 19:59:37 -0400
Subject: [PATCH] Move aix.o from SUDO_OBJS to COMMON_OBJS

--HG--
branch : 1.7
---
 Makefile.in  | 2 +-
 configure    | 6 +++---
 configure.in | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7f64a5ba3..e200f1df4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -131,7 +131,7 @@ AUTH_OBJS = sudo_auth.o @AUTH_OBJS@
 
 COMMON_OBJS = alias.o alloc.o defaults.o error.o getline.o gram.o \
 	      list.o match.o pwutil.o timestr.o toke.o redblack.o \
-	      term.o zero_bytes.o @NONUNIX_GROUPS_IMPL@
+	      term.o zero_bytes.o @COMMON_OBJS@
 
 SUDO_OBJS = $(AUTH_OBJS) @SUDO_OBJS@ audit.o boottime.o check.o env.o \
 	    exec.o getspwuid.o gettime.o goodpath.o fileops.o find_path.o \
diff --git a/configure b/configure
index 7613516c7..149e08bf8 100755
--- a/configure
+++ b/configure
@@ -817,7 +817,6 @@ timeout
 timedir
 CONFIGURE_ARGS
 ZLIB
-NONUNIX_GROUPS_IMPL
 LOGINCAP_USAGE
 REPLAY
 LDAP
@@ -849,6 +848,7 @@ NET_LIBS
 SUDO_LIBS
 SUDO_OBJS
 SUDO_LDFLAGS
+COMMON_OBJS
 LDFLAGS
 CPPFLAGS
 PROGS
@@ -5078,7 +5078,7 @@ _ACEOF
 
     $as_echo "#define USING_NONUNIX_GROUPS 1" >>confdefs.h
 
-    NONUNIX_GROUPS_IMPL="vasgroups.o"
+    COMMON_OBJS="$COMMON_OBJS vasgroups.o"
 
 # Check whether --with-libvas-rpath was given.
 if test "${with_libvas_rpath+set}" = set; then :
@@ -12646,7 +12646,7 @@ _ACEOF
 fi
 done
 
-		SUDO_OBJS="$SUDO_OBJS aix.o"
+		COMMON_OBJS="$COMMON_OBJS aix.o"
 		;;
     *-*-hiuxmpp*)
 		: ${mansectsu='1m'}
diff --git a/configure.in b/configure.in
index ee956112d..b0489c068 100644
--- a/configure.in
+++ b/configure.in
@@ -19,6 +19,7 @@ AC_SUBST([CFLAGS])
 AC_SUBST([PROGS])
 AC_SUBST([CPPFLAGS])
 AC_SUBST([LDFLAGS])
+AC_SUBST([COMMON_OBJS])
 AC_SUBST([SUDO_LDFLAGS])
 AC_SUBST([SUDO_OBJS])
 AC_SUBST([LIBS])
@@ -51,7 +52,6 @@ AC_SUBST([SELINUX_USAGE])
 AC_SUBST([LDAP])
 AC_SUBST([REPLAY])
 AC_SUBST([LOGINCAP_USAGE])
-AC_SUBST([NONUNIX_GROUPS_IMPL])
 AC_SUBST([ZLIB])
 AC_SUBST([CONFIGURE_ARGS])
 dnl
@@ -1085,7 +1085,7 @@ esac
 if test X"$with_libvas" != X"no"; then
     AC_DEFINE_UNQUOTED([LIBVAS_SO], ["$with_libvas"], [The name of libvas.so])
     AC_DEFINE(USING_NONUNIX_GROUPS)
-    NONUNIX_GROUPS_IMPL="vasgroups.o"
+    COMMON_OBJS="$COMMON_OBJS vasgroups.o"
     AC_ARG_WITH([libvas-rpath],
        [AS_HELP_STRING([--with-libvas-rpath=PATH],
 		       [Path to look for libvas in [default=/opt/quest/lib]])],
@@ -1453,7 +1453,7 @@ case "$host" in
 
 		# AIX-specific functions
 		AC_CHECK_FUNCS(getuserattr setauthdb)
-		SUDO_OBJS="$SUDO_OBJS aix.o"
+		COMMON_OBJS="$COMMON_OBJS aix.o"
 		;;
     *-*-hiuxmpp*)
 		: ${mansectsu='1m'}
-- 
2.40.0