annotate configure.ac @ 4512:df578e2bba19

fixing a spelling mistake
author mf0102 <0102@gmx.at>
date Tue, 22 Apr 2008 17:45:49 +0200
parents 9cd1dca94b2a
children a5377b724505
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
1 dnl ***
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
2 dnl *** Process this file with autoconf to produce a configure script.
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
3 dnl ***
3648
5bea21b52a06 Fix installation of Audacious desktop icon.
William Pitcock <nenolod@atheme.org>
parents: 3641
diff changeset
4
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
5 dnl Require autoconf 2.59 or later
1420
0aa4bee03747 [svn] - ok, move this fix down a little
nenolod
parents: 1419
diff changeset
6 AC_PREREQ([2.59])
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
7
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
8 dnl Initialize
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
9 AC_INIT([audacious], [1.9.0], [bugs+audacious@atheme.org])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
10 AC_COPYRIGHT([(C) 2005-2008 Audacious Development Team])
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
11 AC_CANONICAL_HOST
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
12 AC_CANONICAL_TARGET
4459
fcd559cfae89 Add AC_GNU_SOURCE, because the newer m4-macros want it.
Matti Hamalainen <ccr@tnsp.org>
parents: 4443
diff changeset
13 AC_GNU_SOURCE
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
14 AC_CONFIG_HEADERS([config.h])
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
15 PKG_PROG_PKG_CONFIG
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
16
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
17
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
18 dnl buildsystem bootstrap
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
19 dnl =====================
38
4e0397865a31 [svn] Regenerate a bunch of stuff :)
nenolod
parents: 33
diff changeset
20 dnl XXX kludge for FreeBSD
4e0397865a31 [svn] Regenerate a bunch of stuff :)
nenolod
parents: 33
diff changeset
21 if test -d "/usr/X11R6/include"; then
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
22 CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
38
4e0397865a31 [svn] Regenerate a bunch of stuff :)
nenolod
parents: 33
diff changeset
23 fi
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
24
2324
2ab9ef1e9544 [svn] - remove leftover remnants of automake from buildsystem
nenolod
parents: 2323
diff changeset
25 AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])
2ab9ef1e9544 [svn] - remove leftover remnants of automake from buildsystem
nenolod
parents: 2323
diff changeset
26 AC_SUBST([VERSION], [AC_PACKAGE_VERSION])
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
27 AC_DEFINE_UNQUOTED([PACKAGE], "$PACKAGE", [Name of package])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
28 AC_DEFINE_UNQUOTED([VERSION], "$VERSION", [Version number of package])
2324
2ab9ef1e9544 [svn] - remove leftover remnants of automake from buildsystem
nenolod
parents: 2323
diff changeset
29
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
30 BUILDSYS_PROG_IMPLIB
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
31 BUILDSYS_SHARED_LIB
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
32 IMPLIB_LIBS=""
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
33 AC_SUBST([IMPLIB_LIBS])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
34
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
35 dnl XXX
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
36 SHARED_SUFFIX="$PLUGIN_SUFFIX"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
37 AC_SUBST([SHARED_SUFFIX])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
38 AC_DEFINE_UNQUOTED([SHARED_SUFFIX], "${SHARED_SUFFIX}",
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
39 [Define the shared module suffix extension on your platform.])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
40
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
41 AC_MSG_CHECKING([if you are running Apple-GCC])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
42 case "$target" in
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
43 *-apple-*)
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
44 AC_MSG_RESULT([yes, sorry you poor bastard])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
45 LDFLAGS="$LDFLAGS -framework CoreFoundation -framework CoreServices -framework Carbon"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
46 ;;
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
47 *)
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
48 AC_MSG_RESULT([no])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
49 ;;
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
50 esac
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
51
756
97f5ebf52a3d [svn] put AM_INIT_AUTOMAKE back
nenolod
parents: 751
diff changeset
52
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
53 dnl GNU gettext
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
54 dnl ===========
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
55 AM_GNU_GETTEXT
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
56 AM_GNU_GETTEXT_VERSION([0.14.0])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
57
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
58
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
59 dnl Check for C and C++ compilers
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
60 dnl =============================
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
61 AUD_CHECK_GNU_MAKE
1353
35ef03569852 [svn] Hook up Altivec-enabled DCT64 for MP3. WMA throws a tantrum on Altivec machines. Submit a patch, or wait for me to fix it.
chainsaw
parents: 1317
diff changeset
62 AC_PROG_CC
35ef03569852 [svn] Hook up Altivec-enabled DCT64 for MP3. WMA throws a tantrum on Altivec machines. Submit a patch, or wait for me to fix it.
chainsaw
parents: 1317
diff changeset
63 AC_PROG_CXX
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
64 AM_PROG_AS
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
65 AC_ISC_POSIX
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
66 AC_C_BIGENDIAN
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
67
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
68 if test "x$GCC" = "xyes"; then
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
69 CFLAGS="$CFLAGS -Wall -pipe"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
70 fi
2315
af0e789e70a7 [svn] Add -Wall to CFLAGS by default if the CC is gcc
js
parents: 2313
diff changeset
71
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
72
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
73 dnl Checks for various programs
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
74 dnl ===========================
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
75 AC_PROG_LN_S
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
76 AC_PROG_MAKE_SET
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
77 AC_PATH_PROG([RM], [rm])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
78 AC_PATH_PROG([MV], [mv])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
79 AC_PATH_PROG([CP], [cp])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
80 AC_PATH_PROG([AR], [ar])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
81 AC_PATH_PROG([RANLIB], [ranlib])
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
82
750
5fe9bafc1895 [svn] more stuff
nenolod
parents: 743
diff changeset
83
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
84 dnl Check for headers and functions
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
85 dnl ===============================
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
86 AC_CHECK_HEADERS([unistd.h fcntl.h sys/ioctl.h fnmatch.h limits.h wchar.h fts.h execinfo.h])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
87 AC_CHECK_FUNCS([mkdtemp getmntinfo statvfs strtoul lrintf])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
88
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
89
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
90 ### ---------------------------------------------------------------------------
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
91 dnl Path settings
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
92 dnl =============
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
93 AC_PATH_PROG([AUDACIOUS_PATH], [audacious], [no])
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
94
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
95 AUD_ARG_ENABLE([one-plugin-dir], [no],
4496
4e78a3958166 Show default settings for options in --help.
Matti Hamalainen <ccr@tnsp.org>
parents: 4493
diff changeset
96 [ --enable-one-plugin-dir Use a single plugin dir (def: no)])
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
97
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
98
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
99 AUD_ARG_ENABLE([user-plugin-dir], [yes],
4496
4e78a3958166 Show default settings for options in --help.
Matti Hamalainen <ccr@tnsp.org>
parents: 4493
diff changeset
100 [ --disable-user-plugin-dir Disable per-user plugin dir (def: enabled)])
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
101
4480
28863634a2da Properly define DISABLE_USER_PLUGIN_DIR if needed.
Matti Hamalainen <ccr@tnsp.org>
parents: 4476
diff changeset
102 if test "x$enable_user_plugin_dir" = "xno"; then
28863634a2da Properly define DISABLE_USER_PLUGIN_DIR if needed.
Matti Hamalainen <ccr@tnsp.org>
parents: 4476
diff changeset
103 AC_DEFINE([DISABLE_USER_PLUGIN_DIR], 1, [Define to disable per user plugin directory])
28863634a2da Properly define DISABLE_USER_PLUGIN_DIR if needed.
Matti Hamalainen <ccr@tnsp.org>
parents: 4476
diff changeset
104 fi
28863634a2da Properly define DISABLE_USER_PLUGIN_DIR if needed.
Matti Hamalainen <ccr@tnsp.org>
parents: 4476
diff changeset
105
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
106
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
107 ### ---------------------------------------------------------------------------
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
108 dnl Check for Gtk+/GLib and pals
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
109 dnl ============================
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
110 AUD_CHECK_MODULE([GLIB], [glib-2.0], [>= 2.14.0], [Glib2])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
111 AUD_CHECK_MODULE([GTHREAD], [gthread-2.0], [>= 2.14.0], [gthread-2.0])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
112 AUD_CHECK_MODULE([GTK], [gtk+-2.0], [>= 2.10.0], [Gtk+2])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
113 AUD_CHECK_MODULE([PANGO], [pango], [>= 1.8.0], [Pango])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
114 AUD_CHECK_MODULE([CAIRO], [cairo], [>= 1.2.4], [Cairo])
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
115
2503
10692383c103 [svn] first try for libid3tag integration. this improved libid3tag supports vfs operations and is capable of adding id3v2 tag to files which doesn't have id3v2 tag ever.
yaz
parents: 2359
diff changeset
116
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
117 dnl Check for libmowgli
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
118 dnl ===================
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
119 AUD_CHECK_MODULE([MOWGLI], [libmowgli], [>= 0.4.0], [libmowgli],
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
120 [http://www.atheme.org/projects/mowgli.shtml])
2503
10692383c103 [svn] first try for libid3tag integration. this improved libid3tag supports vfs operations and is capable of adding id3v2 tag to files which doesn't have id3v2 tag ever.
yaz
parents: 2359
diff changeset
121
4337
67dfe68c0560 Some sanitization.
Matti Hamalainen <ccr@tnsp.org>
parents: 4334
diff changeset
122
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
123 dnl Check for libmcs
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
124 dnl ================
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
125 AUD_CHECK_MODULE([LIBMCS], [libmcs >= 0.7], [libmcs],
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
126 [http://www.atheme.org/projects/mcs.shtml])
2631
a2afa6ca7294 [svn] - integrate libmowgli requirement into buildsystem
nenolod
parents: 2619
diff changeset
127
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
128
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
129 ### ---------------------------------------------------------------------------
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
130 dnl Plugin stuff
978
a7b53e6a71e0 [svn] - IPv6 support
nenolod
parents: 967
diff changeset
131 dnl ========================
1622
55011fbbd8cb [svn] - detect what $(SHARED_SUFFIX) should be.
nenolod
parents: 1613
diff changeset
132 dnl Ok, first we find out what flags we need to use.
3763
6bec10770466 static import libraries on Win32/BeOS/etc (-Wl,--out-implib) and dynamic import libraries (POSIX) are no longer needed.
William Pitcock <nenolod@atheme.org>
parents: 3657
diff changeset
133 IMPLIB_LIBS=''
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
134 AC_SUBST([IMPLIB_LIBS])
3535
9ddf21ab5c84 Transit to Mk2.
William Pitcock <nenolod@atheme.org>
parents: 3515
diff changeset
135
9ddf21ab5c84 Transit to Mk2.
William Pitcock <nenolod@atheme.org>
parents: 3515
diff changeset
136 dnl XXX
9ddf21ab5c84 Transit to Mk2.
William Pitcock <nenolod@atheme.org>
parents: 3515
diff changeset
137 SHARED_SUFFIX=$PLUGIN_SUFFIX
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
138 AC_SUBST([SHARED_SUFFIX])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
139 AC_DEFINE_UNQUOTED([SHARED_SUFFIX], "${SHARED_SUFFIX}",
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
140 [Define the shared module suffix extension on your platform.])
1622
55011fbbd8cb [svn] - detect what $(SHARED_SUFFIX) should be.
nenolod
parents: 1613
diff changeset
141
55011fbbd8cb [svn] - detect what $(SHARED_SUFFIX) should be.
nenolod
parents: 1613
diff changeset
142 AC_MSG_CHECKING([if you are running Apple-GCC])
55011fbbd8cb [svn] - detect what $(SHARED_SUFFIX) should be.
nenolod
parents: 1613
diff changeset
143 case "$target" in
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
144 *-apple-*)
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
145 AC_MSG_RESULT([yes, sorry you poor bastard])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
146 LDFLAGS="$LDFLAGS -framework CoreFoundation -framework CoreServices -framework Carbon"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
147 ;;
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
148 *)
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
149 AC_MSG_RESULT([no])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
150 ;;
1622
55011fbbd8cb [svn] - detect what $(SHARED_SUFFIX) should be.
nenolod
parents: 1613
diff changeset
151 esac
55011fbbd8cb [svn] - detect what $(SHARED_SUFFIX) should be.
nenolod
parents: 1613
diff changeset
152
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
153
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
154 ### ---------------------------------------------------------------------------
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
155 dnl Chardet support
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
156 dnl ===============
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
157 AUD_ARG_ENABLE([chardet], [yes],
4496
4e78a3958166 Show default settings for options in --help.
Matti Hamalainen <ccr@tnsp.org>
parents: 4493
diff changeset
158 [ --disable-chardet Disable charset detection support (def: enabled)],
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
159 [
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
160 AC_DEFINE([USE_CHARDET], 1, [Define if character set detection enabled])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
161 AC_CHECK_LIB([udet_c], [detectCharset], [
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
162 AC_DEFINE([HAVE_UDET], 1, [Define if the system has Mozilla universal character detector library])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
163 CHARDET_LIBS="$CHARDET_LIBS -ludet -ludet_c"
4481
25730d90d916 USE_CHARDET is now substituted in AUD_CONDITIONAL.
Matti Hamalainen <ccr@tnsp.org>
parents: 4480
diff changeset
164 AC_SUBST([CHARDET_LIBS])
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
165 ])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
166 ])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
167 AUD_CONDITIONAL([USE_CHARDET], [enable_chardet])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
168
2694
c2b82432c1b6 [svn] Added basic DBus support, disabled by default with a configuration option to enable it. The general and playback information/manipulation methods are currently the only ones implemented. That is version, play, pause, stop, playing, paused, stopped, status, and seek. There are stubs for many unimplemented methods.
magma
parents: 2692
diff changeset
169
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
170 ### ---------------------------------------------------------------------------
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
171 dnl D-Bus support
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
172 dnl =============
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
173 AUD_ARG_ENABLE([dbus], [yes],
4496
4e78a3958166 Show default settings for options in --help.
Matti Hamalainen <ccr@tnsp.org>
parents: 4493
diff changeset
174 [ --enable-dbus Enable D-Bus support (def: enabled)],
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
175 [
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
176 PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60 dbus-glib-1 >= 0.60 gthread-2.0],
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
177 [enable_dbus=yes],
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
178 [enable_dbus=no])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
179
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
180 AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
181 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal], [no])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
182 if test "x$DBUS_BINDING_TOOL" = "xno" || test "x$GLIB_GENMARSHAL" = "xno" || test "x$enable_dbus" = "xno" ; then
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
183 enable_dbus="no"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
184 else
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
185 AC_DEFINE([USE_DBUS], 1, [Define if D-Bus support enabled])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
186 AC_DEFINE([DBUS_SERVICES_DIR], "$datadir/dbus-1/services",
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
187 [Location of D-Bus services directory])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
188 LIBAUDCLIENT_LDFLAGS="-laudclient"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
189 AC_SUBST([DBUS_CFLAGS])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
190 AC_SUBST([DBUS_LIBS])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
191 AC_SUBST([DBUS_SERVICES_DIR])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
192 AC_SUBST([DBUS_BINDING_TOOL])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
193 AC_SUBST([LIBAUDCLIENT_LDFLAGS])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
194 fi
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
195 ])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
196 AUD_CONDITIONAL([USE_DBUS], [enable_dbus])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
197
2694
c2b82432c1b6 [svn] Added basic DBus support, disabled by default with a configuration option to enable it. The general and playback information/manipulation methods are currently the only ones implemented. That is version, play, pause, stop, playing, paused, stopped, status, and seek. There are stubs for many unimplemented methods.
magma
parents: 2692
diff changeset
198
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
199 ### ---------------------------------------------------------------------------
2538
719e0898ff3c [svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents: 2535
diff changeset
200 dnl libsamplerate support
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
201 dnl =====================
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
202 AUD_ARG_ENABLE([samplerate], [no],
4496
4e78a3958166 Show default settings for options in --help.
Matti Hamalainen <ccr@tnsp.org>
parents: 4493
diff changeset
203 [ --enable-samplerate Enable libsamplerate support (def: disabled)],
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
204 [
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
205 AUD_CHECK_MODULE([SAMPLERATE], [samplerate],, [libsamplerate])
4482
1884c4a9d84f We don't want libsamplerate check to add -lsamplerate global LIBS, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents: 4481
diff changeset
206 aud_save_LIBS="$LIBS"
1884c4a9d84f We don't want libsamplerate check to add -lsamplerate global LIBS, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents: 4481
diff changeset
207 AC_CHECK_LIB([samplerate], [src_process],[
1884c4a9d84f We don't want libsamplerate check to add -lsamplerate global LIBS, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents: 4481
diff changeset
208 SAMPLERATE_LIBS="-lsamplerate"
1884c4a9d84f We don't want libsamplerate check to add -lsamplerate global LIBS, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents: 4481
diff changeset
209 ], [
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
210 AC_MSG_ERROR([*** Unable to link with libsamplerate!])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
211 ])
4482
1884c4a9d84f We don't want libsamplerate check to add -lsamplerate global LIBS, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents: 4481
diff changeset
212 LIBS="$aud_save_LIBS"
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
213 AC_DEFINE([USE_SAMPLERATE], 1, [Define if libsamplerate enabled])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
214 AC_SUBST([USE_SAMPLERATE])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
215 AC_SUBST([SAMPLERATE_CFLAGS])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
216 AC_SUBST([SAMPLERATE_LIBS])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
217 ])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
218
2538
719e0898ff3c [svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents: 2535
diff changeset
219
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
220 ### ---------------------------------------------------------------------------
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
221 dnl xspf playlist support
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
222 dnl =====================
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
223 AUD_ARG_ENABLE([xspf], [yes],
4496
4e78a3958166 Show default settings for options in --help.
Matti Hamalainen <ccr@tnsp.org>
parents: 4493
diff changeset
224 [ --disable-xspf Disable XSPF support (def: enabled)],
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
225 [
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
226 AM_PATH_XML2([2.0.0],, [
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
227 AC_MSG_WARN([*** libxml2 is not installed. XSPF playlist support will not be built. ***])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
228 enable_xspf="no"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
229 ])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
230 if test "x$enable_xspf" = "xyes"; then
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
231 AC_DEFINE([HAVE_XSPF_PLAYLIST], 1, [Define if XSPF playlists are available.])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
232 fi
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
233 ])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
234
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
235
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
236 ### ---------------------------------------------------------------------------
2168
caaf4b1a8487 [svn] - allow user to choose a regex library between gnu (default), oniguruma, pcre (experimental); oniguruma and pcre support utf-8 encoding
giacomo
parents: 2106
diff changeset
237 dnl regex support (gnu/oniguruma/pcre)
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
238 dnl ==================================
2168
caaf4b1a8487 [svn] - allow user to choose a regex library between gnu (default), oniguruma, pcre (experimental); oniguruma and pcre support utf-8 encoding
giacomo
parents: 2106
diff changeset
239 REGEX_LIBS=
caaf4b1a8487 [svn] - allow user to choose a regex library between gnu (default), oniguruma, pcre (experimental); oniguruma and pcre support utf-8 encoding
giacomo
parents: 2106
diff changeset
240 REGEX_CFLAGS=
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
241 AC_ARG_WITH([regexlib],
4496
4e78a3958166 Show default settings for options in --help.
Matti Hamalainen <ccr@tnsp.org>
parents: 4493
diff changeset
242 [[ --with-regexlib[=gnu/oniguruma/pcre] use the chosen regex library (def: gnu)]],
2168
caaf4b1a8487 [svn] - allow user to choose a regex library between gnu (default), oniguruma, pcre (experimental); oniguruma and pcre support utf-8 encoding
giacomo
parents: 2106
diff changeset
243 [
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
244 case $withval in
2168
caaf4b1a8487 [svn] - allow user to choose a regex library between gnu (default), oniguruma, pcre (experimental); oniguruma and pcre support utf-8 encoding
giacomo
parents: 2106
diff changeset
245 pcre)
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
246 AUD_CHECK_MODULE([LIBPCRE], [libpcre], [>= 6.7], [PCRE])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
247 AC_DEFINE([USE_REGEX_PCRE], 1, [If this macro is defined, use PCRE regex library.])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
248 REGEX_LIBS="-lpcreposix $LIBPCRE_LIBS"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
249 REGEX_CFLAGS=$LIBPCRE_CFLAGS
2168
caaf4b1a8487 [svn] - allow user to choose a regex library between gnu (default), oniguruma, pcre (experimental); oniguruma and pcre support utf-8 encoding
giacomo
parents: 2106
diff changeset
250 ;;
caaf4b1a8487 [svn] - allow user to choose a regex library between gnu (default), oniguruma, pcre (experimental); oniguruma and pcre support utf-8 encoding
giacomo
parents: 2106
diff changeset
251 oniguruma)
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
252 AC_CHECK_LIB([onig], [onig_new],
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
253 [
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
254 AC_DEFINE([USE_REGEX_ONIGURUMA], 1, [If this macro is defined, use Oniguruma regex library.])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
255 REGEX_LIBS=['-lonig']
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
256 ],[
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
257 AC_MSG_ERROR([Cannot find Oniguruma])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
258 ])
2168
caaf4b1a8487 [svn] - allow user to choose a regex library between gnu (default), oniguruma, pcre (experimental); oniguruma and pcre support utf-8 encoding
giacomo
parents: 2106
diff changeset
259 ;;
caaf4b1a8487 [svn] - allow user to choose a regex library between gnu (default), oniguruma, pcre (experimental); oniguruma and pcre support utf-8 encoding
giacomo
parents: 2106
diff changeset
260 *)
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
261 AC_DEFINE([USE_REGEX_GNU], 1, [If this macro is defined, use GNU regex library.])
2168
caaf4b1a8487 [svn] - allow user to choose a regex library between gnu (default), oniguruma, pcre (experimental); oniguruma and pcre support utf-8 encoding
giacomo
parents: 2106
diff changeset
262 ;;
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
263 esac
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
264 ],[
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
265 AC_DEFINE([USE_REGEX_GNU], 1, [If this macro is defined, use GNU regex library.])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
266 ])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
267 AC_SUBST([REGEX_LIBS])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
268 AC_SUBST([REGEX_CFLAGS])
2168
caaf4b1a8487 [svn] - allow user to choose a regex library between gnu (default), oniguruma, pcre (experimental); oniguruma and pcre support utf-8 encoding
giacomo
parents: 2106
diff changeset
269
caaf4b1a8487 [svn] - allow user to choose a regex library between gnu (default), oniguruma, pcre (experimental); oniguruma and pcre support utf-8 encoding
giacomo
parents: 2106
diff changeset
270
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
271 ### ---------------------------------------------------------------------------
4233
74c6f3d3cf1d it buids successfully :)
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 3993
diff changeset
272 dnl SSE2 support
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
273 dnl ============
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
274 AUD_ARG_ENABLE([sse2], [yes],
4496
4e78a3958166 Show default settings for options in --help.
Matti Hamalainen <ccr@tnsp.org>
parents: 4493
diff changeset
275 [ --disable-sse2 Disable SSE2 support (def: enabled)],
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
276 [
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
277 AC_MSG_CHECKING([SSE2 support])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
278 aud_my_save_CFLAGS="$CFLAGS"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
279 CFLAGS="-msse2"
4493
a3566b1f5222 Test for SSE2 was quoted one level too much, thus causing the source to be borked and compilation to fail. Fixed.
Matti Hamalainen <ccr@tnsp.org>
parents: 4486
diff changeset
280 AC_TRY_RUN([
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
281 #include <emmintrin.h>
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
282 int main()
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
283 {
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
284 _mm_setzero_pd();
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
285 return 0;
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
286 }
4493
a3566b1f5222 Test for SSE2 was quoted one level too much, thus causing the source to be borked and compilation to fail. Fixed.
Matti Hamalainen <ccr@tnsp.org>
parents: 4486
diff changeset
287 ],[
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
288 AC_MSG_RESULT([yes])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
289 AC_DEFINE([HAVE_SSE2], 1, [Define to 1 if your system has SSE2 support])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
290 SIMD_CFLAGS="-msse2"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
291 ],[
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
292 AC_MSG_RESULT([no])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
293 enable_sse2="no"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
294 ])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
295 AC_SUBST([SIMD_CFLAGS])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
296 CFLAGS="$aud_my_save_CFLAGS"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
297 ])
4233
74c6f3d3cf1d it buids successfully :)
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 3993
diff changeset
298
74c6f3d3cf1d it buids successfully :)
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 3993
diff changeset
299
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
300 ### ---------------------------------------------------------------------------
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
301 dnl AltiVec support
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
302 dnl ===============
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
303 AUD_ARG_ENABLE([altivec], [yes],
4496
4e78a3958166 Show default settings for options in --help.
Matti Hamalainen <ccr@tnsp.org>
parents: 4493
diff changeset
304 [ --disable-altivec Disable AltiVec support (def: enabled)],
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
305 [
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
306 AC_CHECK_HEADERS([altivec.h],
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
307 [
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
308 AC_DEFINE([HAVE_ALTIVEC], 1, [Define to 1 if your system has AltiVec.])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
309 AC_DEFINE([HAVE_ALTIVEC_H], 1, [Define to 1 if your system has an altivec.h file.])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
310 AC_DEFINE([ARCH_POWERPC], 1, [Define to 1 if your system is a PowerPC.])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
311 SIMD_CFLAGS=-maltivec
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
312 AC_SUBST([SIMD_CFLAGS])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
313 ],[
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
314 enable_altivec="no"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
315 ])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
316 ])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
317
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
318
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
319 ### ---------------------------------------------------------------------------
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
320 dnl Session management support
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
321 dnl ==========================
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
322 AS_AC_EXPAND([desktop_file], "${datadir}/applications/audacious.desktop")
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
323 AC_DEFINE_UNQUOTED([AUDACIOUS_DESKTOP_FILE], "${desktop_file}", [Location of the desktop file])
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
324
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
325 AUD_ARG_ENABLE([sm], [yes],
4496
4e78a3958166 Show default settings for options in --help.
Matti Hamalainen <ccr@tnsp.org>
parents: 4493
diff changeset
326 [ --disable-sm Disable session management (def: enabled)],
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
327 [
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
328 PKG_CHECK_MODULES([SM], [sm >= 1.0], [
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
329 AC_DEFINE([USE_EGGSM], 1, [Define if session management should be used.])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
330 enable_sm="yes"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
331 ],[
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
332 enable_sm="no"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
333 ])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
334 ])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
335 AUD_CONDITIONAL([USE_EGGSM], [enable_sm])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
336
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
337
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
338 ### ---------------------------------------------------------------------------
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
339 dnl Ugly system checks
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
340 dnl ==================
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
341 AC_MSG_CHECKING([if __ELF__ is defined])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
342 AC_EGREP_CPP([yes],
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
343 [#ifdef __ELF__
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
344 yes
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
345 #endif
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
346 ],
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
347 [is_elf=yes],
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
348 [is_elf=no]
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
349 )
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
350 AC_MSG_RESULT([$is_elf])
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
351
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
352 have_solaris=no
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
353 have_sun=no
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
354 ARCH_DEFINES=""
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
355 case $host in
2018
58ea18909fe7 [svn] - MirBSD support from <bsiegert -at- gmx.de>
nenolod
parents: 2005
diff changeset
356 *-*-openbsd* | *-*-netbsd* | *-*-mirbsd*)
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
357 have_sun=yes
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
358 if test "x${is_elf}" = "xno"; then
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
359 AC_DEFINE([SYMBOL_PREFIX], "_", [Define to symbol prefix, if any])
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
360 fi
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
361 ;;
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
362 *-*-darwin*)
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
363 AC_DEFINE([SYMBOL_PREFIX], "_", [Define to symbol prefix, if any])
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
364 ;;
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
365 *-hpux-*)
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
366 ARCH_DEFINES="-DHPUX"
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
367 ;;
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
368 *-*-solaris* | *-*-sunos*)
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
369 have_solaris=yes
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
370 ;;
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
371 esac
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
372
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
373 arch_type=other
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
374 x86_asm=no
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
375 case $host in
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
376 i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
377 arch_type=ix86
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
378 case $host in
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
379 *-*-netbsd* | *-*openbsd*)
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
380 ;;
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
381 *)
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
382 ARCH_DEFINES="-DI386_ASSEM"
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
383 x86_asm=yes
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
384 ;;
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
385 esac
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
386 ;;
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
387 esac
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
388
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
389 AC_SUBST([ARCH_DEFINES])
1518
0c5dc8ffcc42 [svn] - hook up paranormal -- client interface code doesn't exist yet though
nenolod
parents: 1503
diff changeset
390
0c5dc8ffcc42 [svn] - hook up paranormal -- client interface code doesn't exist yet though
nenolod
parents: 1503
diff changeset
391 dnl XXX delete ASAP -nenolod
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
392 AUD_CONDITIONAL([ARCH_X86], [arch_type], [ix86])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
393 AUD_CONDITIONAL([USE_X86ASM], [x86_asm])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
394 AUD_CONDITIONAL([HAVE_SOLARIS], [have_solaris])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
395 AUD_CONDITIONAL([HAVE_SUN], [have_sun])
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
396
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
397
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
398 ### ---------------------------------------------------------------------------
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
399 dnl Define plugin directories
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
400 dnl =========================
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
401 plugindir="$libdir/audacious"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
402 AC_SUBST([plugindir])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
403 AC_SUBST([pluginsubs])
1418
0d6d938bc936 [svn] - work around a possible autoconf bug causing datadir to be blank
nenolod
parents: 1408
diff changeset
404
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
405 AUD_DEFINE_PLUGIN_DIR([Input])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
406 AUD_DEFINE_PLUGIN_DIR([Output])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
407 AUD_DEFINE_PLUGIN_DIR([Effect])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
408 AUD_DEFINE_PLUGIN_DIR([General])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
409 AUD_DEFINE_PLUGIN_DIR([Visualization])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
410 AUD_DEFINE_PLUGIN_DIR([Container])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
411 AUD_DEFINE_PLUGIN_DIR([Transport])
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
412 AUD_DEFINE_PLUGIN_DIR([Discovery])
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
413
1747
44ed31f63ee4 [svn] - add back a test for libxml2, that way we'll still use xspf as default if available
nenolod
parents: 1746
diff changeset
414
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
415 ### ---------------------------------------------------------------------------
4484
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
416 dnl XXX Work around some autoconf bugs.
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
417 if test "x$prefix" = "xNONE"; then
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
418 prefix="${ac_default_prefix}"
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
419 fi
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
420
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
421 if test -z "$datadir"; then
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
422 datadir="${prefix}/share"
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
423 fi
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
424
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
425 localedir="$datadir/locale"
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
426 AC_SUBST([localedir])
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
427
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
428 AUDACIOUS_DEFINES="$CFLAGS -DDATA_DIR=\\\"$datadir/audacious\\\" -DPLUGIN_DIR=\\\"$plugindir\\\" -DPLUGINSUBS=$pluginsubs -DLOCALEDIR=\\\"$localedir\\\""
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
429 AC_SUBST([AUDACIOUS_DEFINES])
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
430
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
431
925df071b0c7 Imported and cleaned up some missing pieces of functionality from old configure.ac.
Matti Hamalainen <ccr@tnsp.org>
parents: 4483
diff changeset
432 ### ---------------------------------------------------------------------------
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
433 dnl Output configuration files
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
434 dnl ==========================
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
435 AC_CONFIG_FILES([
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
436 audacious.pc
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
437 audclient.pc
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
438 buildsys.mk
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
439 extra.mk
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
440 man/audtool.1
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
441 man/audacious.1
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
442 applications/audacious.desktop
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
443 po/Makefile.in
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
444 ])
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
445
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
446 AC_OUTPUT
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
447
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
448
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
449 ### ---------------------------------------------------------------------------
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
450 dnl Print out the results
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
451 dnl =====================
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
452 echo ""
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
453 echo "Configuration:"
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
454 echo ""
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
455 echo " Install path: $prefix"
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
456
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
457 if test "x$AUDACIOUS_PATH" != "xno"; then
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
458 echo " Current Audacious executable: $AUDACIOUS_PATH"
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
459 fi
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
460
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
461 echo " Use one plugin dir: $enable_one_plugin_dir"
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
462 echo " Allow user plugin dir: $enable_user_plugin_dir"
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
463 echo ""
2692
6abffd68fa59 [svn] - make --enable-chardet default.
yaz
parents: 2661
diff changeset
464 echo " Automatic character code detection: $enable_chardet"
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
465 echo " Sample rate conversion: $enable_samplerate"
2694
c2b82432c1b6 [svn] Added basic DBus support, disabled by default with a configuration option to enable it. The general and playback information/manipulation methods are currently the only ones implemented. That is version, play, pause, stop, playing, paused, stopped, status, and seek. There are stubs for many unimplemented methods.
magma
parents: 2692
diff changeset
466 echo " D-Bus support: $enable_dbus"
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
467 echo " Session management (eggsm) $enable_sm"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
468 echo " XSPF playlists $enable_xspf"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
469 echo ""
4233
74c6f3d3cf1d it buids successfully :)
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 3993
diff changeset
470 echo " SSE2: $enable_sse2"
74c6f3d3cf1d it buids successfully :)
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 3993
diff changeset
471 echo " AltiVec: $enable_altivec"
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
472 echo ""
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
473
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
474 if test "x$AUDACIOUS_PATH" != "xno" && test "x$prefix/bin/audacious" != "x$AUDACIOUS_PATH"; then
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
475 audlocation=`dirname $AUDACIOUS_PATH`
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
476 echo "**"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
477 echo "** NOTICE! Configure has discovered that you already have Audacious installed"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
478 echo "** and it does not match with the given --prefix. You have Audacious installed"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
479 echo "** in ${audlocation} and you chose ${prefix}/bin."
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
480 echo "**"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
481 echo "** If you don't want two copies of Audacious installed, rerun configure with"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
482 echo "** the --prefix option set to the location of the old Audacious, or uninstall"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
483 echo "** the old Audacious."
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
484 echo "**"
0
cb178e5ad177 [svn] Import audacious source.
nenolod
parents:
diff changeset
485 fi
4476
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
486
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
487 if test "x$enable_dbus" != "xyes"; then
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
488 echo "**"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
489 echo "** WARNING! DBUS support is disabled. This means that various features"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
490 echo "** the user might expect (such as remotely adding files to session via"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
491 echo "** commandline) will not work!"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
492 echo "**"
1ff0224469a8 Beginnings of a configure/builsystem cleanup (and partial refactoring).
Matti Hamalainen <ccr@tnsp.org>
parents: 4465
diff changeset
493 fi