OS X compilation issues
authorAlex Kirhenshtein <alk@netxms.org>
Sun, 5 Jul 2009 22:08:05 +0000 (22:08 +0000)
committerAlex Kirhenshtein <alk@netxms.org>
Sun, 5 Jul 2009 22:08:05 +0000 (22:08 +0000)
reconf
src/server/core/main.cpp
src/server/tools/nxadm/nxadm.cpp

diff --git a/reconf b/reconf
index da4cc0c..6a38572 100755 (executable)
--- a/reconf
+++ b/reconf
@@ -13,7 +13,8 @@ ACLOCAL=aclocal
 AUTOCONF=autoconf
 AUTOHEADER=autoheader
 AUTOMAKE=automake
-LIBTOOLIZE=libtoolize
+which libtoolize > /dev/null && LIBTOOLIZE=libtoolize
+which glibtoolize > /dev/null && LIBTOOLIZE=glibtoolize
 
 mkdir -p config
 touch README
index 7698ad7..04ee90b 100644 (file)
@@ -1293,7 +1293,7 @@ THREAD_RESULT NXCORE_EXPORTABLE THREAD_CALL Main(void *pArg)
 
 #if USE_READLINE
                // Initialize readline library if we use it
-# if (RL_READLINE_VERSION && ((RL_VERSION_MAJOR == 4 && RL_VERSION_MINOR >= 2) || (RL_VERSION_MAJOR >= 5))) || __FreeBSD__ >= 5
+# if (RL_READLINE_VERSION && ((RL_VERSION_MAJOR == 4 && RL_VERSION_MINOR >= 2) || (RL_VERSION_MAJOR >= 5))) || __FreeBSD__ >= 5 || __APPLE__
                rl_bind_key('\t', (rl_command_func_t *)rl_insert);
 # else 
                rl_bind_key('\t', (Function *)rl_insert);
index b9fe415..5bfbaa7 100644 (file)
@@ -110,7 +110,7 @@ static void Shell(void)
 
 #if USE_READLINE
    // Initialize readline library if we use it
-# if (RL_READLINE_VERSION && ((RL_VERSION_MAJOR == 4 && RL_VERSION_MINOR >= 2) || (RL_VERSION_MAJOR >= 5))) || __FreeBSD__ >= 5
+# if (RL_READLINE_VERSION && ((RL_VERSION_MAJOR == 4 && RL_VERSION_MINOR >= 2) || (RL_VERSION_MAJOR >= 5))) || __FreeBSD__ >= 5 || __APPLE__
    rl_bind_key('\t', (rl_command_func_t *)rl_insert);
 # else 
    rl_bind_key('\t', (Function *)rl_insert);