diff options
| author | Timo Sirainen <cras@irssi.org> | 1999-10-09 18:04:21 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 1999-10-09 18:04:21 +0000 |
| commit | 15dcd0a2c50d308b3e1536d31f4c72cf87e896a1 (patch) | |
| tree | c493e99f559939b5fe298a54c6eeda58f30bec3d | |
| parent | ccfef94ec597381aa6cafe806abb8083fe21132c (diff) | |
| download | irssi-15dcd0a2c50d308b3e1536d31f4c72cf87e896a1.zip | |
popt-gnome.h isn't used anymore
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@39 dbcabf3a-b0e7-0310-adc4-f8d773084564
| -rw-r--r-- | acconfig.h | 1 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | src/common.h | 8 |
3 files changed, 3 insertions, 14 deletions
@@ -14,7 +14,6 @@ #undef HAVE_IPV6 #undef HAVE_POPT_H -#undef HAVE_POPT_GNOME_H #undef HAVE_SOCKS_H #undef HAVE_NCURSES_USE_DEFAULT_COLORS diff --git a/configure.in b/configure.in index 120c0826..0042c991 100644 --- a/configure.in +++ b/configure.in @@ -196,10 +196,6 @@ else PROG_LIBS="$PROG_LIBS $poptlib -lpopt" if test -f $popt_dir/include/popt.h; then 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 @@ -262,11 +258,9 @@ if test "x$want_gnome" = "xyes"; then AC_DEFINE(HAVE_GTK) AC_DEFINE(HAVE_GNOME) AC_DEFINE(HAVE_IMLIB) - AC_DEFINE(HAVE_POPT_GNOME_H) GNOME_SUPPORT_CHECKS - dnl ** needed for including popt-gnome.h - CFLAGS="$CFLAGS $GNOME_INCLUDEDIR" + GUI_CFLAGS="$GNOME_INCLUDEDIR" dnl ** dnl ** check for gnome panel applet library diff --git a/src/common.h b/src/common.h index ca777c27..f176ea0e 100644 --- a/src/common.h +++ b/src/common.h @@ -27,13 +27,9 @@ #include <sys/utsname.h> #ifdef HAVE_POPT_H -#include <popt.h> +# include <popt.h> #else -# ifdef HAVE_POPT_GNOME_H -# include <popt-gnome.h> -# else -# include <lib-popt/popt.h> -# endif +# include <src/lib-popt/popt.h> #endif #ifdef HAVE_UNISTD_H |