libmcs
changeset 146:fbcbfe9cc60f
Automated merge with ssh://hg.atheme.org//hg/libmcs
| author | William Pitcock <nenolod@atheme.org> |
|---|---|
| date | Sat Oct 20 18:47:47 2007 -0500 (2007-10-20) |
| parents | cf624481f7e9 ba790df035f7 |
| children | 1589bbe93884 |
| files |
line diff
1.1 --- a/configure.ac Sat Oct 20 18:47:04 2007 -0500 1.2 +++ b/configure.ac Sat Oct 20 18:47:47 2007 -0500 1.3 @@ -49,16 +49,15 @@ 1.4 ) 1.5 1.6 if test "$enable_gconf" = "yes"; then 1.7 - PKG_CHECK_MODULES(GCONF, [gconf-2.0 >= 2.6.0], [], 1.8 + PKG_CHECK_MODULES(GCONF, [gconf-2.0 >= 2.6.0], 1.9 + [ 1.10 + GCONF_BUILD="gconf" 1.11 + ], 1.12 [ 1.13 AC_MSG_WARN([Cannot find GConf, disabling GConf support]) 1.14 enable_gconf="no" 1.15 ] 1.16 ) 1.17 -fi 1.18 - 1.19 -if test "$enable_gconf" = "yes"; then 1.20 - GCONF_BUILD="gconf" 1.21 else 1.22 enable_gconf="no" 1.23 fi 1.24 @@ -77,16 +76,15 @@ 1.25 CXXFLAGS="$CXXFLAGS -I/usr/kde/3.5/include -I/usr/qt/3/include" 1.26 LDFLAGS="$LDFLAGS -L/usr/kde/3.5/lib -I/usr/qt/3/lib" 1.27 1.28 - AC_CHECK_LIB([kdecore], [main], [], 1.29 + AC_CHECK_LIB([kdecore], [main], 1.30 + [ 1.31 + KCONFIG_BUILD="kconfig" 1.32 + ], 1.33 [ 1.34 AC_MSG_WARN([Cannot find libkdecore, disabling KDE KConfig support]) 1.35 enable_kconfig="no" 1.36 ] 1.37 ) 1.38 -fi 1.39 - 1.40 -if test "$enable_kconfig" = "yes"; then 1.41 - KCONFIG_BUILD="kconfig" 1.42 else 1.43 enable_kconfig="no" 1.44 fi
