[Adonthell-commits] CVS: adonthell config.status,1.16,1.17 configure.in,1.68,1.69

[Kai Sterker <address@hidden>]

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

Modified Files:
        config.status configure.in 
Log Message:
FIXED configure script to work in all cases

Index: config.status
===================================================================
RCS file: /cvsroot/adonthell/adonthell/Attic/config.status,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** config.status       22 Aug 2002 17:56:40 -0000      1.16
--- config.status       24 Aug 2002 18:59:25 -0000      1.17
***************
*** 282,286 ****
  adonthell config.status 0.3.3pre1
  configured by ./configure, generated by GNU Autoconf 2.53,
!   with options \"'--enable-doc' '--enable-py-debug' '--enable-tools'\"
  
  Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
--- 282,286 ----
  adonthell config.status 0.3.3pre1
  configured by ./configure, generated by GNU Autoconf 2.53,
!   with options \"'--enable-py-debug'\"
  
  Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
***************
*** 312,317 ****
    # Handling of the options.
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     echo "running /bin/sh ./configure " '--enable-doc' '--enable-py-debug' 
'--enable-tools' " --no-create --no-recursion"
!     exec /bin/sh ./configure '--enable-doc' '--enable-py-debug' 
'--enable-tools' --no-create --no-recursion ;;
    --version | --vers* | -V )
      echo "$ac_cs_version"; exit 0 ;;
--- 312,317 ----
    # Handling of the options.
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     echo "running /bin/sh ./configure " '--enable-py-debug' " --no-create 
--no-recursion"
!     exec /bin/sh ./configure '--enable-py-debug' --no-create --no-recursion ;;
    --version | --vers* | -V )
      echo "$ac_cs_version"; exit 0 ;;
***************
*** 555,569 ****
  s,@haveldd@,/usr/bin/ldd,;t t
  s,@P_SWIG@,/usr/local/bin/swig,;t t
! s,@BUILD_TOOLS_TRUE@,,;t t
! s,@BUILD_TOOLS_FALSE@,#,;t t
! s,@GTK_CONFIG@,/usr/bin/gtk-config,;t t
! s,@GTK_CFLAGS@,-I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 
-I/usr/lib/glib/include -I/usr/X11R6/include,;t t
! s,@GTK_LIBS@,-L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule 
-lglib -ldl -lXi -lXext -lX11 -lm,;t t
! s,@HAVE_GTK_TRUE@,,;t t
! s,@HAVE_GTK_FALSE@,#,;t t
! s,@BUILD_DOC_TRUE@,,;t t
! s,@BUILD_DOC_FALSE@,#,;t t
! s,@P_DOXYGEN@,/usr/local/bin/doxygen,;t t
! s,@P_DOT@,/usr/bin/dot,;t t
  s,@HAVE_OGG_VORBIS_TRUE@,,;t t
  s,@HAVE_OGG_VORBIS_FALSE@,#,;t t
--- 555,569 ----
  s,@haveldd@,/usr/bin/ldd,;t t
  s,@P_SWIG@,/usr/local/bin/swig,;t t
! s,@BUILD_TOOLS_TRUE@,#,;t t
! s,@BUILD_TOOLS_FALSE@,,;t t
! s,@GTK_CONFIG@,,;t t
! s,@GTK_CFLAGS@,,;t t
! s,@GTK_LIBS@,,;t t
! s,@HAVE_GTK_TRUE@,#,;t t
! s,@HAVE_GTK_FALSE@,,;t t
! s,@BUILD_DOC_TRUE@,#,;t t
! s,@BUILD_DOC_FALSE@,,;t t
! s,@P_DOXYGEN@,,;t t
! s,@P_DOT@,,;t t
  s,@HAVE_OGG_VORBIS_TRUE@,,;t t
  s,@HAVE_OGG_VORBIS_FALSE@,#,;t t

Index: configure.in
===================================================================
RCS file: /cvsroot/adonthell/adonthell/configure.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -r1.68 -r1.69
*** configure.in        22 Aug 2002 17:56:40 -0000      1.68
--- configure.in        24 Aug 2002 18:59:25 -0000      1.69
***************
*** 312,321 ****
  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 ***************************
--- 312,320 ----
  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 ***************************
***************
*** 326,337 ****
        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
--- 325,335 ----
        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 = xtrue)
+ 
  dnl ****************************************
  dnl Check whether to build the documentation
***************
*** 341,350 ****
  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 *****************************************************
  dnl Doxygen and dot are needed to build the documentation
--- 339,348 ----
  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 *****************************************************
  dnl Doxygen and dot are needed to build the documentation
***************
*** 362,366 ****
                  exit 1
          fi
! fi        
  
  dnl  **************************
--- 360,364 ----
                  exit 1
          fi
! fi
  
  dnl  **************************
***************
*** 377,385 ****
  if test x$OGG_VORBIS = xyes; then
     AC_CHECK_HEADERS([vorbis/vorbisfile.h]) 
-    AM_CONDITIONAL(HAVE_OGG_VORBIS, true)
- else
-    AM_CONDITIONAL(HAVE_OGG_VORBIS, false)
  fi 
  
  
  dnl ********************************
--- 375,381 ----
  if test x$OGG_VORBIS = xyes; then
     AC_CHECK_HEADERS([vorbis/vorbisfile.h]) 
  fi 
  
+ AM_CONDITIONAL(HAVE_OGG_VORBIS, test x$OGG_VORBIS = xyes)
  
  dnl ********************************