From 946810f9ca870b75732f59c021ec49f2c0ef67d3 Mon Sep 17 00:00:00 2001 From: Curtis Gedak Date: Wed, 23 Jul 2008 17:56:57 +0000 Subject: [PATCH] Added check for gksu for gparted menu invocation svn path=/trunk/; revision=870 --- ChangeLog | 8 ++++++++ Makefile.am | 3 ++- configure.in | 4 ++++ gparted.desktop.in.in | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d20fa84a..c5e14c3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2008-07-23 Curtis Gedak + * gparted.desktop.in.in, + Makefile.am, + configure.in: Added check for gksu for gparted menu invocation. + - Permits GNU/Linux distributions with gksu to prompt for root + password when invoked from the menu, while not hampering + distributions without gksu. + - Partially addresses bug 318557 for some GNU/Linux distributions + * configure.in: Append -svn to version for continuing development 2008-07-10 Curtis Gedak diff --git a/Makefile.am b/Makefile.am index 927776a1..e6d47e89 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,8 @@ desktop_DATA = $(DESKTOP_FILES) sbin_SCRIPTS = gparted CLEANFILES = $(sbin_SCRIPTS) $(DESKTOP_IN_FILES) -do_subst = sed -e 's,[@]installdir[@],$(sbindir),g' +do_subst = sed -e 's,[@]installdir[@],$(sbindir),g' \ + -e 's,[@]gksuprog[@],$(GKSUPROG),g' gparted.desktop.in: gparted.desktop.in.in Makefile $(do_subst) < $(srcdir)/gparted.desktop.in.in > gparted.desktop.in diff --git a/configure.in b/configure.in index ea4ac092..6255488a 100644 --- a/configure.in +++ b/configure.in @@ -14,6 +14,10 @@ AC_PROG_CC AC_PROG_CXX AM_PROG_LIBTOOL +dnl====================== +dnl checks for other programs +dnl====================== +AC_PATH_PROG(GKSUPROG, gksu) dnl====================== dnl i18n stuff diff --git a/gparted.desktop.in.in b/gparted.desktop.in.in index 377a6b9e..a3168db1 100644 --- a/gparted.desktop.in.in +++ b/gparted.desktop.in.in @@ -1,7 +1,7 @@ [Desktop Entry] _Name=GParted Partition Editor _Comment=Create, reorganize, and delete partitions -Exec=@installdir@/gparted +Exec=@gksuprog@ @installdir@/gparted Icon=gparted Terminal=false Type=Application