]>
Commit | Line | Data |
---|---|---|
baa94ad9 PG |
1 | --- ./ltdl/Makefile.am.org 2005-09-28 17:06:38.000000000 +0000 |
2 | +++ ./ltdl/Makefile.am 2005-09-28 17:07:54.000000000 +0000 | |
591bcbd4 | 3 | @@ -28,12 +28,8 @@ |
4 | #endif | |
cd57a8f7 | 5 | |
591bcbd4 | 6 | if WITH_LTDL |
7 | - LIBLTDL=ltdl/libltdl.la | |
8 | -if INSTALL_LTDL | |
9 | - LTDL_INSTALLHEADERS = $(LTDL_HDRS) | |
10 | -else | |
11 | + LIBLTDL=-lltdl | |
12 | LTDL_NOINST_HDRS = $(LTDL_HDRS) | |
13 | -endif # INSTALL_LTDL | |
cd57a8f7 | 14 | else |
591bcbd4 | 15 | LIBLTDL= |
16 | endif # WITH_LTDL | |
baa94ad9 PG |
17 | --- ./Makefile.am.org 2005-09-28 17:04:01.000000000 +0000 |
18 | +++ ./Makefile.am 2005-09-28 17:05:13.000000000 +0000 | |
19 | @@ -113,7 +113,6 @@ | |
20 | $(WAND_EXTRA_DIST) | |
21 | ||
22 | lib_LTLIBRARIES = $(LIBMAGICK) $(LIBWAND) $(LIBMAGICKPP) | |
23 | -noinst_LTLIBRARIES = $(LIBLTDL) | |
24 | ||
25 | check_PROGRAMS = \ | |
26 | $(TESTS_CHECK_PGRMS) \ | |
27 | --- ./configure.ac.org 2005-09-28 17:05:32.000000000 +0000 | |
28 | +++ ./configure.ac 2005-09-28 17:06:18.000000000 +0000 | |
29 | @@ -293,7 +293,7 @@ | |
30 | ||
31 | # Configure libltdl | |
32 | #AC_CONFIG_SUBDIRS(ltdl) | |
33 | -AC_LIBLTDL_CONVENIENCE(ltdl) | |
34 | +AC_LIBLTDL_INSTALLABLE(ltdl) | |
35 | AC_LIB_LTDL | |
36 | # Substitute INCLTDL and LIBLTDL in the Makefiles | |
37 | #AC_SUBST(INCLTDL) |