mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
Revert "autoconf"
I did not plan to push this
This reverts commit 0bd6cc30bc
.
This commit is contained in:
parent
88d0390724
commit
e8d8f0abf8
@ -4,7 +4,8 @@ AC_DEFUN([QT_TRY_LINK],
|
||||
SAVE_LIBS="$LIBS"
|
||||
LIBS="$LIBS $1"
|
||||
AC_TRY_LINK([
|
||||
#include <QtCore/QString>
|
||||
#include <qglobal.h>
|
||||
#include <qstring.h>
|
||||
],
|
||||
[
|
||||
QString s("mangle_failure");
|
||||
@ -103,7 +104,7 @@ AC_DEFUN([QT_GET_VERSION],
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
#include <QtCore/qglobal.h>
|
||||
#include <qglobal.h>
|
||||
"%%%"QT_VERSION_STR"%%%"
|
||||
EOF
|
||||
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)])
|
||||
else
|
||||
AC_PREPROC_IFELSE([AC_LANG_SOURCE([
|
||||
[#include <QtCore/qglobal.h>],
|
||||
[#include <qglobal.h>],
|
||||
[#ifndef Q_WS_X11],
|
||||
[#error Fail],
|
||||
[#endif]])],
|
||||
|
Loading…
Reference in New Issue
Block a user