diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-08-28 20:11:28 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-08-31 20:16:09 -0400 |
| commit | 7e223d3ac6c0d549a7d6e4dcc86a053e19594028 (patch) | |
| tree | a9ec2c51937640f9fe4b539e9ffa76bcf14cee3a /greeter | |
| parent | 674f08cbcbf9c4a29560e8b32e0335d9638b6868 (diff) | |
greeter: only build the shared library version
There is no evidence that the static version is needed since monolith
as hinted by the comment in configure.ac.
The greeter code is now all managed by the greeter Makefile.
The configure option enable-dynamic-greeter no longer needed.
GREET_USER_STATIC is no longer needed.
GREET_LIB is still needed in greet.h as it is compiled with
both session.c for xdm execuatable and greeter shared lib.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'greeter')
| -rw-r--r-- | greeter/Makefile.am | 4 | ||||
| -rw-r--r-- | greeter/greet.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/greeter/Makefile.am b/greeter/Makefile.am index 70fa5df..668a2fd 100644 --- a/greeter/Makefile.am +++ b/greeter/Makefile.am @@ -1,10 +1,11 @@ -if DYNAMIC_GREETER xdmlibdir = $(XDMLIBDIR) xdmlib_LTLIBRARIES = libXdmGreet.la libXdmGreet_la_SOURCES = \ Login.c \ + Login.h \ + LoginP.h \ greet.c \ verify.c @@ -13,7 +14,6 @@ libXdmGreet_la_LIBADD = $(XDMGREET_LIBS) AM_CFLAGS = $(CWARNFLAGS) $(XDMGREET_CFLAGS) -I$(top_srcdir) libXdmGreet_la_LDFLAGS = -module -avoid-version -endif if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ diff --git a/greeter/greet.c b/greeter/greet.c index eaf7527..6e29b05 100644 --- a/greeter/greet.c +++ b/greeter/greet.c @@ -93,7 +93,6 @@ from The Open Group. extern int getdomainname(char *name, size_t len); #endif -#ifdef GREET_LIB /* * Function pointers filled in by the initial call ito the library */ @@ -135,8 +134,6 @@ char *(*__xdm_crypt)(CRYPT_ARGS) = NULL; pam_handle_t **(*__xdm_thepamhp)(void) = NULL; # endif -#endif - #ifdef SECURE_RPC # include <rpc/rpc.h> # include <rpc/key_prot.h> @@ -438,7 +435,6 @@ greet_user_rtn GreetUser( { int i; -#ifdef GREET_LIB /* * These must be set before they are used. */ @@ -478,7 +474,6 @@ greet_user_rtn GreetUser( # ifdef USE_PAM __xdm_thepamhp = dlfuncs->_thepamhp; # endif -#endif *dpy = InitGreet (d); /* |