[xorg-commit-diffs] xc/config/cf FreeBSD.cf, 1.1.4.5.2.3, 1.1.4.5.2.3.2.1 X11.tmpl, 1.1.4.7.2.10.2.1, 1.1.4.7.2.10.2.2

[Alan Coopersmith]

Committed by: alanc

Update of /cvs/xorg/xc/config/cf
In directory pdx:/tmp/cvs-serv11719/config/cf

Modified Files:
      Tag: XORG-RELEASE-1-STSF
	FreeBSD.cf X11.tmpl 
Log Message:
libXst Imakefile fixes and FreeBSD build fixes


Index: FreeBSD.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/FreeBSD.cf,v
retrieving revision 1.1.4.5.2.3
retrieving revision 1.1.4.5.2.3.2.1
diff -u -d -r1.1.4.5.2.3 -r1.1.4.5.2.3.2.1
--- a/FreeBSD.cf	2 Apr 2004 21:47:10 -0000	1.1.4.5.2.3
+++ b/FreeBSD.cf	15 Apr 2004 01:33:22 -0000	1.1.4.5.2.3.2.1
@@ -562,6 +562,42 @@
 #define GccOptBug295
 #endif
 
+XCOMM Assumes iconv is installed from /usr/ports/converters/libiconv 
+#ifndef iconvDir
+# define iconvDir /usr/local
+#endif
+          ICONVDIR = iconvDir
+          ICONVINC = -I$(ICONVDIR)/include -Diconv=libiconv \
+			-Diconv_open=libiconv_open -Diconv_close=libiconv_close
+       ICONVSYSLIB = -L$(ICONVDIR)/lib -lgiconv
+/* The inbuf paramter to iconv(3) is "const char**", not "char **" */
+ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST=const
+
+XCOMM Assumes ICU is installed from /usr/ports/devel/icu
+#ifndef icuDir
+# define icuDir /usr/local
+#endif
+            ICUDIR = icuDir
+	    ICUINC = -I$(ICUDIR)/include
+	    ICULIB = -L$(ICUDIR)/lib -licuuc -lstdc++
+
+XCOMM Assumes GNU gettext is installed from /usr/ports/devel/gettext
+#ifndef gettextDir
+# define gettextDir /usr/local
+#endif
+        GETTEXTDIR = gettextDir
+        GETTEXTINC = -I$(GETTEXTDIR)/include
+        GETTEXTLIB = -L$(GETTEXTDIR)/lib -lintl
+
+XCOMM Assumes OpenMotif is installed from /usr/ports/x11-toolkits/open-motif
+#define UseInstalledMotif YES
+#define MTop	/usr/X11R6
+DEPXMLIB = $(MTOP)/lib/libXm.so.2
+
+$(DEPXMLIB):
+	@echo You must install OpenMotif from /usr/ports/x11-toolkits/open-motif
+	@echo in order to compile this program
+
 #include <bsdLib.rules>
 
 #include <xorg.cf>

Index: X11.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
retrieving revision 1.1.4.7.2.10.2.1
retrieving revision 1.1.4.7.2.10.2.2
diff -u -d -r1.1.4.7.2.10.2.1 -r1.1.4.7.2.10.2.2
--- a/X11.tmpl	6 Apr 2004 02:41:19 -0000	1.1.4.7.2.10.2.1
+++ b/X11.tmpl	15 Apr 2004 01:33:22 -0000	1.1.4.7.2.10.2.2
@@ -569,17 +569,17 @@
 #ifndef BuildRenderLibrary
 #define BuildRenderLibrary	!BuildServersOnly
 #endif
+#ifndef BuildXst
+#define BuildXst                YES
+#endif
 #ifndef BuildXstLibrary
-#define BuildXstLibrary		YES
+#define BuildXstLibrary		BuildXst
+#endif
 #ifndef Buildxstls
-#define Buildxstls		YES
+#define Buildxstls		BuildXstLibrary
 #endif
 #ifndef Buildxstshowfont
-#define Buildxstshowfont        YES
-#endif
-#endif
-#ifndef BuildXst
-#define BuildXst                YES
+#define Buildxstshowfont        BuildXstLibrary
 #endif
 #ifndef BuildXftLibrary
 #define BuildXftLibrary		BuildRenderLibrary
@@ -1127,7 +1127,7 @@
 
 #ifndef XstDefines
 #if BuildXst
-#define XstDefines -DXST
+#define XstDefines -DXST -DUSE_XST_EXTENSION
 #else
 #define XstDefines /**/
 #endif
@@ -1722,6 +1722,24 @@
         XLOGFILE = XLogFile
      XSERVERNAME = XServerName
 
+#if BuildXstLibrary || BuildXst
+# if UseInstalledSTSF
+#  ifndef STDir
+#   define STDir /usr/local
+#  endif
+           STDIR  = STDir
+           STINC  = -I$(STDIR)/include
+           STLIB  = -L$(STDIR)/lib -lST 
+# else
+#  ifndef STTopDir
+#   define STTopDir $(TOP)/../stsf
+#  endif
+           STDIR  = STTopDir
+           STINC  = -I$(STDIR)/interface
+           STLIB  = -L$(STDIR)/STClientLibrary/src -lST
+# endif
+#endif
+
 #if HasSharedLibraries
 #ifndef DontUseLibPathVar
 #ifndef BuildLibPathVar