diff options
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/xvmc/Makefile.am | 7 |
3 files changed, 13 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 8e6fda71..6adb4ba5 100644 --- a/configure.ac +++ b/configure.ac @@ -71,9 +71,9 @@ fi AC_MSG_CHECKING([whether to include DRI support]) if test x$DRI = xauto; then - if test "$ac_cv_header_dri_h" = yes -a \ - "$ac_cv_header_sarea_h" = yes -a \ - "$ac_cv_header_dristruct_h" = yes; then + if test "$have_dri_h" = yes -a \ + "$have_sarea_h" = yes -a \ + "$have_dristruct_h" = yes; then DRI="yes" else DRI="no" @@ -97,5 +97,6 @@ XORG_RELEASE_VERSION AC_OUTPUT([ Makefile src/Makefile + src/xvmc/Makefile man/Makefile ]) diff --git a/src/Makefile.am b/src/Makefile.am index 36bdfa4b..fa695928 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,6 +18,7 @@ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +SUBDIRS = xvmc # this is obnoxious: # -module lets us name the module exactly how we want # -avoid-version prevents gratuitous .0.0.0 version numbers on the end @@ -55,7 +56,7 @@ i810_drv_la_SOURCES = \ i830_shadow.c if DRI -i810_drv_la_SOURCES = \ +i810_drv_la_SOURCES += \ i810_dri.c \ i810_dri.h \ i830_dri.c \ diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am new file mode 100644 index 00000000..ebab67e4 --- /dev/null +++ b/src/xvmc/Makefile.am @@ -0,0 +1,7 @@ + +lib_LTLIBRARIES=libI810XvMC.la +libI810XvMC_la_SOURCES = I810XvMC.c \ + I810XvMC.h + +libI810XvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0 +libI810XvMC_la_LDFLAGS = -version-number 1:0:0 |