From f303c9851e8adc77f2db3b1ff9ada84eb0e83ac5 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 14 Jul 2009 14:22:30 +0000 Subject: [PATCH] 2009-07-14 16:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * make_gnu.sh - Reverted most part of prev. It's still needed to form hbmk script and add settings to hbmk.cfg. --- harbour/ChangeLog | 5 +++++ harbour/make_gnu.sh | 55 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6b3245a71f..26cb6b4fb0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-14 16:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * make_gnu.sh + - Reverted most part of prev. It's still needed to form + hbmk script and add settings to hbmk.cfg. + 2009-07-14 16:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * make_gnu.sh - Deleted CRS, SLN, GPM detection. diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh index 0b68068b4f..a13bd9fa1e 100755 --- a/harbour/make_gnu.sh +++ b/harbour/make_gnu.sh @@ -62,6 +62,61 @@ then export HB_ARCHITECTURE=win fi +if [ -z "$HB_GPM_MOUSE" ]; then + if [ "$HB_ARCHITECTURE" = "linux" ] && \ + ( [ -f /usr/include/gpm.h ] || [ -f /usr/local/include/gpm.h ]); then + HB_GPM_MOUSE=yes + else + HB_GPM_MOUSE=no + fi + export HB_GPM_MOUSE +fi + +if [ -z "${HB_WITHOUT_GTSLN}" ]; then + HB_WITHOUT_GTSLN=yes + case "$HB_ARCHITECTURE" in + linux|bsd|darwin|hpux|sunos) + for dir in /usr /usr/local /sw /opt/local + do + if [ -f ${dir}/include/slang.h ] || \ + [ -f ${dir}/include/slang/slang.h ]; then + HB_WITHOUT_GTSLN=no + fi + done + ;; + esac + export HB_WITHOUT_GTSLN +fi + +if [ -z "${HB_WITHOUT_GTCRS}" ]; then + HB_WITHOUT_GTCRS=yes + case "$HB_ARCHITECTURE" in + linux|bsd|darwin|hpux|sunos) + for dir in /usr /usr/local /sw /opt/local + do + if [ -f ${dir}/include/curses.h ] || \ + [ -f ${dir}/include/ncurses.h ] || \ + [ -f ${dir}/include/ncurses/ncurses.h ]; then + HB_WITHOUT_GTCRS=no + fi + done + ;; + esac + export HB_WITHOUT_GTCRS +fi + +if [ -z "$HB_COMMERCE" ]; then export HB_COMMERCE=no; fi + +if [ "$HB_COMMERCE" = yes ] +then + export HB_GPM_MOUSE=no + export HB_WITHOUT_GTSLN=yes +fi + +# export HB_USER_PRGFLAGS= +# export HB_USER_CFLAGS= +# export HB_USER_LDFLAGS= + if [ "$HB_ARCHITECTURE" = "linux" ] then if [ "${HB_USER_CFLAGS}" == "${HB_USER_CFLAGS//-fPIC/}" ]