[Fedora-directory-commits] ldapserver component_versions.mk, 1.52, 1.53 components.mk, 1.54, 1.55

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	component_versions.mk components.mk 
Log Message:
Bug(s) fixed: 210220
Bug Description: Update ldapconsole version to 1.0.3; package net-snmp when building from source
Reviewed by: nhosoi, nkinder (Thanks!)
Fix Description: 1) Need to bump version of ldapconsole to 1.0.3 for fds 1.0.3
2) On RHEL3 we still need to build/package net-snmp.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no



Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- component_versions.mk	7 Oct 2006 03:20:36 -0000	1.52
+++ component_versions.mk	10 Oct 2006 20:37:05 -0000	1.53
@@ -156,7 +156,7 @@
   LDAPCONSOLE_GENREL=1.0
 endif
 ifndef LDAPCONSOLE_REL
-  LDAPCONSOLE_REL=1.0.2
+  LDAPCONSOLE_REL=1.0.3
 endif
 ifndef LDAPCONSOLE_COMP
   LDAPCONSOLE_COMP = directoryconsole


Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- components.mk	15 Sep 2006 19:33:42 -0000	1.54
+++ components.mk	10 Oct 2006 20:37:05 -0000	1.55
@@ -408,8 +408,15 @@
 ###########################################################
 
 ### Net-SNMP package ######################################
+# given source root overrides other settings
+# otherwise, on linux, use 
+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
 ifeq ($(ARCH), Linux)
-  ifeq ($(USE_64), 1)
+ ifeq ($(USE_64), 1)
     NETSNMP_LIBPATH = /usr/lib64
   else
     NETSNMP_LIBPATH = /usr/lib
@@ -417,16 +424,11 @@
   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_LIBPATH = $(NETSNMP_BUILD_DIR)/lib
+  NETSNMP_INCDIR = $(NETSNMP_BUILD_DIR)/include
+  NETSNMP_BINDIR = $(NETSNMP_BUILD_DIR)/bin
+endif
+endif
 
 NETSNMP_INCLUDE = -I$(NETSNMP_INCDIR)
 NETSNMP_LIBNAMES = netsnmp netsnmpagent netsnmpmibs netsnmphelpers
@@ -439,6 +441,11 @@
       NETSNMP_SOLIBS = $(addsuffix .$(DLL_SUFFIX).5, $(addprefix $(LIB_PREFIX), $(NETSNMP_LIBNAMES)))
     endif
     LIBS_TO_PKG += $(addprefix $(NETSNMP_LIBPATH)/,$(NETSNMP_SOLIBS))
+  else # Linux
+    ifdef NETSNMP_SOURCE_ROOT
+      NETSNMP_SOLIBS = $(addsuffix .$(DLL_SUFFIX).5.2.1, $(addprefix $(LIB_PREFIX), $(NETSNMP_LIBNAMES)))
+	  LIBS_TO_PKG += $(addprefix $(NETSNMP_LIBPATH)/,$(NETSNMP_SOLIBS))
+    endif # NETSNMP_SOURCE_ROOT
   endif # Linux
 endif # WINNT
 ###########################################################