[Fedora-directory-commits] ldapserver components.mk, 1.48, 1.49 internal_comp_deps.mk, 1.40, 1.41

[Doctor Conrad]

Author: nkinder

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24599

Modified Files:
	components.mk internal_comp_deps.mk 
Log Message:
188931 - Use system Net-SNMP libraries on Linux systems


Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- components.mk	13 Apr 2006 05:26:51 -0000	1.48
+++ components.mk	13 Apr 2006 23:12:13 -0000	1.49
@@ -406,27 +406,39 @@
 ###########################################################
 
 ### Net-SNMP package ######################################
-ifdef NETSNMP_SOURCE_ROOT
-  NETSNMP_LIBPATH = $(NETSNMP_SOURCE_ROOT)/built/lib
-  NETSNMP_INCDIR = $(NETSNMP_SOURCE_ROOT)/built/include
-  NETSNMP_BINDIR = $(NETSNMP_SOURCE_ROOT)/built/bin
-else
-  NETSNMP_LIBPATH = $(NETSNMP_BUILD_DIR)/lib
-  NETSNMP_INCDIR = $(NETSNMP_BUILD_DIR)/include
-  NETSNMP_BINDIR = $(NETSNMP_BUILD_DIR)/bin
-endif
+ifeq ($(ARCH), Linux)
+  ifeq ($(USE_64), 1)
+    NETSNMP_LIBPATH = /usr/lib64
+  else
+    NETSNMP_LIBPATH = /usr/lib
+  endif
+  NETSNMP_INCDIR = /usr/include/net-snmp
+  NETSNMP_BINDIR = /usr/bin
+else
+  ifdef NETSNMP_SOURCE_ROOT
+    NETSNMP_LIBPATH = $(NETSNMP_SOURCE_ROOT)/built/lib
+    NETSNMP_INCDIR = $(NETSNMP_SOURCE_ROOT)/built/include
+    NETSNMP_BINDIR = $(NETSNMP_SOURCE_ROOT)/built/bin
+  else
+    NETSNMP_LIBPATH = $(NETSNMP_BUILD_DIR)/lib
+    NETSNMP_INCDIR = $(NETSNMP_BUILD_DIR)/include
+    NETSNMP_BINDIR = $(NETSNMP_BUILD_DIR)/bin
+  endif
+endif # Linux
 
 NETSNMP_INCLUDE = -I$(NETSNMP_INCDIR)
 NETSNMP_LIBNAMES = netsnmp netsnmpagent netsnmpmibs netsnmphelpers
 NETSNMP_LINK = -L$(NETSNMP_LIBPATH) $(addprefix -l, $(NETSNMP_LIBNAMES))
 ifneq ($(ARCH), WINNT)
-  ifeq ($(ARCH), HPUX)
-    NETSNMP_SOLIBS = $(addsuffix .$(DLL_SUFFIX).7, $(addprefix $(LIB_PREFIX),
$(NETSNMP_LIBNAMES)))
-  else
-    NETSNMP_SOLIBS = $(addsuffix .$(DLL_SUFFIX).5, $(addprefix $(LIB_PREFIX),
$(NETSNMP_LIBNAMES)))
-  endif
-  LIBS_TO_PKG += $(addprefix $(NETSNMP_LIBPATH)/,$(NETSNMP_SOLIBS))
-endif
+  ifneq ($(ARCH), Linux)
+    ifeq ($(ARCH), HPUX)
+      NETSNMP_SOLIBS = $(addsuffix .$(DLL_SUFFIX).7, $(addprefix $(LIB_PREFIX),
$(NETSNMP_LIBNAMES)))
+    else
+      NETSNMP_SOLIBS = $(addsuffix .$(DLL_SUFFIX).5, $(addprefix $(LIB_PREFIX),
$(NETSNMP_LIBNAMES)))
+    endif
+    LIBS_TO_PKG += $(addprefix $(NETSNMP_LIBPATH)/,$(NETSNMP_SOLIBS))
+  endif # Linux
+endif # WINNT
 ###########################################################
 
 ### ICU package ##########################################


Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- internal_comp_deps.mk	13 Apr 2006 05:26:51 -0000	1.40
+++ internal_comp_deps.mk	13 Apr 2006 23:12:13 -0000	1.41
@@ -311,6 +311,7 @@
 # Net-SNMP
 
 ifndef NETSNMP_SOURCE_ROOT
+ifneq ($(ARCH), Linux)
 #NETSNMP_RELEASE = $(COMPONENTS_DIR_DEV)/net-snmp/$(NETSNMP_VER)/$(NSOBJDIR_NAME)
 NETSNMP_RELEASE = $(COMPONENTS_DIR)/net-snmp/$(NETSNMP_VER)/$(NSOBJDIR_NAME)
 NETSNMP_DEP = $(NETSNMP_INCDIR)/net-snmp/net-snmp-includes.h
@@ -329,6 +330,7 @@
 	-@if [ ! -f $@ ] ; \
 	then echo "Error: could not get component NETSNMP file $@" ; \
 	fi
+endif # Linux
 endif # NETSNMP_SOURCE_ROOT
 
 ###########################################################