diff options
author | marha <marha@users.sourceforge.net> | 2013-01-11 08:22:46 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-01-11 08:22:46 +0100 |
commit | 0e1adc84d471955eaabe26486154e8ec44e91dd4 (patch) | |
tree | e2363fb022bfa7b730b0032b4c35379aa2a997d6 /libX11/configure.ac | |
parent | e59b1896b907c5ecfe184723d4c6adc2c20fa678 (diff) | |
parent | ddc05759f098f06bd93253a7bffe38640963dfb3 (diff) | |
download | vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.tar.gz vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.tar.bz2 vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/glsl/glcpp/.gitignore
mesalib/src/mapi/glapi/gen/.gitignore
mesalib/src/mesa/program/.gitignore
Diffstat (limited to 'libX11/configure.ac')
-rw-r--r-- | libX11/configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libX11/configure.ac b/libX11/configure.ac index fe3179948..c29209420 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -177,7 +177,7 @@ else AC_DEFINE(HAVE_DLOPEN,1,[Use dlopen to load shared libraries]) AC_CHECK_HEADERS([dlfcn.h]) fi -if test x$ac_cv_header_dlcfn_h -o x$ac_cv_header_dl_h; then +if test "x$ac_cv_header_dlfcn_h" = xyes -o "x$ac_cv_header_dl_h" = xyes; then HAVE_LOADABLE_MODULES=yes else HAVE_LOADABLE_MODULES=no |