3 files changed, 67 insertions, 57 deletions
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake
index 400cde295d..c8d4eb466e 100644
--- a/cmake/Modules/GrSwig.cmake
+++ b/cmake/Modules/GrSwig.cmake
@@ -190,7 +190,12 @@ macro(GR_SWIG_MAKE name)
     #setup the actual swig library target to be built
     include(UseSWIG)
     SWIG_ADD_MODULE(${name} python ${ifiles})
-    SWIG_LINK_LIBRARIES(${name} ${PYTHON_LIBRARIES} ${GR_SWIG_LIBRARIES})
+    if(APPLE)
+      set(PYTHON_LINK_OPTIONS "-undefined dynamic_lookup")
+    else()
+      set(PYTHON_LINK_OPTIONS ${PYTHON_LIBRARIES})
+    endif(APPLE)
+    SWIG_LINK_LIBRARIES(${name} ${PYTHON_LINK_OPTIONS} ${GR_SWIG_LIBRARIES})
     if(${name} STREQUAL "runtime_swig")
         SET_TARGET_PROPERTIES(${SWIG_MODULE_runtime_swig_REAL_NAME} PROPERTIES DEFINE_SYMBOL "gnuradio_runtime_EXPORTS")
     endif(${name} STREQUAL "runtime_swig")
diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml b/gr-qtgui/grc/qtgui_time_sink_x.xml
index 2ff832de35..6223208797 100644
--- a/gr-qtgui/grc/qtgui_time_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_time_sink_x.xml
@@ -46,7 +46,7 @@ markers = [$marker1, $marker2, $marker3, $marker4, $marker5,
 alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
           $alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
 
-#if($type() == "complex" or $type() == "msg_complex")
+#if ($type == "complex" or $type == "msg_complex")
 for i in xrange(#if $type.t == 'message' then 2 else 2*$nconnections#):
     if len(labels[i]) == 0:
         if(i % 2 == 0):
@@ -540,14 +540,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 2 Label</name>
     <key>label2</key>
-    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type == "complex" and int($nconnections()) >= 1) or ($type == "msg_complex")) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 2 Width</name>
     <key>width2</key>
-    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type == "complex" and int($nconnections()) >= 1) or ($type == "msg_complex")) then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -555,28 +555,28 @@ $(gui_hint()($win))</make>
     <name>Line 2 Color</name>
     <key>color2</key>
     <value>"red"</value>
-    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type == "complex" and int($nconnections()) >= 1) or ($type == "msg_complex")) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 2 Style</name>
     <key>style2</key>
-    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type == "complex" and int($nconnections()) >= 1) or ($type == "msg_complex")) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 2 Marker</name>
     <key>marker2</key>
-    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type == "complex" and int($nconnections()) >= 1) or ($type == "msg_complex")) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 2 Alpha</name>
     <key>alpha2</key>
-    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type == "complex" and int($nconnections()) >= 1) or ($type == "msg_complex")) then 'part' else 'all'#</hide>
   </param>
 
 
@@ -584,14 +584,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 3 Label</name>
     <key>label3</key>
-    <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 3 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 3 Width</name>
     <key>width3</key>
-    <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 3 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -599,28 +599,28 @@ $(gui_hint()($win))</make>
     <name>Line 3 Color</name>
     <key>color3</key>
     <value>"green"</value>
-    <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 3 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 3 Style</name>
     <key>style3</key>
-    <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 3 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 3 Marker</name>
     <key>marker3</key>
-    <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 3 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 3 Alpha</name>
     <key>alpha3</key>
-    <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 3 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
 
@@ -628,14 +628,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 4 Label</name>
     <key>label4</key>
-    <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 4 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 4 Width</name>
     <key>width4</key>
-    <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 4 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -643,28 +643,28 @@ $(gui_hint()($win))</make>
     <name>Line 4 Color</name>
     <key>color4</key>
     <value>"black"</value>
-    <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 4 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 4 Style</name>
     <key>style4</key>
-    <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 4 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 4 Marker</name>
     <key>marker4</key>
-    <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 4 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 4 Alpha</name>
     <key>alpha4</key>
-    <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 4 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
 
@@ -672,14 +672,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 5 Label</name>
     <key>label5</key>
-    <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 5 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 5 Width</name>
     <key>width5</key>
-    <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 5 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -687,28 +687,28 @@ $(gui_hint()($win))</make>
     <name>Line 5 Color</name>
     <key>color5</key>
     <value>"cyan"</value>
