Mercurial > geeqie.yaz
comparison configure.in @ 1660:3ba101d04c91
Fix AM_CFLAGS and AM_CXXFLAGS from @1701
The commit 1701 did insert wrong lines for AM_CFLAGS and AM_CXXFLAGS to
src/Makefile.am.
I also did some minor whitespace fixes and made the internal
documentation consistent by using \ than @ for doxygen doc.
author | mow |
---|---|
date | Sat, 27 Jun 2009 22:56:50 +0000 |
parents | 8efd65465de5 |
children | b90e261c6d5d |
comparison
equal
deleted
inserted
replaced
1659:ae9441cb4409 | 1660:3ba101d04c91 |
---|---|
101 fi | 101 fi |
102 | 102 |
103 AM_CONDITIONAL(DEBUG, test x$enable_debug_flags = xyes) | 103 AM_CONDITIONAL(DEBUG, test x$enable_debug_flags = xyes) |
104 | 104 |
105 AC_ARG_ENABLE(deprecated, [ | 105 AC_ARG_ENABLE(deprecated, [ |
106 AC_HELP_STRING([--enable-deprecated], [turn off checking of deprecated functions [default=yes]])], [], | 106 AC_HELP_STRING([--enable-deprecated], [turn off checking of deprecated functions [default=yes]])], [], |
107 [ | 107 [ |
108 if test "x${enable_developer}" != "xyes" | 108 if test "x${enable_developer}" != "xyes" |
109 then | 109 then |
110 enable_deprecated="no" | 110 enable_deprecated="no" |
111 else | 111 else |
280 AC_MSG_WARN([$LCMS_PKG_ERRORS]) | 280 AC_MSG_WARN([$LCMS_PKG_ERRORS]) |
281 ]) | 281 ]) |
282 else | 282 else |
283 HAVE_LCMS=disabled | 283 HAVE_LCMS=disabled |
284 fi | 284 fi |
285 | 285 |
286 AM_CONDITIONAL(HAVE_LCMS, [test "x$HAVE_LCMS" = xyes]) | 286 AM_CONDITIONAL(HAVE_LCMS, [test "x$HAVE_LCMS" = xyes]) |
287 AC_SUBST(LCMS_CFLAGS) | 287 AC_SUBST(LCMS_CFLAGS) |
288 AC_SUBST(LCMS_LIBS) | 288 AC_SUBST(LCMS_LIBS) |
289 | 289 |
290 | 290 |
306 AC_MSG_WARN([$EXIV2_PKG_ERRORS]) | 306 AC_MSG_WARN([$EXIV2_PKG_ERRORS]) |
307 ]) | 307 ]) |
308 else | 308 else |
309 HAVE_EXIV2=disabled | 309 HAVE_EXIV2=disabled |
310 fi | 310 fi |
311 | 311 |
312 AM_CONDITIONAL(HAVE_EXIV2, [test "x$HAVE_EXIV2" = xyes]) | 312 AM_CONDITIONAL(HAVE_EXIV2, [test "x$HAVE_EXIV2" = xyes]) |
313 AC_SUBST(EXIV2_CFLAGS) | 313 AC_SUBST(EXIV2_CFLAGS) |
314 AC_SUBST(EXIV2_LIBS) | 314 AC_SUBST(EXIV2_LIBS) |
315 | 315 |
316 | 316 |
365 AC_MSG_WARN([$LIBCHAMPLAIN_GTK_PKG_ERRORS]) | 365 AC_MSG_WARN([$LIBCHAMPLAIN_GTK_PKG_ERRORS]) |
366 ]) | 366 ]) |
367 else | 367 else |
368 HAVE_LIBCHAMPLAIN_GTK=disabled | 368 HAVE_LIBCHAMPLAIN_GTK=disabled |
369 fi | 369 fi |
370 | 370 |
371 AM_CONDITIONAL(HAVE_LIBCHAMPLAIN_GTK, [test "x$HAVE_LIBCHAMPLAIN_GTK" = xyes]) | 371 AM_CONDITIONAL(HAVE_LIBCHAMPLAIN_GTK, [test "x$HAVE_LIBCHAMPLAIN_GTK" = xyes]) |
372 AC_SUBST(LIBCHAMPLAIN_GTK_CFLAGS) | 372 AC_SUBST(LIBCHAMPLAIN_GTK_CFLAGS) |
373 AC_SUBST(LIBCHAMPLAIN_GTK_LIBS) | 373 AC_SUBST(LIBCHAMPLAIN_GTK_LIBS) |
374 | 374 |
375 AH_TOP([ | 375 AH_TOP([ |
376 /** @file config.h | 376 /** \file |
377 * autogenerated definition by autoheader. | 377 * \short autogenerated definition by autoheader. |
378 * @author Bruclik | 378 * \author Bruclik |
379 */ | 379 */ |
380 | 380 |
381 /* | 381 /* |
382 * This file is a part of Geeqie project (http://geeqie.sourceforge.net/). | 382 * This file is a part of Geeqie project (http://geeqie.sourceforge.net/). |
383 * Copyright (C) 2008 - 2009 The Geeqie Team | 383 * Copyright (C) 2008 - 2009 The Geeqie Team |
384 * | 384 * |
385 * This program is free software; you can redistribute it and/or modify | 385 * This program is free software; you can redistribute it and/or modify |
386 * it under the terms of the GNU General Public License as published by | 386 * it under the terms of the GNU General Public License as published by |
387 * the Free Software Foundation; either version 2 of the License, or | 387 * the Free Software Foundation; either version 2 of the License, or |
388 * (at your option) any later version. | 388 * (at your option) any later version. |
389 * | 389 * |
390 * This program is distributed in the hope that it will be useful, | 390 * This program is distributed in the hope that it will be useful, |
391 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 391 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
392 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 392 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
393 * GNU General Public License for more details. | 393 * GNU General Public License for more details. |
394 */ | 394 */ |
395 | 395 |
396 #ifndef _INCLUDE_CONFIG_H | 396 #ifndef _INCLUDE_CONFIG_H |
397 #define _INCLUDE_CONFIG_H | 397 #define _INCLUDE_CONFIG_H |
398 ]) | 398 ]) |
399 | 399 |
400 AH_BOTTOM([#endif]) | 400 AH_BOTTOM([#endif]) |