summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure17
1 files changed, 13 insertions, 4 deletions
diff --git a/configure b/configure
index 0b5f61c14d..749c400206 100755
--- a/configure
+++ b/configure
@@ -3262,6 +3262,9 @@ EOF
cc_check $_ld_lm $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" &&
_iconv=yes && break
done
+ if test "$_iconv" != yes ; then
+ die "Unable to find iconv which should be part of standard compilation environment. Aborting. If you really mean to compile without iconv support use --disable-iconv."
+ fi
fi
if test "$_iconv" = yes ; then
def_iconv='#define CONFIG_ICONV 1'
@@ -4032,11 +4035,11 @@ echores "$_xf86keysym"
echocheck "DGA"
if test "$_dga2" = auto && test "$_x11" = yes ; then
_dga2=no
- statement_check_broken X11/Xlib.h X11/extensions/xf86dga.h 'XDGASetViewport(0, 0, 0, 0, 0)' -lXxf86dga && _dga2=yes
+ statement_check_broken X11/Xlib.h X11/extensions/Xxf86dga.h 'XDGASetViewport(0, 0, 0, 0, 0)' -lXxf86dga && _dga2=yes
fi
if test "$_dga1" = auto && test "$_dga2" = no && test "$_vm" = yes ; then
_dga1=no
- statement_check_broken X11/Xlib.h X11/extensions/xf86dga.h 'XF86DGASetViewPort(0, 0, 0, 0)' -lXxf86dga -lXxf86vm && _dga1=yes
+ statement_check_broken X11/Xlib.h X11/extensions/Xxf86dga.h 'XF86DGASetViewPort(0, 0, 0, 0)' -lXxf86dga -lXxf86vm && _dga1=yes
fi
_dga=no
@@ -4067,6 +4070,7 @@ if test "$_3dfx" = yes && test "$_dga" = yes ; then
def_3dfx='#define CONFIG_3DFX 1'
vomodules="3dfx $vomodules"
else
+ _3dfx=no
def_3dfx='#undef CONFIG_3DFX'
novomodules="3dfx $novomodules"
fi
@@ -5436,6 +5440,9 @@ EOF
else
_freetype=no
fi
+ if test "$_freetype" != yes ; then
+ die "Unable to find development files for libfreetype. Aborting. If you really mean to compile without FreeType support use --disable-freetype."
+ fi
fi
if test "$_freetype" = yes ; then
def_freetype='#define CONFIG_FREETYPE 1'
@@ -5479,6 +5486,9 @@ EOF
cc_check $_inc_tmp $_ld_tmp && _fontconfig=yes &&
extra_ldflags="$extra_ldflags $_ld_tmp" && extra_cflags="$extra_cflags $_inc_tmp"
fi
+ if test "$_fontconfig" != yes ; then
+ die "Unable to find development files for libfontconfig. Aborting. If you really mean to compile without fontconfig support use --disable-fontconfig."
+ fi
fi
if test "$_fontconfig" = yes ; then
def_fontconfig='#define CONFIG_FONTCONFIG 1'
@@ -5496,8 +5506,7 @@ if test "$_ass" = auto -o "$_ass" = yes ; then
extra_ldflags="$extra_ldflags $($_pkg_config --libs libass)"
extra_cflags="$extra_cflags $($_pkg_config --cflags libass)"
else
- _ass=no
- def_ass='#undef CONFIG_ASS'
+ die "Unable to find development files for libass. Aborting. If you really mean to compile without libass support use --disable-ass."
fi
else
def_ass='#undef CONFIG_ASS'