summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-cdr/cdrdao/files/cdrdao-1.1.5-gentoo.diff')
-rw-r--r--app-cdr/cdrdao/files/cdrdao-1.1.5-gentoo.diff540
1 files changed, 0 insertions, 540 deletions
diff --git a/app-cdr/cdrdao/files/cdrdao-1.1.5-gentoo.diff b/app-cdr/cdrdao/files/cdrdao-1.1.5-gentoo.diff
deleted file mode 100644
index bfb6cc4f1af1..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.1.5-gentoo.diff
+++ /dev/null
@@ -1,540 +0,0 @@
-diff -ur cdrdao-1.1.5.orig/Makefile.in cdrdao-1.1.5/Makefile.in
---- cdrdao-1.1.5.orig/Makefile.in Sun Apr 29 15:42:08 2001
-+++ cdrdao-1.1.5/Makefile.in Wed Aug 8 18:15:33 2001
-@@ -41,8 +41,8 @@
- #
- #
- #
--SUBDIRS = @scsilib_dir@ edc_ecc trackdb paranoia dao utils @xdao@
--SUBDIRSINST = trackdb dao utils @xdao@
-+SUBDIRS = @scsilib_dir@ edc_ecc trackdb paranoia dao utils
-+SUBDIRSINST = trackdb dao utils
-
- all:
- for d in $(SUBDIRS) ; do \
-diff -ur cdrdao-1.1.5.orig/configure cdrdao-1.1.5/configure
---- cdrdao-1.1.5.orig/configure Sun Apr 29 15:42:08 2001
-+++ cdrdao-1.1.5/configure Wed Aug 8 18:15:33 2001
-@@ -3202,502 +3202,8 @@
- fi
- fi
-
--xdao=xdao
--# Check whether --with-gtkmm-prefix or --without-gtkmm-prefix was given.
--if test "${with_gtkmm_prefix+set}" = set; then
-- withval="$with_gtkmm_prefix"
-- gtkmm_config_prefix="$withval"
--else
-- gtkmm_config_prefix=""
--fi
--
--# Check whether --with-gtkmm-exec-prefix or --without-gtkmm-exec-prefix was given.
--if test "${with_gtkmm_exec_prefix+set}" = set; then
-- withval="$with_gtkmm_exec_prefix"
-- gtkmm_config_exec_prefix="$withval"
--else
-- gtkmm_config_exec_prefix=""
--fi
--
--# Check whether --enable-gtkmmtest or --disable-gtkmmtest was given.
--if test "${enable_gtkmmtest+set}" = set; then
-- enableval="$enable_gtkmmtest"
-- :
--else
-- enable_gtkmmtest=yes
--fi
--
--
-- if test x$gtkmm_config_exec_prefix != x ; then
-- gtkmm_config_args="$gtkmm_config_args --exec-prefix=$gtkmm_config_exec_prefix"
-- if test x${GTKMM_CONFIG+set} != xset ; then
-- GTKMM_CONFIG=$gtkmm_config_exec_prefix/bin/gtkmm-config
-- fi
-- fi
-- if test x$gtkmm_config_prefix != x ; then
-- gtkmm_config_args="$gtkmm_config_args --prefix=$gtkmm_config_prefix"
-- if test x${GTKMM_CONFIG+set} != xset ; then
-- GTKMM_CONFIG=$gtkmm_config_prefix/bin/gtkmm-config
-- fi
-- fi
--
-- # Extract the first word of "gtkmm-config", so it can be a program name with args.
--set dummy gtkmm-config; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3248: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_GTKMM_CONFIG'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- case "$GTKMM_CONFIG" in
-- /*)
-- ac_cv_path_GTKMM_CONFIG="$GTKMM_CONFIG" # Let the user override the test with a path.
-- ;;
-- ?:/*)
-- ac_cv_path_GTKMM_CONFIG="$GTKMM_CONFIG" # Let the user override the test with a dos path.
-- ;;
-- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_GTKMM_CONFIG="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-- test -z "$ac_cv_path_GTKMM_CONFIG" && ac_cv_path_GTKMM_CONFIG="no"
-- ;;
--esac
--fi
--GTKMM_CONFIG="$ac_cv_path_GTKMM_CONFIG"
--if test -n "$GTKMM_CONFIG"; then
-- echo "$ac_t""$GTKMM_CONFIG" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
-- min_gtkmm_version=1.2.5
--
-- echo $ac_n "checking for GTK-- - version >= $min_gtkmm_version""... $ac_c" 1>&6
--echo "configure:3284: checking for GTK-- - version >= $min_gtkmm_version" >&5
-- no_gtkmm=""
-- if test "$GTKMM_CONFIG" = "no" ; then
-- no_gtkmm=yes
-- else
--
-- ac_ext=C
--# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cxx_cross
--
--
-- GTKMM_CFLAGS=`$GTKMM_CONFIG --cflags`
-- GTKMM_LIBS=`$GTKMM_CONFIG --libs`
-- gtkmm_config_major_version=`$GTKMM_CONFIG --version | \
-- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-- gtkmm_config_minor_version=`$GTKMM_CONFIG --version | \
-- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-- gtkmm_config_micro_version=`$GTKMM_CONFIG --version | \
-- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-- if test "x$enable_gtkmmtest" = "xyes" ; then
-- ac_save_CXXFLAGS="$CXXFLAGS"
-- ac_save_LIBS="$LIBS"
-- CXXFLAGS="$CXXFLAGS $GTKMM_CFLAGS"
-- LIBS="$LIBS $GTKMM_LIBS"
-- rm -f conf.gtkmmtest
-- if test "$cross_compiling" = yes; then
-- echo $ac_n "cross compiling; assumed OK... $ac_c"
--else
-- cat > conftest.$ac_ext <<EOF
--#line 3316 "configure"
--#include "confdefs.h"
--#ifdef __cplusplus
--extern "C" void exit(int);
--#endif
--
--#include <gtk--.h>
--#include <stdio.h>
--#include <stdlib.h>
--
--int
--main ()
--{
-- int major, minor, micro;
-- char *tmp_version;
--
-- system ("touch conf.gtkmmtest");
--
-- /* HP/UX 0 (%@#!) writes to sscanf strings */
-- tmp_version = g_strdup("$min_gtkmm_version");
-- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-- printf("%s, bad version string\n", "$min_gtkmm_version");
-- exit(1);
-- }
--
-- if ((gtkmm_major_version != $gtkmm_config_major_version) ||
-- (gtkmm_minor_version != $gtkmm_config_minor_version) ||
-- (gtkmm_micro_version != $gtkmm_config_micro_version))
-- {
-- printf("\n*** 'gtkmm-config --version' returned %d.%d.%d, but GTK-- (%d.%d.%d)\n",
-- $gtkmm_config_major_version, $gtkmm_config_minor_version, $gtkmm_config_micro_version,
-- gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version);
-- printf ("*** was found! If gtkmm-config was correct, then it is best\n");
-- printf ("*** to remove the old version of GTK--. You may also be able to fix the error\n");
-- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-- printf("*** required on your system.\n");
-- printf("*** If gtkmm-config was wrong, set the environment variable GTKMM_CONFIG\n");
-- printf("*** to point to the correct copy of gtkmm-config, and remove the file config.cache\n");
-- printf("*** before re-running configure\n");
-- }
--/* GTK-- does not have the GTKMM_*_VERSION constants */
--/*
-- else if ((gtkmm_major_version != GTKMM_MAJOR_VERSION) ||
-- (gtkmm_minor_version != GTKMM_MINOR_VERSION) ||
-- (gtkmm_micro_version != GTKMM_MICRO_VERSION))
-- {
-- printf("*** GTK-- header files (version %d.%d.%d) do not match\n",
-- GTKMM_MAJOR_VERSION, GTKMM_MINOR_VERSION, GTKMM_MICRO_VERSION);
-- printf("*** library (version %d.%d.%d)\n",
-- gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version);
-- }
--*/
-- else
-- {
-- if ((gtkmm_major_version > major) ||
-- ((gtkmm_major_version == major) && (gtkmm_minor_version > minor)) ||
-- ((gtkmm_major_version == major) && (gtkmm_minor_version == minor) && (gtkmm_micro_version >= micro)))
-- {
-- return 0;
-- }
-- else
-- {
-- printf("\n*** An old version of GTK-- (%d.%d.%d) was found.\n",
-- gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version);
-- printf("*** You need a version of GTK-- newer than %d.%d.%d. The latest version of\n",
-- major, minor, micro);
-- printf("*** GTK-- is always available from ftp://ftp.gtk.org.\n");
-- printf("***\n");
-- printf("*** If you have already installed a sufficiently new version, this error\n");
-- printf("*** probably means that the wrong copy of the gtkmm-config shell script is\n");
-- printf("*** being found. The easiest way to fix this is to remove the old version\n");
-- printf("*** of GTK--, but you can also set the GTKMM_CONFIG environment to point to the\n");
-- printf("*** correct copy of gtkmm-config. (In this case, you will have to\n");
-- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-- printf("*** so that the correct libraries are found at run-time))\n");
-- }
-- }
-- return 1;
--}
--
--EOF
--if { (eval echo configure:3398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-- :
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -fr conftest*
-- no_gtkmm=yes
--fi
--rm -fr conftest*
--fi
--
-- CXXFLAGS="$ac_save_CXXFLAGS"
-- LIBS="$ac_save_LIBS"
-- fi
-- fi
-- if test "x$no_gtkmm" = x ; then
-- echo "$ac_t""yes" 1>&6
-- :
-- else
-- echo "$ac_t""no" 1>&6
-- if test "$GTKMM_CONFIG" = "no" ; then
-- echo "*** The gtkmm-config script installed by GTK-- could not be found"
-- echo "*** If GTK-- was installed in PREFIX, make sure PREFIX/bin is in"
-- echo "*** your path, or set the GTKMM_CONFIG environment variable to the"
-- echo "*** full path to gtkmm-config."
-- echo "*** The gtkmm-config script was not available in GTK-- versions"
-- echo "*** prior to 0.9.12. Perhaps you need to update your installed"
-- echo "*** version to 0.9.12 or later"
-- else
-- if test -f conf.gtkmmtest ; then
-- :
-- else
-- echo "*** Could not run GTK-- test program, checking why..."
-- CXXFLAGS="$CFLAGS $GTKMM_CXXFLAGS"
-- LIBS="$LIBS $GTKMM_LIBS"
-- cat > conftest.$ac_ext <<EOF
--#line 3435 "configure"
--#include "confdefs.h"
--
--#include <gtk--.h>
--#include <stdio.h>
--
--int main() {
-- return ((gtkmm_major_version) || (gtkmm_minor_version) || (gtkmm_micro_version));
--; return 0; }
--EOF
--if { (eval echo configure:3445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- echo "*** The test program compiled, but did not run. This usually means"
-- echo "*** that the run-time linker is not finding GTK-- or finding the wrong"
-- echo "*** version of GTK--. If it is not finding GTK--, you'll need to set your"
-- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-- echo "*** to the installed location Also, make sure you have run ldconfig if that"
-- echo "*** is required on your system"
-- echo "***"
-- echo "*** If you have an old version installed, it is best to remove it, although"
-- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- echo "*** The test program failed to compile or link. See the file config.log for the"
-- echo "*** exact error that occured. This usually means GTK-- was incorrectly installed"
-- echo "*** or that you have moved GTK-- since it was installed. In the latter case, you"
-- echo "*** may want to edit the gtkmm-config script: $GTKMM_CONFIG"
--fi
--rm -f conftest*
-- CXXFLAGS="$ac_save_CXXFLAGS"
-- LIBS="$ac_save_LIBS"
-- fi
-- fi
-- GTKMM_CFLAGS=""
-- GTKMM_LIBS=""
-- xdao=no; echo Disabled building of xcdrdao.
-- ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
--
-- fi
--
--
-- rm -f conf.gtkmmtest
--
--
--if test $xdao = xdao; then
-- # Check whether --with-gnome-prefix or --without-gnome-prefix was given.
--if test "${with_gnome_prefix+set}" = set; then
-- withval="$with_gnome_prefix"
-- gnome_config_prefix="$withval"
--else
-- gnome_config_prefix=""
--fi
--
--
-- if test x$gnome_config_prefix != x ; then
-- gnome_config_args="$gnome_config_args --prefix=$gnome_config_prefix"
-- if test x${GNOME_CONFIG+set} != xset ; then
-- GNOME_CONFIG=$gnome_config_prefix/bin/gnome-config
-- fi
-- fi
--
-- # Extract the first word of "gnome-config", so it can be a program name with args.
--set dummy gnome-config; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3506: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- case "$GNOME_CONFIG" in
-- /*)
-- ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a path.
-- ;;
-- ?:/*)
-- ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a dos path.
-- ;;
-- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_GNOME_CONFIG="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-- test -z "$ac_cv_path_GNOME_CONFIG" && ac_cv_path_GNOME_CONFIG="no"
-- ;;
--esac
--fi
--GNOME_CONFIG="$ac_cv_path_GNOME_CONFIG"
--if test -n "$GNOME_CONFIG"; then
-- echo "$ac_t""$GNOME_CONFIG" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
-- min_gnome_version=1.2.3;
--
-- echo $ac_n "checking for Gnome - version >= $min_gnome_version""... $ac_c" 1>&6
--echo "configure:3542: checking for Gnome - version >= $min_gnome_version" >&5
-- no_gnome=""
-- if test "$GNOME_CONFIG" = "no" ; then
-- no_gnome=yes
-- else
-- gnome_config_major_version=`$GNOME_CONFIG --version | \
-- sed 's/.* \([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-- gnome_config_minor_version=`$GNOME_CONFIG --version | \
-- sed 's/.* \([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-- gnome_config_micro_version=`$GNOME_CONFIG --version | \
-- sed 's/.* \([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
--
-- GNOME_CFLAGS=`$GNOME_CONFIG --cflags gnomeui`
-- GNOME_LIBS=`$GNOME_CONFIG --libs gnomeui`
-- fi
-- if test "x$no_gnome" = x ; then
-- echo "$ac_t""yes" 1>&6
-- :
-- else
-- echo "$ac_t""no" 1>&6
-- if test "$GNOME_CONFIG" = "no" ; then
-- echo "*** The gnome-config script installed by Gnome could not be found"
-- echo "*** If Gnome was installed in PREFIX, make sure PREFIX/bin is in"
-- echo "*** your path, or set the GNOME_CONFIG environment variable to the"
-- echo "*** full path to gnome-config."
-- fi
-- GNOME_CFLAGS=""
-- GNOME_LIBS=""
-- xdao=no; echo Disabled building of xcdrdao.
-- fi
--
--
--
--fi
--
--if test $xdao = xdao; then
-- # Check whether --with-gnome-prefix or --without-gnome-prefix was given.
--if test "${with_gnome_prefix+set}" = set; then
-- withval="$with_gnome_prefix"
-- gnome_config_prefix="$withval"
--else
-- gnome_config_prefix=""
--fi
--
--
-- min_gnome_module_major_version=`echo 1.1.17 | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`;
-- min_gnome_module_minor_version=`echo 1.1.17 | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`;
-- min_gnome_module_micro_version=`echo 1.1.17 | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`;
--
-- if test x$gnome_config_prefix != x ; then
-- gnome_config_args="$gnome_config_args --prefix=$gnome_config_prefix"
-- if test x${GNOME_CONFIG+set} != xset ; then
-- GNOME_CONFIG=$gnome_config_prefix/bin/gnome-config
-- fi
-- fi
--
-- # Extract the first word of "gnome-config", so it can be a program name with args.
--set dummy gnome-config; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3601: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- case "$GNOME_CONFIG" in
-- /*)
-- ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a path.
-- ;;
-- ?:/*)
-- ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a dos path.
-- ;;
-- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_GNOME_CONFIG="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-- test -z "$ac_cv_path_GNOME_CONFIG" && ac_cv_path_GNOME_CONFIG="no"
-- ;;
--esac
--fi
--GNOME_CONFIG="$ac_cv_path_GNOME_CONFIG"
--if test -n "$GNOME_CONFIG"; then
-- echo "$ac_t""$GNOME_CONFIG" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--
-- echo $ac_n "checking for Gnome module gnomemm - version >= 1.1.17""... $ac_c" 1>&6
--echo "configure:3636: checking for Gnome module gnomemm - version >= 1.1.17" >&5
--
-- no_gnome=""
-- no_gnome_module=""
--
-- if test "$GNOME_CONFIG" = "no" ; then
-- no_gnome=yes
-- elif $GNOME_CONFIG --libs gnomemm > /dev/null 2>&1 ; then
-- gnome_module_major_version=`$GNOME_CONFIG --modversion gnomemm | \
-- sed "s/gnomemm-\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/"`
-- gnome_module_minor_version=`$GNOME_CONFIG --modversion gnomemm | \
-- sed "s/gnomemm-\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/"`
-- gnome_module_micro_version=`$GNOME_CONFIG --modversion gnomemm | \
-- sed "s/gnomemm-\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/"`
-- else
-- no_gnome_module=yes
-- fi
--
-- GNOMEMM_CFLAGS=""
-- GNOMEMM_LIBS=""
--
-- if test "x$no_gnome_module" = xyes ; then
-- echo "$ac_t"""no - module gnomemm not found"" 1>&6
-- xdao=no; echo Disabled building of xcdrdao.
-- elif test "x$no_gnome" = x ; then
-- gnome_module_version_ok=no
--
-- if test $gnome_module_major_version -gt $min_gnome_module_major_version ; then
-- gnome_module_version_ok=yes
-- elif test $gnome_module_major_version -eq $min_gnome_module_major_version ; then
-- if test $gnome_module_minor_version -gt $min_gnome_module_minor_version ; then
-- gnome_module_version_ok=yes
-- elif test $gnome_module_minor_version -eq $min_gnome_module_minor_version ; then
-- if test $gnome_module_micro_version -ge $min_gnome_module_micro_version ; then
-- gnome_module_version_ok=yes
-- fi
-- fi
-- fi
--
-- if test $gnome_module_version_ok = yes ; then
-- echo "$ac_t""yes" 1>&6
--
-- GNOMEMM_CFLAGS=`$GNOME_CONFIG --cflags gnomemm`
-- GNOMEMM_LIBS=`$GNOME_CONFIG --libs gnomemm`
--
-- :
-- else
-- echo "$ac_t"""no - found version $gnome_module_major_version.$gnome_module_minor_version.$gnome_module_micro_version"" 1>&6
-- xdao=no; echo Disabled building of xcdrdao.
-- fi
-- else
-- echo "$ac_t""no" 1>&6
-- if test "$GNOME_CONFIG" = "no" ; then
-- echo "*** The gnome-config script installed by Gnome could not be found"
-- echo "*** If Gnome was installed in PREFIX, make sure PREFIX/bin is in"
-- echo "*** your path, or set the GNOME_CONFIG environment variable to the"
-- echo "*** full path to gnome-config."
-- fi
-- xdao=no; echo Disabled building of xcdrdao.
-- fi
--
--
--
--
--fi
--
-+# xdao stuff erased
-+xdao=no
- if test $xdao != xdao; then
- xdao=
- fi
-@@ -3910,7 +3416,7 @@
- ac_given_srcdir=$srcdir
- ac_given_INSTALL="$INSTALL"
-
--trap 'rm -fr `echo "edc_ecc/Makefile trackdb/Makefile dao/Makefile utils/Makefile xdao/Makefile Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+trap 'rm -fr `echo "edc_ecc/Makefile trackdb/Makefile dao/Makefile utils/Makefile Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
-
-@@ -4018,7 +3524,7 @@
-
- cat >> $CONFIG_STATUS <<EOF
-
--CONFIG_FILES=\${CONFIG_FILES-"edc_ecc/Makefile trackdb/Makefile dao/Makefile utils/Makefile xdao/Makefile Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"edc_ecc/Makefile trackdb/Makefile dao/Makefile utils/Makefile Makefile"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then