Mercurial > octave

comparison build-aux/subst-cross-config-vals.in.sh @ 31752:345a3f5890e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
assume QOpenGLWidget is available QOpenGLWidget was introduced in Qt 5.4. * acinclude.m4 (OCTAVE_CHECK_QT_OPENGL_OK): Delete. (OCTAVE_CHECK_QT_VERSION): Delete use. Don't define separate macros and compiler flag variables for QtOpenGL module. Include them with the other Qt compiler flags. * subst-config-vals.in.sh, subst-cross-config-vals.in.sh, configure.ac, GLCanvas.cc, GLCanvas.h, module.mk, build-env.h, build-env.in.cc, toplev.cc: Eliminate checks for Qt QOpenGLWidget. Assume it is always available. Eliminate QtOpenGL configuration variables.
author John W. Eaton <jwe@octave.org>
date Tue, 17 Jan 2023 13:43:26 -0500
parents 597f3ee61a48
children 2e484f9f1f18
comparison
equal deleted inserted replaced
31751:e863066429f1 31752:345a3f5890e7
212 QRUPDATE_LDFLAGS="@QRUPDATE_LDFLAGS@" 212 QRUPDATE_LDFLAGS="@QRUPDATE_LDFLAGS@"
213 QRUPDATE_LIBS="@QRUPDATE_LIBS@" 213 QRUPDATE_LIBS="@QRUPDATE_LIBS@"
214 QT_CPPFLAGS="@QT_CPPFLAGS@" 214 QT_CPPFLAGS="@QT_CPPFLAGS@"
215 QT_LDFLAGS="@QT_LDFLAGS@" 215 QT_LDFLAGS="@QT_LDFLAGS@"
216 QT_LIBS="@QT_LIBS@" 216 QT_LIBS="@QT_LIBS@"
217 QT_OPENGL_LIBS="@QT_OPENGL_LIBS@"
218 RANLIB="@RANLIB@" 217 RANLIB="@RANLIB@"
219 RDYNAMIC_FLAG="@RDYNAMIC_FLAG@" 218 RDYNAMIC_FLAG="@RDYNAMIC_FLAG@"
220 READLINE_LIBS="@LIBREADLINE@" 219 READLINE_LIBS="@LIBREADLINE@"
221 SHARED_LIBS="@SHARED_LIBS@" 220 SHARED_LIBS="@SHARED_LIBS@"
222 SH_LDFLAGS="@SH_LDFLAGS@" 221 SH_LDFLAGS="@SH_LDFLAGS@"
374 -e "s|%OCTAVE_CONF_QRUPDATE_LDFLAGS%|\"${QRUPDATE_LDFLAGS}\"|" \ 373 -e "s|%OCTAVE_CONF_QRUPDATE_LDFLAGS%|\"${QRUPDATE_LDFLAGS}\"|" \
375 -e "s|%OCTAVE_CONF_QRUPDATE_LIBS%|\"${QRUPDATE_LIBS}\"|" \ 374 -e "s|%OCTAVE_CONF_QRUPDATE_LIBS%|\"${QRUPDATE_LIBS}\"|" \
376 -e "s|%OCTAVE_CONF_QT_CPPFLAGS%|\"${QT_CPPFLAGS}\"|" \ 375 -e "s|%OCTAVE_CONF_QT_CPPFLAGS%|\"${QT_CPPFLAGS}\"|" \
377 -e "s|%OCTAVE_CONF_QT_LDFLAGS%|\"${QT_LDFLAGS}\"|" \ 376 -e "s|%OCTAVE_CONF_QT_LDFLAGS%|\"${QT_LDFLAGS}\"|" \
378 -e "s|%OCTAVE_CONF_QT_LIBS%|\"${QT_LIBS}\"|" \ 377 -e "s|%OCTAVE_CONF_QT_LIBS%|\"${QT_LIBS}\"|" \
379 -e "s|%OCTAVE_CONF_QT_OPENGL_LIBS%|\"${QT_OPENGL_LIBS}\"|" \
380 -e "s|%OCTAVE_CONF_RANLIB%|\"${RANLIB}\"|" \ 378 -e "s|%OCTAVE_CONF_RANLIB%|\"${RANLIB}\"|" \
381 -e "s|%OCTAVE_CONF_RDYNAMIC_FLAG%|\"${RDYNAMIC_FLAG}\"|" \ 379 -e "s|%OCTAVE_CONF_RDYNAMIC_FLAG%|\"${RDYNAMIC_FLAG}\"|" \
382 -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" | \ 380 -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" | \
383 $SED \ 381 $SED \
384 -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \ 382 -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \