View | Details | Raw Unified
Collapse All | Expand All

(-) /root/aclocal.m4.old (-6 / +15 lines)
 Lines 495-502    Link Here  
	AC_MSG_NOTICE([     not building text-mode ... requires ncurses library])
	AC_MSG_NOTICE([     not building text-mode ... requires ncurses library])
elif test "$have_panel" = "no"; then
elif test "$have_panel" = "no"; then
	AC_MSG_NOTICE([     not building text-mode ... requires panel library])
	AC_MSG_NOTICE([     not building text-mode ... requires panel library])
elif test "$have_ha_glib" = "no"; then
 
#elif test "$have_ha_glib" = "no"; then
 
	AC_MSG_NOTICE([     not building text-mode ... requires $ha_glib library])
 
#	AC_MSG_NOTICE([     not building text-mode ... requires $ha_glib library])
 
elif test "$have_math" = "no"; then
elif test "$have_math" = "no"; then
	AC_MSG_NOTICE([     not building text-mode ... requires math library])
	AC_MSG_NOTICE([     not building text-mode ... requires math library])
else
else
 Lines 920-926    Link Here  
	fi
	fi
fi
fi

            

              
              
ha_glib=glib

            

            

              
              
have_ha_glib=$have_glib

            

            

              
              
HA_GLIB_CPPFLAGS=$GLIB_CPPFLAGS

            

            

              
              
HA_GLIB_LIBS=$GLIB_LIBS

            

            

              
              

            

        
if test "x$no_glib2" = x; then
if test "x$no_glib2" = x; then

            

              
              
	ha_glib=glib2

            

            

              
              
	have_ha_glib=$have_glib2

            

            

              
              
	HA_GLIB_CPPFLAGS=$GLIB2_CPPFLAGS

            

            

              
              
	HA_GLIB_LIBS=$GLIB2_LIBS

            

        
	AC_MSG_RESULT([yes])
	AC_MSG_RESULT([yes])

        
	ifelse([$2], , :, [$2])
	ifelse([$2], , :, [$2])

        
else
else

  

    

    

       Lines 1286-1295
       
    
  Link Here 
    

  

        
		   [ifelse([$3], , :, [$3])])
		   [ifelse([$3], , :, [$3])])

        
fi
fi

        

            

              
ha_glib=glib

              
#ha_glib=glib

            

            

              
have_ha_glib=$have_glib

              
#have_ha_glib=$have_glib

            

            

              
HA_GLIB_CPPFLAGS=$GLIB_CPPFLAGS

              
#HA_GLIB_CPPFLAGS=$GLIB_CPPFLAGS

            

            

              
HA_GLIB_LIBS=$GLIB_LIBS

              
#HA_GLIB_LIBS=$GLIB_LIBS

            

        

        
if test "$have_ha_version" = "yes"; then
if test "$have_ha_version" = "yes"; then

        
	if test -d /usr/include/heartbeat -a	\
	if test -d /usr/include/heartbeat -a	\