summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>1999-10-06 16:47:43 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>1999-10-06 16:47:43 +0000
commit95c6a0d9f61f5c0b45baa483cf244600610a61f5 (patch)
tree17f922b3f1b877c47f5472bbe50b88e56c0a82c7 /configure.in
parentd226c655249660189c618a1e009ddb151536cf67 (diff)
downloadirssi-95c6a0d9f61f5c0b45baa483cf244600610a61f5.zip
libpopt is now distributed with irssi since it's small enough and I got
tired of installing it to every computer when I tried to run irssi.. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@37 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in15
1 files changed, 4 insertions, 11 deletions
diff --git a/configure.in b/configure.in
index 835ffb75..120c0826 100644
--- a/configure.in
+++ b/configure.in
@@ -203,16 +203,9 @@ else
fi
fi
-AC_CHECK_LIB(popt, poptGetContext, [
- POPT_LIBS="$poptlib -lpopt"
-], [
- AC_CHECK_LIB(gnomesupport, poptGetContext, [
- POPT_LIBS="$poptlib $GNOME_LIBDIR -lgnomesupport"
- ], [
- AC_ERROR(["libpropt or libgnomesupport not found"])
- ], $PROG_LIBS $poptlib $GNOME_LIBDIR -lgnomesupport)
-], $PROG_LIBS $poptlib -lpopt)
-
+if test "x$POPT_LIBS" = "x"; then
+ POPT_LIBS="../lib-popt/libpopt.a"
+fi
dnl **
dnl ** check for libPropList
@@ -290,7 +283,6 @@ if test "x$want_gnome" = "xyes"; then
else
GUI_LIBS="$GNOME_LIBDIR $GNOMEUI_LIBS"
fi
-
else
want_gnome_panel="no"
AC_DEFINE(HAVE_GTK)
@@ -398,6 +390,7 @@ src/gui-gnome/help/C/Makefile
src/gui-gnome/pixmaps/Makefile
src/lib-config/Makefile
src/lib-nongui/Makefile
+src/lib-popt/Makefile
src/settings/Makefile
servertest/Makefile
plugins/Makefile