comparison configure.ac @ 729:92c284766c49

Synchronize changes from Audacious port.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 06 Nov 2009 16:20:19 +0200
parents 171f42746b88
children 337b3c17b4db
comparison
equal deleted inserted replaced
728:171f42746b88 729:92c284766c49
103 if test "x$xs_have_sidplay2" = "xyes"; then 103 if test "x$xs_have_sidplay2" = "xyes"; then
104 AC_DEFINE([HAVE_SIDPLAY2]) 104 AC_DEFINE([HAVE_SIDPLAY2])
105 AC_LANG_PUSH([C++]) 105 AC_LANG_PUSH([C++])
106 106
107 XS_BUILDERS_CHECK 107 XS_BUILDERS_CHECK
108 xs_builders_available="no"
108 XS_BUILDERS_FIND([reSID], [resid-builder], [resid.h], [ReSIDBuilder]) 109 XS_BUILDERS_FIND([reSID], [resid-builder], [resid.h], [ReSIDBuilder])
109 XS_BUILDERS_FIND([HardSID], [hardsid-builder], [hardsid.h], [HardSID]) 110 XS_BUILDERS_FIND([HardSID], [hardsid-builder], [hardsid.h], [HardSID])
110 if test "x$xs_builders_available" = "xno"; then 111 if test "x$xs_builders_available" = "xno"; then
111 AC_MSG_ERROR([No builder modules were found in the sidbuilders directory!]); 112 AC_MSG_ERROR([No builder modules were found in the sidbuilders directory!]);
112 fi 113 fi
118 CPPFLAGS="$CPPFLAGS -I${xs_sidplay2_includes}" 119 CPPFLAGS="$CPPFLAGS -I${xs_sidplay2_includes}"
119 fi 120 fi
120 AC_EGREP_HEADER([::Iid], [sidplay/sidplay2.h], 121 AC_EGREP_HEADER([::Iid], [sidplay/sidplay2.h],
121 [xs_have_sidplay2_api="yes"], 122 [xs_have_sidplay2_api="yes"],
122 [ 123 [
123 AC_EGREP_HEADER([SIDIID], 124 AC_EGREP_HEADER([SIDIID], [sidplay/sidplay2.h],
124 [xs_have_sidplay2_api="yes"], 125 [xs_have_sidplay2_api="yes"],
125 [xs_have_sidplay2_api="(old style API)"]) 126 [xs_have_sidplay2_api="(old style API)"])
126 ] 127 ]
127 ) 128 )
128 if test "x$xs_have_sidplay2_api" = "xyes"; then 129 if test "x$xs_have_sidplay2_api" = "xyes"; then
130 AC_LANG_PROGRAM( 131 AC_LANG_PROGRAM(
131 [#include <sidplay/sidunknown.h>], 132 [#include <sidplay/sidunknown.h>],
132 [ISidUnknown *i;]) 133 [ISidUnknown *i;])
133 ], [ 134 ], [
134 xs_have_sidplay2_api="(new COMI style API)" 135 xs_have_sidplay2_api="(new COMI style API)"
135 AC_DEFINE([HAVE_SIDPLAY2_COMI]) 136 AC_DEFINE([HAVE_SIDPLAY2_COMI], [1], [Define if using new libSIDPlay2 with COM-style API.])
136 ],[ 137 ],[
137 xs_have_sidplay2_api="(broken version!)" 138 xs_have_sidplay2_api="(broken version!)"
138 ]) 139 ])
139 fi 140 fi
140 AC_MSG_RESULT([$xs_have_sidplay2_api]) 141 AC_MSG_RESULT([$xs_have_sidplay2_api])