]>
Commit | Line | Data |
---|---|---|
4c8d1d09 JB |
1 | diff -Nur ecasound-2.2.0.orig/configure.in ecasound-2.2.0/configure.in |
2 | --- ecasound-2.2.0.orig/configure.in Thu Jan 9 21:24:30 2003 | |
3 | +++ ecasound-2.2.0/configure.in Sat Feb 15 11:10:34 2003 | |
4 | @@ -629,8 +629,8 @@ | |
5 | [AC_CHECK_HEADER(readline/history.h,, | |
6 | AC_MSG_ERROR([*** readline history headers not installed ***]))]) | |
7 | ||
8 | - AC_CHECK_LIB(readline, main,, AC_MSG_ERROR([*** readline support not installed ***])) | |
9 | - AC_CHECK_LIB(history, main,, AC_MSG_ERROR([*** readline history support not installed ***])) | |
10 | + AC_CHECK_LIB(readline, main, true, AC_MSG_ERROR([*** readline support not installed ***])) | |
11 | + AC_CHECK_LIB(history, main, true, AC_MSG_ERROR([*** readline history support not installed ***])) | |
12 | AC_SUBST(ECA_S_READLINE_INCLUDES) | |
13 | else | |
14 | AC_CONFIG_SUBDIRS(readline-4.0) | |
15 | diff -Nur ecasound-2.2.0.orig/ecasound/Makefile.am ecasound-2.2.0/ecasound/Makefile.am | |
16 | --- ecasound-2.2.0.orig/ecasound/Makefile.am Wed Oct 30 19:39:32 2002 | |
17 | +++ ecasound-2.2.0/ecasound/Makefile.am Sat Feb 15 11:11:34 2003 | |
18 | @@ -43,11 +43,11 @@ | |
19 | ||
20 | if ECA_AM_SYSTEM_READLINE | |
21 | ecasound_LDFLAGS = -export-dynamic | |
22 | -ecasound_LDADD = $(termcap_library) \ | |
23 | +ecasound_LDADD = $(termcap_library) -lreadline -lhistory \ | |
24 | $(top_builddir)/libecasound/libecasound.la \ | |
25 | $(top_builddir)/kvutils/libkvutils.la | |
26 | ecasound_debug_LDFLAGS = $(ecasound_LDFLAGS) | |
27 | -ecasound_debug_LDADD = $(termcap_library) \ | |
28 | +ecasound_debug_LDADD = $(termcap_library) -lreadline -lhistory \ | |
29 | $(top_builddir)/libecasound/libecasound_debug.la \ | |
30 | $(top_builddir)/kvutils/libkvutils_debug.la | |
31 | ||
03ed783d JB |
32 | diff -Nur ecasound-2.2.3.orig/kvutils/Makefile.am ecasound-2.2.3/kvutils/Makefile.am |
33 | --- ecasound-2.2.3.orig/kvutils/Makefile.am Tue Nov 5 02:05:17 2002 | |
34 | +++ ecasound-2.2.3/kvutils/Makefile.am Sat Feb 15 11:07:24 2003 | |
4c8d1d09 | 35 | @@ -41,13 +41,13 @@ |
03ed783d | 36 | kvu_inttypes.h |
4c8d1d09 JB |
37 | |
38 | libkvutils_la_SOURCES = $(kvutil_sources) $(kvutil_headers) | |
39 | -libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:0 -static | |
40 | +libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:0 | |
41 | ||
42 | libkvutils_debug_la_SOURCES = $(libkvutils_la_SOURCES) | |
43 | libkvutils_debug_la_LDFLAGS = $(libkvutils_la_LDFLAGS) | |
44 | ||
45 | libkvutils_tester_SOURCES = libkvutils_tester.cpp | |
03ed783d JB |
46 | -libkvutils_tester_LDFLAGS = -static |
47 | +libkvutils_tester_LDFLAGS = | |
48 | libkvutils_tester_LDADD = $(lib_LTLIBRARIES) | |
4c8d1d09 JB |
49 | |
50 | noinst_HEADERS = $(kvutil_headers) | |
4c8d1d09 JB |
51 | diff -Nur ecasound-2.2.0.orig/libecasound/Makefile.am ecasound-2.2.0/libecasound/Makefile.am |
52 | --- ecasound-2.2.0.orig/libecasound/Makefile.am Tue Jan 7 23:35:13 2003 | |
53 | +++ ecasound-2.2.0/libecasound/Makefile.am Sat Feb 15 11:12:58 2003 | |
54 | @@ -315,8 +315,8 @@ | |
55 | libecasound_la_SOURCES = $(ecasound_common_src) | |
56 | libecasound_debug_la_SOURCES = $(ecasound_common_src) | |
57 | libecasound_la_CFLAGS = $(eca_cxxflags) | |
58 | -libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -static | |
59 | -libecasound_la_LIBADD = $(eca_libadd) | |
60 | +libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) | |
61 | +libecasound_la_LIBADD = $(eca_libadd) ../kvutils/libkvutils.la | |
62 | libecasound_debug_la_CFLAGS = $(libecasound_la_CFLAGS) | |
63 | libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS) | |
64 | libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD) | |
03ed783d JB |
65 | diff -Nur ecasound-2.2.3.orig/libecasound/plugins/Makefile.am ecasound-2.2.3/libecasound/plugins/Makefile.am |
66 | --- ecasound-2.2.3.orig/libecasound/plugins/Makefile.am Thu Oct 17 03:09:07 2002 | |
67 | +++ ecasound-2.2.3/libecasound/plugins/Makefile.am Sat Feb 15 11:07:34 2003 | |
4c8d1d09 JB |
68 | @@ -86,7 +86,7 @@ |
69 | libecasound_plugins_la_SOURCES = audioio_dummy.cpp $(plugin_cond_sources) | |
70 | EXTRA_libecasound_plugins_la_SOURCES = $(plugin_cond_sources) | |
03ed783d | 71 | libecasound_plugins_la_LIBADD = $(af_libs) $(alsa_libs) $(arts_libs) $(ECA_S_JACK_LIBS) |
4c8d1d09 JB |
72 | -libecasound_plugins_la_LDFLAGS = -static |
73 | +libecasound_plugins_la_LDFLAGS = | |
74 | ||
75 | libecasound_plugins_debug_la_SOURCES = $(libecasound_plugins_la_SOURCES) | |
76 | EXTRA_libecasound_plugins_debug_la_SOURCES = $(EXTRA_libecasound_plugins_la_SOURCES) | |
77 | diff -Nur ecasound-2.2.0.orig/libecasoundc/Makefile.am ecasound-2.2.0/libecasoundc/Makefile.am | |
78 | --- ecasound-2.2.0.orig/libecasoundc/Makefile.am Mon Dec 16 05:20:39 2002 | |
79 | +++ ecasound-2.2.0/libecasoundc/Makefile.am Sat Feb 15 11:07:07 2003 | |
80 | @@ -8,9 +8,9 @@ | |
81 | # !!! | |
82 | # remember to update eca-version.cpp | |
83 | if ECA_AM_DEBUG_MODE | |
84 | -eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:0 -static | |
85 | +eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:0 | |
86 | else | |
87 | -eca_ldflags = -s -version-info @LIBECASOUNDC_VERSION@:0:0 -static | |
88 | +eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:0 | |
89 | endif | |
90 | ||
91 | INCLUDES = -I$(srcdir) | |
03ed783d JB |
92 | --- ecasound-2.2.3/pyecasound/Makefile.am.orig 2003-04-02 21:37:45.000000000 +0200 |
93 | +++ ecasound-2.2.3/pyecasound/Makefile.am 2003-05-10 20:48:34.000000000 +0200 | |
94 | @@ -50,7 +50,7 @@ | |
95 | all: pyecasound.so | |
96 | ||
97 | pyecasound.so: pyecasound.lo | |
98 | - $(CC) -o pyecasound.so -shared -nostartfiles $(libpyecasound_la_LDFLAGS) pyecasound.lo $(top_builddir)/libecasoundc/ecasoundc_sa.lo | |
99 | + $(LINK) -o pyecasound.so -shared -nostartfiles $(libpyecasound_la_LDFLAGS) pyecasound.lo $(top_builddir)/libecasoundc/ecasoundc_sa.lo | |
100 | endif | |
101 | ||
102 | # ---------------------------------------------------------------------- |