Removed a C99 local variable definition that breaks the build with gcc

006-03-28  Julio M. Merino Vidal  <jmmv@NetBSD.org>

        * daemon/xdmcp.c: Removed a C99 local variable definition that
          breaks the build with gcc 2.95 (e.g. under NetBSD 1.6).  Fixes
          bug #336368.

2006-03-28  Julio M. Merino Vidal  <jmmv@NetBSD.org>

        * daemon/gdmconfig.c, daemon/server.c: Include sys/resource.h,
          needed to use setpriority(2) and its associated definitions.
          Fixes the build under NetBSD, closing bug #336369.

2006-03-28  Julio M. Merino Vidal  <jmmv@NetBSD.org>

        * Makefile.am, README.install, acconfig.h, configure.ac,
          gdmsetup-security.in, config/Makefile.am, config/Xsession.in,
          config/gdm.conf.in, daemon/Makefile.am, daemon/gdm.c, daemon/gdm.h,
          daemon/gdm.in, daemon/gdmconfig.c, daemon/misc.c, daemon/server.c,
          daemon/slave.c, docs/C/gdm.xml, gui/Makefile.am, gui/gdmphotosetup.c,
          gui/gdmsetup.c, gui/gdmsetup.desktop.in, gui/greeter/Makefile.am,
          gui/greeter/gdmthemetester.in, gui/greeter/greeter.c,
          gui/modules/Makefile.am: Get rid of all EXPANDED_* variables from
          the build procedure.  Directory-related variables must only be
          expanded from the Makefiles so that they can be easily overriden
          during the installation phase.  Fixes bug #336364.

8 files changed, 57 insertions, 22 deletions

diff --git a/gui/Makefile.am b/gui/Makefile.am
index b0f89364..29a7a14d 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -3,9 +3,15 @@ SUBDIRS = . greeter modules faces
 ## Process this file with automake to produce makefile.in
 DEFS = @DEFS@ \
 	-DPREFIX=\"@prefix@\" \
+	-DAUTHDIR=\"@authdir@\" \
 	-DDATADIR=\"@datadir@\" \
+	-DDMCONFDIR=\"@dmconfdir@\" \
+	-DGDMLOCALEDIR=\"@gdmlocaledir@\" \
+	-DGDM_GLADE_DIR=\"@datadir@/gdm\" \
 	-DLIBDIR=\"@libdir@\" \
-	-DGDM_GLADE_DIR=\"@datadir@/gdm\"
+	-DLIBEXECDIR=\"@libexecdir@\" \
+	-DPIXMAPDIR=\"@pixmapdir@\" \
+	-DSBINDIR=\"@sbindir@\"
 
 INCLUDES = \
 	-I.						\
@@ -206,6 +212,12 @@ System_in_files = \
 	gdmflexiserver-xnest.desktop.in
 System_DATA = $(System_in_files:.desktop.in=.desktop)
 
+CLEANFILES = gdmsetup.desktop
+
+gdmsetup.desktop: $(srcdir)/gdmsetup.desktop.in
+	sed -e 's,[@]sbindir[@],$(sbindir),g' <$(srcdir)/gdmsetup.desktop.in \
+		>gdmsetup.desktop
+
 @INTLTOOL_DESKTOP_RULE@
 
 Gladedir = $(datadir)/gdm
diff --git a/gui/gdmphotosetup.c b/gui/gdmphotosetup.c
index 610362c1..59abb078 100644
--- a/gui/gdmphotosetup.c
+++ b/gui/gdmphotosetup.c
@@ -264,9 +264,9 @@ browse_button_cb (GtkWidget *widget, gpointer data)
 						      facedir, NULL);
 	} else {
 		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (file_dialog),
-						     EXPANDED_DATADIR "/pixmaps");
+						     DATADIR "/pixmaps");
 		gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (file_dialog),
-						      EXPANDED_DATADIR "/pixmaps", NULL);
+						      DATADIR "/pixmaps", NULL);
 	}
 
 	filter = gtk_file_filter_new ();
diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c
index f6b98832..e973f803 100644
--- a/gui/gdmsetup.c
+++ b/gui/gdmsetup.c
@@ -923,15 +923,15 @@ combobox_timeout (GtkWidget *combo_box)
 		new_key_val = NULL;
 
 		if (selected == LOCAL_PLAIN_WITH_FACE) {		
-			new_key_val = g_strdup (EXPANDED_LIBEXECDIR "/gdmlogin");
+			new_key_val = g_strdup (LIBEXECDIR "/gdmlogin");
 			browser_val = TRUE;
 		} 
 		else if (selected == LOCAL_THEMED) {
-			new_key_val = g_strdup (EXPANDED_LIBEXECDIR "/gdmgreeter");
+			new_key_val = g_strdup (LIBEXECDIR "/gdmgreeter");
 			browser_val = gdm_config_get_bool (GDM_KEY_BROWSER);
 		}
 		else {  /* Plain style */
-			new_key_val = g_strdup (EXPANDED_LIBEXECDIR "/gdmlogin");
+			new_key_val = g_strdup (LIBEXECDIR "/gdmlogin");
 			browser_val = FALSE;
 		}		
 		
