Changeset 129 in MondoRescue for trunk


Ignore:
Timestamp:
Nov 22, 2005, 1:04:31 AM (19 years ago)
Author:
bcornec
Message:

Removal of the code related to Xmondo/X11/KDE

Location:
trunk/mondo
Files:
3 deleted
6 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/mondo/ChangeLog

    r41 r129  
    1 MONDO CHANGES          Hugo Rabson <hugorabson@msn.com>             2005-09-09
     1MONDO CHANGES
    22
    33

  • trunk/mondo/INSTALL

    r30 r129  
    1313configure --with-maximum-noof-media=<big-number>. To make a statically
    1414linked mondorestore (not tested), configure --enable-static-mr.
    15 
    16 *** To compile XMondo, you must configure --with-x11. ***
    17 
    18 Yes, XMondo *does* exist :-) but seeing as many folks don't have Qt and
    19 KDE libraries, it's *NOT* compiled by default.
    20 
    21 
    22 
    23 
    24 
    25 
    26 
    27 
    2815
    2916

  • trunk/mondo/configure.in

    r94 r129  
    3030dnl --with/--enable stuff
    3131do_static_mr=
    32 AC_ARG_WITH(x11, AS_HELP_STRING(--with-x11,Create libXmondo and XMondo for X11/KDE support), do_x=$withval, do_x= )
    3332AC_ARG_ENABLE(static-mr, AS_HELP_STRING(--enable-static-mr,Link mondorestore statically), do_static_mr=$withval, do_static_mr= )
    3433AC_ARG_ENABLE(debug, AS_HELP_STRING(--enable-debug,Add debugging flags), CFLAGS="$CFLAGS -g", )
    … …  
    4342AC_DEFINE_UNQUOTED(MAX_NOOF_MEDIA, $max_noof_media, [Maximum number of media])
    4443AC_DEFINE_UNQUOTED(EXTTAPE, $exttape, [Tape blocksize])
    45 if test -n "$do_x"; then
    46     AC_DEFINE(WITH_X, 1, [Define if compiled with X support])
    47 else
    48     AC_DEFINE(WITH_X, 0, [Define if compiled with X support])
    49 fi
    50 AM_CONDITIONAL(XWIN, test x$do_x = xyes)
    5144
    5245# ( 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]) ) )
    … …  
    108101AC_SUBST(LIBS)
    109102
    110 if test x$do_x = xyes ; then
    111     XMONDO=xmondo
    112     QT_LIBRARY=-lqt
    113     AC_PATH_XTRA
    114     dnl AC_PATH_KDE
    115     dnl KDE_USE_QT(3)
    116 else
    117     dnl Automake requires all conditionals to be done sometime; if they're not being
    118     dnl done by the KDE checks, they're done here.
    119     AM_CONDITIONAL(include_ARTS, false)
    120     dnl AC_FIND_BZIP2
    121     dnl KDE_CHECK_BINUTILS
    122     XMONDO=
    123     QT_LIBRARY=
    124 fi
    125 AC_SUBST(XMONDO)
    126 AC_SUBST(QT_LIBRARY)
     103dnl AC_FIND_BZIP2
    127104
    128105# Checks for header files.
    … …  
    146123AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr getline asprintf trunc vasprintf])
    147124
    148 if test -n "$qt_includes"; then
    149     my_qt_includes="-I$qt_includes"
    150 else
    151     my_qt_includes=""
    152 fi
    153 AC_SUBST(my_qt_includes)
    154 
    155 if test -n "$qt_libraries"; then
    156     my_qt_libraries="-L$qt_libraries"
    157 else
    158     my_qt_libraries=""
    159 fi
    160 AC_SUBST(my_qt_libraries)
    161 
    162 if test -n "$kde_includes"; then
    163     my_kde_includes="-I$kde_includes"
    164 else
    165     my_kde_includes=""
    166 fi
    167 AC_SUBST(my_kde_includes)
    168 
    169 if test -n "$kde_libraries"; then
    170     my_kde_libraries="-L$kde_libraries"
    171 else
    172     my_kde_libraries=""
    173 fi
    174 AC_SUBST(my_kde_libraries)
    175 
    176 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])
     125AC_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])

  • trunk/mondo/mondo.spec

    r80 r129  
    5252%ifarch ia64
    5353Requires:   mindi >= 1.04_berlios, bzip2 >= 0.9, afio, mkisofs, binutils, elilo, newt >= 0.50, slang >= 1.4.1, buffer, parted
    54 %{!?_without_xmondo:BuildRequires:    gcc-c++, XFree86-devel, qt-devel, kdelibs-devel, libpng-devel}
    5554%else
    5655Requires:   mindi >= 1.04_berlios, bzip2 >= 0.9, afio, mkisofs, binutils, syslinux >= 1.52, newt >= 0.50, slang >= 1.4.1, cdrecord, buffer
    57 %{!?_without_xmondo:BuildRequires:    gcc-c++, XFree86-devel, qt-devel, kdelibs-devel, arts-devel, libart_lgpl-devel, libpng-devel}
    5856%endif
    5957
    60 #%package xmondo
    61 #Summary:   A QT based graphical front end for %{name}
    62 #Group:     Applications/Archiving
    63 #Requires:  %{name} = %{version}-${release}, qt, kdelibs
    64 #
    6558#%package %{name}-devel
    6659#Summary:   Header files for building against Mondo
    … …  
    10093con cintas y NFS, tambien.
    10194
    102 #%description xmondo
    103 #Xmondo is a QT based graphical frontend to mondoarchive.  It can help you
    104 #set up a backup by following onscreen prompts.
    105 
    10695%prep
    10796%setup -q -n %name-%{version}
    10897
    10998%build
    110 %configure %{!?_without_xmondo:--with-x11}
     99%configure
    111100%{__make} VERSION=%{version} CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
    112101
    … …  
    134123%{_mandir}/*
    135124%{_libdir}/*
    136 
    137 #%{!?_without_xmondo:%files xmondo}
    138 #%{!?_without_xmondo:%{_sbindir}/xmondo}
    139 #%{!?_without_xmondo:%{_libdir}/libXmondo-%{libversion}.so}
    140 #%{!?_without_xmondo:%{_libdir}/libXmondo.so}
    141 #%{!?_without_xmondo:%{_datadir}/mondo/mondo.png}
    142125
    143126%changelog

  • trunk/mondo/mondo/Makefile.am

    r30 r129  
    1 # Note that configure will define @XMONDO@ to be "xmondo" if X support
    2 # is enabled, "" if not
    3 SUBDIRS        = common mondoarchive mondorestore @XMONDO@ docs restore-scripts
    4 DIST_SUBDIRS   = common mondoarchive mondorestore xmondo docs restore-scripts
     1SUBDIRS        = common mondoarchive mondorestore docs restore-scripts
    52
    63pkgdata_DATA   = do-not-compress-these

  • trunk/mondo/mondo/common/Makefile.am

    r30 r129  
    1414                       libmondo-mountlist-EXT.h libmondo-raid-EXT.h libmondo-stream-EXT.h \
    1515                       libmondo-string-EXT.h libmondo-tools-EXT.h libmondo-verify-EXT.h \
    16                        X-specific.h newt-specific.h
     16                       newt-specific.h
    1717
    1818## Libraries
    19 if XWIN
    20  XMONDOLIB           = libXmondo.la
    21 endif XWIN
    22 lib_LTLIBRARIES      = libmondo.la libmondo-newt.la $(XMONDOLIB)
     19lib_LTLIBRARIES      = libmondo.la libmondo-newt.la
    2320
    2421## libmondo
    … …  
    3532libmondo_newt_la_LDFLAGS = -version-info 1:0:0 -shrext .so
    3633libmondo_newt_la_LIBADD  = -lnewt
    37 
    38 ## libXmondo
    39 libXmondo_la_SOURCES = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
    40                        libmondo-filelist.c libmondo-files.c libmondo-fork.c \
    41                        X-specific.cpp libmondo-mountlist.c libmondo-raid.c \
    42                        libmondo-stream.c libmondo-string.c libmondo-tools.c \
    43                        libmondo-verify.c
    44 libXmondo_la_LDFLAGS = -version-info 1:0:0 -shrext .so
    45 libXmondo_la_LIBADD  = -L/usr/X11R6/lib -L/usr/local/lib @QT_LIBRARY@ @LIBS@ @my_qt_libraries@ @my_kde_libraries@
    46 libXmondo_la_CFLAGS  = -D_XWIN
    47 libXmondo_la_CXXFLAGS= -D_XWIN @my_qt_includes@ @my_kde_includes@
Note: See TracChangeset for help on using the changeset viewer.