]> git.lyx.org Git - lyx.git/commitdiff
Remove some old files belonging to the old (now removed) gnome frontend
authorLars Gullik Bjønnes <larsbj@gullik.org>
Sat, 29 Jul 2006 10:34:49 +0000 (10:34 +0000)
committerLars Gullik Bjønnes <larsbj@gullik.org>
Sat, 29 Jul 2006 10:34:49 +0000 (10:34 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14508 a592a061-630c-0410-9148-cb99ea01b6c8

autogen.sh
config/gnome--.m4 [deleted file]
config/gnome.m4 [deleted file]
config/gtk--.m4 [deleted file]

index e31767b4b7e18e1e98e5a0db15bb9ceb8a763176..df0229d48261e9e25221bf3daa88f1c77115de2b 100755 (executable)
@@ -4,7 +4,7 @@ ACLOCAL="aclocal -I ${PWD}/m4"
 AUTOHEADER="autoheader"
 AUTOMAKE="automake --add-missing --copy --foreign"
 AUTOCONF="autoconf"
-ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 qt.m4 qt4.m4 gtk--.m4 gnome--.m4 gnome.m4 spell.m4 pkg.m4"
+ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 qt.m4 qt4.m4 spell.m4 pkg.m4"
 
 # Discover what version of automake we are using.
 automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
diff --git a/config/gnome--.m4 b/config/gnome--.m4
deleted file mode 100644 (file)
index 48d95a0..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-# Configure paths for GNOME--
-# Modified from GTK--.m4
-
-dnl Test for GNOMEMM, and define GNOMEMM_INCLUDEDIR, GNOMEMM_LIBDIR, GNOMEMM_LIBS
-dnl   to be used as follows:
-dnl AM_PATH_GNOMEMM([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl
-AC_DEFUN([AM_PATH_GNOMEMM],
-[
-dnl
-dnl Get the cflags and libraries from the gtkmm-config script
-dnl
-AC_ARG_WITH(gnomemm-config-path,[  --with-gnomemm-config-path=PREFIX
-                          Path to GNOME-- configuration file gnomemmConf.sh (optional)],
-            gnomemm_config_prefix="$withval", gnome_config_prefix="")
-
-  AC_MSG_CHECKING(for GNOME-- gnomemmConf.sh)
-
-  if test x$gnomemm_config_prefix != x; then
-    if test -r $gnomemm_config_prefix; then
-       source $gnomemm_config_prefix
-    else
-        no_gnomemm=yes
-    fi
-  else
-    if test -r /usr/lib/gnomemmConf.sh ; then
-       source /usr/lib/gnomemmConf.sh
-    elif test -r /opt/gnome/lib/gnomemmConf.sh ; then
-       source /opt/gnome/lib/gnomemmConf.sh
-    elif test -r /usr/local/lib/gnomemmConf.sh ; then
-       source /usr/local/lib/gnomemmConf.sh
-    else
-        no_gnomemm=yes
-    fi
-  fi
-
-  if test "x$no_gnomemm" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])
-  else
-     AC_MSG_RESULT(no)
-     AC_MSG_ERROR(Cannot find GNOME-- configuration file gnomemmConf.sh)
-  fi
-
-  AC_SUBST(GNOMEMM_INCLUDEDIR)
-  AC_SUBST(GNOMEMM_LIBDIR)
-  AC_SUBST(GNOMEMM_LIBS)
-])
diff --git a/config/gnome.m4 b/config/gnome.m4
deleted file mode 100644 (file)
index ace5356..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-dnl
-dnl GNOME_INIT_HOOK (script-if-gnome-enabled, [failflag], [additional-inits])
-dnl
-dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh
-dnl is not found.
-dnl
-
-AC_DEFUN([GNOME_INIT_HOOK],[
-       AC_SUBST(GNOME_LIBS)
-       AC_SUBST(GNOMEUI_LIBS)
-       AC_SUBST(GNOMEGNORBA_LIBS)
-       AC_SUBST(GTKXMHTML_LIBS)
-       AC_SUBST(ZVT_LIBS)
-       AC_SUBST(GNOME_LIBDIR)
-       AC_SUBST(GNOME_INCLUDEDIR)
-
-       AC_ARG_WITH(gnome-includes,
-       [  --with-gnome-includes   Specify location of GNOME headers],[
-       CFLAGS="$CFLAGS -I$withval"
-       ])
-
-       AC_ARG_WITH(gnome-libs,
-       [  --with-gnome-libs       Specify location of GNOME libs],[
-       LDFLAGS="$LDFLAGS -L$withval"
-       gnome_prefix=$withval
-       ])
-
-       AC_ARG_WITH(gnome,
-       [  --with-gnome            Specify prefix for GNOME files],
-               if test x$withval = xyes; then
-                       want_gnome=yes
-                       dnl Note that an empty true branch is not
-                       dnl valid sh syntax.
-                       ifelse([$1], [], :, [$1])
-               else
-                       if test "x$withval" = xno; then
-                               want_gnome=no
-                       else
-                               want_gnome=yes
-                               LDFLAGS="$LDFLAGS -L$withval/lib"
-                               CFLAGS="$CFLAGS -I$withval/include"
-                               gnome_prefix=$withval/lib
-                       fi
-               fi,
-               want_gnome=yes)
-
-       if test "x$want_gnome" = xyes; then
-
-           AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
-           if test "$GNOME_CONFIG" = "no"; then
-             no_gnome_config="yes"
-           else
-             AC_MSG_CHECKING(if $GNOME_CONFIG works)
-             if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
-               AC_MSG_RESULT(yes)
-               GNOME_GNORBA_HOOK([],$2)
-               GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`"
-               GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`"
-               GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`"
-               GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`"
-               ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`"
-               GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`"
-               GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`"
-                $1
-             else
-               AC_MSG_RESULT(no)
-               no_gnome_config="yes"
-              fi
-            fi
-
-           if test x$exec_prefix = xNONE; then
-               if test x$prefix = xNONE; then
-                   gnome_prefix=$ac_default_prefix/lib
-               else
-                   gnome_prefix=$prefix/lib
-               fi
-           else
-               gnome_prefix=`eval echo \`echo $libdir\``
-           fi
-
-           if test "$no_gnome_config" = "yes"; then
-              AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix)
-             if test -f $gnome_prefix/gnomeConf.sh; then
-               AC_MSG_RESULT(found)
-               echo "loading gnome configuration from" \
-                    "$gnome_prefix/gnomeConf.sh"
-               . $gnome_prefix/gnomeConf.sh
-               $1
-             else
-               AC_MSG_RESULT(not found)
-               if test x$2 = xfail; then
-                 AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install)
-               fi
-             fi
-            fi
-       fi
-
-       if test -n "$3"; then
-         n="$3"
-         for i in $n; do
-           AC_MSG_CHECKING(extra library \"$i\")
-           case $i in
-             applets)
-               AC_SUBST(GNOME_APPLETS_LIBS)
-               GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets`
-               AC_MSG_RESULT($GNOME_APPLETS_LIBS);;
-             docklets)
-               AC_SUBST(GNOME_DOCKLETS_LIBS)
-               GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets`
-               AC_MSG_RESULT($GNOME_DOCKLETS_LIBS);;
-             capplet)
-               AC_SUBST(GNOME_CAPPLET_LIBS)
-               GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet`
-               AC_MSG_RESULT($GNOME_CAPPLET_LIBS);;
-             *)
-               AC_MSG_RESULT(unknown library)
-           esac
-         done
-       fi
-])
-
-dnl
-dnl GNOME_INIT ([additional-inits])
-dnl
-
-AC_DEFUN([GNOME_INIT],[
-       GNOME_INIT_HOOK([],fail,$1)
-])
diff --git a/config/gtk--.m4 b/config/gtk--.m4
deleted file mode 100644 (file)
index 1682248..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-# Configure paths for GTK--
-# Erik Andersen        30 May 1998
-# Modified by Tero Pulkkinen (added the compiler checks... I hope they work..)
-# Modified by Thomas Langen 16 Jan 2000 (corrected CXXFLAGS)
-
-dnl Test for GTKMM, and define GTKMM_CFLAGS and GTKMM_LIBS
-dnl   to be used as follows:
-dnl AM_PATH_GTKMM([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl
-AC_DEFUN([AM_PATH_GTKMM],
-[dnl
-dnl Get the cflags and libraries from the gtkmm-config script
-dnl
-AC_ARG_WITH(gtkmm-prefix,[  --with-gtkmm-prefix=PREFIX
-                         Prefix where GTK-- is installed (optional)],
-           gtkmm_config_prefix="$withval", gtkmm_config_prefix="")
-AC_ARG_WITH(gtkmm-exec-prefix,[  --with-gtkmm-exec-prefix=PREFIX
-                         Exec prefix where GTK-- is installed (optional)],
-           gtkmm_config_exec_prefix="$withval", gtkmm_config_exec_prefix="")
-AC_ARG_ENABLE(gtkmmtest, [  --disable-gtkmmtest     Do not try to compile and run a test GTK-- program],
-                   , enable_gtkmmtest=yes)
-
-  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
-
-  AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no)
-  min_gtkmm_version=ifelse([$1], ,0.10.0,$1)
-
-  AC_MSG_CHECKING(for GTK-- - version >= $min_gtkmm_version)
-  no_gtkmm=""
-  if test "$GTKMM_CONFIG" = "no" ; then
-    no_gtkmm=yes
-  else
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-
-    GTKMM_CFLAGS=`$GTKMM_CONFIG $gtkmm_config_args --cflags`
-    GTKMM_LIBS=`$GTKMM_CONFIG $gtkmm_config_args --libs`
-    gtkmm_config_major_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \
-          sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtkmm_config_minor_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \
-          sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtkmm_config_micro_version=`$GTKMM_CONFIG $gtkmm_config_args --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"
-dnl
-dnl Now check if the installed GTK-- is sufficiently new. (Also sanity
-dnl checks the results of gtkmm-config to some extent
-dnl
-      rm -f conf.gtkmmtest
-      AC_TRY_RUN([
-#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;
-}
-],, no_gtkmm=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CXXFLAGS="$ac_save_CXXFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtkmm" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])
-  else
-     AC_MSG_RESULT(no)
-     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="$CXXFLAGS $GTKMM_CFLAGS"
-         LIBS="$LIBS $GTKMM_LIBS"
-         AC_TRY_LINK([
-#include <gtk--.h>
-#include <stdio.h>
-],      [ return ((gtkmm_major_version) || (gtkmm_minor_version) || (gtkmm_micro_version)); ],
-       [ 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" ],
-       [ 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" ])
-         CXXFLAGS="$ac_save_CXXFLAGS"
-         LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTKMM_CFLAGS=""
-     GTKMM_LIBS=""
-     ifelse([$3], , :, [$3])
-     AC_LANG_RESTORE
-  fi
-  AC_SUBST(GTKMM_CFLAGS)
-  AC_SUBST(GTKMM_LIBS)
-  rm -f conf.gtkmmtest
-])