From 2b42b9154f9886ab05da1c3d6ce75fd95f59e04e Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sun, 15 May 2005 20:52:39 +0000 Subject: Add settings to bring Solaris builds closer to the ones Sun packages in Solaris. Adds "BuildLikeSun" options for areas Sun deviates from the way Xorg is packaged on other platforms. See comment in sun.cf for details. Also, use system-provided Expat on Solaris 10 and other cleanups. Set shared library versions for Solaris builds to match versions used in Solaris. Add missing SharedXfixesReqs and SharedXdamageReqs. Add -solarisabi option to create XtStrings code compatibile with existing Solaris binaries. (Off by default, on if "BuildLikeSun" is set in sun.cf) --- util/makestrs.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'util') diff --git a/util/makestrs.c b/util/makestrs.c index f544146..6e79bd5 100644 --- a/util/makestrs.c +++ b/util/makestrs.c @@ -1,4 +1,4 @@ -/* $Id */ +/* $XdotOrg: $ */ /* @@ -73,6 +73,13 @@ static char* fileprotstr; static char* externrefstr; static char* externdefstr; +#ifndef FALSE +# define FALSE 0 +# define TRUE !(FALSE) +#endif + +static int solaris_abi_names = FALSE; + #define X_DEFAULT_ABI 0 #define X_ARRAYPER_ABI 1 #define X_INTEL_ABI 2 @@ -490,6 +497,13 @@ static void DoLine(char *buf) if ((table->name = malloc (strlen (buf + strlen (table_str)) + 1)) == NULL) exit(1); (void) strcpy (table->name, buf + strlen (table_str) + 1); + if (solaris_abi_names) { + if (strcmp(table->name, "XtStringsR6") == 0) { + strcpy(table->name, "XtR6Strings"); + } else if (strcmp(table->name, "XtShellStringsR6") == 0) { + strcpy(table->name, "XtR6ShellStrings"); + } + } table->tableent = NULL; table->tableentcurrent = NULL; table->tableenttail = &table->tableent; @@ -676,6 +690,8 @@ int main(int argc, char *argv[]) if (strcmp (argv[i], "-defaultabi") == 0) abi = X_DEFAULT_ABI; #endif + if (strcmp (argv[i], "-solarisabinames") == 0) + solaris_abi_names = TRUE; } } -- cgit v1.2.1