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

popt fixes

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@48 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 1999-10-16 12:26:30 +00:00 committed by cras
parent 42092bacbe
commit 18ecebe10d
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
configure.in
View File

@ -183,27 +183,6 @@ AM_CONDITIONAL(BUILD_SERVERTEST, test "x$want_servertest" = "xyes")
AC_DEFINE_UNQUOTED(SYSCONFDIR, "$prefix/etc") AC_DEFINE_UNQUOTED(SYSCONFDIR, "$prefix/etc")
AC_DEFINE_UNQUOTED(PLUGINSDIR, "$prefix/lib/irssi/plugins") AC_DEFINE_UNQUOTED(PLUGINSDIR, "$prefix/lib/irssi/plugins")
dnl **
dnl ** check for popt.h
dnl **
if test "x$popt_dir" = "x"; then
AC_CHECK_HEADER(popt.h, [
AC_DEFINE(HAVE_POPT_H)
PROG_LIBS="$PROG_LIBS -lpopt"
])
else
poptlib=-L$popt_dir/lib
CFLAGS="$CFLAGS -I$popt_dir/include"
PROG_LIBS="$PROG_LIBS $poptlib -lpopt"
if test -f $popt_dir/include/popt.h; then
AC_DEFINE(HAVE_POPT_H)
fi
fi
if test "x$POPT_LIBS" = "x"; then
POPT_LIBS="../lib-popt/libpopt.a"
fi
dnl ** dnl **
dnl ** check for libPropList dnl ** check for libPropList
dnl ** dnl **
@ -281,8 +260,9 @@ else
want_gnome_panel="no" want_gnome_panel="no"
AC_DEFINE(HAVE_GTK) AC_DEFINE(HAVE_GTK)
AM_PATH_GTK(1.2.0) AM_PATH_GTK(1.2.0)
GUI_CFLAGS="$GTK_CFLAGS $POPT_CFLAGS" GUI_CFLAGS="$GTK_CFLAGS"
GUI_LIBS="$GTK_LIBS $POPT_LIBS" GUI_LIBS="$GTK_LIBS"
PROG_LIBS="$PROG_LIBS ../lib-popt/libpopt.a"
if test "x$want_imlib" = "xyes"; then if test "x$want_imlib" = "xyes"; then
AM_PATH_GDK_IMLIB(, [define_imlib=true]) AM_PATH_GDK_IMLIB(, [define_imlib=true])
@ -354,7 +334,7 @@ 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" PROG_LIBS="$PROG_LIBS $GLIB_LIBS"
AC_SUBST(PROG_LIBS) AC_SUBST(PROG_LIBS)