Browse Source

* configure.in: Remove all GNOME stuff except GNOME_VFS_CHECKS.
* Makefile.am (SUBDIRS): Remove all GNOME-related directories.

Pavel Roskin 23 years ago
parent
commit
621a8f2391
3 changed files with 4 additions and 45 deletions
  1. 3 0
      ChangeLog
  2. 1 2
      Makefile.am
  3. 0 43
      configure.in

+ 3 - 0
ChangeLog

@@ -1,5 +1,8 @@
 2001-08-24  Pavel Roskin  <proski@gnu.org>
 
+	* configure.in: Remove all GNOME stuff except GNOME_VFS_CHECKS.
+	* Makefile.am (SUBDIRS): Remove all GNOME-related directories.
+
 	* lib/startup.links: Remove.
 	* lib/README.desktop: Likewise.
 	* lib/Makefile.am: Remove all references to DESKTOP_FILES.

+ 1 - 2
Makefile.am

@@ -1,7 +1,6 @@
 ## Process this file with automake to create Makefile.in.
 
-SUBDIRS = intl po vfs slang edit src lib doc syntax pc \
-	gtkedit gnome new_icons idl doc-gnome
+SUBDIRS = intl po vfs slang edit src lib doc syntax pc
 
 ACLOCAL_AMFLAGS = -I macros
 

+ 0 - 43
configure.in

@@ -408,41 +408,6 @@ AC_ARG_WITH(hsc,
         fi
 ])
 
-dnl
-dnl Check for Gnome
-dnl
-mx=""
-libgtkedit=""
-xvers="none"
-
-GNOME_INIT_HOOK([
-	mx=mx
-	libgtkedit="libgtkedit.a"
-	if test x"$xvers" = xnone; then
-	    xvers="Gnome"
-	else
-	    xvers="Gnome+$xvers"
-	fi
-	gnomeicondir=`gnome-config --datadir`/pixmaps
-
-dnl Check for new enough gnome-libs
-	CFLAGS_save=$CFLAGS
-	LIBS_save=$LIBS
-	CFLAGS=`gnome-config --cflags gnomeui`
-	LIBS=`gnome-config --libs gnomeui`
-
-	AC_CHECK_LIB(gnomeui, gnome_window_icon_set_default_from_file,
-			      [AC_DEFINE(HAVE_GNOME_WINDOW_ICON)])
-
-	CFLAGS=$CFLAGS_save
-	LIBS=$LIBS_save
-])
-AC_SUBST(gnomeicondir)
-AC_SUBST(mx)
-AC_SUBST(libgtkedit)
-AC_SUBST(GNOMEGNORBA_LIBS)
-AM_CONDITIONAL(GNOME, [test x"$mx" = xmx])
-
 dnl
 dnl Check for the -mandoc package
 dnl
@@ -961,21 +926,13 @@ Make.common
 Makefile 
 mc.spec
 doc/Makefile 
-doc-gnome/Makefile
-doc-gnome/C/Makefile
-doc-gnome/C/figs/Makefile
 vfs/Makefile:vfs/Make-mc.in
 vfs/extfs/Makefile
 lib/Makefile
-gnome/Makefile 
-gnome/mc.keys.in
-idl/Makefile
 src/Makefile
 slang/Makefile 
 edit/Makefile 
-gtkedit/Makefile 
 syntax/Makefile
-new_icons/Makefile 
 pc/Makefile
 
 lib/mc.ext