anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "autoconf"

Browse Source 
I did not plan to push this

This reverts commit 0bd6cc30bc.
This commit is contained in:
Jean-Marc Lasgouttes 2017-10-11 12:02:25 +02:00
parent 88d0390724
commit e8d8f0abf8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/qt4.m4
View File

@ -4,7 +4,8 @@ AC_DEFUN([QT_TRY_LINK],
SAVE_LIBS="$LIBS" SAVE_LIBS="$LIBS"
LIBS="$LIBS $1" LIBS="$LIBS $1"
AC_TRY_LINK([ AC_TRY_LINK([
#include <QtCore/QString> #include <qglobal.h>
#include <qstring.h>
], ],
[ [
QString s("mangle_failure"); QString s("mangle_failure");
@ -103,7 +104,7 @@ AC_DEFUN([QT_GET_VERSION],
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line __oline__ "configure" #line __oline__ "configure"
#include "confdefs.h" #include "confdefs.h"
#include <QtCore/qglobal.h> #include <qglobal.h>
"%%%"QT_VERSION_STR"%%%" "%%%"QT_VERSION_STR"%%%"
EOF EOF
lyx_cv_qtversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \ lyx_cv_qtversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
@ -192,7 +193,7 @@ AC_DEFUN([QT_DO_IT_ALL],
[AC_MSG_RESULT(no)]) [AC_MSG_RESULT(no)])
else else
AC_PREPROC_IFELSE([AC_LANG_SOURCE([ AC_PREPROC_IFELSE([AC_LANG_SOURCE([
[#include <QtCore/qglobal.h>], [#include <qglobal.h>],
[#ifndef Q_WS_X11], [#ifndef Q_WS_X11],
[#error Fail], [#error Fail],
[#endif]])], [#endif]])],