gnome-applets-modemlights-conditional.patch

   1 diff -urN aaa/gnome-applets-2.15.90/configure.in gnome-applets-2.15.90/configure.in
   2 --- aaa/gnome-applets-2.15.90/configure.in      2006-08-22 06:41:25.000000000 +0200
   3 +++ gnome-applets-2.15.90/configure.in  2006-08-26 13:32:25.429217504 +0200
   4 @@ -512,23 +512,32 @@
   5  dnl *** modemlights applet check                                            ***
   6  dnl ***************************************************************************
   7
   8 +dnl --disable-modemlights=(yes|no)
   9 +AC_ARG_ENABLE(modemlights,
  10 +             [  --disable-modemlights=[[no/yes]]
  11 +                          don't build modemlights applet [[default: no]]],,
  12 +             disable_modemlights=no)
  13 +
  14  SU_TOOL=
  15  P_MODEMLIGHTS=
  16  HAVE_LIBUTIL=
  17 +BUILD_MODEM_LIGHTS=no
  18
  19 -AC_PATH_PROG(SU_TOOL, su)
  20 -AC_CHECK_LIB(util, forkpty, HAVE_LIBUTIL=true, HAVE_LIBUTIL=false)
  21 -AM_PATH_SYSTEM_TOOLS_BACKENDS($SYSTEM_TOOLS_BACKENDS_REQUIRED, P_MODEMLIGHTS=modemlights)
  22 -
  23 -if test "x$HAVE_LIBUTIL" = "xtrue" -a "x$P_MODEMLIGHTS" = "xmodemlights" -a "x$HAVE_GNOME_SETTINGS_DAEMON" = "xyes"; then
  24 -  MODEMLIGHTS_LIBS=" -lutil"
  25 -  AC_SUBST(MODEMLIGHTS_LIBS)
  26 -  AC_DEFINE_UNQUOTED(STB_SCRIPTS_DIR, "$STB_SCRIPTS_DIR", [System tools backends])
  27 -  AC_DEFINE_UNQUOTED(SU_PATH, "${SU_TOOL}", [su executable path])
  28 -  BUILD_MODEM_LIGHTS=yes
  29 -else
  30 -  AC_MSG_WARN([*** modemlights applet will not be built ***])
  31 -  BUILD_MODEM_LIGHTS=no
  32 +if test x$disable_modemlights = xno; then
  33 +  AC_PATH_PROG(SU_TOOL, su)
  34 +  AC_CHECK_LIB(util, forkpty, HAVE_LIBUTIL=true, HAVE_LIBUTIL=false)
  35 +  AM_PATH_SYSTEM_TOOLS_BACKENDS($SYSTEM_TOOLS_BACKENDS_REQUIRED, P_MODEMLIGHTS=modemlights)
  36 +
  37 +  if test "x$HAVE_LIBUTIL" = "xtrue" -a "x$P_MODEMLIGHTS" = "xmodemlights" -a "x$HAVE_GNOME_SETTINGS_DAEMON" = "xyes"; then
  38 +    MODEMLIGHTS_LIBS=" -lutil"
  39 +    AC_SUBST(MODEMLIGHTS_LIBS)
  40 +    AC_DEFINE_UNQUOTED(STB_SCRIPTS_DIR, "$STB_SCRIPTS_DIR", [System tools backends])
  41 +    AC_DEFINE_UNQUOTED(SU_PATH, "${SU_TOOL}", [su executable path])
  42 +    BUILD_MODEM_LIGHTS=yes
  43 +  else
  44 +    AC_MSG_WARN([*** modemlights applet will not be built ***])
  45 +    BUILD_MODEM_LIGHTS=no
  46 +  fi
  47  fi
  48
  49  AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes")