diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-10-26 02:25:02 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-10-26 02:25:02 +0000 |
| commit | eb1ed04945a3af8d04f5441966674486be715036 (patch) | |
| tree | cdd94fcfb043e9469681343eec9849f2fde8c466 | |
| parent | 1770fc21706c276d051de4dbe8a199f12a06f711 (diff) | |
We forgot to build the Xdm greeter library. Add it to build and cleanup
hardcoded values to find it.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 14 | ||||
| -rw-r--r-- | configure.ac | 19 | ||||
| -rw-r--r-- | greeter/Makefile.am | 16 |
5 files changed, 55 insertions, 4 deletions
@@ -1,3 +1,11 @@ +2005-10-25 Shawn Starr <shawn.starr@rogers.com> + + * configure.ac: + * Makefile.am: + * greeter/Makefile.am: + We forgot to build the Xdm greeter library. Add it to build and cleanup + hardcoded values to find it. + 2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/Makefile.am b/Makefile.am index 4c0a1a0..51ec234 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -SUBDIRS = config +SUBDIRS = config greeter bin_PROGRAMS = xdm xdmshell diff --git a/acinclude.m4 b/acinclude.m4 new file mode 100644 index 0000000..0654ed5 --- /dev/null +++ b/acinclude.m4 @@ -0,0 +1,14 @@ +dnl From http://autoconf-archive.cryp.to/ac_define_dir.html. + +AC_DEFUN([AC_DEFINE_DIR], [ + prefix_NONE= + exec_prefix_NONE= + test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix + eval ac_define_dir="\"[$]$2\"" + AC_SUBST($1, "$ac_define_dir") + AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3]) + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE +]) + diff --git a/configure.ac b/configure.ac index 35e1087..64e25e5 100644 --- a/configure.ac +++ b/configure.ac @@ -29,8 +29,9 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) AC_PROG_CC +AC_LIBTOOL_WIN32_DLL +AM_PROG_LIBTOOL AC_PROG_INSTALL -AC_CANONICAL_HOST XORG_PROG_RAWCPP @@ -207,7 +208,6 @@ PKG_CHECK_MODULES(XPROTO, xproto) XDM_CFLAGS="$XDM_CFLAGS $XDM_PRINT_CFLAGS $DMCP_CFLAGS $XPROTO_CFLAGS $OS_CFLAGS" XDM_LIBS="$XDM_LIBS $XDM_PRINT_LIBS $DMCP_LIBS" - AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$DMCP_LIBS]) AC_SEARCH_LIBS(crypt, crypt) @@ -217,6 +217,19 @@ AC_SUBST(XDM_CFLAGS) AC_SUBST(XDM_LIBS) # +# Greeter +# + +XDMGREET_CFLAGS="$XDMGREET_CFLAGS $DMCP_CFLAGS $XPROTO_CFLAGS $OS_CFLAGS" +XDMGREET_LIBS="$XDMGREET_LIBS $DMCP_LIBS" + +GREETERLIB="${XDMDIR}/libXdmGreet.so" +AC_DEFINE_DIR(DEF_GREETER_LIB, GREETERLIB, [Location of Xdm Greeter library]) + +AC_SUBST(XDMGREET_CFLAGS) +AC_SUBST(XDMGREET_LIBS) + +# # Chooser # @@ -229,4 +242,4 @@ AC_SUBST(CHOOSER_LIBS) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION -AC_OUTPUT([Makefile config/Makefile]) +AC_OUTPUT([Makefile config/Makefile greeter/Makefile]) diff --git a/greeter/Makefile.am b/greeter/Makefile.am new file mode 100644 index 0000000..f482601 --- /dev/null +++ b/greeter/Makefile.am @@ -0,0 +1,16 @@ +# $XdotOrg: app/xdm/greeter/Makefile.am,v $ + +xdmdir = $(libdir)/X11/xdm + +xdm_LTLIBRARIES = libXdmGreet.la + +libXdmGreet_la_SOURCES = \ + Login.c \ + greet.c \ + verify.c + +libXdmGreet_la_LIBADD = $(XDMGREET_LIBS) + +AM_CFLAGS = $(XDMGREET_CFLAGS) + +libXdmGreet_la_LDFLAGS = -module -avoid-version |