aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-02-02 15:08:01 -05:00
Code

configure add libs to PROG_LIBS instead of LIBS since plugins were linked

Browse Source 
against them too.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@36 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 1999-10-05 18:53:45 +00:00 committed by cras
parent 2cc1ddc5e1
commit d226c65524
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
configure.in
View File

@ -159,11 +159,11 @@ dnl **
AC_CHECK_FUNCS(mkfifo) AC_CHECK_FUNCS(mkfifo)
AC_CHECK_LIB(socket, socket, [ AC_CHECK_LIB(socket, socket, [
LIBS="$LIBS -lsocket" PROG_LIBS="$PROG_LIBS -lsocket"
]) ])
AC_CHECK_LIB(nsl, inet_addr, [ AC_CHECK_LIB(nsl, inet_addr, [
LIBS="$LIBS -lnsl" PROG_LIBS="$PROG_LIBS -lnsl"
], -lsocket) ], -lsocket)
# gcc specific options # gcc specific options
@ -188,12 +188,12 @@ dnl **
if test "x$popt_dir" = "x"; then if test "x$popt_dir" = "x"; then
AC_CHECK_HEADER(popt.h, [ AC_CHECK_HEADER(popt.h, [
AC_DEFINE(HAVE_POPT_H) AC_DEFINE(HAVE_POPT_H)
LIBS="-lpopt" PROG_LIBS="$PROG_LIBS -lpopt"
]) ])
else else
poptlib=-L$popt_dir/lib poptlib=-L$popt_dir/lib
CFLAGS="$CFLAGS -I$popt_dir/include" CFLAGS="$CFLAGS -I$popt_dir/include"
LIBS="$LIBS $poptlib -lpopt" PROG_LIBS="$PROG_LIBS $poptlib -lpopt"
if test -f $popt_dir/include/popt.h; then if test -f $popt_dir/include/popt.h; then
AC_DEFINE(HAVE_POPT_H) AC_DEFINE(HAVE_POPT_H)
else else
@ -210,8 +210,8 @@ AC_CHECK_LIB(popt, poptGetContext, [
POPT_LIBS="$poptlib $GNOME_LIBDIR -lgnomesupport" POPT_LIBS="$poptlib $GNOME_LIBDIR -lgnomesupport"
], [ ], [
AC_ERROR(["libpropt or libgnomesupport not found"]) AC_ERROR(["libpropt or libgnomesupport not found"])
], $LIBS $poptlib $GNOME_LIBDIR -lgnomesupport) ], $PROG_LIBS $poptlib $GNOME_LIBDIR -lgnomesupport)
], $LIBS $poptlib -lpopt) ], $PROG_LIBS $poptlib -lpopt)
dnl ** dnl **
@ -225,7 +225,7 @@ else
fi fi
AC_CHECK_LIB(PropList, PLSave, [ AC_CHECK_LIB(PropList, PLSave, [
LIBS="$LIBS $proplib -lPropList" PROG_LIBS="$PROG_LIBS $proplib -lPropList"
if test "x$proplist_dir" != "x"; then if test "x$proplist_dir" != "x"; then
CFLAGS="$CFLAGS -I$proplist_dir/include" CFLAGS="$CFLAGS -I$proplist_dir/include"
fi fi
@ -233,7 +233,7 @@ AC_CHECK_LIB(PropList, PLSave, [
echo "ERROR: Irssi needs libPropList for configuration file handling." echo "ERROR: Irssi needs libPropList for configuration file handling."
echo "Go get it from http://xlife.dhs.org/irssi/download.php" echo "Go get it from http://xlife.dhs.org/irssi/download.php"
AC_ERROR(["libPropList not found"]) AC_ERROR(["libPropList not found"])
], $LIBS $proplib -lPropList) ], $PROG_LIBS $proplib -lPropList)
dnl ** dnl **
@ -242,7 +242,7 @@ dnl **
if test "x$want_socks" = "xyes"; then if test "x$want_socks" = "xyes"; then
AC_CHECK_LIB(socks, connect, [ AC_CHECK_LIB(socks, connect, [
LIBS="$LIBS -lsocks" PROG_LIBS="$PROG_LIBS -lsocks"
AC_CHECK_HEADER(socks.h, [ AC_CHECK_HEADER(socks.h, [
AC_DEFINE(HAVE_SOCKS_H) AC_DEFINE(HAVE_SOCKS_H)
CFLAGS="$CFLAGS -DSOCKS" CFLAGS="$CFLAGS -DSOCKS"
@ -309,15 +309,15 @@ else
fi fi
if test "x$GUI_LIBS" != "x"; then if test "x$GUI_LIBS" != "x"; then
GUI_LIBS="$GUI_LIBS $HEBREW_LIBS" GUI_LIBS="$GUI_LIBS $HEBREW_LIBS $PROG_LIBS"
fi fi
AC_SUBST(POPT_LIBS)
AC_SUBST(GUI_LIBS) AC_SUBST(GUI_LIBS)
AC_SUBST(GUI_CFLAGS) AC_SUBST(GUI_CFLAGS)
AM_CONDITIONAL(BUILD_GNOMEUI, test "x$GUI_LIBS" != "x") AM_CONDITIONAL(BUILD_GNOMEUI, test "x$GUI_LIBS" != "x")
AM_CONDITIONAL(HAVE_GNOME_PANEL, test "x$want_gnome_panel" = "xyes") AM_CONDITIONAL(HAVE_GNOME_PANEL, test "x$want_gnome_panel" = "xyes")
dnl ** dnl **
dnl ** gui-text checks dnl ** gui-text checks
dnl ** dnl **
@ -368,6 +368,10 @@ if test "x$want_ipv6" = "xyes"; then
AC_DEFINE(HAVE_IPV6) AC_DEFINE(HAVE_IPV6)
fi fi
PROG_LIBS="$PROG_LIBS $POPT_LIBS $GLIB_LIBS"
AC_SUBST(PROG_LIBS)
dnl ** dnl **
dnl ** internationalization support dnl ** internationalization support
dnl ** dnl **