darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2001-11-26 Lutz M�ller <urc8@rz.uni-karlsruhe.de>

Browse Source 
* configure.in: Fix typo (USB_LIBS, not USB_LDFLAGS) *sigh*
        * usb/Makefile.am: libgphoto2-port-usb.so needs -lusb, therefore add
          it using LIBADD (ldopen is not clever enough to figure that out).


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3217 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Lutz Mueller
2001-11-26 07:19:43 +00:00
parent 62260d4191
commit f0003d7e55
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libgphoto2_port/ChangeLog
View File

@@ -1,3 +1,9 @@
2001-11-26 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* configure.in: Fix typo (USB_LIBS, not USB_LDFLAGS) *sigh*
* usb/Makefile.am: libgphoto2-port-usb.so needs -lusb, therefore add
it using LIBADD (ldopen is not clever enough to figure that out).
2001-11-25 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* gphoto2-port-config.in: Remove another reference to IOLIB_CFLAGS...

16
libgphoto2_port/configure.in
View File

@@ -74,13 +74,6 @@ AC_TRY_COMPILE([#include <ioctl-types.h>], [int foo = TIOCM_RTS;],
AC_TRY_COMPILE([#include <sys/ioctl.h>], [int foo = TIOCM_RTS;],
AC_DEFINE(HAVE_RTS_IOCTL))
GPPORT_LIBDIR='-L${libdir}'
GPPORT_INCLUDEDIR='-I${includedir}/gphoto2'
GPPORT_LIBS="-lgphoto2_port"
AC_SUBST(GPPORT_LIBDIR)
AC_SUBST(GPPORT_LIBS)
AC_SUBST(GPPORT_INCLUDEDIR)
dnl ******
dnl serial
dnl ******
@@ -194,7 +187,7 @@ if $try_usb; then
AC_CHECK_HEADER(usb.h,
usb_msg=yes
IOLIB_SUBDIRS="$IOLIB_SUBDIRS usb"
USB_LDFLAGS="`libusb-config --libs` -lgphoto2_port_usb"
USB_LIBS="`libusb-config --libs`"
USB_CFLAGS="`libusb-config --cflags`",
AC_MSG_WARN([
*** You need the libusb library for USB support
@@ -218,6 +211,13 @@ AC_SUBST(USB_LIBS)
AC_SUBST(IOLIB_SUBDIRS)
GPPORT_LIBDIR='-L${libdir}'
GPPORT_INCLUDEDIR='-I${includedir}/gphoto2'
GPPORT_LIBS="-lgphoto2_port"
AC_SUBST(GPPORT_LIBDIR)
AC_SUBST(GPPORT_LIBS)
AC_SUBST(GPPORT_INCLUDEDIR)
dnl ********
dnl gtk-doc?
dnl ********

3
libgphoto2_port/usb/Makefile.am
View File

@@ -4,5 +4,6 @@ INCLUDES = -I$(top_srcdir) $(USB_CFLAGS)
## Compile the IO library into a shared library
iolibdir = $(prefix)/lib/gphoto2_port
iolib_LTLIBRARIES = libgphoto2_port_usb.la
libgphoto2_port_usb_la_LDFLAGS = -module -avoid-version $(USB_LIBS)
libgphoto2_port_usb_la_LDFLAGS = -module -avoid-version
libgphoto2_port_usb_la_LIBADD = $(USB_LIBS)
libgphoto2_port_usb_la_SOURCES = libusb.c