diff options
| author | Alex Deucher <alex@botch2.(none)> | 2008-03-03 12:02:44 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.(none)> | 2008-03-03 12:02:44 -0500 |
| commit | 74eb981287d76836327830bd51272f605a07e0cc (patch) | |
| tree | da00addddd4cca4fbba723cb1e91272f48bc6158 | |
| parent | f7769ea86e265f347eb58c517ccb5ef8b35eec27 (diff) | |
ATOMBIOS: fix atombios parser support on *bsd
bsd requires a different pragma pack than Linux.
See bug 14594.
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 2412d4f1..83219158 100644 --- a/configure.ac +++ b/configure.ac @@ -232,6 +232,16 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) +case $host_os in + *freebsd*) + AC_DEFINE(ALT_PRAGMA_PACK, 1, [Use alternate pragma pack]) ;; + *netbsd*) + AC_DEFINE(ALT_PRAGMA_PACK, 1, [Use alternate pragma pack]) ;; + *openbsd*) + AC_DEFINE(ALT_PRAGMA_PACK, 1, [Use alternate pragma pack]) ;; +esac +AM_CONDITIONAL(ALT_PRAGMA_PACK, test "x$ALT_PRAGMA_PACK" = xyes) + AC_SUBST([XORG_CFLAGS]) AC_SUBST([DRI_CFLAGS]) AC_SUBST([moduledir]) diff --git a/src/Makefile.am b/src/Makefile.am index 70c05e5c..6fe06952 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,7 +66,11 @@ if USE_EXA RADEON_EXA_SOURCES = radeon_exa.c endif +if ALT_PRAGMA_PACK +AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER +else AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DFGL_LINUX -DDRIVER_PARSER +endif INCLUDES = -I$(srcdir)/AtomBios/includes ati_drv_la_LTLIBRARIES = ati_drv.la |