Mercurial > ~mikael > mcabber > hg
comparison mcabber/configure.ac @ 1834:d3d4d1c1cb00
Fix previous changeset (760affbebb96)
INSTALL_HEADERS wasn't set anymore after the configure.ac change.
BTW, consistently use AC_HELP_STRING.
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sat, 27 Mar 2010 15:49:14 +0100 |
parents | 760affbebb96 |
children | a09eddfdb6e8 |
comparison
equal
deleted
inserted
replaced
1833:760affbebb96 | 1834:d3d4d1c1cb00 |
---|---|
70 # Check for tm_gmtoff | 70 # Check for tm_gmtoff |
71 MC_TM_GMTOFF | 71 MC_TM_GMTOFF |
72 | 72 |
73 # Check if we must provide a SIGWINCH handler | 73 # Check if we must provide a SIGWINCH handler |
74 AC_ARG_ENABLE(sigwinch, | 74 AC_ARG_ENABLE(sigwinch, |
75 [ --enable-sigwinch compile with SIGWINCH handler], | 75 AC_HELP_STRING([--enable-sigwinch], [compile with SIGWINCH handler]), |
76 [with_sigwinch=$enableval], | 76 [with_sigwinch=$enableval], |
77 [with_sigwinch=$with_ext_funcs]) | 77 [with_sigwinch=$with_ext_funcs]) |
78 AC_MSG_RESULT($with_sigwinch) | 78 AC_MSG_RESULT($with_sigwinch) |
79 if test "$with_sigwinch" = yes; then | 79 if test "$with_sigwinch" = yes; then |
80 AC_DEFINE([USE_SIGWINCH], [], [Provide own SIGWINCH handler]) | 80 AC_DEFINE([USE_SIGWINCH], [], [Provide own SIGWINCH handler]) |
168 AC_DEFINE(HAVE_LIBIDN, 1, [Define to 1 if you want Libidn.]) | 168 AC_DEFINE(HAVE_LIBIDN, 1, [Define to 1 if you want Libidn.]) |
169 fi | 169 fi |
170 fi | 170 fi |
171 | 171 |
172 # Check for gpgme | 172 # Check for gpgme |
173 AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--disable-gpgme], [disable GPGME support]), | 173 AC_ARG_ENABLE(gpgme, |
174 AC_HELP_STRING([--disable-gpgme], [disable GPGME support]), | |
174 [ if test x"$enableval" = x"no"; then | 175 [ if test x"$enableval" = x"no"; then |
175 enable_gpgme=no | 176 enable_gpgme=no |
176 fi | 177 fi |
177 ]) | 178 ]) |
178 | 179 |
180 AM_PATH_GPGME(1.0.0, AC_DEFINE([HAVE_GPGME], 1, | 181 AM_PATH_GPGME(1.0.0, AC_DEFINE([HAVE_GPGME], 1, |
181 [Define if you use GPGME to support OpenPGP])) | 182 [Define if you use GPGME to support OpenPGP])) |
182 fi | 183 fi |
183 | 184 |
184 # Check for otr | 185 # Check for otr |
185 AC_ARG_ENABLE(otr, [ --enable-otr enable OTR (Off-the-Record) messaging support], | 186 AC_ARG_ENABLE(otr, |
187 AC_HELP_STRING([--enable-otr], | |
188 [enable OTR (Off-the-Record) messaging support]), | |
186 enable_otr=$enableval, otr="") | 189 enable_otr=$enableval, otr="") |
187 if test "x$enable_otr" = "xyes"; then | 190 if test "x$enable_otr" = "xyes"; then |
188 # Look for libgcrypt and libotr | 191 # Look for libgcrypt and libotr |
189 AM_PATH_LIBGCRYPT(1.2.2, [ | 192 AM_PATH_LIBGCRYPT(1.2.2, [ |
190 AM_PATH_LIBOTR(3.1.0, , | 193 AM_PATH_LIBOTR(3.1.0, , |
192 ], AC_MSG_ERROR(libgcrypt 1.2.2 or newer is required.) | 195 ], AC_MSG_ERROR(libgcrypt 1.2.2 or newer is required.) |
193 ) | 196 ) |
194 fi | 197 fi |
195 | 198 |
196 # Check for Enchant stuff | 199 # Check for Enchant stuff |
197 AC_ARG_ENABLE(enchant, [ --enable-enchant enable enchant support], | 200 AC_ARG_ENABLE(enchant, |
201 AC_HELP_STRING([--enable-enchant], [enable enchant support]), | |
198 enable_enchant=$enableval, enchant="") | 202 enable_enchant=$enableval, enchant="") |
199 # Check for Aspell stuff | 203 # Check for Aspell stuff |
200 AC_ARG_ENABLE(aspell, [ --enable-aspell enable aspell support], | 204 AC_ARG_ENABLE(aspell, |
205 AC_HELP_STRING([--enable-aspell], [enable aspell support]), | |
201 enable_aspell=$enableval, aspell="") | 206 enable_aspell=$enableval, aspell="") |
202 | 207 |
203 if test "x$enable_enchant" = "xyes"; then | 208 if test "x$enable_enchant" = "xyes"; then |
204 PKG_CHECK_MODULES(ENCHANT, [enchant], | 209 PKG_CHECK_MODULES(ENCHANT, [enchant], |
205 AC_DEFINE(WITH_ENCHANT, 1, [Define if you want enchant support]) | 210 AC_DEFINE(WITH_ENCHANT, 1, [Define if you want enchant support]) |
228 | 233 |
229 # Export $libexecdir to the source tree | 234 # Export $libexecdir to the source tree |
230 AC_DEFINE_DIR(PKGLIB_DIR, "${libdir}/${PACKAGE}", [Modules directory]) | 235 AC_DEFINE_DIR(PKGLIB_DIR, "${libdir}/${PACKAGE}", [Modules directory]) |
231 | 236 |
232 AC_ARG_ENABLE(debug, | 237 AC_ARG_ENABLE(debug, |
233 [AC_HELP_STRING(--enable-debug, add development compilation options)], | 238 AC_HELP_STRING([--enable-debug], [add development compilation options]), |
234 debug=$enableval, debug="") | 239 debug=$enableval, debug="") |
235 if test x"${debug}" = x"yes"; then | 240 if test x"${debug}" = x"yes"; then |
236 AC_DEFINE_UNQUOTED([ENABLE_DEBUG],[1],[Devel compilation options]) | 241 AC_DEFINE_UNQUOTED([ENABLE_DEBUG],[1],[Devel compilation options]) |
237 if test "x$GCC" = "xyes"; then | 242 if test "x$GCC" = "xyes"; then |
238 if test "$gccvernum" -ge "400"; then | 243 if test "$gccvernum" -ge "400"; then |
246 else | 251 else |
247 CFLAGS="-O2 $CFLAGS" | 252 CFLAGS="-O2 $CFLAGS" |
248 fi | 253 fi |
249 | 254 |
250 AC_ARG_ENABLE(hgcset, | 255 AC_ARG_ENABLE(hgcset, |
251 [AC_HELP_STRING(--disable-hgcset, do not use Mercurial changeset value)], | 256 AC_HELP_STRING([--disable-hgcset], [do not use Mercurial changeset value]), |
252 hgcset=$enableval, hgcset="yes") | 257 hgcset=$enableval, hgcset="yes") |
253 AM_CONDITIONAL(HGCSET, [test x$hgcset = xyes]) | 258 AM_CONDITIONAL(HGCSET, [test x$hgcset = xyes]) |
254 if test "${hgcset}" = "yes"; then | 259 if test "${hgcset}" = "yes"; then |
255 AC_DEFINE([ENABLE_HGCSET], 1, [Use Mercurial changeset]) | 260 AC_DEFINE([ENABLE_HGCSET], 1, [Use Mercurial changeset]) |
256 fi | 261 fi |
257 | 262 |
258 AM_CONDITIONAL([OTR], [test x$libotr_found = xyes]) | 263 AM_CONDITIONAL([OTR], [test x$libotr_found = xyes]) |
259 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules = xyes]) | 264 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xyes]) |
260 | 265 |
261 # Prepare some config.h variables | 266 # Prepare some config.h variables |
262 AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch]) | 267 AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch]) |
263 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string]) | 268 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string]) |
264 | 269 |