Module Name:    xsrc
Committed By:   mrg
Date:           Thu Jun  6 09:08:11 UTC 2013

Modified Files:
        xsrc/external/mit/xdm/dist/xdm: session.c

Log Message:
allow for static linking of the greeter library.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xdm/dist/xdm/session.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/xdm/session.c
diff -u xsrc/external/mit/xdm/dist/xdm/session.c:1.1.1.1 xsrc/external/mit/xdm/dist/xdm/session.c:1.2
--- xsrc/external/mit/xdm/dist/xdm/session.c:1.1.1.1	Fri May 31 22:19:37 2013
+++ xsrc/external/mit/xdm/dist/xdm/session.c	Thu Jun  6 09:08:11 2013
@@ -340,10 +340,15 @@ ManageSession (struct display *d)
      */
     LoadXloginResources (d);
 
+#ifndef STATIC_GREETER_LIB
     Debug ("ManageSession: loading greeter library %s\n", greeterLib);
     greet_lib_handle = dlopen(greeterLib, RTLD_NOW);
     if (greet_lib_handle != NULL)
 	greet_user_proc = (GreetUserProc)dlsym(greet_lib_handle, "GreetUser");
+#else
+    greet_user_proc = (GreetUserProc)GreetUser;
+#endif
+
     if (greet_user_proc == NULL) {
 	LogError ("%s while loading %s\n", dlerror(), greeterLib);
 	exit(UNMANAGE_DISPLAY);

Reply via email to