Commit 673d277c authored by William Jon McCann's avatar William Jon McCann Committed by William Jon McCann

OMFG - I hate you. Add gmodule to SETTINGS_DAEMON modules so we don't get:

2007-10-25  William Jon McCann  <mccann@jhu.edu>

	* configure.ac:
	* gui/settings-daemon/Makefile.am:
	* gui/settings-daemon/plugins/xsettings/Makefile.am:
	* gui/simple-greeter/Makefile.am:
	* gui/simple-greeter/libnotificationarea/Makefile.am:
	OMFG - I hate you.  Add gmodule to SETTINGS_DAEMON modules so we don't get:
	undefined symbol: gdm_settings_plugin_get_type
	Twiddled some other crap during the screaming.


svn path=/trunk/; revision=5413
parent 4c80d9f4
2007-10-25 William Jon McCann <mccann@jhu.edu>
* configure.ac:
* gui/settings-daemon/Makefile.am:
* gui/settings-daemon/plugins/xsettings/Makefile.am:
* gui/simple-greeter/Makefile.am:
* gui/simple-greeter/libnotificationarea/Makefile.am:
OMFG - I hate you. Add gmodule to SETTINGS_DAEMON modules so we don't get:
undefined symbol: gdm_settings_plugin_get_type
Twiddled some other crap during the screaming.
2007-10-25 William Jon McCann <mccann@jhu.edu> 2007-10-25 William Jon McCann <mccann@jhu.edu>
* configure.ac: * configure.ac:
......
...@@ -2,22 +2,21 @@ ...@@ -2,22 +2,21 @@
AC_PREREQ(2.59c) AC_PREREQ(2.59c)
AC_INIT([gdm], AC_INIT([gdm],
[2.21.1], [2.21.1],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gdm], [http://bugzilla.gnome.org/enter_bug.cgi?product=gdm])
[gdm])
AC_CONFIG_SRCDIR([daemon/gdm-manager.c]) AC_CONFIG_SRCDIR([daemon/gdm-manager.c])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE([1.9])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
# for utmpx stuff # for utmpx stuff
AC_GNU_SOURCE AC_GNU_SOURCE
AC_ISC_POSIX
AC_PROG_CC
AC_STDC_HEADERS AC_STDC_HEADERS
AC_PROG_LIBTOOL AC_PROG_CXX
AM_PROG_CC_C_O
AC_PROG_LIBTOOL()
AC_HEADER_STDC AC_HEADER_STDC
...@@ -66,6 +65,12 @@ PKG_CHECK_MODULES(DAEMON, ...@@ -66,6 +65,12 @@ PKG_CHECK_MODULES(DAEMON,
AC_SUBST(DAEMON_CFLAGS) AC_SUBST(DAEMON_CFLAGS)
AC_SUBST(DAEMON_LIBS) AC_SUBST(DAEMON_LIBS)
PKG_CHECK_MODULES(GTK,
gtk+-2.0 >= $GTK_REQUIRED_VERSION
)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
PKG_CHECK_MODULES(SIMPLE_GREETER, PKG_CHECK_MODULES(SIMPLE_GREETER,
dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gtk+-2.0 >= $GTK_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION
...@@ -86,6 +91,7 @@ AC_SUBST(SIMPLE_CHOOSER_LIBS) ...@@ -86,6 +91,7 @@ AC_SUBST(SIMPLE_CHOOSER_LIBS)
PKG_CHECK_MODULES(SETTINGS_DAEMON, PKG_CHECK_MODULES(SETTINGS_DAEMON,
gtk+-2.0 >= $GTK_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION
gmodule-2.0
) )
AC_SUBST(SETTINGS_DAEMON_CFLAGS) AC_SUBST(SETTINGS_DAEMON_CFLAGS)
AC_SUBST(SETTINGS_DAEMON_LIBS) AC_SUBST(SETTINGS_DAEMON_LIBS)
......
...@@ -11,6 +11,8 @@ INCLUDES = \ ...@@ -11,6 +11,8 @@ INCLUDES = \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DSBINDIR=\""$(sbindir)"\" \ -DSBINDIR=\""$(sbindir)"\" \
-DGDM_SETTINGS_PLUGINDIR=\""$(libdir)/gdm/settings/plugins"\" \ -DGDM_SETTINGS_PLUGINDIR=\""$(libdir)/gdm/settings/plugins"\" \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(SETTINGS_DAEMON_CFLAGS) \ $(SETTINGS_DAEMON_CFLAGS) \
$(NULL) $(NULL)
...@@ -30,6 +32,18 @@ gdm_settings_daemon_SOURCES = \ ...@@ -30,6 +32,18 @@ gdm_settings_daemon_SOURCES = \
gdm-settings-module.h \ gdm-settings-module.h \
$(NULL) $(NULL)
gdm_settings_daemon_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(NULL)
gdm_settings_daemon_CFLAGS = \
$(AM_CFLAGS) \
$(NULL)
gdm_settings_daemon_LDFLAGS = \
$(AM_LDFLAGS) \
$(NULL)
gdm_settings_daemon_LDADD = \ gdm_settings_daemon_LDADD = \
$(SETTINGS_DAEMON_LIBS) \ $(SETTINGS_DAEMON_LIBS) \
$(top_builddir)/common/libgdmcommon.la \ $(top_builddir)/common/libgdmcommon.la \
......
NULL = NULL =
modules_flags = -export_dynamic -avoid-version -module modules_flags = -export_dynamic -avoid-version -module -no-undefined
plugindir = $(libdir)/gdm/settings/plugins plugindir = $(libdir)/gdm/settings/plugins
......
...@@ -17,7 +17,7 @@ INCLUDES = \ ...@@ -17,7 +17,7 @@ INCLUDES = \
-DLIBEXECDIR=\""$(libexecdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \
-DSBINDIR=\""$(sbindir)"\" \ -DSBINDIR=\""$(sbindir)"\" \
-DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \ -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \
$(GREETER_CFLAGS) \ $(GTK_CFLAGS) \
$(SIMPLE_GREETER_CFLAGS) \ $(SIMPLE_GREETER_CFLAGS) \
$(NULL) $(NULL)
...@@ -67,7 +67,7 @@ test_greeter_panel_SOURCES = \ ...@@ -67,7 +67,7 @@ test_greeter_panel_SOURCES = \
$(NULL) $(NULL)
test_greeter_panel_LDADD = \ test_greeter_panel_LDADD = \
$(GREETER_LIBS) \ $(GTK_LIBS) \
$(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la \ $(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la \
$(NULL) $(NULL)
...@@ -81,7 +81,7 @@ test_language_chooser_SOURCES = \ ...@@ -81,7 +81,7 @@ test_language_chooser_SOURCES = \
$(NULL) $(NULL)
test_language_chooser_LDADD = \ test_language_chooser_LDADD = \
$(GREETER_LIBS) \ $(GTK_LIBS) \
$(NULL) $(NULL)
test_session_chooser_SOURCES = \ test_session_chooser_SOURCES = \
...@@ -93,7 +93,7 @@ test_session_chooser_SOURCES = \ ...@@ -93,7 +93,7 @@ test_session_chooser_SOURCES = \
$(NULL) $(NULL)
test_session_chooser_LDADD = \ test_session_chooser_LDADD = \
$(GREETER_LIBS) \ $(GTK_LIBS) \
$(NULL) $(NULL)
test_user_chooser_SOURCES = \ test_user_chooser_SOURCES = \
......
...@@ -3,14 +3,14 @@ NULL = ...@@ -3,14 +3,14 @@ NULL =
INCLUDES = \ INCLUDES = \
-I. \ -I. \
-I.. \ -I.. \
-DBINDIR=\"$(bindir)\" \ -DBINDIR=\"$(bindir)\" \
-DDATADIR=\"$(datadir)\" \ -DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\" \ -DLIBDIR=\"$(libdir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" \
-DLOGDIR=\"$(logdir)\" \ -DLOGDIR=\"$(logdir)\" \
-DPIXMAPDIR=\"$(pixmapdir)\" \ -DPIXMAPDIR=\"$(pixmapdir)\" \
-DSBINDIR=\"$(sbindir)\" \ -DSBINDIR=\"$(sbindir)\" \
$(GREETER_CFLAGS) \ $(GTK_CFLAGS) \
$(NULL) $(NULL)
noinst_LTLIBRARIES = \ noinst_LTLIBRARIES = \
...@@ -36,7 +36,7 @@ libnotificationarea_la_SOURCES = \ ...@@ -36,7 +36,7 @@ libnotificationarea_la_SOURCES = \
$(NULL) $(NULL)
libnotificationarea_la_LIBADD = \ libnotificationarea_la_LIBADD = \
$(GUI_LIBS) \ $(GTK_LIBS) \
$(NULL) $(NULL)
libnotificationarea_la_LDFLAGS = \ libnotificationarea_la_LDFLAGS = \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment