--- cdrdao-1.1.9/configure.in	2004-06-09 19:44:33 +0400

+++ cdrdao-1.1.9/configure.in.alt	2004-06-09 19:49:21 +0400

@@ -8,6 +8,7 @@

 AM_CONFIG_HEADER(config.h)

 AC_CANONICAL_HOST

+AC_ARG_ENABLE([xdao],[  --enable-xdao    whether build xdao (default is YES)], [ac_cv_enable_xdao=$enableval], [ac_cv_enable_xdao=yes])

 AC_ARG_WITH(pcctsbin,[  --with-pcctsbin=dir     set directory of PCCTS parser generator executables],[pcctsbin=$withval],[pcctsbin=default])

 AC_ARG_WITH(pcctsinc,[  --with-pcctsinc=dir     set directory of PCCTS parser generator includes],[pcctsinc=$withval],[pcctsinc=default])

 AC_ARG_WITH(linux-qnx-sched,[  --with-linux-qnx-sched  enable QNX real time scheduling for Linux],[AC_DEFINE(LINUX_QNX_SCHEDULING,1,"Use real time scheduling for Linux")])

@@ -15,7 +16,6 @@

 AC_ARG_WITH(scglib,[  --with-scglib           use Joerg Schillings SCSI library (default: on)],[scglib=$withval],[scglib=default])

 AC_ARG_WITH(scglib-inc,[  --with-scglib-inc=dir   set directory for SCSI library include files],[scglib_inc=$withval],[scglib_inc=default])

 AC_ARG_WITH(scglib-lib,[  --with-scglib-lib=dir   set directory that contains the SCSI library],[scglib_lib=$withval],[scglib_lib=default])

-AC_ARG_WITH(xdao,[  --with-xdao             enable building of gcdmaster (default: on)],[xdao=$withval],[xdao=default])

 dnl Checks for programs.

 AC_PROG_CC

@@ -210,16 +210,14 @@

         [echo "Building of toc2mp3 disabled"])

 dnl Determine whether we're building the gcdaster GUI front-end

-en_xdao=no

-if test "$xdao" = default; then

-  xdao=yes

-fi

-if test "$xdao" = yes; then

-  en_xdao=yes

-  PKG_CHECK_MODULES(GTKMM2, gtkmm-2.0 >= 2.2,[],

-        [echo "Building of gcdmaster disabled"; en_xdao=no])

-  PKG_CHECK_MODULES(LIBGUIMM2, libgnomeuimm-2.0 >= 2.0,[],

-        [echo "Building of gcdmaster disabled"; en_xdao=no])

+if test "$ac_cv_enable_xdao" = yes

+then

+    en_xdao=yes

+    en_scsilib=yes

+	PKG_CHECK_MODULES(GTKMM2, gtkmm-2.4 >= 2.4,[],[en_xdao=no])

+	PKG_CHECK_MODULES(LIBGUIMM2, libgnomeuimm-2.6 >= 2.6,[],[en_xdao=no])

+else

+    en_xdao=no

 fi

 dnl Determine source for scsi interface class