Attachment 9823 Details for Bug 10823 – Fix OSNAME value

[patch] Fix OSNAME value

crap (text/plain), 1.71 KB, created by Tilman Sauerbeck on 2007-05-01 04:01:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tilman Sauerbeck

Created: 2007-05-01 04:01:13 UTC

Size: 1.71 KB

patch

obsolete

>diff --git a/configure.ac b/configure.ac
>index 9d4a50a..c8b40a1 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -374,11 +374,6 @@ fi
> AC_MSG_RESULT([$mmx_capable])
> AM_CONDITIONAL(MMX_CAPABLE, [test "x$mmx_capable" = xyes])
> 
>-
>-OSNAME=`uname -srm`
>-AC_DEFINE_UNQUOTED(OSNAME, "$OSNAME", 
>-	[Define to OS Name string to display for build OS in Xorg log])
>-
> DEFAULT_VENDOR_NAME="The X.Org Foundation"
> DEFAULT_VENDOR_NAME_SHORT="X.Org"
> DEFAULT_VERSION_MAJOR=7
>@@ -444,9 +439,9 @@ AC_ARG_WITH(builder-addr,    AS_HELP_STRING([--with-builder-addr=ADDRESS],
> 				  [Builder address (default: xorg@lists.freedesktop.org)]),
> 				[ BUILDERADDR="$withval" ],
> 				[ BUILDERADDR="xorg@lists.freedesktop.org" ])
>-AC_ARG_WITH(os-name,         AS_HELP_STRING([--with-os-name=OSNAME], [Name of OS (default: UNKNOWN)]),
>+AC_ARG_WITH(os-name,         AS_HELP_STRING([--with-os-name=OSNAME], [Name of OS (default: output of "uname -srm")]),
> 				[ OSNAME="$withval" ],
>-				[ OSNAME="UNKNOWN" ])
>+				[ OSNAME=`uname -srm` ])
> AC_ARG_WITH(os-vendor,       AS_HELP_STRING([--with-os-vendor=OSVENDOR], [Name of OS vendor]),
> 				[ OSVENDOR="$withval" ],
> 				[ OSVENDOR="" ])
>@@ -948,6 +943,11 @@ AC_DEFINE_UNQUOTED(XORG_RELEASE, ["$VENDOR_RELEASE_STRING"], [Vendor release])
> AC_DEFINE_UNQUOTED(XORG_DATE, ["$RELEASE_DATE"], [Vendor release])
> AC_DEFINE_UNQUOTED(XORG_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version])
> AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address])
>+
>+if test -z "$OSNAME"; then
>+    OSNAME="UNKNOWN"
>+fi
>+
> AC_DEFINE_UNQUOTED(OSNAME, ["$OSNAME"], [Operating System Name])
> AC_DEFINE_UNQUOTED(OSVENDOR, ["$OSVENDOR"], [Operating System Vendor])
> AC_DEFINE_UNQUOTED(BUILDERSTRING, ["$BUILDERSTRING"], [Builder string])

Actions: View | Splinter Review

Attachments on bug 10823: 9823

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.