From 6e251b1d4beb3689ff5941b8c4d235669bf1caea Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 2 May 2010 10:30:19 +0000
Subject: [PATCH] 2010-05-02 12:29 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/darwin/libs.mk     ! Fixed to include MacPorts and Fink
 lib paths only if       they exist. This fixes potential warnings with latest
       release of clang.

  * config/linux/libs.mk
    ! Minor in comment.

  * src/rtl/achoice.prg
    ! Added patch by Jerry Finuliar to refix dbu menu hang.
---
 harbour/ChangeLog             | 18 +++++++++++++++---
 harbour/config/darwin/libs.mk |  7 ++++++-
 harbour/config/linux/libs.mk  |  2 +-
 harbour/src/rtl/achoice.prg   |  3 +++
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d79c27c6dc..2d5c8d338f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-02 12:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/darwin/libs.mk
+    ! Fixed to include MacPorts and Fink lib paths only if
+      they exist. This fixes potential warnings with latest
+      release of clang.
+
+  * config/linux/libs.mk
+    ! Minor in comment.
+
+  * src/rtl/achoice.prg
+    ! Added patch by Jerry Finuliar to refix dbu menu hang.
+
 2010-04-30 11:39 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/rtl/hbznet.c
     ! fixed stupid typo which caused that hb_znetFlush() in encrypted
@@ -61,7 +73,7 @@
 
 2010-04-29 02:00 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbqt/hbqt_hbqplaintextedit.cpp
-    % Improvement to horizontal ruler to respect long lines 
+    % Improvement to horizontal ruler to respect long lines
       extending beyond viewport.
 
 2010-04-29 02:00 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
@@ -72,7 +84,7 @@
   * contrib/hbqt/hbqt_hbqplaintextedit.h
 
   * contrib/hbqt/hbqt_hbslots.cpp
-    + Implemented: horizontal ruler in the editor instances at the top 
+    + Implemented: horizontal ruler in the editor instances at the top
       of the window. Opinions are welcome about its base and tab colors.
 
 2010-04-29 10:51 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
@@ -1037,7 +1049,7 @@
   * config/wce/msvcarm.mk
   * config/win/msvc.mk
     * Deleted Exception Handling options from all msvc cmdlines
-      where it was supplied. It has a heritage from the past, and
+      where it was supplied. It was a heritage from the past, and
       I could depict no sense in the setup:
          - old wce/msvcarm: -EHsc
          - new wce/msvcarm: -EHsc-
diff --git a/harbour/config/darwin/libs.mk b/harbour/config/darwin/libs.mk
index d111b5c29d..d8a86bfd26 100644
--- a/harbour/config/darwin/libs.mk
+++ b/harbour/config/darwin/libs.mk
@@ -17,7 +17,12 @@ ifneq ($(HB_LINKING_RTL),)
       ifneq ($(HB_HAS_CURSES),)
          SYSLIBS += $(HB_LIBNAME_CURSES)
       endif
-      SYSLIBPATHS += /sw/lib /opt/local/lib
+      ifneq ($(wildcard /sw/lib),)
+         SYSLIBPATHS += /sw/lib
+      endif
+      ifneq ($(wildcard /opt/local/lib),)
+         SYSLIBPATHS += /opt/local/lib
+      endif
    endif
    ifneq ($(HB_HAS_X11),)
       SYSLIBS += X11
diff --git a/harbour/config/linux/libs.mk b/harbour/config/linux/libs.mk
index 8ffe733f8e..1eed434094 100644
--- a/harbour/config/linux/libs.mk
+++ b/harbour/config/linux/libs.mk
@@ -16,7 +16,7 @@ ifneq ($(HB_LINKING_RTL),)
    endif
    ifneq ($(HB_HAS_X11),)
       SYSLIBS += X11
-      # add 64-bit lib dir needed for some distros (red hat)
+      # add 64-bit lib dir needed for some distros (Red Hat)
       ifneq ($(findstring 64,$(shell uname -m)),)
          SYSLIBPATHS += /usr/X11R6/lib64
       endif
diff --git a/harbour/src/rtl/achoice.prg b/harbour/src/rtl/achoice.prg
index f7c2c9a6ef..fc3614c11f 100644
--- a/harbour/src/rtl/achoice.prg
+++ b/harbour/src/rtl/achoice.prg
@@ -131,6 +131,9 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo
 
 
    lFinished := ( nMode == AC_NOITEM )
+   IF lFinished .AND. lUserFunc
+      Do( xUserFunc, nMode, nPos, nPos - nAtTop )
+   ENDIF
    DO WHILE !lFinished
 
       IF nMode != AC_GOTO .AND. nMode != AC_NOITEM