Darin/OS X Build Fixes.. Now automatically looks for glibtool if it exists

in a darwin environment.. Otherwise it looks for libtool, thinking we're in a
GNU environment.. Could probably use the same basic idea for a FreeBSD Environment
Should we ever test a build there.

diff --git a/Makefile.in b/Makefile.in
index 4697972a9b9309ae110f5897755ae5333259bf3c..7f1688e1e843af9541740c110967d669d21a63ee 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,6 +19,7 @@ CC=@CC@
 
 SQL_CFLAGS=@MYSQL_CFLAGS@ @POSTGRESQL_CFLAGS@ @SQLITE3_CFLAGS@
 SQL_LDFLAGS=@MYSQL_LDFLAGS@ @POSTGRESQL_LDFLAGS@ @SQLITE3_LDFLAGS@
+LIBTOOL=@LIBTOOL@
 
 CPPFLAGS=@CPPFLAGS@
 CCFLAGS=@CFLAGS@ -I.. -I../hdrs @OPENSSL_INCLUDES@ @CPPFLAGS@ @PCRE_CFLAGS@ -Werror

diff --git a/configure.ac b/configure.ac
index e6d0b689b5f411a8d2238429576e33013dfac311..602b278d14a52f2b45a326a01c510c158e3e4b7f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,17 @@ m4_include(m4/confsetup.m4)
 
 AC_CANONICAL_BUILD
 
+host_os=`uname | sed 's/^(\s)*//'`
+
+# Search for glibtool
+if test $host_os = "Darwin"; then
+ AC_PATH_PROG(LIBTOOL, glibtool)
+else
+ AC_PATH_PROG(LIBTOOL, libtool) 
+fi
+
+echo $host_os;
+
 if test "x$CFLAGS" = "x"; then
 CFLAGS="-O"
 DEFAULT_CFLAGS=yes

diff --git a/src/Makefile.in b/src/Makefile.in
index a54504873cadc8a21c67e0c57941b95f689dec70..5e52ecdb0e9cafd0139b8c9ccce4fe24311fbeb0 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -8,7 +8,6 @@ OUTFILES=buildinf netmud info_slave
 
 # Libs EXCEPT for SQL ones
 LIBS=$(CLIBS)
-LIBTOOL=libtool
 
 CFLAGS=$(CCFLAGS) $(SQL_CFLAGS)
 

diff --git a/src/bsd.c b/src/bsd.c
index 1a5351df41750d6c9103456b3bec85db234b8819..b4bd7a9cfb95b3041a51ae687b2722e99f847d8e 100644 (file)
--- a/src/bsd.c
+++ b/src/bsd.c
@@ -3467,6 +3467,12 @@ dump_info(DESC * call_by)
   queue_string_eol(call_by, "### End INFO");
 }
 
+#ifndef HAVE_SSL
+#define SSL_WHO_ENTRY(x)  ' ' 
+#else
+#define SSL_WHO_ENTRY(x)  x->ssl ? 'S' : ' '
+#endif
+
 COMMAND(cmd_dump_users)
 {
   DESC *d;
@@ -3555,12 +3561,8 @@ COMMAND(cmd_dump_users)
                            player) ? unparse_dbref(Location(d->player)) :
                 "#-1", time_format_1(now - d->connected_at),
                 time_format_2(now - d->last_time), csite ? d->cmds : 0,
-                csite ? d->descriptor : 0,
-#ifdef HAVE_SSL
-                d->ssl ? 'S' : ' ',
-#else
-                ' ',
-#endif
+                csite ? d->descriptor : 1,
+               SSL_WHO_ENTRY(d),
                 csite ? d->addr : "---");
         tbuf1[78] = '\0';
         if (Dark(d->player)) {
@@ -3580,11 +3582,7 @@ COMMAND(cmd_dump_users)
                 "#-1", time_format_1(now - d->connected_at),
                 time_format_2(now - d->last_time), csite ? d->cmds : 0,
                 csite ? d->descriptor : 0,
-#ifdef HAVE_SSL
-                d->ssl ? 'S' : ' ',
-#else
-                ' ',
-#endif
+               SSL_WHO_ENTRY(d),
                 csite ? d->input_chars : 0, csite ? d->output_chars : 0,
                 csite ? d->output_size : 0);
       } else {
@@ -3623,11 +3621,7 @@ COMMAND(cmd_dump_users)
                  T("Connecting..."), "#-1",
                  time_format_1(now - d->connected_at),
                  time_format_2(now - d->last_time), d->cmds, d->descriptor,
-#ifdef HAVE_SSL
-                 d->ssl ? 'S' : ' ',
-#else
-                 ' ',
-#endif
+                SSL_WHO_ENTRY(d),
                  d->addr);
         tbuf1[78] = '\0';
       } else {
@@ -3637,11 +3631,7 @@ COMMAND(cmd_dump_users)
                  T("Connecting..."), "#-1",
                  time_format_1(now - d->connected_at),
                  time_format_2(now - d->last_time), d->cmds, d->descriptor,
-#ifdef HAVE_SSL
-                 d->ssl ? 'S' : ' ',
-#else
-                 ' ',
-#endif
+               SSL_WHO_ENTRY(d),
                  d->input_chars, d->output_chars, d->output_size);
       }
 #ifdef COLOREDWHO

diff --git a/utils/preparedist.sh b/utils/preparedist.sh
index 1b1f50a8097b10a05dfcd1d2f41113a834bff2b8..d9b652618398c12209c0eaa5a9ec5f2e27e77afb 100755 (executable)
--- a/utils/preparedist.sh
+++ b/utils/preparedist.sh
@@ -30,6 +30,7 @@ mv hdrs/funs.h win32/
 
 # Step 3: run autoconf
 echo "Running autoconf to generate configure"
+aclocal
 autoconf
 
 # Step 4: generate changes.txt