]> git.lyx.org Git - lyx.git/commitdiff
* config/qt.m4: remove (unused)
authorJean-Marc Lasgouttes <lasgouttes@lyx.org>
Wed, 25 Apr 2007 10:40:50 +0000 (10:40 +0000)
committerJean-Marc Lasgouttes <lasgouttes@lyx.org>
Wed, 25 Apr 2007 10:40:50 +0000 (10:40 +0000)
* config/lyxinclude25x.m4: remove (move contents to lyxinclude.m4)

* autogen.sh:
* config/Makefile.am: adapt.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17980 a592a061-630c-0410-9148-cb99ea01b6c8

autogen.sh
config/Makefile.am
config/lyxinclude.m4
config/lyxinclude25x.m4 [deleted file]
config/qt.m4 [deleted file]

index e43a5f96ea7f199be93cabd3a6d5850de9dccf97..b30a91d19ef6b23c70a5424ddff7e0d1f416922c 100755 (executable)
@@ -4,7 +4,7 @@ ACLOCAL="aclocal -I ${PWD}/m4"
 AUTOHEADER="autoheader"
 AUTOMAKE="automake --add-missing --copy --foreign"
 AUTOCONF="autoconf"
-ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 pkg.m4 qt.m4 qt4.m4 spell.m4"
+ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 pkg.m4 qt4.m4 spell.m4"
 
 # Discover what version of automake we are using.
 automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
@@ -39,7 +39,6 @@ test "$autoversion" != "" && {
 
 case $autoversion in
     *' '2.5[2-9]|*' '2.60[ab]|*' '2.6[0-1])
-       EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
        ;;
     *)
        echo "This autoconf version is not supported by LyX."
index 9ecb9c9ee523744b7538a14e2dc6a703d8216709..8d27c6e158f46ef8db1a114c26adc8346a166f0e 100644 (file)
@@ -3,9 +3,7 @@ include $(top_srcdir)/config/common.am
 EXTRA_DIST = \
        common.am \
        libtool.m4 \
-       lyxinclude25x.m4 \
        lyxinclude.m4 \
        pkg.m4 \
-       qt.m4 \
        qt4.m4 \
        spell.m4
index d5dce19dba314aad9c73e7d03ca5479243e563d0..50cd0ce18595063221320795455003e22477ccc2 100644 (file)
@@ -694,3 +694,23 @@ AC_DEFUN([MSYS_AC_CANONICAL_PATH],
  $1=`echo "$2" | sed "s?^[[./]]*$ac_dir/*?$ac_val/?"'
    s?/*$[]??'`
 ])
