This commit is contained in:
@@ -81,10 +81,6 @@ test "$enableval" = "yes" && HAVE_DOT="YES" || HAVE_DOT="NO";
|
||||
AM_PATH_CPPUNIT([1.0.0], [have_cppunit="yes"], [have_cppunit="no"])
|
||||
|
||||
# Special Options
|
||||
AC_CHECK_PROGS([QMAKE], [qmake-qt4 qmake-mac qmake])
|
||||
test -n "$QMAKE" || AC_MSG_ERROR([qmake for Qt 4 not found!])
|
||||
AC_MSG_NOTICE([QMAKE IS: $QMAKE])
|
||||
AC_SUBST(QMAKE)
|
||||
AC_CHECK_PROGS([LRELEASE], [lrelease-qt4 lrelease-mac lrelease])
|
||||
test -n "$LRELEASE" || AC_MSG_ERROR([lrelease for Qt 4 not found!])
|
||||
AC_SUBST(LRELEASE)
|
||||
@@ -118,6 +114,8 @@ AM_CONDITIONAL(BUILD_LIN32, test "$build_lin32" = "yes")
|
||||
|
||||
# Environment Variables
|
||||
AC_ARG_VAR(LUPDATE_ARGS, [arguments for qt lupdate command, e.g. -no-obsolete])
|
||||
AC_PATH_PROG(QMAKE, [qmake qmake-qt4], [])
|
||||
AC_ARG_VAR(QMAKE, [path to qmake program])
|
||||
|
||||
# Enviropnment Variables
|
||||
AC_ARG_VAR(EDITION, [name of the edition, e.g. comol])
|
||||
@@ -137,7 +135,6 @@ AC_SUBST(PACKAGENAME)
|
||||
AC_SUBST(AM_CXXFLAGS)
|
||||
AC_SUBST(AM_CPPFLAGS)
|
||||
AC_SUBST(LIBS)
|
||||
AC_SUBST(QMAKE)
|
||||
AC_SUBST(QMAKE_OPTIONS)
|
||||
AC_SUBST(STATIC_QTPLUGINS)
|
||||
AC_SUBST(STATIC_QCONFIG)
|
||||
|
Reference in New Issue
Block a user