diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2006-12-10 19:33:07 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2006-12-10 19:33:07 +0000 |
| commit | 891188ee5e9ba757224a8900aabf29ba28def53f (patch) | |
| tree | 8df783348c079426e00701f83f6693cb72360fe7 | |
| parent | 9b37a125ab45a2bb1871447859f1c7decca1f405 (diff) | |
| download | libgphoto2-891188ee5e9ba757224a8900aabf29ba28def53f.tar.gz | |
link against libiconv on non-Linux systems.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_3/libgphoto2@9550 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | camlibs/ptp2/ChangeLog | 5 | ||||
| -rw-r--r-- | camlibs/ptp2/Makefile.am | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/camlibs/ptp2/ChangeLog b/camlibs/ptp2/ChangeLog index 598bf780f..a1b82cd7e 100644 --- a/camlibs/ptp2/ChangeLog +++ b/camlibs/ptp2/ChangeLog @@ -1,3 +1,8 @@ +2006-12-10 Marcus Meissner <marcus@jet.franken.de> + + * Makefile.am: Link against libiconv if necessary. + (not necessary on Linux, since libiconv is in glibc). + 2006-12-02 Marcus Meissner <marcus@jet.franken.de> * library.c: Added Canon PowerShot SD600, HP Photosmart C500. diff --git a/camlibs/ptp2/Makefile.am b/camlibs/ptp2/Makefile.am index 2e367113f..16f7225bc 100644 --- a/camlibs/ptp2/Makefile.am +++ b/camlibs/ptp2/Makefile.am @@ -6,6 +6,6 @@ ptp2_la_SOURCES = ptp.c ptp.h library.c ptp-bugs.h ptp-private.h ptpip.c config. ptp2_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym ptp2_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym -ptp2_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +ptp2_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la $(LTLIBICONV) camlibdoc_DATA = README.ptp2 |