Guess the proper instance of MOC in case it's not the first in path.
This can happen if both Qt3 and Qt4 are installed. git-svn-id: http://voip.null.ro/svn/yate@1667 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
parent
eed97ee954
commit
92e76e4dfc
|
@ -6,7 +6,7 @@ DEBUG :=
|
||||||
|
|
||||||
CXX := @CXX@ -Wall
|
CXX := @CXX@ -Wall
|
||||||
AR := ar
|
AR := ar
|
||||||
MOC := moc
|
MOC := @QT4_MOC@
|
||||||
DEFS:=
|
DEFS:=
|
||||||
|
|
||||||
INCLUDES:=-I. -I@srcdir@ -I@top_srcdir@ @QT4_INC@
|
INCLUDES:=-I. -I@srcdir@ -I@top_srcdir@ @QT4_INC@
|
||||||
|
|
|
@ -680,6 +680,7 @@ AC_SUBST(GMOZ_LIB)
|
||||||
HAVE_QT4=no
|
HAVE_QT4=no
|
||||||
QT4_INC=""
|
QT4_INC=""
|
||||||
QT4_LIB=""
|
QT4_LIB=""
|
||||||
|
QT4_MOC=""
|
||||||
QT4_VER=""
|
QT4_VER=""
|
||||||
AC_ARG_WITH(libqt4,AC_HELP_STRING([--with-libqt4],[use Qt for graphical clients (default)]),[ac_cv_use_libqt4=$withval],[ac_cv_use_libqt4=yes])
|
AC_ARG_WITH(libqt4,AC_HELP_STRING([--with-libqt4],[use Qt for graphical clients (default)]),[ac_cv_use_libqt4=$withval],[ac_cv_use_libqt4=yes])
|
||||||
if [[ "x$ac_cv_use_libqt4" = "xyes" ]]; then
|
if [[ "x$ac_cv_use_libqt4" = "xyes" ]]; then
|
||||||
|
@ -691,6 +692,8 @@ if [[ "x$ac_cv_use_libqt4" = "xyes" ]]; then
|
||||||
HAVE_QT4=yes
|
HAVE_QT4=yes
|
||||||
QT4_INC="$incqt"
|
QT4_INC="$incqt"
|
||||||
QT4_LIB="$libqt"
|
QT4_LIB="$libqt"
|
||||||
|
QT4_MOC=`echo "$incqt" | sed -n 's,^.*-I\([[^ ]]\+\)/include .*$,\1/bin/moc,p'`
|
||||||
|
test -z "$QT4_MOC" && QT4_MOC="moc"
|
||||||
QT4_VER=`echo "$verqt" | sed "$vsed" | sed "$vsed" | sed 's/\(..\)\.\(..\)\.\(..\)/\1\2\3/'`
|
QT4_VER=`echo "$verqt" | sed "$vsed" | sed "$vsed" | sed 's/\(..\)\.\(..\)\.\(..\)/\1\2\3/'`
|
||||||
ac_cv_use_libqt="no"
|
ac_cv_use_libqt="no"
|
||||||
else
|
else
|
||||||
|
@ -701,6 +704,7 @@ fi
|
||||||
AC_SUBST(HAVE_QT4)
|
AC_SUBST(HAVE_QT4)
|
||||||
AC_SUBST(QT4_INC)
|
AC_SUBST(QT4_INC)
|
||||||
AC_SUBST(QT4_LIB)
|
AC_SUBST(QT4_LIB)
|
||||||
|
AC_SUBST(QT4_MOC)
|
||||||
AC_SUBST(QT4_VER)
|
AC_SUBST(QT4_VER)
|
||||||
|
|
||||||
AC_ARG_WITH(libgtk2,AC_HELP_STRING([--with-libgtk2],[use Gtk for graphical clients (default)]),[ac_cv_use_libgtk2=$withval],[ac_cv_use_libgtk2=yes])
|
AC_ARG_WITH(libgtk2,AC_HELP_STRING([--with-libgtk2],[use Gtk for graphical clients (default)]),[ac_cv_use_libgtk2=$withval],[ac_cv_use_libgtk2=yes])
|
||||||
|
|
Loading…
Reference in New Issue