diff --git a/libgphoto2_port/ChangeLog b/libgphoto2_port/ChangeLog index c2e1c94e9..b7f33daac 100644 --- a/libgphoto2_port/ChangeLog +++ b/libgphoto2_port/ChangeLog @@ -1,3 +1,8 @@ +2002-06-14 Lutz Müller + + * libgphoto2_port/Makefile.am: + * configure.in: Fix (?) -version-info + 2002-06-14 Lutz Müller * configure.in: Don't use ltdl.h - libtool is just too broken diff --git a/libgphoto2_port/configure.in b/libgphoto2_port/configure.in index 75a924cab..ead1f8979 100644 --- a/libgphoto2_port/configure.in +++ b/libgphoto2_port/configure.in @@ -19,6 +19,8 @@ LIBGPHOTO2_PORT_CURRENT=0 AC_SUBST(LIBGPHOTO2_PORT_AGE) AC_SUBST(LIBGPHOTO2_PORT_REVISION) AC_SUBST(LIBGPHOTO2_PORT_CURRENT) +LIBGPHOTO2_PORT_VERSION_INFO=`expr $LIBGPHOTO2_PORT_CURRENT + $LIBGPHOTO2_PORT_REVISION`:$LIBGPHOTO2_PORT_AGE:$LIBGPHOTO2_PORT_REVISION +AC_SUBST(LIBGPHOTO2_PORT_VERSION_INFO) LIBGPHOTO2_PORT_VERSION=$LIBGPHOTO2_PORT_CURRENT.$LIBGPHOTO2_PORT_REVISION.$LIBGPHOTO2_PORT_AGE AC_SUBST(LIBGPHOTO2_PORT_VERSION) diff --git a/libgphoto2_port/libgphoto2_port/Makefile.am b/libgphoto2_port/libgphoto2_port/Makefile.am index d9ea185b2..eaa4b728a 100644 --- a/libgphoto2_port/libgphoto2_port/Makefile.am +++ b/libgphoto2_port/libgphoto2_port/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = \ ## Compile the IO library into a shared library lib_LTLIBRARIES = libgphoto2_port.la -libgphoto2_port_la_LDFLAGS = -version-info $(LIBGPHOTO2_PORT_CURRENT):$(LIBGPHOTO2_PORT_REVISION):$(LIBGPHOTO2_PORT_AGE) +libgphoto2_port_la_LDFLAGS = -version-info @LIBGPHOTO2_PORT_VERSION_INFO@ libgphoto2_port_la_LIBADD = $(LTDL_LIBS) $(INTLLIBS) libgphoto2_port_la_SOURCES = \ gphoto2-port-info-list.c \