remove silly patch; blank SHLIB_LDCONFIG_CMD so ldconfig isn't run from any subdir's Makefile

This commit is contained in:
danh 2000-10-26 01:55:22 +00:00
parent c77cb6b7e3
commit 707a281d78
2 changed files with 11 additions and 20 deletions

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-configure_in,v 1.4 2000/10/26 01:55:22 danh Exp $
--- configure.in.orig Fri May 5 12:46:26 2000
+++ configure.in Wed Oct 25 16:35:10 2000
@@ -400,22 +400,10 @@
+++ configure.in Wed Oct 25 21:46:25 2000
@@ -400,22 +400,10 @@ if test "x$prefix" = "xNONE"; then
prefix=/usr/local
fi
@ -23,7 +24,7 @@
dnl Set SNMPLIBPATH & SNMPSHAREPATH
SNMPLIBPATH=""
@@ -484,7 +472,7 @@
@@ -484,7 +472,7 @@ if test "x$with_shared" = "xyes"; then
fi
;;
@ -32,7 +33,7 @@
AC_MSG_CHECKING(if this is ELF system)
AC_EGREP_CPP(yes, [dnl
#ifdef __ELF__
@@ -502,6 +490,22 @@
@@ -502,6 +490,22 @@ yes
])
;;
@ -48,14 +49,14 @@
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD_CMD='$(CC) -shared -o'
+ CC_RUNTIME_ARG="-Wl,-rpath,$libdir"
+ SHLIB_LDCONFIG_CMD='PATH="$$PATH:/sbin" ldconfig -m $(libdir)'
+ SHLIB_LDCONFIG_CMD=''
+ SHLIB_VERSION=.41.2
+ ;;
+
hpux*)
SHLIB_EXTENSION="sl"
if test "x$GCC" != "xyes"; then
@@ -1256,29 +1260,17 @@
@@ -1256,29 +1260,17 @@ AC_CHECK_STRUCT_FOR([
AC_CHECK_STRUCT_FOR([
#include <sys/types.h>
@ -85,7 +86,7 @@
#include <net/route.h>
], rtentry, rt_dst, no)
@@ -1289,11 +1281,7 @@
@@ -1289,11 +1281,7 @@ AC_CACHE_CHECK(type of rtentry structure
dnl 4.4 compat
AC_TRY_COMPILE([
#include <sys/types.h>
@ -97,7 +98,7 @@
#include <net/route.h>
],[
@@ -1310,11 +1298,7 @@
@@ -1310,11 +1298,7 @@ dnl 4.3 compat
if test "x$ac_cv_RTENTRY_TYPE" = "x"; then
AC_TRY_COMPILE([
#include <sys/types.h>
@ -109,7 +110,7 @@
#include <net/route.h>
],[
struct rtentry rt;
@@ -1364,11 +1348,7 @@
@@ -1364,11 +1348,7 @@ AC_CACHE_CHECK(for struct rtentry has a
[
AC_TRY_COMPILE([
#include <sys/types.h>
@ -121,7 +122,7 @@
#include <net/route.h>
],[
struct rtentry rt;
@@ -1385,41 +1365,25 @@
@@ -1385,41 +1365,25 @@ fi
dnl Check struct rtentry for various things.
AC_CHECK_STRUCT_FOR([
#include <sys/types.h>

View File

@ -1,10 +0,0 @@
--- snmplib/Makefile.in.orig Wed Oct 25 16:45:25 2000
+++ snmplib/Makefile.in Wed Oct 25 16:45:34 2000
@@ -59,7 +59,6 @@
install: $(TARG) installdirs
@for i in $(TARG) ; do $(INSTALL) $$i $(libdir) ; $(RANLIB) $(libdir)/$$i ; echo "install: installed $$i in $(libdir)" ; done
@for i in $(INSTALLHEADERS) ; do $(INSTALL) $(srcdir)/$$i $(includedir) ; echo "install: installed $$i in $(includedir)" ; done
- $(SHLIB_LDCONFIG_CMD)
../lib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION): libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
cp libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ../lib