Rev 65 | Go to most recent revision | Details | Last modification | View Log | RSS feed
Rev | Author | Line No. | Line |
---|---|---|---|
62 | magnus | 1 | Description: Use Automake conditionals to construct lib_LTLIBRARIES |
2 | Otherwise automake doesn't pick up the correct dependencies for test-oop |
||
3 | Bug-Debian: https://bugs.debian.org/909904 |
||
4 | |||
5 | --- a/configure.ac |
||
6 | +++ b/configure.ac |
||
7 | @@ -31,20 +31,22 @@ AC_CHECK_HEADERS(poll.h sys/select.h sys |
||
8 | |||
9 | if test xno != x$with_adns; then |
||
10 | AC_CHECK_LIB(adns,adns_init,[ |
||
11 | - LIBOOP_LIBS="liboop-adns.la $LIBOOP_LIBS" |
||
12 | + with_adns="true" |
||
13 | ADNS_LIBS="-ladns" |
||
14 | AC_DEFINE(HAVE_ADNS) |
||
15 | ]) |
||
16 | fi |
||
17 | +AM_CONDITIONAL([WITH_ADNS], [test x$with_adns = xtrue]) |
||
18 | |||
19 | if test xno != x$with_readline; then |
||
20 | AC_CHECK_LIB(readline,rl_callback_handler_install,[ |
||
21 | AC_CHECK_HEADER(readline/readline.h,[ |
||
22 | - LIBOOP_LIBS="liboop-rl.la $LIBOOP_LIBS" |
||
23 | + with_readline="true" |
||
24 | READLINE_LIBS="-lreadline" |
||
25 | AC_DEFINE(HAVE_READLINE) |
||
26 | ])]) |
||
27 | fi |
||
28 | +AM_CONDITIONAL([WITH_READLINE], [test x$with_readline = xtrue]) |
||
29 | |||
30 | if test xno != x$with_glib; then |
||
31 | save_libs="$LIBS" |
||
32 | @@ -57,7 +59,7 @@ if test xno != x$with_glib; then |
||
33 | CPPFLAGS="$save_cppflags $GLIB_INCLUDES" |
||
34 | AC_CHECK_FUNC(g_main_set_poll_func,[ |
||
35 | AC_CHECK_HEADER(glib.h,[ |
||
36 | - LIBOOP_LIBS="liboop-glib.la $LIBOOP_LIBS" |
||
37 | + with_glib="true" |
||
38 | AC_DEFINE(HAVE_GLIB) |
||
39 | ])]) |
||
40 | fi |
||
41 | @@ -65,18 +67,20 @@ if test xno != x$with_glib; then |
||
42 | CPPFLAGS="$save_cppflags" |
||
43 | |||
44 | PKG_CHECK_MODULES(GLIB2,glib-2.0 >= 2.0,[ |
||
45 | - LIBOOP_LIBS="liboop-glib2.la $LIBOOP_LIBS" |
||
46 | + with_glib2="true" |
||
47 | AC_DEFINE(HAVE_GLIB) |
||
48 | ],[:]) |
||
49 | fi |
||
50 | +AM_CONDITIONAL([WITH_GLIB], [test x$with_glib = xtrue]) |
||
51 | +AM_CONDITIONAL([WITH_GLIB2], [test x$with_glib2 = xtrue]) |
||
52 | |||
53 | if test xno != x$with_tcl; then |
||
54 | - for version in "" 8.4 8.3 8.2 8.1 8.0 ; do |
||
55 | + for version in 8.4 8.3 8.2 8.1 8.0 ; do |
||
56 | CPPFLAGS="$save_cppflags -I/usr/include/tcl$version" |
||
57 | AC_CHECK_LIB(tcl$version,Tcl_Main,[ |
||
58 | AC_CHECK_HEADER(tcl.h,[ |
||
59 | - LIBOOP_LIBS="liboop-tcl.la $LIBOOP_LIBS" |
||
60 | AC_DEFINE(HAVE_TCL) |
||
61 | + with_tcl="true" |
||
62 | TCL_INCLUDES="-I/usr/include/tcl$version" |
||
63 | TCL_LIBS="-ltcl$version" |
||
64 | break |
||
65 | @@ -84,6 +88,7 @@ if test xno != x$with_tcl; then |
||
66 | done |
||
67 | CPPFLAGS="$save_cppflags" |
||
68 | fi |
||
69 | +AM_CONDITIONAL([WITH_TCL], [test x$with_tcl = xtrue]) |
||
70 | |||
71 | if test xyes = x$with_libwww; then |
||
72 | save_libs="$LIBS" |
||
73 | @@ -95,13 +100,14 @@ if test xyes = x$with_libwww; then |
||
74 | LIBS="$save_libs $WWW_LIBS" |
||
75 | CPPFLAGS="$save_cppflags $WWW_INCLUDES" |
||
76 | AC_CHECK_FUNC(HTEvent_setRegisterCallback,[ |
||
77 | - LIBOOP_LIBS="liboop-www.la $LIBOOP_LIBS" |
||
78 | + with_www="true" |
||
79 | AC_DEFINE(HAVE_WWW) |
||
80 | ]) |
||
81 | fi |
||
82 | LIBS="$save_libs" |
||
83 | CPPFLAGS="$save_cppflags" |
||
84 | fi |
||
85 | +AM_CONDITIONAL([WITH_WWW], [test x$with_www = xtrue]) |
||
86 | |||
87 | if test -z "$no_wacky_libs" ; then |
||
88 | AC_CHECK_LIB(resolv,res_query) |
||
89 | @@ -123,5 +129,4 @@ AC_SUBST(ADNS_LIBS) |
||
90 | AC_SUBST(WWW_INCLUDES) |
||
91 | AC_SUBST(WWW_LIBS) |
||
92 | AC_SUBST(READLINE_LIBS) |
||
93 | -AC_SUBST(LIBOOP_LIBS) |
||
94 | AC_OUTPUT([Makefile liboop.pc liboop-glib2.pc]) |
||
95 | --- a/Makefile.am |
||
96 | +++ b/Makefile.am |
||
97 | @@ -7,8 +7,25 @@ |
||
98 | # See the file COPYING for details. |
||
99 | |||
100 | AUTOMAKE_OPTIONS = foreign 1.7 |
||
101 | -lib_LTLIBRARIES = liboop.la @LIBOOP_LIBS@ |
||
102 | -EXTRA_LTLIBRARIES = liboop-adns.la liboop-glib2.la liboop-glib.la liboop-tcl.la liboop-www.la liboop-rl.la |
||
103 | +lib_LTLIBRARIES = liboop.la |
||
104 | +if WITH_ADNS |
||
105 | + lib_LTLIBRARIES += liboop-adns.la |
||
106 | +endif |
||
107 | +if WITH_GLIB |
||
108 | + lib_LTLIBRARIES += liboop-glib.la |
||
109 | +endif |
||
110 | +if WITH_GLIB2 |
||
111 | + lib_LTLIBRARIES += liboop-glib2.la |
||
112 | +endif |
||
113 | +if WITH_TCL |
||
114 | + lib_LTLIBRARIES += liboop-tcl.la |
||
115 | +endif |
||
116 | +if WITH_WWW |
||
117 | + lib_LTLIBRARIES += liboop-www.la |
||
118 | +endif |
||
119 | +if WITH_READLINE |
||
120 | + lib_LTLIBRARIES += liboop-rl.la |
||
121 | +endif |
||
122 | |||
123 | pkgconfigdir = $(libdir)/pkgconfig |
||
124 | pkgconfig_DATA = liboop.pc liboop-glib2.pc |