[PATCH lib/libX11] Fix config check for loadable modules

Jon TURNEY jon.turney at dronecode.org.uk
Wed Jan 9 06:52:52 PST 2013


On 07/01/2013 14:24, Dan Nicholson wrote:
> On Mon, Jan 7, 2013 at 5:14 AM, Jon TURNEY wrote:
>> The config check of the results of testing for dlcfn.h or dl.h just tests the
>> value of the ac_cv_ variables, which will be 'yes' or 'no', rather than checking
>> it is 'yes', so loadable module support would always be detected.
>>
>> This is neccessary for successful compilation for the MinGW target without the
>> optional dlfcn-win32 library.
>>
>> Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
>> ---
>>  configure.ac |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index fe31799..6c3534e 100644
>> --- a/configure.ac
>> +++ b/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_dlcfn_h" = xyes -o "x$ac_cv_header_dl_h" = xyes; then
>>         HAVE_LOADABLE_MODULES=yes
>>  else
>>         HAVE_LOADABLE_MODULES=no
> 
> Looks right.

Looking at this again, I'm not sure why I though this still worked in the
normal case where dlfcn.h exists when I tested it, as ac_cv_header_dlfcn_h is
typo-ed.

Pushed with that correction.



More information about the xorg-devel mailing list