[Goodies-commits] r3412 - in xfce4-smartpm-plugin/trunk: . src

[Anders F Bjorklund]

Author: afb
Date: 2007-10-20 10:14:01 +0000 (Sat, 20 Oct 2007)
New Revision: 3412

Modified:
   xfce4-smartpm-plugin/trunk/configure.in.in
   xfce4-smartpm-plugin/trunk/src/xfcesmart.c
Log:
fix paths to programs

Modified: xfce4-smartpm-plugin/trunk/configure.in.in
===================================================================
--- xfce4-smartpm-plugin/trunk/configure.in.in	2007-10-20 10:07:06 UTC (rev 3411)
+++ xfce4-smartpm-plugin/trunk/configure.in.in	2007-10-20 10:14:01 UTC (rev 3412)
@@ -67,7 +67,6 @@
 AC_CHECK_PROG(SMART, smart, smart)
 AC_CHECK_PROG(SMART_UPDATE, smart-update, smart-update)
 AC_CHECK_PROG(SMART_ROOT, smart-root, smart-root)
-AC_CHECK_PROG(GKSUDO, gksudo, gksudo)
 
 AC_MSG_CHECKING([Smart version])
 SMART_VERSION="`$ac_cv_prog_SMART --version | sed -e 's/smart //'`"
@@ -84,6 +83,13 @@
 AC_DEFINE_UNQUOTED(PATH_SU, ["$SU"], [path to su])
 AC_DEFINE_UNQUOTED(PATH_SUDO, ["$SUDO"], [path to sudo])
 
+AC_PATH_PROG(GKSU, gksu, gksu)
+AC_PATH_PROG(GKSUDO, gksudo, gksudo)
+AC_ARG_VAR(GKSU, [path to gksu command])
+AC_ARG_VAR(GKSUDO, [path to gksudo command])
+AC_DEFINE_UNQUOTED(PATH_GKSU, ["$GKSU"], [path to gksu])
+AC_DEFINE_UNQUOTED(PATH_GKSUDO, ["$GKSUDO"], [path to gksudo])
+
 dnl ******************************
 dnl *** Check for RPM programs ***
 dnl ******************************
@@ -101,8 +107,10 @@
 dnl ********************************
 dnl *** Check for Slapt programs ***
 dnl ********************************
-AC_CHECK_PROG(SLAPT_GET, slapt-get, slapt-get)
-AC_CHECK_PROG(GSLAPT, gslapt, gslapt)
+AC_PATH_PROG(SLAPT_GET, slapt-get, slapt-get)
+AC_PATH_PROG(GSLAPT, gslapt, gslapt)
+AC_DEFINE_UNQUOTED(PATH_SLAPT_GET, ["$SLAPT_GET"], [path to slapt-get])
+AC_DEFINE_UNQUOTED(PATH_GSLAPT, ["$GSLAPT"], [path to gslapt])
 
 dnl ***********************************
 dnl *** Check for required packages ***

Modified: xfce4-smartpm-plugin/trunk/src/xfcesmart.c
===================================================================
--- xfce4-smartpm-plugin/trunk/src/xfcesmart.c	2007-10-20 10:07:06 UTC (rev 3411)
+++ xfce4-smartpm-plugin/trunk/src/xfcesmart.c	2007-10-20 10:14:01 UTC (rev 3412)
@@ -51,7 +51,7 @@
 
 #include "xfcesmart.h"
 
-#define SMART_PATH    "/usr/local/bin:/usr/bin:/usr/sbin:/bin:/opt/gnome/bin"
+#define SMART_PATH    "/usr/local/bin:/usr/bin:/bin:/opt/gnome/bin"
 #define SMART_LANG    "C" /* we're looking for certain phrases... */
 
 enum
@@ -66,7 +66,6 @@
 #define SMART_PROGRAM "smart" /* regular bin */
 #define SMART_UPDATE  "smart-update" /* suid */
 #define SMART_SUIDBIN "smart-root" /* Fedora */
-#define SMART_SUDOBIN "gksudo" /* Ubuntu/etc */
 
 #define YUM_WEBSITE   "http://www.yum-extender.org/"
 #define YUM_PROGRAM   "yumex"
@@ -77,8 +76,8 @@
 #define APT_UPDATE    "apt-get"
 
 #define SLAPT_WEBSITE "http://software.jaos.org/#gslapt"
-#define SLAPT_PROGRAM "gslapt"
-#define SLAPT_UPDATE  "slapt-get"
+#define SLAPT_PROGRAM /* "gslapt" */    PATH_GSLAPT
+#define SLAPT_UPDATE  /* "slapt-get" */ PATH_SLAPT_GET
 
 #define TIMEOUT_TIME  1000 /* milliseconds */
 
@@ -699,26 +698,26 @@
     case PACKAGE_MANAGER_SMART:
       if (smart_program_exists(SMART_SUIDBIN))
         program = g_strdup(SMART_SUIDBIN);
-      else /* if (smart_program_exists(SMART_SUDOBIN)) */
-        program = g_strdup_printf("%s -- %s", SMART_SUDOBIN, SMART_PROGRAM);
-      /*else
-        program = g_strdup(SMART_PROGRAM);*/
+      else if (smart_program_exists(PATH_GKSUDO))
+        program = g_strdup_printf("%s -- %s", PATH_GKSUDO, SMART_PROGRAM);
+      else
+        program = g_strdup(SMART_PROGRAM);
       break;
     case PACKAGE_MANAGER_YUM:
-      if (smart_program_exists(SMART_SUDOBIN))
-        program = g_strdup_printf("%s %s", SMART_SUDOBIN, YUM_PROGRAM);
+      if (smart_program_exists(PATH_GKSU))
+        program = g_strdup_printf("%s %s", PATH_GKSU, YUM_PROGRAM);
       else
         program = g_strdup(YUM_PROGRAM); /* it is using consolehelper */
       break;
     case PACKAGE_MANAGER_APT:
-      if (smart_program_exists(SMART_SUDOBIN))
-        program = g_strdup_printf("%s %s", SMART_SUDOBIN, APT_PROGRAM);
+      if (smart_program_exists(PATH_GKSUDO))
+        program = g_strdup_printf("%s %s", PATH_GKSUDO, APT_PROGRAM);
       else
         program = g_strdup(APT_PROGRAM); /* it is using consolehelper */
       break;
     case PACKAGE_MANAGER_SLAPT:
-      if (smart_program_exists(SMART_SUDOBIN))
-        program = g_strdup_printf("%s %s", SMART_SUDOBIN, SLAPT_PROGRAM);
+      if (smart_program_exists(PATH_GKSU))
+        program = g_strdup_printf("%s %s", PATH_GKSU, SLAPT_PROGRAM);
       else
         program = g_strdup(SLAPT_PROGRAM);
       break;