Mercurial > octave-nkf

comparison configure.in @ 8770:af676d09da08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix test for X11 if "--without-x" is given.
author Thomas Treichl <Thomas.Treichl@gmx.net>
date Tue, 17 Feb 2009 00:27:30 -0500
parents 0899370cce9f
children d3382daaf4d2
comparison
equal deleted inserted replaced
8769:a186c5b4f264 8770:af676d09da08
262 262
263 AC_PATH_X 263 AC_PATH_X
264 if test "$have_x"; then 264 if test "$have_x"; then
265 AC_DEFINE(HAVE_X_WINDOWS, 1, [Define if you have X11]) 265 AC_DEFINE(HAVE_X_WINDOWS, 1, [Define if you have X11])
266 266
267 X11_INCFLAGS="$x_includes" 267 if test $x_includes != "NONE"; then
268 X11_INCFLAGS="$x_includes"
269 fi
268 AC_SUBST(X11_INCFLAGS) 270 AC_SUBST(X11_INCFLAGS)
269 271
270 AC_CHECK_LIB(X11, XrmInitialize, [X11_LIBS=-lX11], [X11_LIBS=]) 272 if test -z $x_libraries; then
273 AC_CHECK_LIB(X11, XrmInitialize, [X11_LIBS=-lX11], [X11_LIBS=])
274 elif test $x_libraries != "NONE"; then
275 AC_CHECK_LIB(X11, XrmInitialize,
276 [X11_LIBS="-L$x_libraries -lX11"], [X11_LIBS=], "-L$x_libraries")
277 fi
271 AC_SUBST(X11_LIBS) 278 AC_SUBST(X11_LIBS)
272 fi 279 fi
273 280
274 ### On MacOSX system the Carbon framework is used to determine ScreenSize 281 ### On MacOSX system the Carbon framework is used to determine ScreenSize
275 OCTAVE_HAVE_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>], [CGMainDisplayID ()], 282 OCTAVE_HAVE_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>], [CGMainDisplayID ()],