diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-10-14 15:46:52 -0300 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-10-14 15:46:52 -0300 |
| commit | fc722212d297a5141245beb7c8ae396606a8f221 (patch) | |
| tree | f820ee743895f4e5314c55b77e6476ca23a94722 | |
| parent | 5adb3b502ef79827b89fb11926b6198c3a57d2e6 (diff) | |
Remove dependency on xf86cvt.c.
It actually was not added in a previous commit (due to using git reset
to remake a commit, and not readding it), but now, changed only call
xf86CVTMode if it is available in the X Server, otherwise, for older
X Servers, a modeline should be specified in xorg.conf.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/smi_output.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 825aa9c..436a241 100644 --- a/configure.ac +++ b/configure.ac @@ -77,6 +77,10 @@ fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) AM_CONDITIONAL(XMODES, test "x$XMODES" = xno) +if test "x$XMODES" = xyes; then + XORG_CFLAGS="$XORG_CFLAGS -DHAVE_XMODES" +fi + AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) diff --git a/src/Makefile.am b/src/Makefile.am index 8db8ab6..aff239f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,7 +54,3 @@ siliconmotion_drv_la_SOURCES = \ smilynx.h \ smi501_crtc.c \ smi501_output.c - -if XMODES - siliconmotion_drv_la_SOURCES += xf86cvt.c -endif diff --git a/src/smi_output.c b/src/smi_output.c index 209e2f9..43fe343 100644 --- a/src/smi_output.c +++ b/src/smi_output.c @@ -143,7 +143,11 @@ SMI_OutputGetModes_native(xf86OutputPtr output) SMIPtr pSmi = SMIPTR(output->scrn); ENTER(); +#ifdef HAVE_XMODES RETURN(xf86CVTMode(pSmi->lcdWidth, pSmi->lcdHeight, 60.0f, FALSE, FALSE)); +#else + RETURN(NULL); +#endif } |