Make GUI shell compilation optional, and add a desktop file for it.

diff --git a/clients/gtk2/Makefile.am b/clients/gtk2/Makefile.am
index a1aa4e6..7cbf39a 100644 (file)
--- a/clients/gtk2/Makefile.am
+++ b/clients/gtk2/Makefile.am
@@ -1,7 +1,9 @@
 if CLI_GTK2
 bin_PROGRAMS=dolcon
+if !GUISHELL
 app_DATA=dolcon.desktop
 endif
+endif
 
 dolcon_SOURCES=        dolcon.c \
                dolcon.h \

diff --git a/clients/gui-shell/Makefile.am b/clients/gui-shell/Makefile.am
index 1b49bee..43e6afc 100644 (file)
--- a/clients/gui-shell/Makefile.am
+++ b/clients/gui-shell/Makefile.am
@@ -1,10 +1,13 @@
+if GUISHELL
 bin_PROGRAMS=dolcon-launch doldacond-shell
+app_DATA=dolcon.desktop
+endif
 
 dolcon_launch_SOURCES=launch.c
 
 doldacond_shell_SOURCES=dsh.c
 
-EXTRA_DIST=dsh-start.desc dsh-menu.desc
+EXTRA_DIST=dsh-start.desc dsh-menu.desc dolcon.desktop
 BUILT_SOURCES=dsh-start.gtk dsh-menu.gtk
 
 dsh.c: dsh-start.gtk dsh-menu.gtk
@@ -21,3 +24,5 @@ doldacond_shell_CPPFLAGS=@GTK2_CFLAGS@ @LIBNOTIFY_CFLAGS@ \
        basename="$${target%.gtk}"; \
        cpp $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $< \
         | $(top_srcdir)/common/makegdesc -h "$${basename}.gtkh" >$@
+
+appdir=$(datadir)/applications

diff --git a/clients/gui-shell/dolcon.desktop b/clients/gui-shell/dolcon.desktop
new file mode 100644 (file)
index 0000000..4aa168f
--- /dev/null
+++ b/clients/gui-shell/dolcon.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Categories=Network
+Type=Application
+Terminal=false
+Icon=hellodolda.png
+Exec=dolcon-launch
+Name=Dolda Connect

diff --git a/configure.in b/configure.in
index 0fc4a01..37eef90 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -98,6 +98,11 @@ DOLDA_ENABLE(dolconf, [  --enable-dolconf        Build the configuration helper]
                      [HAS_GTK2])
 AM_CONDITIONAL(DOLCONF, test "$enable_dolconf" = yes)
 
+# GUI shell check
+DOLDA_ENABLE(guishell, [  --enable-guishell       Build the GUI shell programs], yes,
+                      [HAS_GTK2])
+AM_CONDITIONAL(GUISHELL, test "$enable_guishell" = yes)
+
 # Gtk progress bar check
 AH_TEMPLATE(ENABLE_GTK2PBAR, [define to compile GTK2 progress bars (experimental)])
 DOLDA_ENABLE(gtk2pbar, [  --enable-gtk2pbar       Enable GTK2 progress bars (experimental)], no,
@@ -258,6 +263,7 @@ echo "    Kerberos 5 support:      $krb_msg"
 echo "    GTK2 user interface:     $enable_gtk2ui"
 echo "    GTK2 progress bars:      $enable_gtk2pbar"
 echo "    Dolconf configurator:    $enable_dolconf"
+echo "    GUI shell:               $enable_guishell"
 echo "    Guile extension library: $guile_msg"
 echo "    GNOME transfer applet:   $enable_gnomeapplet"
 echo "    Gaim chat plugin:        $gaimplugin_msg"