folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

got rid of LIBSOCKET, ZLIB 

check for not needing -lnsl and -lsocket before looking for the libs

CVS patchset: 1481
CVS date: 1997/03/11 17:09:34
This commit is contained in:
ewt 1997-03-11 17:09:34 +00:00
parent 13255871fd
commit fd5f6c1efc
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.in
View File

@ -151,16 +151,20 @@ else
echo "user specificed no gettext; will not build i18n support" echo "user specificed no gettext; will not build i18n support"
fi fi
AC_CHECK_LIB(nsl, gethostname, [LIBSOCKET="-lnsl"]) AC_CHECK_FUNC(gethostname, [], [
AC_CHECK_LIB(socket, socket, [LIBSOCKET="-lsocket $LIBSOCKET"]) AC_CHECK_LIB(nsl, gethostname, [LIBS="-lnsl $LIBS"])
])
AC_CHECK_FUNC(socket, [], [
AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"])
])
AC_CHECK_FUNC(dbopen, [], AC_CHECK_FUNC(dbopen, [],
AC_CHECK_LIB(db, dbopen, [], AC_MSG_WARN([sorry this package needs libdb.a AC_CHECK_LIB(db, dbopen, [], AC_MSG_WARN([sorry this package needs libdb.a
(from the db package)]), $LIBS) (from the db package)]))
) )
AC_CHECK_FUNC(fork, [], [echo "using vfork() instead of fork()"; AC_CHECK_FUNC(fork, [], [echo "using vfork() instead of fork()";
MISCOBJS=fakefork.o], $LIBS) MISCOBJS=fakefork.o])
dnl AmigaOS and IXEmul have a fork() dummy dnl AmigaOS and IXEmul have a fork() dummy
case "$target" in case "$target" in
@ -174,14 +178,12 @@ esac
ZLIB= ZLIB=
for zlib in z gz ; do for zlib in z gz ; do
AC_CHECK_LIB(${zlib}, gzread, AC_CHECK_LIB(${zlib}, gzread,
[ZLIB="-l${zlib}"; break], [LIBS="-l${zlib} $LIBS"; break],
[if test ${zlib} = gz; then [if test ${zlib} = gz; then
AC_MSG_WARN([sorry this package needs libz.a or libgz.a (from the zlib package)]) AC_MSG_WARN([sorry this package needs libz.a or libgz.a (from the zlib package)])
fi] fi]
, $LIBS) )
done done
AC_SUBST(ZLIB)
dnl Checks for header files we can live without. dnl Checks for header files we can live without.
AC_HEADER_STDC AC_HEADER_STDC
@ -264,7 +266,6 @@ AC_SUBST(MISCOBJS)
AC_SUBST(INCPATH) AC_SUBST(INCPATH)
AC_SUBST(LIBMISC) AC_SUBST(LIBMISC)
AC_SUBST(LIBINTL) AC_SUBST(LIBINTL)
AC_SUBST(LIBSOCKET)
AC_SUBST(varprefix) AC_SUBST(varprefix)
AC_SUBST(tmpdir) AC_SUBST(tmpdir)
AC_SUBST(topdir) AC_SUBST(topdir)