Changeset 129 in MondoRescue for trunk/mondo/configure.in

Timestamp:

Nov 22, 2005, 1:04:31 AM (18 years ago)

Author:

bcornec

Message:

Removal of the code related to Xmondo/X11/KDE

File:

• trunk/mondo/configure.in (modified) (4 diffs)

trunk/mondo/configure.in

@@ -30 +30 @@
 dnl --with/--enable stuff
 do_static_mr=
-AC_ARG_WITH(x11, AS_HELP_STRING(--with-x11,Create libXmondo and XMondo for X11/KDE support), do_x=$withval, do_x= )
 AC_ARG_ENABLE(static-mr, AS_HELP_STRING(--enable-static-mr,Link mondorestore statically), do_static_mr=$withval, do_static_mr= )
 AC_ARG_ENABLE(debug, AS_HELP_STRING(--enable-debug,Add debugging flags), CFLAGS="$CFLAGS -g", )
@@ -43 +42 @@
 AC_DEFINE_UNQUOTED(MAX_NOOF_MEDIA, $max_noof_media, [Maximum number of media])
 AC_DEFINE_UNQUOTED(EXTTAPE, $exttape, [Tape blocksize])
-if test -n "$do_x"; then
-    AC_DEFINE(WITH_X, 1, [Define if compiled with X support])
-else
-    AC_DEFINE(WITH_X, 0, [Define if compiled with X support])
-fi
-AM_CONDITIONAL(XWIN, test x$do_x = xyes)
 
 # ( which automake 2>/dev/null >/dev/null && ( automake --version 2>&1 | grep -q 1.5 || automake --version 2>&1 | grep -q 1.7 || AC_MSG_ERROR([Automake must be version 1.5 or 1.7, if you have it at all]) ) )
@@ -108 +101 @@
 AC_SUBST(LIBS)
 
-if test x$do_x = xyes ; then
-    XMONDO=xmondo
-    QT_LIBRARY=-lqt
-    AC_PATH_XTRA
-    dnl AC_PATH_KDE
-    dnl KDE_USE_QT(3)
-else
-    dnl Automake requires all conditionals to be done sometime; if they're not being
-    dnl done by the KDE checks, they're done here.
-    AM_CONDITIONAL(include_ARTS, false)
-    dnl AC_FIND_BZIP2
-    dnl KDE_CHECK_BINUTILS
-    XMONDO=
-    QT_LIBRARY=
-fi
-AC_SUBST(XMONDO)
-AC_SUBST(QT_LIBRARY)
+dnl AC_FIND_BZIP2
 
 # Checks for header files.
@@ -146 +123 @@
 AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr getline asprintf trunc vasprintf])
 
-if test -n "$qt_includes"; then
-    my_qt_includes="-I$qt_includes"
-else
-    my_qt_includes=""
-fi
-AC_SUBST(my_qt_includes)
-
-if test -n "$qt_libraries"; then
-    my_qt_libraries="-L$qt_libraries"
-else
-    my_qt_libraries=""
-fi
-AC_SUBST(my_qt_libraries)
-
-if test -n "$kde_includes"; then
-    my_kde_includes="-I$kde_includes"
-else
-    my_kde_includes=""
-fi
-AC_SUBST(my_kde_includes)
-
-if test -n "$kde_libraries"; then
-    my_kde_libraries="-L$kde_libraries"
-else
-    my_kde_libraries=""
-fi
-AC_SUBST(my_kde_libraries)
-
-AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/docs/Makefile mondo/docs/en/Makefile mondo/docs/en/1.6x-howto/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/xmondo/Makefile])
+AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/docs/Makefile mondo/docs/en/Makefile mondo/docs/en/1.6x-howto/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile])