aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2011-01-30 12:36:59 +0000
committerIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2011-01-30 12:36:59 +0000
commite37b5b9a839b55934c1712114ccbfd6db061c715 (patch)
tree36edc953d7e236f82cca66dabc02812f09307e0c
parent7c31ec53d229b3082acb451d1f2a213e68095c4c (diff)
use standard names (PACKAGE_* rather than LIBRARAY_*)
svn path=/trunk/externals/iem/iemmatrix/; revision=14840
-rw-r--r--src/Make.config.in4
-rw-r--r--src/configure.ac2
-rw-r--r--src/iemmatrix.h7
3 files changed, 7 insertions, 6 deletions
diff --git a/src/Make.config.in b/src/Make.config.in
index ee81806..6105c9c 100644
--- a/src/Make.config.in
+++ b/src/Make.config.in
@@ -1,5 +1,5 @@
-LIBRARY_NAME=@LIBRARY_NAME@
-TARNAME = $(LIBRARY_NAME)-@LIBRARY_VERSION@.tgz
+LIBRARY_NAME=@PACKAGE_NAME@
+TARNAME = $(LIBRARY_NAME)-@PACKAGE_VERSION@.tgz
# when build as a library this holds a pre-processor define
# (e.g. "-DZEXY_LIBRARY")
diff --git a/src/configure.ac b/src/configure.ac
index da3bd0c..e5bdfd2 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4,8 +4,6 @@ AC_INIT([iemmatrix],[0.2],[zmoelnig@iem.at])
AC_CONFIG_HEADER(config.h)
DFLAGS="${DFLAGS} -DHAVE_CONFIG_H"
-
-
dnl Checks for programs.
AC_PROG_CC
diff --git a/src/iemmatrix.h b/src/iemmatrix.h
index 5021ed0..d03b611 100644
--- a/src/iemmatrix.h
+++ b/src/iemmatrix.h
@@ -58,8 +58,11 @@
# include "config.h"
#endif /* HAVE_CONFIG_H */
-#define VERSION "0.1"
-
+#ifdef PACKAGE_VERSION
+# define VERSION PACKAGE_VERSION
+#else
+# define VERSION "(unknown)"
+#endif
#include <math.h>
#include <stdio.h>