@@ -963,7 +963,7 @@ combobox_timeout (GtkWidget *combo_box)
 				free_new_val = FALSE;
 			}
 			else if (selected == REMOTE_PLAIN_WITH_FACE) {
-				new_key_val = g_strdup (EXPANDED_LIBEXECDIR "/gdmlogin");
+				new_key_val = g_strdup (LIBEXECDIR "/gdmlogin");
 				gdm_setup_config_set_bool (GDM_KEY_BROWSER, TRUE);
 			}
 			else {
@@ -972,10 +972,10 @@ combobox_timeout (GtkWidget *combo_box)
 				selected_text = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_box));
 				
 				if (strcmp (ve_sure_string (selected_text), _("Themed")) == 0) {
-					new_key_val = g_strdup (EXPANDED_LIBEXECDIR "/gdmgreeter");
+					new_key_val = g_strdup (LIBEXECDIR "/gdmgreeter");
 				}
 				else {
-					new_key_val = g_strdup (EXPANDED_LIBEXECDIR "/gdmlogin");
+					new_key_val = g_strdup (LIBEXECDIR "/gdmlogin");
 					gdm_setup_config_set_bool (GDM_KEY_BROWSER, FALSE);
 				}
 				g_free (selected_text);
@@ -2665,9 +2665,9 @@ setup_greeter_combobox (const char *name,
 
 	if (greetval != NULL &&
 	    strcmp (ve_sure_string (greetval),
-	    EXPANDED_LIBEXECDIR "/gdmlogin --disable-sound --disable-crash-dialog") == 0) {
+	    LIBEXECDIR "/gdmlogin --disable-sound --disable-crash-dialog") == 0) {
 		g_free (greetval);
-		greetval = g_strdup (EXPANDED_LIBEXECDIR "/gdmlogin");
+		greetval = g_strdup (LIBEXECDIR "/gdmlogin");
 	}
 
 	/* Set initial state of local style combo box. */
@@ -2886,10 +2886,10 @@ acc_modules_toggled (GtkWidget *toggle, gpointer data)
 		modules_list = strings_list_add (modules_list, "atk-bridge",
 			GDM_DELIMITER_MODULES);
 		modules_list = strings_list_add (modules_list,
-			EXPANDED_LIBDIR "/gtk-2.0/modules/libkeymouselistener",
+			LIBDIR "/gtk-2.0/modules/libkeymouselistener",
 			GDM_DELIMITER_MODULES);
 		modules_list = strings_list_add (modules_list,
-			EXPANDED_LIBDIR "/gtk-2.0/modules/libdwellmouselistener",
+			LIBDIR "/gtk-2.0/modules/libdwellmouselistener",
 			GDM_DELIMITER_MODULES);
 		add_gtk_modules = TRUE;
 	}
@@ -3134,7 +3134,7 @@ get_theme_dir (void)
 	if (theme_dir == NULL ||
 	    theme_dir[0] == '\0' ||
 	    g_access (theme_dir, R_OK) != 0) {
-		theme_dir = g_strdup (EXPANDED_DATADIR "/gdm/themes/");
+		theme_dir = g_strdup (DATADIR "/gdm/themes/");
 	}
 
 	return theme_dir;
@@ -5602,7 +5602,7 @@ hookup_plain_background (void)
 
         if (ve_string_empty (background_filename)) {
                 gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (image_filechooser),
-                        EXPANDED_PIXMAPDIR);
+                        PIXMAPDIR);
 	} else {
                 gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (image_filechooser),
 			background_filename);
@@ -5736,7 +5736,7 @@ hookup_plain_logo (void)
 
 	if (ve_string_empty (logo_filename)) {
 		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (logo_button),
-			EXPANDED_PIXMAPDIR);
+			PIXMAPDIR);
 	} else {
 		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (logo_button),
 			logo_filename);
@@ -5877,7 +5877,7 @@ hookup_remote_plain_background (void)
 
         if (ve_string_empty (background_filename)) {
                 gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (image_filechooser),
-                        EXPANDED_PIXMAPDIR);
+                        PIXMAPDIR);
         } else {
                 gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (image_filechooser),
 			background_filename);
@@ -6012,7 +6012,7 @@ hookup_remote_plain_logo (void)
 		
         if (ve_string_empty (logo_filename))
                 gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (logo_button),
-                        EXPANDED_PIXMAPDIR);
+                        PIXMAPDIR);
         else
                 gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (logo_button), logo_filename);
 
diff --git a/gui/gdmsetup.desktop.in b/gui/gdmsetup.desktop.in
index 3ea1ef50..f304c273 100644
--- a/gui/gdmsetup.desktop.in
+++ b/gui/gdmsetup.desktop.in
@@ -3,7 +3,7 @@ Encoding=UTF-8
 _Name=Login Window
 _GenericName=Login Window Preferences
 _Comment=Configure the login window (GNOME Display Manager)
