Browse Source

Sun Nov 22 22:23:20 1998 Norbert Warmuth <nwarmuth@privat.circular.de>

* tk/Makefile.in: added findme.o to LOBJS and filegui.o to OOBJS

* autogen.sh: replaced "cat *.m4" with a call to aclocal. Concatenate
mc-aclocal.m4 and gettext.m4 to acinclude.m4. The other way round
would have been to add three more m4 files to the replaced cat line
(including cond.m4 from automake-1.3b).

Fixed OBJ_DIR handling.

* deleted glib.m4 which isn't needed any longer

* cvsignore: added acinclude.m4
Norbert Warmuth 26 years ago
parent
commit
45bb4a3329
6 changed files with 25 additions and 195 deletions
  1. 1 0
      .cvsignore
  2. 9 5
      autogen.sh
  3. 0 188
      glib.m4
  4. 9 0
      src/ChangeLog
  5. 4 0
      tk/ChangeLog
  6. 2 2
      tk/Makefile.in

+ 1 - 0
.cvsignore

@@ -9,3 +9,4 @@ configure
 mcfn_install
 aclocal.m4
 VERSION
+acinclude.m4

+ 9 - 5
autogen.sh

@@ -1,11 +1,14 @@
+#! /bin/sh
+# Run this to generate all the initial makefiles, etc.
+
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 (
 cd $srcdir
 if test -d macros; then
-	cat macros/gnome.m4 macros/gnome-vfs.m4 macros/gnome-undelfs.m4 \
-	macros/linger.m4 mc-aclocal.m4 gettext.m4 glib.m4 > aclocal.m4
+	test -f mc-aclocal.m4 && test -f gettext.m4 && cat mc-aclocal.m4 gettext.m4 > acinclude.m4
+	aclocal $ACLOCAL_FLAGS
 else
 	echo macros directory not found, skipping generation of aclocal.m4
 fi
@@ -13,9 +16,10 @@ autoheader
 autoconf
 )
 
-if [ ! -z "$OBJ_DIR" ]; then
+if [ -z "$OBJ_DIR" ]; then
+	$srcdir/configure --enable-maintainer-mode $*
+else
 	mkdir -p "$OBJ_DIR"
 	cd "$OBJ_DIR"
+	../configure --enable-maintainer-mode $*
 fi
-
-$srcdir/$OBJDIR/configure --enable-maintainer-mode $*

+ 0 - 188
glib.m4

@@ -1,188 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor     97-11-3
-
-dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" is specified
-dnl in MODULES, feature the glib-config gmodule option.
-dnl
-AC_DEFUN(AM_PATH_GLIB,
-[dnl 
-dnl Get the cflags and libraries from the glib-config script
-dnl
-AC_ARG_WITH(glib-prefix,[  --with-glib-prefix=PFX   Prefix where GLIB is installed (optional)],
-            glib_config_prefix="$withval", glib_config_prefix="")
-AC_ARG_WITH(glib-exec-prefix,[  --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
-            glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  if test x$glib_config_exec_prefix != x ; then
-     glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
-     fi
-  fi
-  if test x$glib_config_prefix != x ; then
-     glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
-     if test x${GLIB_CONFIG+set} != xset ; then
-        GLIB_CONFIG=$glib_config_prefix/bin/glib-config
-     fi
-  fi
-
-  case "$4" in
-  *gmodule*) glib_config_args="$glib_config_args gmodule";;
-  esac
-
-  AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
-  min_glib_version=ifelse([$1], ,0.99.7,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-  no_glib=""
-  if test "$GLIB_CONFIG" = "no" ; then
-    no_glib=yes
-  else
-    GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-    GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-    glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$LIBS $GLIB_LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of glib-config to some extent
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.glibtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If glib-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLIB. 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 glib-config was wrong, set the environment variable GLIB_CONFIG\n");
-      printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB 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 glib-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
-        printf("*** correct copy of glib-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;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$GLIB_CONFIG" = "no" ; then
-       echo "*** The glib-config script installed by GLIB could not be found"
-       echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GLIB_CONFIG environment variable to the"
-       echo "*** full path to glib-config."
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, 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"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
-          echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
-          echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  rm -f conf.glibtest
-])

+ 9 - 0
src/ChangeLog

@@ -1,3 +1,12 @@
+Sun Nov 22 22:30:50 1998  Norbert Warmuth  <nwarmuth@privat.circular.de>
+
+	* autogen.sh: replaced "cat *.m4" with a call to aclocal. Concatenate
+	mc-aclocal.m4 and gettext.m4 to acinclude.m4. The other way round
+	would have been to add three more m4 files to the replaced cat line
+	(including cond.m4 from automake-1.3b).
+
+	Fixed OBJ_DIR handling.
+	
 Sun Nov 15 00:37:58 1998  Pavel Machek  <pavel@bug.ucw.cz>
 
 	* mad.c (mad_tempnam): needed wrapper for tempnam added

+ 4 - 0
tk/ChangeLog

@@ -1,3 +1,7 @@
+Sun Nov 22 22:23:20 1998  Norbert Warmuth  <nwarmuth@privat.circular.de>
+
+	* Makefile.in: added findme.o to LOBJS and filegui.o to OOBJS
+
 Sun May 31 13:22:09 1998  Norbert Warmuth  <k3190@fh-sw.de>
 
 	* Makefile.in: use @LIBVFS@ when referring to libvfs-mc.a

+ 2 - 2
tk/Makefile.in

@@ -29,7 +29,7 @@ GUIS   = gui.dbits.tcl gui.display.tcl gui.findfile.tcl gui.hotlist.tcl   \
 #
 # These objects from ../src do not depend on HAVE_X / HAVE_TK??
 #
-LOBJS =  mad.o
+LOBJS =  mad.o findme.o
 
 #
 # These objects from ../src do depend on HAVE_TK
@@ -39,7 +39,7 @@ OOBJS = main.o dlg.o screen.o widget.o wtools.o info.o layout.o boxes.o \
 	panelize.o hotlist.o listmode.o background.o dir.o util.o \
 	win.o color.o profile.o user.o \
 	ext.o setup.o \
-	tree.o \
+	tree.o filegui.o\
 	subshell.o terms.o \
 	achown.o fsusage.o mountlist.o \
 	@XCURSES@ @REGEX_O@ complete.o command.o \