gnome-utils r8282 - in trunk: . logview

[cosimoc svn gnome org]

Author: cosimoc
Date: Tue Dec 23 13:27:06 2008
New Revision: 8282
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=8282&view=rev

Log:
Remove all the useless CONSOLE_HELPER stuff.

Modified:
   trunk/configure.ac
   trunk/logview/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Dec 23 13:27:06 2008
@@ -223,23 +223,6 @@
 dnl Other miscellaneous checks 
 dnl ***************************************************************
 
-dnl Allow users to run logview using the console helper PAM stuff.
-AC_ARG_ENABLE(console-helper,
-              AC_HELP_STRING([--enable-console-helper=@<:@no/yes@:>@],
-                             [Enable PAM console helper @<:@default=no@:>@]),,
-              enable_console_helper=no)
-
-if test "x$enable_console_helper" = "xyes"; then
-  AM_CONDITIONAL(CONSOLE_HELPER, true)
-else
-  AM_CONDITIONAL(CONSOLE_HELPER, false)
-fi
-
-AC_PATH_PROG(CONSOLE_HELPER,consolehelper,no)
-if test "x$CONSOLE_HELPER" = "xno" -a "x$enable_console_helper" = "xyes" ; then
-	AC_MSG_ERROR(Console helper requested but consolehelper binary not found)
-fi
-
 dnl Enable debug messages
 m4_define([debug_default],
           m4_if(m4_eval(gdict_minor_version % 2), [1], [yes], [no]))

Modified: trunk/logview/Makefile.am
==============================================================================
--- trunk/logview/Makefile.am	(original)
+++ trunk/logview/Makefile.am	Tue Dec 23 13:27:06 2008
@@ -3,7 +3,6 @@
 SUBDIRS = help tests
 
 Utilitiesdir = $(datadir)/applications
-additionaldir  = $(datadir)/gnome-system-log
 
 INCLUDES = \
 	$(GNOME_UTILS_CFLAGS)					\
@@ -66,16 +65,9 @@
 schemas_DATA = $(schemas_in_file:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
-additional_DATA  = gnome-system-log-descript.db \
-                   gnome-system-log-regexp.db \
-		   gnome-system-log-actions.db
-
 EXTRA_DIST = \
 	gnome-system-log.desktop.in.in	\
-	$(additional_DATA)		\
 	$(schemas_in_file) 		\
-	gnome-system-log-pam		\
-	gnome-system-log-security.in	\
 	$(man_MANS)
 
 if GCONF_SCHEMAS_INSTALL
@@ -89,15 +81,7 @@
 install-gconf-schemas:
 endif
 
-install-data-local: gnome-system-log-security install-gconf-schemas
-
-if CONSOLE_HELPER
-	$(INSTALL_DATA) -D gnome-system-log-pam $(DESTDIR)$(PAM_PREFIX)/pam.d/gnome-system-log
-	$(INSTALL_DATA) -D gnome-system-log-security $(DESTDIR)$(PAM_PREFIX)/security/console.apps/gnome-system-log
-	$(INSTALL_DATA) -m 755 -d $(DESTDIR)$(sbindir)
-	mv -f $(DESTDIR)$(bindir)/gnome-system-log $(DESTDIR)$(sbindir)
-	$(LN_S) @CONSOLE_HELPER@ $(DESTDIR)$(bindir)/gnome-system-log
-endif
+install-data-local: install-gconf-schemas
 
 CLEANFILES = 				\
 	gnome-system-log.desktop	\