- Conditionally include config.h in xc/lib/SMXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_10

- Add libSM to symlink.sh
- Add SM build system

8 files changed, 45 insertions, 0 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..678879d
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,24 @@
+lib_LTLIBRARIES=libSM.la
+
+AM_CFLAGS= -I${top_srcdir}/include $(SM_CFLAGS)
+
+libSM_la_LDFLAGS = -version-info 6:1:0 -no-undefined
+
+libSM_la_LIBADD = $(SM_LIBS)
+
+libSM_la_SOURCES = \
+	SMlibint.h \
+	globals.h \
+	sm_auth.c \
+	sm_client.c \
+	sm_error.c \
+	sm_genid.c \
+	sm_manager.c \
+	sm_misc.c \
+	sm_process.c
+
+smincludedir=$(includedir)/X11/SM
+sminclude_HEADERS=\
+	$(top_srcdir)/include/X11/SM/SM.h \
+	$(top_srcdir)/include/X11/SM/SMlib.h \
+	$(top_srcdir)/include/X11/SM/SMproto.h
diff --git a/src/sm_auth.c b/src/sm_auth.c
index 111235e..9acd371 100644
--- a/src/sm_auth.c
+++ b/src/sm_auth.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
  * Author: Ralph Mor, X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/SM/SMlib.h>
 #include "SMlibint.h"
 
diff --git a/src/sm_client.c b/src/sm_client.c
index 028262e..02f9ccd 100644
--- a/src/sm_client.c
+++ b/src/sm_client.c
@@ -30,6 +30,9 @@ in this Software without prior written authorization from The Open Group.
  * Author: Ralph Mor, X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/SM/SMlib.h>
 #include "SMlibint.h"
 #include "globals.h"
diff --git a/src/sm_error.c b/src/sm_error.c
index 8cd7989..50a476e 100644
--- a/src/sm_error.c
+++ b/src/sm_error.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
  * Author: Ralph Mor, X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/SM/SMlib.h>
 #include "SMlibint.h"
 #include <stdio.h>
diff --git a/src/sm_genid.c b/src/sm_genid.c
index 171e762..76e1350 100644
--- a/src/sm_genid.c
+++ b/src/sm_genid.c
@@ -34,6 +34,9 @@ in this Software without prior written authorization from The Open Group.
 #ifdef WIN32
 #define _WILLWINSOCK_
 #endif
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/SM/SMlib.h>
 #include "SMlibint.h"
 #ifdef XTHREADS
diff --git a/src/sm_manager.c b/src/sm_manager.c
index a88fe0d..bdb6f57 100644
--- a/src/sm_manager.c
+++ b/src/sm_manager.c
@@ -30,6 +30,9 @@ in this Software without prior written authorization from The Open Group.
  * Author: Ralph Mor, X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/SM/SMlib.h>
 #include "SMlibint.h"
 #include <X11/Xtrans.h>
diff --git a/src/sm_misc.c b/src/sm_misc.c
index 9fc3e90..30c2c2d 100644
--- a/src/sm_misc.c
+++ b/src/sm_misc.c
@@ -30,6 +30,9 @@ in this Software without prior written authorization from The Open Group.
  * Author: Ralph Mor, X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/SM/SMlib.h>
 #include "SMlibint.h"
 #include <stdio.h>
diff --git a/src/sm_process.c b/src/sm_process.c
index c770236..ab3ec0b 100644
--- a/src/sm_process.c
+++ b/src/sm_process.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
  * Author: Ralph Mor, X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/SM/SMlib.h>
 #include "SMlibint.h"