Mercurial > hg > xmms-sid

comparison configure.in @ 690:5066bced5160

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes in distortion patch and libsidplay2 COM API detection.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 22 May 2008 08:03:52 +0300
parents 0c4e0feca4df
children 52d1cd646f08
comparison
equal deleted inserted replaced
689:0c4e0feca4df 690:5066bced5160
102 xs_have_sidplay2_api="" 102 xs_have_sidplay2_api=""
103 xs_have_distortion="no" 103 xs_have_distortion="no"
104 if test "x$xs_have_sidplay2" = "xyes"; then 104 if test "x$xs_have_sidplay2" = "xyes"; then
105 AC_DEFINE([HAVE_SIDPLAY2]) 105 AC_DEFINE([HAVE_SIDPLAY2])
106 AC_LANG_PUSH([C++]) 106 AC_LANG_PUSH([C++])
107
107 XS_BUILDERS_CHECK 108 XS_BUILDERS_CHECK
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 AC_LANG_POP([C++])
111 if test "x$xs_builders_available" = "xno"; then 111 if test "x$xs_builders_available" = "xno"; then
112 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!]);
113 fi 113 fi
114 114
115 dnl *** Check for new COMI API 115 dnl *** Check for new COMI API
116 AC_MSG_CHECKING([libSIDPlay2 API style]) 116 AC_MSG_CHECKING([libSIDPlay2 API style])
117 tmp_CPPFLAGS="$CPPFLAGS" 117 tmp_CPPFLAGS="$CPPFLAGS"
118 if test -d "$xs_sidplay2_includes"; then 118 if test -d "$xs_sidplay2_includes"; then
119 CPPFLAGS="$CPPFLAGS -I${xs_sidplay2_includes}" 119 CPPFLAGS="$CPPFLAGS -I${xs_sidplay2_includes}"
120 fi 120 fi
121 AC_EGREP_HEADER([SIDIID], [sidplay/sidplay2.h], [ 121 AC_EGREP_HEADER([SIDIID], [sidplay/sidplay2.h],
122 [xs_have_sidplay2_api="yes"],
123 [xs_have_sidplay2_api="no"]
124 )
125 if test "x$xs_have_sidplay2_api" = "xyes"; then
126 AC_LINK_IFELSE([
127 AC_LANG_PROGRAM(
128 [#include <sidplay/sidunknown.h>],
129 [ISidUnknown *i;])
130 ], [
122 xs_have_sidplay2_api="(new COMI style API)" 131 xs_have_sidplay2_api="(new COMI style API)"
123 AC_DEFINE([HAVE_SIDPLAY2_COMI]) 132 AC_DEFINE([HAVE_SIDPLAY2_COMI])
124 ],[ 133 ],[
125 xs_have_sidplay2_api="(old style API)" 134 xs_have_sidplay2_api="(old style API)"
126 ]) 135 ])
127 AC_MSG_RESULT([$xs_sidplay2_api]) 136 fi
137 AC_MSG_RESULT([$xs_have_sidplay2_api])
138
139 AC_LANG_POP([C++])
128 140
129 dnl *** Check for distortion patch 141 dnl *** Check for distortion patch
130 AC_MSG_CHECKING([libSIDPlay2+reSID distortion patch]) 142 AC_MSG_CHECKING([libSIDPlay2+reSID distortion patch])
131 AC_EGREP_HEADER([minimumfetresistance], [sidplay/sidtypes.h], [ 143 AC_EGREP_HEADER([minimumfetresistance], [sidplay/sidtypes.h], [
132 xs_have_distortion="yes" 144 xs_have_distortion="yes"
133 AC_DEFINE([HAVE_SIDPLAY2_DISTORTION]) 145 AC_DEFINE([HAVE_SIDPLAY2_DISTORTION])
134 ],[ 146 ],[
135 xs_have_distortion="no" 147 xs_have_distortion="no"
136 ]) 148 ])
137 AC_MSG_RESULT([$xs_sidplay2_api]) 149 AC_MSG_RESULT([$xs_have_distortion])
138 CPPFLAGS="$tmp_CPPFLAGS" 150 CPPFLAGS="$tmp_CPPFLAGS"
139 fi 151 fi
140 152
141 153
142 dnl *** 154 dnl ***