Attachment #95721 for bug #145960




# check for tcp wrapper support
_cppflags="${CPPFLAGS}"
_ldflags="${LDFLAGS}"
_libs=${LIBS}

AC_ARG_WITH(libwrap,
[  --with-libwrap[=LIBPATH] Compile in libwrap (tcp_wrappers) support.],[
  if test "$with_libwrap" != "no"; then
    if test "$with_libwrap" != "yes"; then
      CPPFLAGS="${CPPFLAGS} -I$with_libwrap/include"
      LIBS="${LIBS} -L$with_libwrap/lib"
    fi

    _libs=${LIBS}


  # zlib is required for newer versions of rpm
  _cppflags="${CPPFLAGS}"
  _ldflags="${LIBS}"

  AC_ARG_WITH(zlib,
  [  --with-zlib[=DIR]        use libz in DIR],[
    if test -d "$withval"; then
      CPPFLAGS="${CPPFLAGS} -I$withval/include"
      LIBS="${LIBS} -L$withval/lib"
    fi
  ])


  # dunno if this is needed for rpm-4.0.x, earlier probably needs.
  AC_CHECK_HEADER(zlib.h,
      AC_CHECK_LIB(z, gzread, , CPPFLAGS=${_cppflags} LIBS=${_ldflags}),
      CPPFLAGS=${_cppflags} LIBS=${_ldflags})

  # two variants of bzip2 need checking.
  AC_ARG_WITH(bzip2,
  [  --with-bzip2[=DIR]          use libbzip2 in DIR],[
    if test -d "$withval"; then
      CPPFLAGS="${CPPFLAGS} -I$withval/include"
      LIBS="${LIBS} -L$withval/lib"
    fi
    if test "x$with_bzip2" != "xno"; then
      AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"],

    AC_MSG_RESULT($perlcflags)
    CPPFLAGS="$CPPFLAGS $perlcflags"

    AC_MSG_CHECKING([for perl LIBS])
    perlldopts=`$myperl -MExtUtils::Embed -e ldopts`
    AC_MSG_RESULT($perlldopts)
    PERLLDOPTS="$perlldopts"

    OLDLDFLAGS="$LIBS"
    LIBS="$LIBS $PERLLDOPTS"

    # newer perl vs older perl call functions
    AC_CHECK_FUNCS(Perl_eval_pv eval_pv perl_eval_pv)

    LIBS="$OLDLDFLAGS"

    AC_DEFINE(NETSNMP_EMBEDDED_PERL)
    OTHERAGENTLIBOBJS="snmp_perl.o"

Lines 122-126 Link Here

(-)agent/helpers/Makefile.in.old (-1 / +1 lines)
122	all: standardall	122	all: standardall
123		123
124	libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION): ${LOBJS}	124	libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION): ${LOBJS}
125	$(LIB_LD_CMD) libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION) ${LOBJS} $(LIB_LD_LIBS)	125	$(LIB_LD_CMD) ${LOBJS} -o $@ $(LIB_LD_LIBS) $(LIBS)
126	$(RANLIB) libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION)	126	$(RANLIB) libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION)

Lines 137-143 Link Here

(-)apps/Makefile.in.old (-1 / +1 lines)
137	$(LINK) -o $@ snmpdf.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}	137	$(LINK) -o $@ snmpdf.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}
138		138
139	libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION): $(LLIBTRAPD_OBJS)	139	libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION): $(LLIBTRAPD_OBJS)
140	$(LIB_LD_CMD) libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBTRAPD_OBJS} $(LIB_LD_LIBS)	140	$(LIB_LD_CMD) ${LLIBTRAPD_OBJS} -o $@ $(LIB_LD_LIBS) $(LIBS)
141	$(RANLIB) libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION)	141	$(RANLIB) libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION)
142		142
143	snmpinforminstall:	143	snmpinforminstall:

Return to bug 145960

Lines 2212-2224 Link Here

(-)configure.in.old (-10 / +11 lines)
2212	# check for tcp wrapper support	2212	# check for tcp wrapper support
2213	_cppflags="${CPPFLAGS}"	2213	_cppflags="${CPPFLAGS}"
2214	_ldflags="${LDFLAGS}"	2214	_ldflags="${LDFLAGS}"
		2215	_libs=${LIBS}
