Merge pull request #529 from ppp-project/springclean

Springclean

Makefile.am

@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS="-Im4"
 
-SUBDIRS = chat contrib pppd pppstats pppdump
+SUBDIRS = chat pppd pppstats pppdump
 
 if PPP_WITH_PLUGINS
 SUBDIRS += pppd/plugins

configure.ac

@@ -317,22 +317,11 @@ AM_COND_IF([PPP_WITH_FILTER], [
         ])
     ])
 
-#
-# Some contributions require GTK/GLIB
-AC_ARG_WITH([gtk], AS_HELP_STRING([--with-gtk], [Build contributions with the GTK+ interface]))
-if test "x${with_gtk}" = "xyes"; then
-    PKG_CHECK_MODULES([GTK], [gtk+-2.0])
-    PKG_CHECK_MODULES([GLIB], [glib-2.0])
-fi
-AM_CONDITIONAL([WITH_GTK], test "x${with_gtk}" = "xyes")
-
 AC_DEFINE_UNQUOTED(PPPD_VERSION, "$VERSION", [Version of pppd])
 
 AC_CONFIG_FILES([
     Makefile
     chat/Makefile
-    contrib/Makefile
-    contrib/pppgetpass/Makefile
     include/Makefile
     pppd/Makefile
     pppd/pppd.pc