Miscellaneous fixes for non-default X toolkits.

* configure.ac (MOTIF): Check for /usr/include/openmotif
and /usr/(lib|lib64)/openmotif if --with-x-toolkit=motif.
* lwlib/lwlib-Xm.c (make_menu_in_widget): Remove unused variable.
* src/xfns.c (Fx_file_dialog): Change to SSDATA to avoid warnings.
* src/xterm.c (x_frame_of_widget): Remove redundant prototype.
Move under #ifdef USE_LUCID.
(x_create_toolkit_scroll_bar): Adjust scroll_bar_name
definition and usage to avoid warnings.

2 files changed, 6 insertions, 2 deletions

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 0c0a88a8408..207a1200169 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-31  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Avoid unused variable warning if --with-x-toolkit=motif.
+        * lwlib-Xm.c (make_menu_in_widget): Remove unused variable.
+
 2012-07-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use c_strcasecmp for ASCII case-insensitive comparison (Bug#11786).
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index acd11aec6b5..eccb4db23a6 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -490,7 +490,6 @@ make_menu_in_widget (widget_instance* instance,
   int child_index;
   widget_value* cur;
   Widget button = 0;
-  Widget title = 0;
   Widget menu;
   Arg al [256];
   int ac;
@@ -554,7 +553,7 @@ make_menu_in_widget (widget_instance* instance,
         {
           ac = 0;
           XtSetArg (al[ac], XmNalignment, XmALIGNMENT_CENTER); ac++;
-          title = button = XmCreateLabel (widget, cur->name, al, ac);
+          button = XmCreateLabel (widget, cur->name, al, ac);
         }
       else if (lw_separator_p (cur->name, &separator, 1))
         {