pwre configure, separate library variable for mq

remote/exe/rs_remote_mq/src/os_templ/link_rule.mk

@@ -4,7 +4,8 @@ link_rule_mk := 1
 ifeq ($(pwre_conf_mq),1)
   link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_eobjs) \
-        $(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+        $(pwre_conf_libdir) $(pwre_conf_libpwrremote) $(pwre_conf_libpwrrt) \
+	$(pwre_conf_libmq) $(pwre_conf_lib)
 else
   link = echo "Mq not installed"
 endif

src/tools/pwre/src/os_linux/pwre_configure.sh

@@ -111,6 +111,8 @@ pwre_config_check_lib()
 	    conf_libmotif=$conf_libmotif" -l${lib%.*}"
           elif test $4 == "wb"; then
 	    conf_libwb=$conf_libwb" -l${lib%.*}"
+          elif test $4 == "mq"; then
+	    conf_libmq=$conf_libmq" -l${lib%.*}"
           else
 	    conf_lib=$conf_lib" -l${lib%.*}"
           fi
@@ -200,6 +202,7 @@ dhw=`eval echo ${pwre_hw} | tr [:lower:] [:upper:]`
 conf_cc_define="-D$dos=1 -D$dhw=1 -DOS=${pwre_os:3} -DHW=${pwre_hw:3} -D_${dos:3}"
 conf_lib=""
 conf_libwb=""
+conf_libmq=""
 conf_libgtk="" 
 conf_libmotif="" 
 conf_libdir=""
@@ -284,6 +287,7 @@ if test $pwre_hw == "hw_arm"; then
   echo "export pwre_conf_libpwrsev=\"-lpwr_sev\"" >> $cfile
   echo "export pwre_conf_lib=\"-lpthread -lm -lrt -lcrypt\"" >> $cfile
   echo "export pwre_conf_libwb=\"$conf_libwb\"" >> $cfile
+  echo "export pwre_conf_libmq=\"$conf_libmq\"" >> $cfile
   echo "export pwre_conf_libgtk=\"$conf_libgtk\"" >> $cfile
   echo "export pwre_conf_libmotif=\"$conf_libmotif\"" >> $cfile
   echo "export pwre_conf_libdir=\"$conf_libdir\"" >> $cfile
@@ -306,7 +310,7 @@ else
   pwre_config_check_lib libz      LIBZ     lib lib 0 /usr/lib/libz.so:/usr/lib/libz.a
   pwre_config_check_lib libcrypt  LIBCRYPT lib lib 0 /usr/lib/libcrypt.so:/usr/lib/libcrypt.a
   pwre_config_check_lib mysql     MYSQL    lib lib 1 /usr/lib/libmysqlclient.so:/usr/lib/mysql/libmysqlclient.so
-  pwre_config_check_lib mq        MQ       lib lib 1 /usr/lib/libdmq.so
+  pwre_config_check_lib mq        MQ       lib mq  1 /usr/lib/libdmq.so
   pwre_config_check_lib libpnioif PNAK     lib lib 1 /usr/lib/libpnioif.a:/usr/local/lib/libpnioif.a
   pwre_config_check_lib libusb    LIBUSB   lib lib 1 /usr/lib/libusb-1.0.so
   pwre_config_check_lib librt     LIBRT    lib lib 0 /usr/lib/librt.so:/usr/lib/librt.a
@@ -355,6 +359,7 @@ else
   echo "export pwre_conf_libpwrsev=\"-lpwr_sev\"" >> $cfile
   echo "export pwre_conf_lib=\"$conf_lib\"" >> $cfile
   echo "export pwre_conf_libwb=\"$conf_libwb\"" >> $cfile
+  echo "export pwre_conf_libmq=\"$conf_libmq\"" >> $cfile
   echo "export pwre_conf_libgtk=\"$conf_libgtk\"" >> $cfile
   echo "export pwre_conf_libmotif=\"$conf_libmotif\"" >> $cfile
   echo "export pwre_conf_libdir=\"$conf_libdir\"" >> $cfile