diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-04-15 01:33:22 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-04-15 01:33:22 +0000 |
| commit | 03aebd3e3a30e5a586afca58a42d6d25cc89429e (patch) | |
| tree | ab79acc996b288b8cbe298f79304140000c86685 | |
| parent | ab6a4f930437b04dc828ce61ff6d9a516e7b685c (diff) | |
libXst Imakefile fixes and FreeBSD build fixesXORG-RELEASE-1-STSF
| -rw-r--r-- | FreeBSD.cf | 36 | ||||
| -rw-r--r-- | X11.tmpl | 34 |
2 files changed, 62 insertions, 8 deletions
@@ -562,6 +562,42 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #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> @@ -569,17 +569,17 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ #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 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #ifndef XstDefines #if BuildXst -#define XstDefines -DXST +#define XstDefines -DXST -DUSE_XST_EXTENSION #else #define XstDefines /**/ #endif @@ -1722,6 +1722,24 @@ VENDORSUPPORTDEFS = VendorSupportDefines 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 |