1
0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00

popt-gnome.h isn't used anymore

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@39 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 1999-10-09 18:04:21 +00:00 committed by cras
parent ccfef94ec5
commit 15dcd0a2c5
3 changed files with 3 additions and 14 deletions

View File

@ -14,7 +14,6 @@
#undef HAVE_IPV6 #undef HAVE_IPV6
#undef HAVE_POPT_H #undef HAVE_POPT_H
#undef HAVE_POPT_GNOME_H
#undef HAVE_SOCKS_H #undef HAVE_SOCKS_H
#undef HAVE_NCURSES_USE_DEFAULT_COLORS #undef HAVE_NCURSES_USE_DEFAULT_COLORS

View File

@ -196,10 +196,6 @@ else
PROG_LIBS="$PROG_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
if test -f $popt_dir/include/popt-gnome.h; then
AC_DEFINE(HAVE_POPT_GNOME_H)
fi
fi fi
fi fi
@ -262,11 +258,9 @@ if test "x$want_gnome" = "xyes"; then
AC_DEFINE(HAVE_GTK) AC_DEFINE(HAVE_GTK)
AC_DEFINE(HAVE_GNOME) AC_DEFINE(HAVE_GNOME)
AC_DEFINE(HAVE_IMLIB) AC_DEFINE(HAVE_IMLIB)
AC_DEFINE(HAVE_POPT_GNOME_H)
GNOME_SUPPORT_CHECKS GNOME_SUPPORT_CHECKS
dnl ** needed for including popt-gnome.h GUI_CFLAGS="$GNOME_INCLUDEDIR"
CFLAGS="$CFLAGS $GNOME_INCLUDEDIR"
dnl ** dnl **
dnl ** check for gnome panel applet library dnl ** check for gnome panel applet library

View File

@ -27,13 +27,9 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#ifdef HAVE_POPT_H #ifdef HAVE_POPT_H
#include <popt.h> # include <popt.h>
#else #else
# ifdef HAVE_POPT_GNOME_H # include <src/lib-popt/popt.h>
# include <popt-gnome.h>
# else
# include <lib-popt/popt.h>
# endif
#endif #endif
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H