summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Jennings <mej@lbl.gov>2013-03-06 11:33:41 -0800
committerMichael Jennings <mej@lbl.gov>2013-03-06 11:33:41 -0800
commit101bd9e5fd9cf0fe6b43383e47a29254683aad16 (patch)
tree284da4de997b2a3ea43b465f32a67576263488c1
parent12630faaa6b4be2f920ade11554a0ae5f71d1acc (diff)
downloadlibast-101bd9e5fd9cf0fe6b43383e47a29254683aad16.tar.gz
Add LBNL copyright.
-rw-r--r--LICENSE6
-rw-r--r--configure.ac33
2 files changed, 36 insertions, 3 deletions
diff --git a/LICENSE b/LICENSE
index 3014b15..1f322cc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,8 @@
-Copyright (C) 1997-2006, Michael Jennings <mej@eterm.org>
+Copyright (C) 1997-2013, Michael Jennings <mej@eterm.org>
+
+Copyright (C) 2013, The Regents of the University of California,
+through Lawrence Berkeley National Laboratory (subject to receipt of
+any required approvals from the U.S. Dept. of Energy).
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
diff --git a/configure.ac b/configure.ac
index 660cd86..167ed0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,33 @@
-# $Id$
+# Configure template for LibAST
+#
+# Copyright (C) 1997-2013, Michael Jennings <mej@eterm.org>
+#
+# Copyright (C) 2013, The Regents of the University of California,
+# through Lawrence Berkeley National Laboratory (subject to receipt of
+# any required approvals from the U.S. Dept. of Energy).
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies of the Software, its documentation and
+# marketing & publicity materials, and acknowledgment shall be given in
+# the documentation, materials and software packages that this Software
+# was used.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
AC_INIT(configure.ac)
AM_INIT_AUTOMAKE([libast], [0.8])
@@ -11,7 +40,7 @@ AC_CONFIG_FILES([include/libast/types.h Makefile include/Makefile
libast-config])
dnl# Set some basic variables
-AUTHORS="Michael Jennings (mej@eterm.org)"
+AUTHORS="Michael Jennings (mej@eterm.org and mej@lbl.gov)"
AC_SUBST(AUTHORS)
AC_DEFINE_UNQUOTED(AUTHORS, "$AUTHORS", [Authors])