popt-gnome.h isn't used anymore

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@39 dbcabf3a-b0e7-0310-adc4-f8d773084564

acconfig.h

@@ -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

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

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