Commit 1b418226 authored by Tim Lunn's avatar Tim Lunn Committed by Ray Strode

utils: reintroduce gdmflexiserver

Partial revert of 920b38e2 to
reinstroduce gdmflexiserver since gnome-screensaver depends on it.

https://bugzilla.gnome.org/show_bug.cgi?id=685622
parent 51b03d45
......@@ -368,6 +368,7 @@ EXTRA_DAEMON_LIBS=""
EXTRA_SLAVE_LIBS=""
EXTRA_CHOOSER_LIBS=""
EXTRA_XNEST_LIBS=""
EXTRA_FLEXI_LIBS=""
EXTRA_DYNAMIC_LIBS=""
EXTRA_SETUP_LIBS=""
EXTRA_TEST_LIBS=""
......@@ -379,6 +380,7 @@ AC_CHECK_FUNC(socket,,[
EXTRA_SLAVE_LIBS="$EXTRA_SLAVE_LIBS -lsocket"
EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lsocket"
EXTRA_XNEST_LIBS="$EXTRA_XNEST_LIBS -lsocket"
EXTRA_FLEXI_LIBS="$EXTRA_FLEXI_LIBS -lsocket"
EXTRA_DYNAMIC_LIBS="$EXTRA_DYNAMIC_LIBS -lsocket"
EXTRA_SETUP_LIBS="$EXTRA_SETUP_LIBS -lsocket"
EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -lsocket"])])
......@@ -1200,6 +1202,7 @@ AC_SUBST(EXTRA_DAEMON_LIBS)
AC_SUBST(EXTRA_SLAVE_LIBS)
AC_SUBST(EXTRA_CHOOSER_LIBS)
AC_SUBST(EXTRA_XNEST_LIBS)
AC_SUBST(EXTRA_FLEXI_LIBS)
AC_SUBST(EXTRA_DYNAMIC_LIBS)
AC_SUBST(EXTRA_SETUP_LIBS)
AC_SUBST(EXTRA_TEST_LIBS)
......
......@@ -21,9 +21,20 @@ edit = sed \
-e 's|@GDM_PID_FILE[@]|$(GDM_PID_FILE)|g'
bin_PROGRAMS = \
gdmflexiserver \
gdm-screenshot \
$(NULL)
gdmflexiserver_SOURCES = \
gdmflexiserver.c \
$(NULL)
gdmflexiserver_LDADD = \
$(GTK_LIBS) \
$(COMMON_LIBS) \
$(SYSTEMD_LIBS) \
$(NULL)
gdm_screenshot_SOURCES = \
gdm-screenshot.c \
$(NULL)
......
This diff is collapsed.
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