[Adonthell-commits] CVS: adonthell configure.in,1.50.2.17,1.50.2.18

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell
In directory subversions:/tmp/cvs-serv18083

Modified Files:
      Tag: Branch_road_to_0-4
        configure.in 
Log Message:
FIXES for autoconf 2.53 and automake 1.6


Index: configure.in
===================================================================
RCS file: /cvsroot/adonthell/adonthell/configure.in,v
retrieving revision 1.50.2.17
retrieving revision 1.50.2.18
diff -C2 -r1.50.2.17 -r1.50.2.18
*** configure.in        2 Jul 2002 13:23:01 -0000       1.50.2.17
--- configure.in        12 Sep 2002 20:18:14 -0000      1.50.2.18
***************
*** 13,16 ****
--- 13,17 ----
  
  CFLAGS="-g -Wall -fno-exceptions -fno-rtti"
+ CPPFLAGS=""
  DEFS=""
  
***************
*** 269,278 ****
  if test x$tools = xno; then
        AC_MSG_RESULT(no)
-       AM_CONDITIONAL(BUILD_TOOLS, false)
  else
-       AM_CONDITIONAL(BUILD_TOOLS, true)
        AC_MSG_RESULT(yes)
  fi
  
  
  dnl ***************************
--- 270,278 ----
  if test x$tools = xno; then
        AC_MSG_RESULT(no)
  else
        AC_MSG_RESULT(yes)
  fi
  
+ AM_CONDITIONAL(BUILD_TOOLS, test x$tools = xyes)
  
  dnl ***************************
***************
*** 283,294 ****
        AM_PATH_GTK(1.2.5, havegtk=yes, havegtk=no)
  
!       if test "$havegtk" = yes; then
!               AM_CONDITIONAL(HAVE_GTK, true)
!       else
                AC_MSG_RESULT(disabling tools that need GTK+)
-               AM_CONDITIONAL(HAVE_GTK, false)
        fi
  fi
  
  dnl ****************************************
  dnl Check whether to build the documentation
--- 283,293 ----
        AM_PATH_GTK(1.2.5, havegtk=yes, havegtk=no)
  
!       if test "$havegtk" = no; then
                AC_MSG_RESULT(disabling tools that need GTK+)
        fi
  fi
  
+ AM_CONDITIONAL(HAVE_GTK, test x$havegtk = xyes)
+ 
  dnl ****************************************
  dnl Check whether to build the documentation
***************
*** 298,306 ****
  if test x$builddoc = xno; then
        AC_MSG_RESULT(no)
-       AM_CONDITIONAL(BUILD_DOC, false)
  else
-       AM_CONDITIONAL(BUILD_DOC, true)
        AC_MSG_RESULT(yes)
  fi
  
  dnl *****************************************************
--- 297,305 ----
  if test x$builddoc = xno; then
        AC_MSG_RESULT(no)
  else
        AC_MSG_RESULT(yes)
  fi
+ 
+ AM_CONDITIONAL(BUILD_DOC, test x$builddoc = xyes)
  
  dnl *****************************************************