summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLutz Mueller <lutz@users.sourceforge.net>2002-06-14 15:28:59 +0000
committerLutz Mueller <lutz@users.sourceforge.net>2002-06-14 15:28:59 +0000
commit3eb4fec9b6bb61f53984aa2e4ea1c204a42c85d2 (patch)
tree4ccf26c6431af94d7d3fa102360ca13d83a4d32f
parent6e39958a9447363f7c674c443852c609740edb0a (diff)
downloadlibgphoto2-3eb4fec9b6bb61f53984aa2e4ea1c204a42c85d2.tar.gz
2002-06-14 Lutz M�ller <lutz@users.sourceforge.net>
* libgphoto2/Makefile.am: * configure.in: Fix (?) -version-info git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4666 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
-rw-r--r--libgphoto2/Makefile.am2
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8210a3c88..d7b805a8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2002-06-14 Lutz Müller <lutz@users.sourceforge.net>
+ * libgphoto2/Makefile.am:
+ * configure.in: Fix (?) -version-info
+
+2002-06-14 Lutz Müller <lutz@users.sourceforge.net>
+
* configure.in: Given the pending release, it is safer to disable
the use of the buggy libltdl.
diff --git a/configure.in b/configure.in
index 47cd56794..d83bf33c6 100644
--- a/configure.in
+++ b/configure.in
@@ -22,6 +22,8 @@ LIBGPHOTO2_CURRENT=2
AC_SUBST(LIBGPHOTO2_AGE)
AC_SUBST(LIBGPHOTO2_REVISION)
AC_SUBST(LIBGPHOTO2_CURRENT)
+LIBGPHOTO2_VERSION_INFO=`expr $LIBGPHOTO2_CURRENT + $LIBGPHOTO2_REVISION`:$LIBGPHOTO2_AGE:$LIBGPHOTO2_REVISION
+AC_SUBST(LIBGPHOTO2_VERSION_INFO)
dnl Checks for programs.
AC_PROG_CC
diff --git a/libgphoto2/Makefile.am b/libgphoto2/Makefile.am
index 9b7f26145..549e18479 100644
--- a/libgphoto2/Makefile.am
+++ b/libgphoto2/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = \
lib_LTLIBRARIES = libgphoto2.la
-libgphoto2_la_LDFLAGS = -version-info $(LIBGPHOTO2_CURRENT):$(LIBGPHOTO2_REVISION):$(LIBGPHOTO2_AGE)
+libgphoto2_la_LDFLAGS = -version-info @LIBGPHOTO2_VERSION_INFO@
libgphoto2_la_SOURCES = \
gphoto2-abilities-list.c\