Skip to content

Commit

Permalink
Export the server ABI versions from xorg-server.pc
Browse files Browse the repository at this point in the history
  • Loading branch information
nwnk committed Nov 5, 2007
1 parent 632c33c commit 5833289
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
11 changes: 11 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1536,6 +1536,17 @@ dnl has it in libc), or if libdl is needed to get it.
AC_SUBST([sdkdir])
AC_SUBST([extdir])
AC_SUBST([logdir])

# stuff the ABI versions into the pc file too
extract_abi() {
grep ^.define.*${1}_VERSION ${srcdir}/hw/xfree86/common/xf86Module.h | tr '(),' ' .' | awk '{ print $4$5 }'
}
abi_ansic=`extract_abi ANSIC`
abi_videodrv=`extract_abi VIDEODRV`
abi_xinput=`extract_abi XINPUT`
abi_extension=`extract_abi EXTENSION`
abi_font=`extract_abi FONT`
AC_SUBST([abi_ansic abi_videodrv abi_xinput abi_extension abi_font])
fi
AM_CONDITIONAL([XORG], [test "x$XORG" = xyes])
AM_CONDITIONAL([XORG_BUS_LINUXPCI], [test "x$xorg_bus_linuxpci" = xyes])
Expand Down
6 changes: 6 additions & 0 deletions xorg-server.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ includedir=@includedir@
moduledir=@moduledir@
sdkdir=@sdkdir@

abi_ansic=@abi_ansic@
abi_videodrv=@abi_videodrv@
abi_xinput=@abi_xinput@
abi_extension=@abi_extension@
abi_font=@abi_font@

Name: xorg-server
Description: Modular X.Org X Server
Version: @PACKAGE_VERSION@
Expand Down

0 comments on commit 5833289

Please sign in to comment.