Mercurial > octave-nkf

comparison configure.ac @ 15306:ec3a9ff6c375

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: Use true/false rather than yes/no for build_gui variable. * configure.ac: Use true/false rather than yes/no for build_gui variable.
author Rik <rik@octave.org>
date Wed, 05 Sep 2012 16:59:19 -0700
parents df7ab06ff541
children a4d7909c4edb
comparison
equal deleted inserted replaced
15305:df7ab06ff541 15306:ec3a9ff6c375
2184 2184
2185 HAVE_QT=false 2185 HAVE_QT=false
2186 QT_INCDIR= 2186 QT_INCDIR=
2187 QT_LIBDIR= 2187 QT_LIBDIR=
2188 win32_terminal=no 2188 win32_terminal=no
2189 build_gui=yes 2189 build_gui=true
2190 GUIDIR=libgui 2190 GUIDIR=libgui
2191 AC_ARG_ENABLE(gui, 2191 AC_ARG_ENABLE(gui,
2192 [AS_HELP_STRING([--disable-gui], [don't build the GUI])], 2192 [AS_HELP_STRING([--disable-gui], [don't build the GUI])],
2193 [if test "$enableval" = no; then build_gui=no; fi], [build_gui=yes]) 2193 [if test "$enableval" = no; then build_gui=false; fi], [build_gui=true])
2194 2194
2195 if test $build_gui = yes; then 2195 if test $build_gui = true; then
2196 ## Check for Qt libraries 2196 ## Check for Qt libraries
2197 PKG_CHECK_MODULES(QT, [QtCore, QtGui, QtNetwork], 2197 PKG_CHECK_MODULES(QT, [QtCore, QtGui, QtNetwork],
2198 [], 2198 [],
2199 [AC_MSG_ERROR([Qt libraries are required to build the GUI])]) 2199 [AC_MSG_ERROR([Qt libraries are required to build the GUI])])
2200 2200
2264 esac 2264 esac
2265 else 2265 else
2266 ## GUI disabled. Eliminate building GUIDIR directory 2266 ## GUI disabled. Eliminate building GUIDIR directory
2267 GUIDIR= 2267 GUIDIR=
2268 fi 2268 fi
2269 AM_CONDITIONAL([AMCOND_BUILD_GUI], [test $build_gui = yes]) 2269 AM_CONDITIONAL([AMCOND_BUILD_GUI], [test $build_gui = true])
2270 AM_CONDITIONAL([WIN32_TERMINAL], [test $win32_terminal = yes]) 2270 AM_CONDITIONAL([WIN32_TERMINAL], [test $win32_terminal = yes])
2271 AC_SUBST(QT_INCDIR) 2271 AC_SUBST(QT_INCDIR)
2272 AC_SUBST(QT_LIBDIR) 2272 AC_SUBST(QT_LIBDIR)
2273 AC_SUBST(GUIDIR) 2273 AC_SUBST(GUIDIR)
2274 2274