Changes in / [130633c:a52d13a]

Files:

• .gitignore (modified) (3 diffs)
• Makefile.am (deleted)
• Makefile.in (added)
• athstatic (added)
• autogen.sh (modified) (1 diff)
• configure.ac (modified) (4 diffs)
• install.sh (added)
• libfaim/Makefile.am (deleted)
• libfaim/Makefile.in (added)
• libfaim/configure.ac (added)
• mkinstalldirs (added)
• owl.h (modified) (1 diff)
• perl/modules/Makefile.in (deleted)
• scripts/do-release (modified) (2 diffs)
• scripts/locker-build (modified) (1 diff)

.gitignore

@@ -4 +4 @@
 *~
 .#*
-.deps
 META.yml
 Makefile
-/Makefile.in
-/libfaim/Makefile.in
 Makefile.old
 TAGS
@@ -23 +20 @@
 configure
 core
-depcomp
-install-sh
 jabber.log
-missing
 owl_prototypes.h
 owl_prototypes.h.new
@@ -32 +26 @@
 perlwrap.c
 pm_to_blib
-stamp-h1
 tester
 varstubs.c

autogen.sh

@@ -1 +1 @@
 #!/bin/sh
-autoreconf -fvi
-
+autoreconf

configure.ac

@@ -1 +1 @@
 dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([BarnOwl],[1.3],[bug-barnowl@mit.edu])
-AM_INIT_AUTOMAKE([-Wall foreign])
+AC_INIT(owl.c)
 
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
+
+dnl If we're using GCC, enable all warnings
+if test "$GCC" = yes; then
+     CFLAGS="$CFLAGS -Wall -g";
+fi
 
 dnl Check for Athena
@@ -93 +97 @@
    ])])
 
+AC_ARG_ENABLE([athstatic], AS_HELP_STRING([--enable-athstatic],
+                                          [Statically link libraries in /usr/athena/lib]),
+                                          [ATHSTATIC=./athstatic],
+                                          [ATHSTATIC=])
+
 AC_CHECK_FUNCS(use_default_colors resizeterm des_string_to_key des_key_sched des_ecb_encrypt)
 AC_CHECK_FUNCS(                            DES_string_to_key  DES_ecb_encrypt DES_key_sched)
@@ -134 +143 @@
 dnl Add LDFLAGS for embedded perl
 FOO=`perl -MExtUtils::Embed -e ldopts`
-AC_MSG_NOTICE([Adding perl LIBS ${FOO}])
-LIBS=${LIBS}\ ${FOO}
+AC_MSG_NOTICE([Adding perl LDFLAGS ${FOO}])
+LDFLAGS=${LDFLAGS}\ ${FOO}
 
 dnl Add CFLAGS and LDFLAGS for glib-2.0
@@ -145 +154 @@
 LDFLAGS="${GLIB_LIBS} ${LDFLAGS}"
 
-if test "x${prefix}" = "xNONE"; then
-   prefix="${ac_default_prefix}"
-fi
+dnl Checks for typedefs, structures, and compiler characteristics.
 
-AC_DEFINE_UNQUOTED([DATADIR],["${prefix}/share/${PACKAGE}"],
-                   [Package data directory])
-
-dnl Checks for typedefs, structures, and compiler characteristics.
+dnl Support --program-{prefix,suffix,transform}
+AC_ARG_PROGRAM
 
 AC_SUBST(XSUBPPDIR)
 AC_SUBST(XSUBPPFLAGS)
+AC_SUBST(ATHSTATIC)
 
 AC_PROG_INSTALL
-AC_PROG_RANLIB
 
-AC_CONFIG_FILES([Makefile libfaim/Makefile])
-AC_OUTPUT([perl/modules/Makefile])
+AC_CONFIG_SUBDIRS(libfaim)
+
+AC_OUTPUT(Makefile)

owl.h

@@ -48 +48 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION_STRING PACKAGE_VERSION
+#define BARNOWL_STRINGIFY(x) _STRINGIFY(x)
+#define _STRINGIFY(x) #x
+
+#ifndef OWL_VERSION_STRING
+#define OWL_VERSION_STRING "1.3"
+#endif
 
 /* Feature that is being tested to redirect stderr through a pipe. 

scripts/do-release

@@ -6 +6 @@
 }
 
-VERS=$(perl -ne 'print $1 if m{^AC_INIT\(\[[^\]]+\],\s*\[([^\]]+)\]}' configure.ac) \
+VERS=$(perl -lne 'print $1 if m{^#define\s+OWL_VERSION_STRING\s+"([^"]+)"\s*$}' owl.h) \
     || die "Unable to parse barnowl version"
 TAG=barnowl-$VERS
@@ -29 +29 @@
 CODIR=$(pwd)
 cd "$TMPDIR/$TGZ"
-autoreconf -fvi
+autoreconf
 cd "$TMPDIR"
 tar czvf "$TGZ.tgz" "$TGZ"

scripts/locker-build

@@ -75 +75 @@
 (
     cd "$TMPDIR"/* || die "Unable to cd to $TMPDIR"
-    VERS=$(perl -ne 'print $1 if m{^AC_INIT\(\[[^\]]+\],\s*\[([^\]]+)\]}' configure.ac)
+    VERS=$(perl -ne 'print $1 if m{^#define\s*OWL_VERSION_STRING\s*"([^"]+)"}' owl.h)
     test -z "$VERS" && die "Unable to detect barnowl version."