-TryExec=@EXPANDED_SBINDIR@/gdmsetup
+TryExec=@sbindir@/gdmsetup
 Exec=gdmsetup
 Icon=gdm-setup
 StartupNotify=true
diff --git a/gui/greeter/Makefile.am b/gui/greeter/Makefile.am
index 5d658182..76cc1bef 100644
--- a/gui/greeter/Makefile.am
+++ b/gui/greeter/Makefile.am
@@ -6,8 +6,15 @@ INCLUDES = \
 	-I$(top_srcdir)/gui				\
 	-I$(top_srcdir)/daemon				\
 	-I$(top_srcdir)/vicious-extensions		\
+	-DAUTHDIR=\""$(authdir)"\"		 	\
+	-DDATADIR=\""$(datadir)"\"		 	\
+	-DDMCONFDIR=\""$(dmconfdir)"\"		 	\
 	-DGDM_CONFIG_FILE=\"$(gdmconfdir)/gdm.conf\"	\
+	-DGDMLOCALEDIR=\""$(gdmlocaledir)"\"		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+	-DLIBEXECDIR=\""$(libexecdir)"\" 		\
+	-DSBINDIR=\""$(sbindir)"\"		 	\
+	-DPIXMAPDIR=\""$(pixmapdir)"\"		 	\
 	$(GUI_CFLAGS)					\
 	$(GREETER_CFLAGS)
 
@@ -25,6 +32,12 @@ libexec_PROGRAMS = \
 bin_SCRIPTS = \
 	gdmthemetester
 
+CLEANFILES = gdmthemetester
+
+gdmthemetester: $(srcdir)/gdmthemetester.in
+	sed -e 's,[@]libexecdir[@],$(libexecdir),g' \
+		<$(srcdir)/gdmthemetester.in >gdmthemetester
+
 gdmgreeter_SOURCES =  \
 	greeter.c \
 	greeter.h \
diff --git a/gui/greeter/gdmthemetester.in b/gui/greeter/gdmthemetester.in
index 26564932..139e1e01 100755
--- a/gui/greeter/gdmthemetester.in
+++ b/gui/greeter/gdmthemetester.in
@@ -26,7 +26,7 @@ echo
 
 XNEST=`gdmwhich Xnest`
 GDMXNEST=`gdmwhich gdmXnest`
-GDMGREETER="@EXPANDED_LIBEXECDIR@/gdmgreeter"
+GDMGREETER="@libexecdir@/gdmgreeter"
 
 if [ x$XNEST = x ]; then
 	echo "ERROR: Xnest not found"
@@ -106,4 +106,4 @@ fi
 # This may not be necessary
 sleep 1
 
-@EXPANDED_LIBEXECDIR@/gdmgreeter
+@libexecdir@/gdmgreeter
diff --git a/gui/greeter/greeter.c b/gui/greeter/greeter.c
index 84bd6be2..dba5e6df 100644
--- a/gui/greeter/greeter.c
+++ b/gui/greeter/greeter.c
@@ -1308,7 +1308,7 @@ main (int argc, char *argv[])
       gtk_dialog_run (GTK_DIALOG (dialog));
       gtk_widget_destroy (dialog);
 
-      execl (EXPANDED_LIBEXECDIR "/gdmlogin", EXPANDED_LIBEXECDIR "/gdmlogin", NULL);
+      execl (LIBEXECDIR "/gdmlogin", LIBEXECDIR "/gdmlogin", NULL);
       execlp ("gdmlogin", "gdmlogin", NULL);
 
       dialog = ve_hig_dialog_new (NULL /* parent */,
diff --git a/gui/modules/Makefile.am b/gui/modules/Makefile.am
index 79deb877..868d0db9 100644
--- a/gui/modules/Makefile.am
+++ b/gui/modules/Makefile.am
@@ -49,6 +49,16 @@ EXTRA_DIST = \
 	AccessKeyMouseEvents.in \
 	AccessDwellMouseEvents.in
 
+CLEANFILES = AccessKeyMouseEvents AccessDwellMouseEvents
+
+AccessKeyMouseEvents: $(srcdir)/AccessKeyMouseEvents.in
+	sed -e 's,[@]AT_BINDIR[@],$(AT_BINDIR),g' \
+		<$(srcdir)/AccessKeyMouseEvents.in >AccessKeyMouseEvents
+
+AccessDwellMouseEvents: $(srcdir)/AccessDwellMouseEvents.in
+	sed -e 's,[@]AT_BINDIR[@],$(AT_BINDIR),g' \
+		<$(srcdir)/AccessDwellMouseEvents.in >AccessDwellMouseEvents
+
 uninstall-hook: 
 	rm -f $(DESTDIR)$(moduleconfdir)/AccessKeyMouseEvents \
 	$(DESTDIR)$(moduleconfdir)/factory-AccessKeyMouseEvents \