common/autoconf/libraries.m4

changeset 782
21198f51bc7e
parent 740
c0fa87863427
child 839
174a54ce39c4
child 971
584dc2e95e04
equal deleted inserted replaced
775:5166118c5917 782:21198f51bc7e
183 AC_LANG_PUSH(C) 183 AC_LANG_PUSH(C)
184 OLD_CFLAGS="$CFLAGS" 184 OLD_CFLAGS="$CFLAGS"
185 CFLAGS="$CFLAGS $X_CFLAGS" 185 CFLAGS="$CFLAGS $X_CFLAGS"
186 186
187 # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10 187 # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
188 AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h], 188 AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
189 [X11_A_OK=yes], 189 [X11_A_OK=yes],
190 [X11_A_OK=no; break], 190 [X11_A_OK=no; break],
191 [ # include <X11/Xlib.h> 191 [ # include <X11/Xlib.h>
192 # include <X11/Xutil.h> 192 # include <X11/Xutil.h>
193 ]) 193 ])
195 CFLAGS="$OLD_CFLAGS" 195 CFLAGS="$OLD_CFLAGS"
196 AC_LANG_POP(C) 196 AC_LANG_POP(C)
197 197
198 if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then 198 if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
199 HELP_MSG_MISSING_DEPENDENCY([x11]) 199 HELP_MSG_MISSING_DEPENDENCY([x11])
200 AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h). $HELP_MSG]) 200 AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG])
201 fi 201 fi
202 202
203 AC_SUBST(X_CFLAGS) 203 AC_SUBST(X_CFLAGS)
204 AC_SUBST(X_LIBS) 204 AC_SUBST(X_LIBS)
205 ]) 205 ])

mercurial