Attachment 3621 Details for Bug 4869 – Add build of libXdmGreet.so and don't make path to library hardcoded in resource.c

[patch] Add build of libXdmGreet.so and don't make path to library hardcoded in resource.c

xdm-libgreet-fix-1.diff (text/plain), 3.20 KB, created by Shawn Starr on 2005-10-24 22:47:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shawn Starr

Created: 2005-10-24 22:47:17 UTC

Size: 3.20 KB

patch

obsolete

>diff -Nrup xdm/ChangeLog xdm.good/ChangeLog
>--- xdm/ChangeLog	2005-10-18 22:47:53.000000000 -0400
>+++ xdm.good/ChangeLog	2005-10-25 01:39:28.000000000 -0400
>@@ -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 -Nrup xdm/Makefile.am xdm.good/Makefile.am
>--- xdm/Makefile.am	2005-10-17 20:32:55.000000000 -0400
>+++ xdm.good/Makefile.am	2005-10-25 01:37:00.000000000 -0400
>@@ -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 -Nrup xdm/acinclude.m4 xdm.good/acinclude.m4
>--- xdm/acinclude.m4	1969-12-31 19:00:00.000000000 -0500
>+++ xdm.good/acinclude.m4	2005-10-25 01:36:49.000000000 -0400
>@@ -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 -Nrup xdm/configure.ac xdm.good/configure.ac
>--- xdm/configure.ac	2005-10-18 22:47:53.000000000 -0400
>+++ xdm.good/configure.ac	2005-10-25 01:36:53.000000000 -0400
>@@ -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="$libdir/xdm/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 -Nrup xdm/greeter/Makefile.am xdm.good/greeter/Makefile.am
>--- xdm/greeter/Makefile.am	1969-12-31 19:00:00.000000000 -0500
>+++ xdm.good/greeter/Makefile.am	2005-10-25 01:43:36.000000000 -0400
>@@ -0,0 +1,14 @@
>+# $XdotOrg: app/xdm/greeter/Makefile.am,v $
>+
>+lib_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

Actions: View | Splinter Review

Attachments on bug 4869: 3621 | 3668

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.