just remove unused macro as i can't get it to work right anyway

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 0bd83d3..86042e3 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -454,9 +454,6 @@ LB_DARWIN_CONDITIONALS
 
 LP_CONDITIONALS
 LC_CONDITIONALS
 
 LP_CONDITIONALS
 LC_CONDITIONALS

-if test "$SNMP_DIST_SUBDIR" ; then
-       LS_CONDITIONALS
-fi

 ])
 
 #
 ])
 
 #

diff --git a/snmp/autoconf/lustre-snmp.m4 b/snmp/autoconf/lustre-snmp.m4
index 2ca0f46..713f395 100644 (file)
--- a/snmp/autoconf/lustre-snmp.m4
+++ b/snmp/autoconf/lustre-snmp.m4
@@ -12,7 +12,7 @@ AC_ARG_ENABLE([snmp],
 AC_MSG_RESULT([$enable_snmp])
 
 if test x$enable_snmp != xno ; then
 AC_MSG_RESULT([$enable_snmp])
 
 if test x$enable_snmp != xno ; then

-       AC_CHECK_PROG([NET_SNMP_CONFIG], [net-snmp-config], [net-snmp-config], [])
+       AC_CHECK_PROG([NET_SNMP_CONFIG], [net-snmp-config])

        if test "$NET_SNMP_CONFIG" ; then
                NET_SNMP_CFLAGS=$($NET_SNMP_CONFIG --base-cflags)
                NET_SNMP_LIBS=$($NET_SNMP_CONFIG --agent-libs)
        if test "$NET_SNMP_CONFIG" ; then
                NET_SNMP_CFLAGS=$($NET_SNMP_CONFIG --base-cflags)
                NET_SNMP_LIBS=$($NET_SNMP_CONFIG --agent-libs)


@@ -58,15 +58,6 @@ AC_SUBST(mibdir)
 ])
 
 #
 ])
 
 #

-# LS_CONDITIONALS
-#
-# AM_CONDITIONALs for lustre-snmp
-#
-AC_DEFUN([LS_CONDITIONALS],
-[
-])
-
-#

 # LS_CONFIG_FILE
 #
 # files that should be generated with AC_OUTPUT
 # LS_CONFIG_FILE
 #
 # files that should be generated with AC_OUTPUT