+
+dnl this is used by the macro blow to general a proper config.h.in entry
+m4_define([LYX_AH_CHECK_DECL],
+[AH_TEMPLATE(AS_TR_CPP(HAVE_DECL_$1),
+  [Define if you have the prototype for function `$1'])])
+
+dnl Check things are declared in headers to avoid errors or warnings.
+dnl Called like LYX_CHECK_DECL(function, header1 header2...)
+dnl Defines HAVE_DECL_{FUNCTION}
+AC_DEFUN([LYX_CHECK_DECL],
+[LYX_AH_CHECK_DECL($1)
+for ac_header in $2
+do
+  AC_MSG_CHECKING([if $1 is declared by header $ac_header])
+  AC_EGREP_HEADER($1, $ac_header,
+      [AC_MSG_RESULT(yes)
+       AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_DECL_$1))
+       break],
+      [AC_MSG_RESULT(no)])
+done])
diff --git a/config/lyxinclude25x.m4 b/config/lyxinclude25x.m4
deleted file mode 100644 (file)
index 7dc9f7b..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-dnl this is used by the macro blow to general a proper config.h.in entry
-m4_define([LYX_AH_CHECK_DECL],
-[AH_TEMPLATE(AS_TR_CPP(HAVE_DECL_$1),
-  [Define if you have the prototype for function `$1'])])
-
-dnl Check things are declared in headers to avoid errors or warnings.
-dnl Called like LYX_CHECK_DECL(function, header1 header2...)
-dnl Defines HAVE_DECL_{FUNCTION}
-AC_DEFUN([LYX_CHECK_DECL],
-[LYX_AH_CHECK_DECL($1)
-for ac_header in $2
-do
-  AC_MSG_CHECKING([if $1 is declared by header $ac_header])
-  AC_EGREP_HEADER($1, $ac_header,
-      [AC_MSG_RESULT(yes)
-       AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_DECL_$1))
-       break],
-      [AC_MSG_RESULT(no)])
-done])
diff --git a/config/qt.m4 b/config/qt.m4
deleted file mode 100644 (file)
index 1e548eb..0000000
+++ /dev/null
@@ -1,282 +0,0 @@
-dnl find a binary in the path
-AC_DEFUN([QT_FIND_PATH],
-[
-       AC_MSG_CHECKING([for $1])
-       AC_CACHE_VAL(qt_cv_path_$1,
-       [
-               qt_cv_path_$1="NONE"
-               if test -n "$$2"; then
-                       qt_cv_path_$1="$$2";
-               else
-                       dirs="$3"
-                       qt_save_IFS=$IFS
-                       IFS=':'
-                       for dir in $PATH; do
-                               dirs="$dirs $dir"
-                       done
-                       IFS=$qt_save_IFS
-
-                       for dir in $dirs; do
-                               if test -x "$dir/$1"; then
-                                       if test -n "$5"; then
-                                               evalstr="$dir/$1 $5 2>&1 "
-                                               if eval $evalstr; then
-                                                       qt_cv_path_$1="$dir/$1"
-                                                       break
-                                               fi
-                                       else
-                                               qt_cv_path_$1="$dir/$1"
-                                               break
-                                       fi
-                               fi
-                       done
-               fi
-       ])
-
-       if test -z "$qt_cv_path_$1" || test "$qt_cv_path_$1" = "NONE"; then
-               AC_MSG_RESULT(not found)
-               $4
-       else
-               AC_MSG_RESULT($qt_cv_path_$1)
-               $2=$qt_cv_path_$1
-       fi
-])
-
-dnl Find the uic compiler on the path or in qt_cv_dir
-AC_DEFUN([QT_FIND_UIC],
-[
-       QT_FIND_PATH(uic, ac_uic, $qt_cv_dir/bin)
-       if test -z "$ac_uic" -a "$FATAL" = 1; then
-               AC_MSG_ERROR([uic binary not found in \$PATH or $qt_cv_dir/bin !])
-       fi
-       AC_MSG_CHECKING([whether uic supports -nounload])
-       if $ac_uic --help 2>&1 | grep nounload >/dev/null ; then
-               AC_MSG_RESULT([yes])
-               ac_uic="$ac_uic -nounload"
-       else
-               AC_MSG_RESULT([no])
-       fi
-])
-
-dnl Find the right moc in path/qt_cv_dir
-AC_DEFUN([QT_FIND_MOC],
-[
-       QT_FIND_PATH(moc2, ac_moc2, $qt_cv_dir/bin)
-       QT_FIND_PATH(moc, ac_moc1, $qt_cv_dir/bin)
-
-       if test -n "$ac_moc1" -a -n "$ac_moc2"; then
-               dnl found both. Prefer Qt3's if it exists else moc2
-               $ac_moc1 -v 2>&1 | grep "Qt 3" >/dev/null
-               if test "$?" = 0; then
-                       ac_moc=$ac_moc1;
-               else
-                       ac_moc=$ac_moc2;
-               fi
-       else
-               if test -n "$ac_moc1"; then
-                       ac_moc=$ac_moc1;
-               else
-                       ac_moc=$ac_moc2;
-               fi
-       fi
-
-       if test -z "$ac_moc"  -a "$FATAL" = 1; then
-               AC_MSG_ERROR([moc binary not found in \$PATH or $qt_cv_dir/bin !])
-       fi
-])
-
-dnl check a particular libname
-AC_DEFUN([QT_TRY_LINK],
-[
-       SAVE_LIBS="$LIBS"
-       LIBS="$LIBS $1"
-       AC_TRY_LINK([
-       #include <qglobal.h>
-       #include <qstring.h>
-               ],
-       [
-       QString s("mangle_failure");
-       #if (QT_VERSION < 0x030000)
-       break_me_(\\\);
-       #endif
-       ],
-       qt_cv_libname=$1,
-       )
-       LIBS="$SAVE_LIBS"
-])
-
-dnl check we can do a compile
-AC_DEFUN([QT_CHECK_COMPILE],
-[
-       AC_MSG_CHECKING([for Qt library name])
-
-       AC_CACHE_VAL(qt_cv_libname,
-       [
-               AC_LANG_CPLUSPLUS
-               SAVE_CXXFLAGS=$CXXFLAGS
-               CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS"
-
-               for libname in -lqt-mt -lqt;
-               do
-                       QT_TRY_LINK($libname)
-                       if test -n "$qt_cv_libname"; then
-                               break;
-                       fi
-               done
-
-               CXXFLAGS=$SAVE_CXXFLAGS
-       ])
-
-       if test -z "$qt_cv_libname"; then
-               AC_MSG_RESULT([failed])
-               if test "$FATAL" = 1 ; then
-                       AC_MSG_ERROR([Cannot compile a simple Qt executable. Check you have the right \$QTDIR !])
-               fi
-       else
-               AC_MSG_RESULT([$qt_cv_libname])
-       fi
-])
-
-dnl get Qt version we're using
-AC_DEFUN([QT_GET_VERSION],
-[
-       AC_CACHE_CHECK([Qt version],lyx_cv_qtversion,
-       [
-               AC_LANG_CPLUSPLUS
-               SAVE_CPPFLAGS=$CPPFLAGS
-               CPPFLAGS="$CPPFLAGS $QT_INCLUDES"
-
-               cat > conftest.$ac_ext <<EOF
-#line __oline__ "configure"
-#include "confdefs.h"
-#include <qglobal.h>
-"%%%"QT_VERSION_STR"%%%"
-EOF
-               lyx_cv_qtversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
-                       grep '^"%%%"'  2>/dev/null | \
-                       sed -e 's/"%%%"//g' -e 's/"//g'`
-               rm -f conftest.$ac_ext
-               CPPFLAGS=$SAVE_CPPFLAGS
-       ])
-
-       QT_VERSION=$lyx_cv_qtversion
-       AC_SUBST(QT_VERSION)
-])
-
-dnl Ascertain whether the Qt libraries are multi-threaded or not
-AC_DEFUN([QT_CHECK_IS_MULTITHREADED],
-[
-       AC_CACHE_CHECK([whether the Qt library is multi-threaded],
-                      qt_cv_is_multithreaded,
-       [
-               AC_LANG_CPLUSPLUS
-               SAVE_CXXFLAGS=$CXXFLAGS
-               SAVE_LIBS="$LIBS"
-               CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS"
-               LIBS="$LIBS $QT_LIB"
-
-               AC_TRY_LINK(
-               [
-#define QT_THREAD_SUPPORT
-#include <qapplication.h>
-               ],
-               [
-       QApplication a(0,0);
-       a.unlock();
-               ],
-               qt_cv_is_multithreaded=yes,
-               qt_cv_is_multithreaded=no
-               )
-
-               LIBS="$SAVE_LIBS"
-               CXXFLAGS=$SAVE_CXXFLAGS
-       ])
-
-       if test x"$qt_cv_is_multithreaded" = xyes; then
-               QT_CPPFLAGS="$QT_CPPFLAGS -DQT_THREAD_SUPPORT"
-       fi
-])
-
-dnl start here
-AC_DEFUN([QT_DO_IT_ALL],
-[
-       dnl this variable is precious
-       AC_ARG_VAR(QTDIR, [the place where the Qt files are, e.g. /usr/lib/qt])
-
-       dnl Please leave this alone. I use this file in
-       dnl oprofile.
-       FATAL=0
-
-       AC_ARG_WITH(qt-dir, [  --with-qt-dir           where the root of Qt is installed ],
-               [ qt_cv_dir=`eval echo "$withval"/` ])
-
-       AC_ARG_WITH(qt-includes, [  --with-qt-includes      where the Qt includes are. ],
-               [ qt_cv_includes=`eval echo "$withval"` ])
-
-       AC_ARG_WITH(qt-libraries, [  --with-qt-libraries     where the Qt library is installed.],
-               [  qt_cv_libraries=`eval echo "$withval"` ])
-
-       dnl pay attention to $QTDIR unless overridden
-       if test -z "$qt_cv_dir"; then
-               qt_cv_dir=$QTDIR
-       fi
-
-       dnl derive inc/lib if needed
-       if test -n "$qt_cv_dir"; then
-               if test -z "$qt_cv_includes"; then
-                       qt_cv_includes=$qt_cv_dir/include
-               fi
-               if test -z "$qt_cv_libraries"; then
-                       qt_cv_libraries=$qt_cv_dir/lib
-               fi
-       fi
-
-       dnl flags for compilation
-       QT_INCLUDES=
-       QT_LDFLAGS=
-       if test -n "$qt_cv_includes"; then
-               QT_INCLUDES="-I$qt_cv_includes"
-       fi
-       if test -n "$qt_cv_libraries"; then
-               QT_LDFLAGS="-L$qt_cv_libraries"
-       fi
-       AC_SUBST(QT_INCLUDES)
-       AC_SUBST(QT_LDFLAGS)
-
-       dnl Preprocessor flags
-       QT_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL -DQT_NO_EMIT"
-       case ${host} in
-       *mingw*) QT_CPPFLAGS="-DQT_DLL $QT_CPPFLAGS";;
-       esac
-
-       case ${host_os} in
-       cygwin* ) 
-               if test "x$with_x" = xno ; then 
-                       QT_CPPFLAGS="$QT_CPPFLAGS -DQ_CYGWIN_WIN"
-               fi;;
-       esac
-
-       AC_SUBST(QT_CPPFLAGS)
-
-       if test -z "$MOC"; then
-               QT_FIND_MOC
-               MOC=$ac_moc
-       fi
-       AC_SUBST(MOC)
-       if test -z "$UIC"; then
-               QT_FIND_UIC
-               UIC=$ac_uic
-       fi
-       AC_SUBST(UIC)
-
-       QT_CHECK_COMPILE
-
-       QT_LIB=$qt_cv_libname;
-       AC_SUBST(QT_LIB)
-
-       QT_CHECK_IS_MULTITHREADED
-
-       if test -n "$qt_cv_libname"; then
-               QT_GET_VERSION
-       fi
-])