-    <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 5 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 5 Style</name>
     <key>style5</key>
-    <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 5 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 5 Marker</name>
     <key>marker5</key>
-    <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 5 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 5 Alpha</name>
     <key>alpha5</key>
-    <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 5 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
 
@@ -716,14 +716,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 6 Label</name>
     <key>label6</key>
-    <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 6 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 6 Width</name>
     <key>width6</key>
-    <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 6 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -731,28 +731,28 @@ $(gui_hint()($win))</make>
     <name>Line 6 Color</name>
     <key>color6</key>
     <value>"magenta"</value>
-    <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 6 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 6 Style</name>
     <key>style6</key>
-    <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 6 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 6 Marker</name>
     <key>marker6</key>
-    <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 6 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 6 Alpha</name>
     <key>alpha6</key>
-    <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 6 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
 
@@ -760,14 +760,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 7 Label</name>
     <key>label7</key>
-    <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 7 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 7 Width</name>
     <key>width7</key>
-    <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 7 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -775,28 +775,28 @@ $(gui_hint()($win))</make>
     <name>Line 7 Color</name>
     <key>color7</key>
     <value>"yellow"</value>
-    <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 7 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 7 Style</name>
     <key>style7</key>
-    <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 7 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 7 Marker</name>
     <key>marker7</key>
-    <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 7 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 7 Alpha</name>
     <key>alpha7</key>
-    <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 7 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
 
@@ -804,14 +804,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 8 Label</name>
     <key>label8</key>
-    <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 8 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 8 Width</name>
     <key>width8</key>
-    <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 8 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -819,28 +819,28 @@ $(gui_hint()($win))</make>
     <name>Line 8 Color</name>
     <key>color8</key>
     <value>"dark red"</value>
-    <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 8 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 8 Style</name>
     <key>style8</key>
-    <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 8 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 8 Marker</name>
     <key>marker8</key>
-    <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 8 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 8 Alpha</name>
     <key>alpha8</key>
-    <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 8 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
 
@@ -848,14 +848,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 9 Label</name>
     <key>label9</key>
-    <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 9 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 9 Width</name>
     <key>width9</key>
-    <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 9 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -863,28 +863,28 @@ $(gui_hint()($win))</make>
     <name>Line 9 Color</name>
     <key>color9</key>
     <value>"dark green"</value>
-    <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 9 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 9 Style</name>
     <key>style9</key>
-    <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 9 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 9 Marker</name>
     <key>marker9</key>
-    <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 9 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 9 Alpha</name>
     <key>alpha9</key>
-    <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 9 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
 
@@ -892,14 +892,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 10 Label</name>
     <key>label10</key>
-    <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 10 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 10 Width</name>
     <key>width10</key>
-    <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 10 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -907,28 +907,28 @@ $(gui_hint()($win))</make>
     <name>Line 10 Color</name>
     <key>color10</key>
     <value>"dark blue"</value>
-    <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 10 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 10 Style</name>
     <key>style10</key>
-    <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 10 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 10 Marker</name>
     <key>marker10</key>
-    <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 10 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 10 Alpha</name>
     <key>alpha10</key>
-    <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 10 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <sink>
diff --git a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake
index ab8926ba7e..58699a7be0 100644
--- a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake
+++ b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrSwig.cmake
@@ -171,7 +171,12 @@ macro(GR_SWIG_MAKE name)
     #setup the actual swig library target to be built
     include(UseSWIG)
     SWIG_ADD_MODULE(${name} python ${ifiles})
-    SWIG_LINK_LIBRARIES(${name} ${PYTHON_LIBRARIES} ${GR_SWIG_LIBRARIES})
+    if(APPLE)
+      set(PYTHON_LINK_OPTIONS "-undefined dynamic_lookup")
+    else()
+      set(PYTHON_LINK_OPTIONS ${PYTHON_LIBRARIES})
+    endif(APPLE)
+    SWIG_LINK_LIBRARIES(${name} ${PYTHON_LINK_OPTIONS} ${GR_SWIG_LIBRARIES})
     if(${name} STREQUAL "runtime_swig")
         SET_TARGET_PROPERTIES(${SWIG_MODULE_runtime_swig_REAL_NAME} PROPERTIES DEFINE_SYMBOL "gnuradio_runtime_EXPORTS")
     endif(${name} STREQUAL "runtime_swig")