2215		2216
2216	AC_ARG_WITH(libwrap,	2217	AC_ARG_WITH(libwrap,
2217	[ --with-libwrap[=LIBPATH] Compile in libwrap (tcp_wrappers) support.],[	2218	[ --with-libwrap[=LIBPATH] Compile in libwrap (tcp_wrappers) support.],[
2218	if test "$with_libwrap" != "no"; then	2219	if test "$with_libwrap" != "no"; then
2219	if test "$with_libwrap" != "yes"; then	2220	if test "$with_libwrap" != "yes"; then
2220	CPPFLAGS="${CPPFLAGS} -I$with_libwrap/include"	2221	CPPFLAGS="${CPPFLAGS} -I$with_libwrap/include"
2221	LDFLAGS="${LDFLAGS} -L$with_libwrap/lib"	2222	LIBS="${LIBS} -L$with_libwrap/lib"
2222	fi	2223	fi
2223		2224
2224	_libs=${LIBS}	2225	_libs=${LIBS}
Lines 2274-2301 Link Here
2274		2275
2275	# zlib is required for newer versions of rpm	2276	# zlib is required for newer versions of rpm
2276	_cppflags="${CPPFLAGS}"	2277	_cppflags="${CPPFLAGS}"
2277	_ldflags="${LDFLAGS}"	2278	_ldflags="${LIBS}"
2278		2279
2279	AC_ARG_WITH(zlib,	2280	AC_ARG_WITH(zlib,
2280	[ --with-zlib[=DIR] use libz in DIR],[	2281	[ --with-zlib[=DIR] use libz in DIR],[
2281	if test -d "$withval"; then	2282	if test -d "$withval"; then
2282	CPPFLAGS="${CPPFLAGS} -I$withval/include"	2283	CPPFLAGS="${CPPFLAGS} -I$withval/include"
2283	LDFLAGS="${LDFLAGS} -L$withval/lib"	2284	LIBS="${LIBS} -L$withval/lib"
2284	fi	2285	fi
2285	])	2286	])
2286		2287
2287		2288
2288	# dunno if this is needed for rpm-4.0.x, earlier probably needs.	2289	# dunno if this is needed for rpm-4.0.x, earlier probably needs.
2289	AC_CHECK_HEADER(zlib.h,	2290	AC_CHECK_HEADER(zlib.h,
2290	AC_CHECK_LIB(z, gzread, , CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),	2291	AC_CHECK_LIB(z, gzread, , CPPFLAGS=${_cppflags} LIBS=${_ldflags}),
2291	CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})	2292	CPPFLAGS=${_cppflags} LIBS=${_ldflags})
2292		2293
2293	# two variants of bzip2 need checking.	2294	# two variants of bzip2 need checking.
2294	AC_ARG_WITH(bzip2,	2295	AC_ARG_WITH(bzip2,
2295	[ --with-bzip2[=DIR] use libbzip2 in DIR],[	2296	[ --with-bzip2[=DIR] use libbzip2 in DIR],[
2296	if test -d "$withval"; then	2297	if test -d "$withval"; then
2297	CPPFLAGS="${CPPFLAGS} -I$withval/include"	2298	CPPFLAGS="${CPPFLAGS} -I$withval/include"
2298	LDFLAGS="${LDFLAGS} -L$withval/lib"	2299	LIBS="${LIBS} -L$withval/lib"
2299	fi	2300	fi
2300	if test "x$with_bzip2" != "xno"; then	2301	if test "x$with_bzip2" != "xno"; then
2301	AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"],	2302	AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"],
Lines 2409-2426 Link Here
2409	AC_MSG_RESULT($perlcflags)	2410	AC_MSG_RESULT($perlcflags)
2410	CPPFLAGS="$CPPFLAGS $perlcflags"	2411	CPPFLAGS="$CPPFLAGS $perlcflags"
2411		2412
2412	AC_MSG_CHECKING([for perl LDFLAGS])	2413	AC_MSG_CHECKING([for perl LIBS])
2413	perlldopts=`$myperl -MExtUtils::Embed -e ldopts`	2414	perlldopts=`$myperl -MExtUtils::Embed -e ldopts`
2414	AC_MSG_RESULT($perlldopts)	2415	AC_MSG_RESULT($perlldopts)
2415	PERLLDOPTS="$perlldopts"	2416	PERLLDOPTS="$perlldopts"
2416		2417
2417	OLDLDFLAGS="$LDFLAGS"	2418	OLDLDFLAGS="$LIBS"
2418	LDFLAGS="$LDFLAGS $PERLLDOPTS"	2419	LIBS="$LIBS $PERLLDOPTS"
2419		2420
2420	# newer perl vs older perl call functions	2421	# newer perl vs older perl call functions
2421	AC_CHECK_FUNCS(Perl_eval_pv eval_pv perl_eval_pv)	2422	AC_CHECK_FUNCS(Perl_eval_pv eval_pv perl_eval_pv)
2422		2423
2423	LDFLAGS="$OLDLDFLAGS"	2424	LIBS="$OLDLDFLAGS"
2424		2425
2425	AC_DEFINE(NETSNMP_EMBEDDED_PERL)	2426	AC_DEFINE(NETSNMP_EMBEDDED_PERL)
2426	OTHERAGENTLIBOBJS="snmp_perl.o"	2427	OTHERAGENTLIBOBJS="snmp_perl.o"