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>
* configure.ac:
......
......@@ -2,22 +2,21 @@
AC_PREREQ(2.59c)
AC_INIT([gdm],
[2.21.1],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gdm],
[gdm])
[http://bugzilla.gnome.org/enter_bug.cgi?product=gdm])
AC_CONFIG_SRCDIR([daemon/gdm-manager.c])
AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([1.9])
AM_MAINTAINER_MODE
# for utmpx stuff
AC_GNU_SOURCE
AC_ISC_POSIX
AC_PROG_CC
AC_STDC_HEADERS
AC_PROG_LIBTOOL
AC_PROG_CXX
AM_PROG_CC_C_O
AC_PROG_LIBTOOL()
AC_HEADER_STDC
......@@ -66,6 +65,12 @@ PKG_CHECK_MODULES(DAEMON,
AC_SUBST(DAEMON_CFLAGS)
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,
dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gtk+-2.0 >= $GTK_REQUIRED_VERSION
......@@ -86,6 +91,7 @@ AC_SUBST(SIMPLE_CHOOSER_LIBS)
PKG_CHECK_MODULES(SETTINGS_DAEMON,
gtk+-2.0 >= $GTK_REQUIRED_VERSION
gmodule-2.0
)
AC_SUBST(SETTINGS_DAEMON_CFLAGS)
AC_SUBST(SETTINGS_DAEMON_LIBS)
......
......@@ -11,6 +11,8 @@ INCLUDES = \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DSBINDIR=\""$(sbindir)"\" \
-DGDM_SETTINGS_PLUGINDIR=\""$(libdir)/gdm/settings/plugins"\" \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(SETTINGS_DAEMON_CFLAGS) \
$(NULL)
......@@ -30,6 +32,18 @@ gdm_settings_daemon_SOURCES = \
gdm-settings-module.h \
$(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 = \
$(SETTINGS_DAEMON_LIBS) \
$(top_builddir)/common/libgdmcommon.la \
......
NULL =
modules_flags = -export_dynamic -avoid-version -module
modules_flags = -export_dynamic -avoid-version -module -no-undefined
plugindir = $(libdir)/gdm/settings/plugins
......
......@@ -17,7 +17,7 @@ INCLUDES = \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DSBINDIR=\""$(sbindir)"\" \
-DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \
$(GREETER_CFLAGS) \
$(GTK_CFLAGS) \
$(SIMPLE_GREETER_CFLAGS) \
$(NULL)
......@@ -67,7 +67,7 @@ test_greeter_panel_SOURCES = \
$(NULL)
test_greeter_panel_LDADD = \
$(GREETER_LIBS) \
$(GTK_LIBS) \
$(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la \
$(NULL)
......@@ -81,7 +81,7 @@ test_language_chooser_SOURCES = \
$(NULL)
test_language_chooser_LDADD = \
$(GREETER_LIBS) \
$(GTK_LIBS) \
$(NULL)
test_session_chooser_SOURCES = \
......@@ -93,7 +93,7 @@ test_session_chooser_SOURCES = \
$(NULL)
test_session_chooser_LDADD = \
$(GREETER_LIBS) \
$(GTK_LIBS) \
$(NULL)
test_user_chooser_SOURCES = \
......
......@@ -10,7 +10,7 @@ INCLUDES = \
-DLOGDIR=\"$(logdir)\" \
-DPIXMAPDIR=\"$(pixmapdir)\" \
-DSBINDIR=\"$(sbindir)\" \
$(GREETER_CFLAGS) \
$(GTK_CFLAGS) \
$(NULL)
noinst_LTLIBRARIES = \
......@@ -36,7 +36,7 @@ libnotificationarea_la_SOURCES = \
$(NULL)
libnotificationarea_la_LIBADD = \
$(GUI_LIBS) \
$(GTK_LIBS) \
$(NULL)
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