frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hook up --with-builderstring for vendor build identification.

This commit is contained in:
Adam Jackson 2007-02-12 17:22:39 -05:00
parent 46784d24c1
commit d21c95f80b
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -448,6 +448,9 @@ AC_ARG_WITH(os-name, AS_HELP_STRING([--with-os-name=OSNAME], [Name of OS
AC_ARG_WITH(os-vendor, AS_HELP_STRING([--with-os-vendor=OSVENDOR], [Name of OS vendor]), AC_ARG_WITH(os-vendor, AS_HELP_STRING([--with-os-vendor=OSVENDOR], [Name of OS vendor]),
[ OSVENDOR="$withval" ], [ OSVENDOR="$withval" ],
[ OSVENDOR="" ]) [ OSVENDOR="" ])
AC_ARG_WITH(builderstring, AS_HELP_STRING([--with-builderstring=BUILDERSTRING], [Additional builder string]),
[ BUILDERSTRING="$withval" ]
[ ])
AC_ARG_WITH(mesa-source, AS_HELP_STRING([--with-mesa-source=MESA_SOURCE], [Path to Mesa source tree]), AC_ARG_WITH(mesa-source, AS_HELP_STRING([--with-mesa-source=MESA_SOURCE], [Path to Mesa source tree]),
[ MESA_SOURCE="$withval" ], [ MESA_SOURCE="$withval" ],
[ MESA_SOURCE="" ]) [ MESA_SOURCE="" ])
@ -934,6 +937,8 @@ AC_DEFINE_UNQUOTED(XORG_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man versio
AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address]) AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address])
AC_DEFINE_UNQUOTED(OSNAME, ["$OSNAME"], [Operating System Name]) AC_DEFINE_UNQUOTED(OSNAME, ["$OSNAME"], [Operating System Name])
AC_DEFINE_UNQUOTED(OSVENDOR, ["$OSVENDOR"], [Operating System Vendor]) AC_DEFINE_UNQUOTED(OSVENDOR, ["$OSVENDOR"], [Operating System Vendor])
AC_DEFINE_UNQUOTED(BUILDERSTRING, ["$BUILDERSTRING"], [Builder string])
AC_SUBST([VENDOR_STRING]) AC_SUBST([VENDOR_STRING])
AC_SUBST([VENDOR_STRING_SHORT]) AC_SUBST([VENDOR_STRING_SHORT])
AC_SUBST([VENDOR_RELEASE]) AC_SUBST([VENDOR_RELEASE])

3
include/dix-config.h.in
View File

@ -15,6 +15,9 @@
/* Operating System Vendor */ /* Operating System Vendor */
#undef OSVENDOR #undef OSVENDOR
/* Builder string */
#undef BUILDERSTRING
/* Default font path */ /* Default font path */
#undef COMPILEDDEFAULTFONTPATH #undef COMPILEDDEFAULTFONTPATH