Integrate fix from Erwan ADAM (look for pyuic in $PATH; fix missing '$'; look for...

diff --git a/adm_local/unix/config_files/check_pyqt.m4 b/adm_local/unix/config_files/check_pyqt.m4
index 7be124e24b4a5f2d68c2ade5bfefc10cb0f36845..e07ead61535ce3655443f7f6d652368ab7344208 100644 (file)
--- a/adm_local/unix/config_files/check_pyqt.m4
+++ b/adm_local/unix/config_files/check_pyqt.m4
@@ -49,6 +49,16 @@ if test "x$pyqt_uic_ok" == "xno"; then
     fi
   fi   
 fi
+if test "x$pyqt_uic_ok" == "xno"; then
+  dnl try in $PATH
+  AC_PATH_PROG(PYUIC, pyuic)
+  if test "x$PYUIC" != x; then
+    PYQTDIR=$PYUIC
+    PYQTDIR=`dirname $PYQTDIR`
+    PYQTDIR=`dirname $PYQTDIR`
+    pyqt_uic_ok=yes
+  fi
+fi
 if test "x$pyqt_uic_ok" == "xno"; then
   dnl try ${SIPDIR}
   if test "x${SIPDIR}" != "x"; then
@@ -106,8 +116,8 @@ if test "x${PYQTDIR}" != "x"; then
     fi
   fi
   if test "x$pyqt_lib_ok" == "xno"; then
-    dnl try {PYQTDIR}/lib
-    if test -d {PYQTDIR}/lib; then
+    dnl try ${PYQTDIR}/lib
+    if test -d ${PYQTDIR}/lib; then
       AC_CHECK_FILE(${PYQTDIR}/lib/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no)
       if test "x$pyqt_lib_ok" == "xyes"; then
         PYQT_LIBS="-L${PYQTDIR}/lib -lqtcmodule"
@@ -120,8 +130,8 @@ if test "x${PYQTDIR}" != "x"; then
     fi
   fi
   if test "x$pyqt_lib_ok" == "xno"; then
-    dnl try {PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages
-    if test -d {PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages; then
+    dnl try ${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages
+    if test -d ${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages; then
       AC_CHECK_FILE(${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no)
       if test "x$pyqt_lib_ok" == "xyes"; then
         PYQT_LIBS="-L${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages -lqtcmodule"
@@ -220,6 +230,17 @@ if test "x$pyqt_sips_ok" == "xno"; then
     fi
   fi
 fi
+if test "x$pyqt_sips_ok" == "xno"; then
+  dnl try ${PYQTDIR}/share/sip/qt
+  if test "x${PYQTDIR}" != "x"; then
+    if test -d ${PYQTDIR}/share/sip/qt ; then
+      AC_CHECK_FILE(${PYQTDIR}/share/sip/qt/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no)
+      if test "x$pyqt_sips_ok" == "xyes"; then
+        PYQT_SIPS="${PYQTDIR}/share/sip/qt"
+      fi
+    fi
+  fi
+fi
 if test "x$pyqt_sips_ok" == "xno"; then
   dnl try ${SIPDIR}/sip
   if test "x${SIPDIR}" != "x"; then