aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSami Kerola <kerolasa@iki.fi>2012-12-30 18:26:11 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2013-01-02 08:58:46 (GMT)
commit23602ef23d81c694911a98f9a0923a0cf21ce066 (patch)
treebd18faa7ec4fcba23b3a71cf5cac947bf20cb4e0
parentf587cc9e7e8c40bce778ffc0811a3a6c29107b85 (diff)
downloadfluxbox-23602ef23d81c694911a98f9a0923a0cf21ce066.zip
fluxbox-23602ef23d81c694911a98f9a0923a0cf21ce066.tar.bz2
rename configure.in to configure.ac
It seems autoheader version 2.69 does not work with configure.in file, and AM_CONFIG_HEADER macro. aclocal: warning: autoconf input should be named 'configure.ac', not 'configure.in' configure.in:585: warning: macro 'AM_CONFIG_HEADER' not found in library Executing: autoheader autoheader: error: AC_CONFIG_HEADERS not found in configure.in
-rw-r--r--configure.ac (renamed from configure.in)284
1 files changed, 142 insertions, 142 deletions
diff --git a/configure.in b/configure.ac
index 14adbac..afb7b94 100644
--- a/configure.in
+++ b/configure.ac
@@ -11,7 +11,7 @@ dnl AC_AIX
11dnl AC_ISC_POSIX 11dnl AC_ISC_POSIX
12 12
13AC_LANG_CPLUSPLUS 13AC_LANG_CPLUSPLUS
14 14
15dnl Locate required external software 15dnl Locate required external software
16AC_PROG_CC 16AC_PROG_CC
17AC_PROG_CXX 17AC_PROG_CXX
@@ -32,18 +32,18 @@ dnl Check for system header files
32AC_HEADER_STDC 32AC_HEADER_STDC
33AC_HEADER_STDBOOL 33AC_HEADER_STDBOOL
34AC_CHECK_HEADERS(errno.h ctype.h dirent.h fcntl.h libgen.h \ 34AC_CHECK_HEADERS(errno.h ctype.h dirent.h fcntl.h libgen.h \
35 locale.h math.h nl_types.h process.h signal.h stdarg.h \ 35 locale.h math.h nl_types.h process.h signal.h stdarg.h \
36 stdint.h stdio.h time.h unistd.h \ 36 stdint.h stdio.h time.h unistd.h \
37 sys/param.h sys/select.h sys/signal.h sys/stat.h \ 37 sys/param.h sys/select.h sys/signal.h sys/stat.h \
38 sys/time.h sys/types.h sys/wait.h \ 38 sys/time.h sys/types.h sys/wait.h \
39 langinfo.h iconv.h) 39 langinfo.h iconv.h)
40 40
41 41
42 42
43AC_CHECK_HEADERS(sstream,,[ 43AC_CHECK_HEADERS(sstream,,[
44 AC_CHECK_HEADERS(strstream,,[ 44 AC_CHECK_HEADERS(strstream,,[
45 AC_MSG_ERROR([Your libstdc++ doesn't have the sstream or strstream classes])] 45 AC_MSG_ERROR([Your libstdc++ doesn't have the sstream or strstream classes])]
46 )] 46 )]
47) 47)
48 48
49AC_CHECK_HEADERS(cassert cctype cerrno cmath cstdarg cstdint cstdio cstdlib cstring ctime) 49AC_CHECK_HEADERS(cassert cctype cerrno cmath cstdarg cstdint cstdio cstdlib cstring ctime)
@@ -70,7 +70,7 @@ AC_SEARCH_LIBS([catgets], [catgets], [], [])
70dnl The autoconf test for strftime is broken now (due to gcc 3.3 bug?): 70dnl The autoconf test for strftime is broken now (due to gcc 3.3 bug?):
71dnl Gcc 3.3 testprog = ``extern "C" char strftime;'', build with g++ test.cc 71dnl Gcc 3.3 testprog = ``extern "C" char strftime;'', build with g++ test.cc
72dnl breaks with: 72dnl breaks with:
73dnl test.cc:1: error: nonnull argument with out-of-range operand number 73dnl test.cc:1: error: nonnull argument with out-of-range operand number
74dnl (arg 1, operand 3) 74dnl (arg 1, operand 3)
75 75
76 76
@@ -94,39 +94,39 @@ size_t x = strftime(s, 5, "%a", localtime(&t));
94AC_MSG_CHECKING(for clock_gettime) 94AC_MSG_CHECKING(for clock_gettime)
95AC_COMPILE_IFELSE( 95AC_COMPILE_IFELSE(
96 [AC_LANG_PROGRAM( 96 [AC_LANG_PROGRAM(
97 [#include <time.h>], 97 [#include <time.h>],
98 [[ 98 [[
99 clock_gettime(CLOCK_MONOTONIC, 0); 99 clock_gettime(CLOCK_MONOTONIC, 0);
100 return 0; 100 return 0;
101 ]] 101 ]]
102 )], 102 )],
103 [ 103 [
104 AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define to 1 if you have the 'clock_gettime' function.]) 104 AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define to 1 if you have the 'clock_gettime' function.])
105 AC_MSG_RESULT(yes) 105 AC_MSG_RESULT(yes)
106 # *bsd has clock_gettime() in libc 106 # *bsd has clock_gettime() in libc
107 AC_CHECK_LIB(rt, clock_gettime, LIBS="-lrt $LIBS") 107 AC_CHECK_LIB(rt, clock_gettime, LIBS="-lrt $LIBS")
108 ], 108 ],
109 [ 109 [
110 AC_MSG_RESULT(no) 110 AC_MSG_RESULT(no)
111 ] 111 ]
112) 112)
113 113
114AC_MSG_CHECKING(for mach_absolute_time) 114AC_MSG_CHECKING(for mach_absolute_time)
115AC_COMPILE_IFELSE( 115AC_COMPILE_IFELSE(
116 [AC_LANG_PROGRAM( 116 [AC_LANG_PROGRAM(
117 [#include <mach/mach_time.h>], 117 [#include <mach/mach_time.h>],
118 [[ 118 [[
119 mach_absolute_time(); 119 mach_absolute_time();
120 return 0; 120 return 0;
121 ]] 121 ]]
122 )], 122 )],
123 [ 123 [
124 AC_DEFINE(HAVE_MACH_ABSOLUTE_TIME, 1, [Define to 1 if you have the 'mach_absolute_time' function.]) 124 AC_DEFINE(HAVE_MACH_ABSOLUTE_TIME, 1, [Define to 1 if you have the 'mach_absolute_time' function.])
125 AC_MSG_RESULT(yes) 125 AC_MSG_RESULT(yes)
126 #AC_CHECK_LIB(, clock_gettime, LIBS="-lrt $LIBS") 126 #AC_CHECK_LIB(, clock_gettime, LIBS="-lrt $LIBS")
127 ], 127 ],
128 [ 128 [
129 AC_MSG_RESULT(no) 129 AC_MSG_RESULT(no)
130 ] 130 ]
131) 131)
132 132
@@ -142,58 +142,58 @@ dnl Find iconv. It may be in libiconv and may be iconv() or libiconv()
142if test "x$ac_cv_header_iconv_h" = "xyes"; then 142if test "x$ac_cv_header_iconv_h" = "xyes"; then
143 ac_found_iconv=no 143 ac_found_iconv=no
144 AC_COMPILE_IFELSE( 144 AC_COMPILE_IFELSE(
145 [AC_LANG_PROGRAM( 145 [AC_LANG_PROGRAM(
146 [[#include <stdlib.h> 146 [[#include <stdlib.h>
147 #include <iconv.h>]], 147 #include <iconv.h>]],
148 [[ 148 [[
149 iconv_open(NULL, NULL); 149 iconv_open(NULL, NULL);
150 return 0; 150 return 0;
151 ]] 151 ]]
152 )], 152 )],
153 [ 153 [
154 ac_found_iconv=yes 154 ac_found_iconv=yes
155 ], 155 ],
156 [ ]) 156 [ ])
157 157
158 AC_COMPILE_IFELSE( 158 AC_COMPILE_IFELSE(
159 [AC_LANG_PROGRAM( 159 [AC_LANG_PROGRAM(
160 [[#include <stdlib.h> 160 [[#include <stdlib.h>
161 #include <iconv.h>]], 161 #include <iconv.h>]],
162 [[ 162 [[
163 libiconv_open(NULL, NULL); 163 libiconv_open(NULL, NULL);
164 return 0; 164 return 0;
165 ]] 165 ]]
166 )], 166 )],
167 [ 167 [
168 ac_found_iconv=yes 168 ac_found_iconv=yes
169 ], 169 ],
170 [ ]) 170 [ ])
171 171
172 if test "x$ac_found_iconv" = xyes; then 172 if test "x$ac_found_iconv" = xyes; then
173 AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) 173 AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
174 AC_CHECK_LIB(iconv, iconv_open, LIBS="-liconv $LIBS") 174 AC_CHECK_LIB(iconv, iconv_open, LIBS="-liconv $LIBS")
175 AC_CHECK_LIB(iconv, libiconv_open, LIBS="-liconv $LIBS") 175 AC_CHECK_LIB(iconv, libiconv_open, LIBS="-liconv $LIBS")
176 176
177dnl Check if iconv uses const in prototype declaration 177dnl Check if iconv uses const in prototype declaration
178 AC_CACHE_CHECK(for iconv declaration, 178 AC_CACHE_CHECK(for iconv declaration,
179 ac_cv_iconv_const, 179 ac_cv_iconv_const,
180 [AC_COMPILE_IFELSE( 180 [AC_COMPILE_IFELSE(
181 [AC_LANG_PROGRAM( 181 [AC_LANG_PROGRAM(
182 [[#include <stdlib.h> 182 [[#include <stdlib.h>
183 #include <iconv.h>]], 183 #include <iconv.h>]],
184 [[ 184 [[
185 char **msg, **new_msg; 185 char **msg, **new_msg;
186 size_t result, inleft, outleft; 186 size_t result, inleft, outleft;
187 result = iconv((iconv_t)(-1), msg, &inleft, new_msg, &outleft); 187 result = iconv((iconv_t)(-1), msg, &inleft, new_msg, &outleft);
188 return 0; 188 return 0;
189 ]] 189 ]]
190 )], 190 )],
191 [ac_cv_iconv_const=no], 191 [ac_cv_iconv_const=no],
192 [ac_cv_iconv_const=yes]) 192 [ac_cv_iconv_const=yes])
193 ]) 193 ])
194 if test "x$ac_cv_iconv_const" = xyes; then 194 if test "x$ac_cv_iconv_const" = xyes; then
195 AC_DEFINE(HAVE_CONST_ICONV, 1, [Define if you have the iconv() function.]) 195 AC_DEFINE(HAVE_CONST_ICONV, 1, [Define if you have the iconv() function.])
196 fi 196 fi
197 fi 197 fi
198fi 198fi
199 199
@@ -241,11 +241,11 @@ AC_ARG_ENABLE(regexp,
241 AS_HELP_STRING([--enable-regexp],[regular expression support (default=yes)]),,[enable_regexp=yes]) 241 AS_HELP_STRING([--enable-regexp],[regular expression support (default=yes)]),,[enable_regexp=yes])
242AS_IF(test "x$enable_regexp" = "xyes",[ 242AS_IF(test "x$enable_regexp" = "xyes",[
243 AC_EGREP_HEADER([regex_t],regex.h, 243 AC_EGREP_HEADER([regex_t],regex.h,
244 AC_DEFINE(USE_REGEXP, 1, "Regular Expression support") 244 AC_DEFINE(USE_REGEXP, 1, "Regular Expression support")
245 AC_MSG_RESULT([yes]) 245 AC_MSG_RESULT([yes])
246 REGEXP_SRC=true, 246 REGEXP_SRC=true,
247 AC_MSG_RESULT([no]) 247 AC_MSG_RESULT([no])
248 REGEXP_SRC=false 248 REGEXP_SRC=false
249 )],[]) 249 )],[])
250AM_CONDITIONAL(REGEXP_SRC, test x$REGEXP_SRC = xtrue) 250AM_CONDITIONAL(REGEXP_SRC, test x$REGEXP_SRC = xtrue)
251 251
@@ -263,7 +263,7 @@ AM_CONDITIONAL(SLIT_SRC, test "x$enable_slit" = "xyes")
263 263
264dnl Check for Toolbar options 264dnl Check for Toolbar options
265AC_MSG_CHECKING([whether to include Toolbar]) 265AC_MSG_CHECKING([whether to include Toolbar])
266AC_ARG_ENABLE(toolbar, 266AC_ARG_ENABLE(toolbar,
267 AS_HELP_STRING([--enable-toolbar],[include Toolbar (default=yes)]),,[enable_toolbar=yes]) 267 AS_HELP_STRING([--enable-toolbar],[include Toolbar (default=yes)]),,[enable_toolbar=yes])
268AC_MSG_RESULT([$enable_toolbar]) 268AC_MSG_RESULT([$enable_toolbar])
269AS_IF(test "x$enable_toolbar" = "xyes",[AC_DEFINE(USE_TOOLBAR, 1, " compile with toolbar")],[]) 269AS_IF(test "x$enable_toolbar" = "xyes",[AC_DEFINE(USE_TOOLBAR, 1, " compile with toolbar")],[])
@@ -330,16 +330,16 @@ AM_PATH_XFT(yes, XFT=true, XFT=false)
330AS_IF(test "x$XFT" = "xtrue",[ 330AS_IF(test "x$XFT" = "xtrue",[
331 AC_TRY_LINK([ 331 AC_TRY_LINK([
332 #include <X11/Xft/Xft.h> 332 #include <X11/Xft/Xft.h>
333 ], [ XftFontClose(0, 0); return 1; ], 333 ], [ XftFontClose(0, 0); return 1; ],
334 [ 334 [
335 335
336 AC_DEFINE(USE_XFT, 1, "antialias support") 336 AC_DEFINE(USE_XFT, 1, "antialias support")
337 AC_MSG_CHECKING([Xft UTF-8 support]) 337 AC_MSG_CHECKING([Xft UTF-8 support])
338 AC_TRY_LINK([ 338 AC_TRY_LINK([
339 #include <X11/Xft/Xft.h> 339 #include <X11/Xft/Xft.h>
340 ], [ XftDrawStringUtf8(0, 0, 0, 0, 0, 0, 0); return 0; ], 340 ], [ XftDrawStringUtf8(0, 0, 0, 0, 0, 0, 0); return 0; ],
341 AC_DEFINE(HAVE_XFT_UTF8_STRING, 1, "Xft UTF8 support") 341 AC_DEFINE(HAVE_XFT_UTF8_STRING, 1, "Xft UTF8 support")
342 FEATURES="$FEATURES XFT" 342 FEATURES="$FEATURES XFT"
343 AC_MSG_RESULT(yes), 343 AC_MSG_RESULT(yes),
344 AC_MSG_RESULT(no) 344 AC_MSG_RESULT(no)
345 ) 345 )
@@ -353,25 +353,25 @@ AM_CONDITIONAL(XFT, test "x$XFT" = "xtrue")
353 353
354AC_MSG_CHECKING([whether to have XRENDER (transparent) support]) 354AC_MSG_CHECKING([whether to have XRENDER (transparent) support])
355AC_ARG_ENABLE(xrender, 355AC_ARG_ENABLE(xrender,
356 AS_HELP_STRING([--enable-xrender],[XRENDER (transparent) support (default=yes)]),,[enable_xrender=yes]) 356 AS_HELP_STRING([--enable-xrender],[XRENDER (transparent) support (default=yes)]),,[enable_xrender=yes])
357AC_MSG_RESULT([$enable_xrender]) 357AC_MSG_RESULT([$enable_xrender])
358AS_IF(test "x$enable_xrender" = "xyes",[ 358AS_IF(test "x$enable_xrender" = "xyes",[
359 AC_CHECK_LIB(Xrender, XRenderCreatePicture, 359 AC_CHECK_LIB(Xrender, XRenderCreatePicture,
360 AC_DEFINE(HAVE_XRENDER, 1, "Xrender support") 360 AC_DEFINE(HAVE_XRENDER, 1, "Xrender support")
361 LIBS="-lXrender $LIBS") 361 LIBS="-lXrender $LIBS")
362 ],[]) 362 ],[])
363 363
364 364
365XPM=false 365XPM=false
366AC_MSG_CHECKING([whether to have XPM (pixmap themes) support]) 366AC_MSG_CHECKING([whether to have XPM (pixmap themes) support])
367AC_ARG_ENABLE(xpm, 367AC_ARG_ENABLE(xpm,
368 AS_HELP_STRING([--enable-xpm],[XPM (pixmap themes) support (default=yes)]),[],[enable_xpm=yes]) 368 AS_HELP_STRING([--enable-xpm],[XPM (pixmap themes) support (default=yes)]),[],[enable_xpm=yes])
369AC_MSG_RESULT([$enable_xpm]) 369AC_MSG_RESULT([$enable_xpm])
370AS_IF(test "x$enable_xpm" = "xyes",[ 370AS_IF(test "x$enable_xpm" = "xyes",[
371 AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, 371 AC_CHECK_LIB(Xpm, XpmReadFileToPixmap,
372 AC_DEFINE(HAVE_XPM, 1, "Xpm support") 372 AC_DEFINE(HAVE_XPM, 1, "Xpm support")
373 XPM=true 373 XPM=true
374 LIBS="-lXpm $LIBS") 374 LIBS="-lXpm $LIBS")
375 ],[]) 375 ],[])
376 376
377AM_CONDITIONAL(XPM, test "x$XPM" = "xtrue") 377AM_CONDITIONAL(XPM, test "x$XPM" = "xtrue")
@@ -384,13 +384,13 @@ AC_ARG_ENABLE(imlib2,
384AC_MSG_RESULT([$enable_imlib2]) 384AC_MSG_RESULT([$enable_imlib2])
385AS_IF(test x$enable_imlib2 = "xyes",[ 385AS_IF(test x$enable_imlib2 = "xyes",[
386 AC_PATH_GENERIC(imlib2, 1.0.0,[ 386 AC_PATH_GENERIC(imlib2, 1.0.0,[
387 IMLIB2=true 387 IMLIB2=true
388 AC_DEFINE(HAVE_IMLIB2, [], [Imlib2 support]) 388 AC_DEFINE(HAVE_IMLIB2, [], [Imlib2 support])
389 LIBS="$IMLIB2_LIBS $LIBS" 389 LIBS="$IMLIB2_LIBS $LIBS"
390 CXXFLAGS="$CXXFLAGS $IMLIB2_CFLAGS" 390 CXXFLAGS="$CXXFLAGS $IMLIB2_CFLAGS"
391 FEATURES="$FEATURES IMLIB2" 391 FEATURES="$FEATURES IMLIB2"
392 ], [] 392 ], []
393 )],[]) 393 )],[])
394 394
395AM_CONDITIONAL(IMLIB2, test "x$IMLIB2" = "xtrue") 395AM_CONDITIONAL(IMLIB2, test "x$IMLIB2" = "xtrue")
396 396
@@ -406,21 +406,21 @@ AM_CONDITIONAL(MULTIBYTE, test "x$enable_xmb" = "xyes")
406dnl Check for Xinerama support and proper library files. 406dnl Check for Xinerama support and proper library files.
407AC_MSG_CHECKING([whether to build support for the XINERAMA extension]) 407AC_MSG_CHECKING([whether to build support for the XINERAMA extension])
408AC_ARG_ENABLE(xinerama, 408AC_ARG_ENABLE(xinerama,
409 AS_HELP_STRING([--enable-xinerama], [XINERAMA extension support (default=yes)]), ,[enable_xinerama=yes]) 409 AS_HELP_STRING([--enable-xinerama], [XINERAMA extension support (default=yes)]), ,[enable_xinerama=yes])
410 410
411AS_IF(test "x$enable_xinerama" = "xyes",[ 411AS_IF(test "x$enable_xinerama" = "xyes",[
412 AC_CHECK_LIB(Xinerama, XineramaQueryScreens, 412 AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
413 AC_MSG_CHECKING([for X11/extensions/Xinerama.h]) 413 AC_MSG_CHECKING([for X11/extensions/Xinerama.h])
414 AC_TRY_COMPILE( 414 AC_TRY_COMPILE(
415#include <X11/Xlib.h> 415#include <X11/Xlib.h>
416#include <X11/Xutil.h> 416#include <X11/Xutil.h>
417#include <X11/extensions/Xinerama.h> 417#include <X11/extensions/Xinerama.h>
418 , XineramaQueryScreens(0, 0), 418 , XineramaQueryScreens(0, 0),
419 AC_MSG_RESULT([yes]) 419 AC_MSG_RESULT([yes])
420 AC_DEFINE(XINERAMA, [1], [Define to 1 if you have XINERAMA]) 420 AC_DEFINE(XINERAMA, [1], [Define to 1 if you have XINERAMA])
421 LIBS="-lXinerama $LIBS" 421 LIBS="-lXinerama $LIBS"
422 FEATURES="$FEATURES XINERAMA", 422 FEATURES="$FEATURES XINERAMA",
423 AC_MSG_RESULT([no])))],[ 423 AC_MSG_RESULT([no])))],[
424 AC_MSG_RESULT([no]) 424 AC_MSG_RESULT([no])
425 CONFIGOPTS="$CONFIGOPTS --disable-xinerama"]) 425 CONFIGOPTS="$CONFIGOPTS --disable-xinerama"])
426 426
@@ -431,17 +431,17 @@ AC_ARG_ENABLE(shape,
431 AS_HELP_STRING([--enable-shape], [XSHAPE extension support (default=yes)]), , [enable_shape=yes]) 431 AS_HELP_STRING([--enable-shape], [XSHAPE extension support (default=yes)]), , [enable_shape=yes])
432AS_IF(test "x$enable_shape" = "xyes",[ 432AS_IF(test "x$enable_shape" = "xyes",[
433 AC_CHECK_LIB(Xext, XShapeCombineShape, 433 AC_CHECK_LIB(Xext, XShapeCombineShape,
434 AC_MSG_CHECKING([for X11/extensions/shape.h]) 434 AC_MSG_CHECKING([for X11/extensions/shape.h])
435 AC_TRY_COMPILE( 435 AC_TRY_COMPILE(
436#include <X11/Xlib.h> 436#include <X11/Xlib.h>
437#include <X11/Xutil.h> 437#include <X11/Xutil.h>
438#include <X11/extensions/shape.h> 438#include <X11/extensions/shape.h>
439 , long foo = ShapeSet, 439 , long foo = ShapeSet,
440 AC_MSG_RESULT([yes]) 440 AC_MSG_RESULT([yes])
441 AC_DEFINE(SHAPE, [1], [Define to 1 if you have SHAPE]) 441 AC_DEFINE(SHAPE, [1], [Define to 1 if you have SHAPE])
442 LIBS="-lXext $LIBS" 442 LIBS="-lXext $LIBS"
443 FEATURES="$FEATURES SHAPE", 443 FEATURES="$FEATURES SHAPE",
444 AC_MSG_RESULT([no])))],[ 444 AC_MSG_RESULT([no])))],[
445 AC_MSG_RESULT([no]) 445 AC_MSG_RESULT([no])
446 CONFIGOPTS="$CONFIGOPTS --disable-shape"]) 446 CONFIGOPTS="$CONFIGOPTS --disable-shape"])
447 447
@@ -456,35 +456,35 @@ AC_ARG_ENABLE(randr,
456AS_IF(test "x$enable_randr" = "xyes", [ 456AS_IF(test "x$enable_randr" = "xyes", [
457 AC_MSG_RESULT([yes]) 457 AC_MSG_RESULT([yes])
458 AC_CHECK_LIB(Xrandr, XRRQueryExtension, [ 458 AC_CHECK_LIB(Xrandr, XRRQueryExtension, [
459 AC_MSG_CHECKING([for X11/extensions/Xrandr.h]) 459 AC_MSG_CHECKING([for X11/extensions/Xrandr.h])
460 AC_COMPILE_IFELSE([ 460 AC_COMPILE_IFELSE([
461 AC_LANG_PROGRAM([[#include <X11/Xlib.h> 461 AC_LANG_PROGRAM([[#include <X11/Xlib.h>
462#include <X11/Xutil.h> 462#include <X11/Xutil.h>
463#include <X11/extensions/Xrandr.h> 463#include <X11/extensions/Xrandr.h>
464 ]], [[XRRQueryExtension(0, 0, 0);]] 464 ]], [[XRRQueryExtension(0, 0, 0);]]
465 )], [ 465 )], [
466 AC_MSG_RESULT([yes]) 466 AC_MSG_RESULT([yes])
467 AC_DEFINE(HAVE_RANDR, [1], [Define to 1 if you have RANDR]) 467 AC_DEFINE(HAVE_RANDR, [1], [Define to 1 if you have RANDR])
468 LIBS="-lXrandr $LIBS" 468 LIBS="-lXrandr $LIBS"
469 FEATURES="$FEATURES RANDR" 469 FEATURES="$FEATURES RANDR"
470 470
471 AC_MSG_CHECKING([for XRRUpdateConfiguration]) 471 AC_MSG_CHECKING([for XRRUpdateConfiguration])
472 AC_COMPILE_IFELSE([ 472 AC_COMPILE_IFELSE([
473 AC_LANG_PROGRAM([[#include <X11/Xlib.h> 473 AC_LANG_PROGRAM([[#include <X11/Xlib.h>
474#include <X11/Xutil.h> 474#include <X11/Xutil.h>
475#include <X11/extensions/Xrandr.h> 475#include <X11/extensions/Xrandr.h>
476 ]], [[XRRUpdateConfiguration(0);]] 476 ]], [[XRRUpdateConfiguration(0);]]
477 )], [ 477 )], [
478 AC_MSG_RESULT([yes]) 478 AC_MSG_RESULT([yes])
479 AC_DEFINE(HAVE_RANDR1_2, [1], [Define to 1 if you have RANDR 1.2]) 479 AC_DEFINE(HAVE_RANDR1_2, [1], [Define to 1 if you have RANDR 1.2])
480 ], [ 480 ], [
481 AC_MSG_RESULT([no]) 481 AC_MSG_RESULT([no])
482 ]) 482 ])
483 ], [ 483 ], [
484 AC_MSG_RESULT([no]) 484 AC_MSG_RESULT([no])
485 ]) 485 ])
486 ],[ 486 ],[
487 AC_MSG_RESULT([no]) 487 AC_MSG_RESULT([no])
488 ])],[ 488 ])],[
489 AC_MSG_RESULT([no]) 489 AC_MSG_RESULT([no])
490 CONFIGOPTS="$CONFIGOPTS --disable-randr"]) 490 CONFIGOPTS="$CONFIGOPTS --disable-randr"])
@@ -582,7 +582,7 @@ dnl Determine if maintainer portions of the Makefiles should be included.
582dnl AM_MAINTAINER_MODE 582dnl AM_MAINTAINER_MODE
583 583
584dnl Output files 584dnl Output files
585AM_CONFIG_HEADER(config.h) 585AC_CONFIG_HEADER(config.h)
586 586
587AC_OUTPUT(Makefile 587AC_OUTPUT(Makefile
588version.h 588version.h