|
Lines 495-502
Link Here
|
| 495 |
AC_MSG_NOTICE([ not building text-mode ... requires ncurses library]) |
495 |
AC_MSG_NOTICE([ not building text-mode ... requires ncurses library]) |
| 496 |
elif test "$have_panel" = "no"; then |
496 |
elif test "$have_panel" = "no"; then |
| 497 |
AC_MSG_NOTICE([ not building text-mode ... requires panel library]) |
497 |
AC_MSG_NOTICE([ not building text-mode ... requires panel library]) |
| 498 |
elif test "$have_ha_glib" = "no"; then |
498 |
#elif test "$have_ha_glib" = "no"; then |
| 499 |
AC_MSG_NOTICE([ not building text-mode ... requires $ha_glib library]) |
499 |
# AC_MSG_NOTICE([ not building text-mode ... requires $ha_glib library]) |
| 500 |
elif test "$have_math" = "no"; then |
500 |
elif test "$have_math" = "no"; then |
| 501 |
AC_MSG_NOTICE([ not building text-mode ... requires math library]) |
501 |
AC_MSG_NOTICE([ not building text-mode ... requires math library]) |
| 502 |
else |
502 |
else |
|
Lines 920-926
Link Here
|
| 920 |
fi |
920 |
fi |
| 921 |
fi |
921 |
fi |
| 922 |
|
922 |
|
|
|
923 |
ha_glib=glib |
| 924 |
have_ha_glib=$have_glib |
| 925 |
HA_GLIB_CPPFLAGS=$GLIB_CPPFLAGS |
| 926 |
HA_GLIB_LIBS=$GLIB_LIBS |
| 927 |
|
| 923 |
if test "x$no_glib2" = x; then |
928 |
if test "x$no_glib2" = x; then |
|
|
929 |
ha_glib=glib2 |
| 930 |
have_ha_glib=$have_glib2 |
| 931 |
HA_GLIB_CPPFLAGS=$GLIB2_CPPFLAGS |
| 932 |
HA_GLIB_LIBS=$GLIB2_LIBS |
| 924 |
AC_MSG_RESULT([yes]) |
933 |
AC_MSG_RESULT([yes]) |
| 925 |
ifelse([$2], , :, [$2]) |
934 |
ifelse([$2], , :, [$2]) |
| 926 |
else |
935 |
else |
|
Lines 1286-1295
Link Here
|
| 1286 |
[ifelse([$3], , :, [$3])]) |
1295 |
[ifelse([$3], , :, [$3])]) |
| 1287 |
fi |
1296 |
fi |
| 1288 |
|
1297 |
|
| 1289 |
ha_glib=glib |
1298 |
#ha_glib=glib |
| 1290 |
have_ha_glib=$have_glib |
1299 |
#have_ha_glib=$have_glib |
| 1291 |
HA_GLIB_CPPFLAGS=$GLIB_CPPFLAGS |
1300 |
#HA_GLIB_CPPFLAGS=$GLIB_CPPFLAGS |
| 1292 |
HA_GLIB_LIBS=$GLIB_LIBS |
1301 |
#HA_GLIB_LIBS=$GLIB_LIBS |
| 1293 |
|
1302 |
|
| 1294 |
if test "$have_ha_version" = "yes"; then |
1303 |
if test "$have_ha_version" = "yes"; then |
| 1295 |
if test -d /usr/include/heartbeat -a \ |
1304 |
if test -d /usr/include/heartbeat -a \ |
