[libcvd-members] gvars3 Makefile.in configure configure.ac main....

[Georg Klein]

CVSROOT:        /cvsroot/libcvd
Module name:    gvars3
Changes by:     Georg Klein <georgklein>        08/02/01 14:57:37

Modified files:
        .              : Makefile.in configure configure.ac main.cc 
        gvars3         : instances.h 
        src            : GUI_readline.cc inst.cc inst_headless.cc 
Removed files:
        gvars2_compat  : GStringUtil.h GUI.h GUI_Motif.h GVars2.h 

Log message:
        Removed GVARS2_COMPAT stuff, I don't think anyone was using it anymore.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gvars3/Makefile.in?cvsroot=libcvd&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gvars3/configure?cvsroot=libcvd&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gvars3/configure.ac?cvsroot=libcvd&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gvars3/main.cc?cvsroot=libcvd&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gvars3/gvars2_compat/GStringUtil.h?cvsroot=libcvd&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/gvars3/gvars2_compat/GUI.h?cvsroot=libcvd&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/gvars3/gvars2_compat/GUI_Motif.h?cvsroot=libcvd&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/gvars3/gvars2_compat/GVars2.h?cvsroot=libcvd&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/gvars3/gvars3/instances.h?cvsroot=libcvd&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gvars3/src/GUI_readline.cc?cvsroot=libcvd&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gvars3/src/inst.cc?cvsroot=libcvd&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gvars3/src/inst_headless.cc?cvsroot=libcvd&r1=1.1&r2=1.2

Patches:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/libcvd/gvars3/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- Makefile.in 18 Oct 2007 16:25:34 -0000      1.19
+++ Makefile.in 1 Feb 2008 14:57:35 -0000       1.20
@@ -112,10 +112,6 @@
     CPPFLAGS+=-DGUI_HAVE_MOTIF
 endif
 
-ifeq (@use_gvars2_compat@,yes)
-    CPPFLAGS+=-DGVARS2_COMPAT
-endif
-
 ifeq (@build_cpu@,x86_64)
     CPPFLAGS+=-fPIC
 endif
@@ -168,7 +164,6 @@
 install:$(soname) $(archive) $(HEADLESS)
        mkdir -p $(DESTDIR)/$(includedir)
        cp -r gvars3 $(DESTDIR)/$(includedir)
-       if test "@use_gvars2_compat@" == "yes"; then cp gvars2_compat/*.h 
$(DESTDIR)/$(includedir); fi
        mkdir -p $(DESTDIR)/$(libdir)
        cp $(soname2) $(archive) $(HEADLESS) $(DESTDIR)/$(libdir)
        ln -fs  $(DESTDIR)/$(libdir)/$(soname2) $(DESTDIR)/$(libdir)/$(soname1)

Index: configure
===================================================================
RCS file: /cvsroot/libcvd/gvars3/configure,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- configure   18 Oct 2007 16:16:25 -0000      1.12
+++ configure   1 Feb 2008 14:57:35 -0000       1.13
@@ -308,7 +308,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK CXX 
CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CXXCPP EGREP build build_cpu 
build_vendor build_os host host_cpu host_vendor host_os osx_hacks have_toon 
have_readline use_gvars2_compat have_fltk have_motif a have_fltk2 make_headless 
major minor HLIBS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK CXX 
CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CXXCPP EGREP build build_cpu 
build_vendor build_os host host_cpu host_vendor host_os osx_hacks have_toon 
have_readline have_fltk have_motif a have_fltk2 make_headless major minor HLIBS 
LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -850,7 +850,6 @@
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-TooN=directory  Specify location for TooN
-  --with-gvars2-compat    add extra GVars2 backwards compatibility
   --with-x                use the X Window System
   --with-headless    Build additional headless library
 
@@ -3037,33 +3036,6 @@
        fi
 done
 
-echo ------------------------------------------------
-echo "Extra GVars2 Compat:"
-echo " (adds GVars2.h, GUI.h, GUI_Motif.h GStringUtil.h wrappers,"
-echo " and removes the global GV2 and GUI instances)"
-# Check if the user (i.e. Georg) wants extra GV2 backwards-compat
-
-# Check whether --with-gvars2_compat or --without-gvars2_compat was given.
-if test "${with_gvars2_compat+set}" = set; then
-  withval="$with_gvars2_compat"
-
-fi;
-if test "$with_gvars2_compat" == "yes"
-then
-       { echo "$as_me:$LINENO: Extra GVars2 compat enabled. " >&5
-echo "$as_me: Extra GVars2 compat enabled. " >&6;}
-        use_gvars2_compat=yes
-
-else
-       { echo "$as_me:$LINENO: Extra GVars2 compat not enabled. " >&5
-echo "$as_me: Extra GVars2 compat not enabled. " >&6;}
-        use_gvars2_compat=no
-
-fi
-
-
-
-
 
################################################################################
 #
 # Basic dialogue box functionality
@@ -3402,7 +3374,7 @@
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Intrinsic.h.
+  # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3410,7 +3382,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -3437,7 +3409,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Intrinsic.h"; then
+  if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -3458,11 +3430,11 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 int
 main ()
 {
-XtMalloc (0)
+XrmInitialize ()
   ;
   return 0;
 }
@@ -4532,7 +4504,6 @@
 s,@osx_hacks@,$osx_hacks,;t t
 s,@have_toon@,$have_toon,;t t
 s,@have_readline@,$have_readline,;t t
-s,@use_gvars2_compat@,$use_gvars2_compat,;t t
 s,@have_fltk@,$have_fltk,;t t
 s,@have_motif@,$have_motif,;t t
 s,@a@,$a,;t t

Index: configure.ac
===================================================================
RCS file: /cvsroot/libcvd/gvars3/configure.ac,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- configure.ac        18 Oct 2007 16:16:25 -0000      1.11
+++ configure.ac        1 Feb 2008 14:57:35 -0000       1.12
@@ -144,24 +144,6 @@
        fi
 done
 
-echo ------------------------------------------------
-echo "Extra GVars2 Compat:"
-echo " (adds GVars2.h, GUI.h, GUI_Motif.h GStringUtil.h wrappers,"
-echo " and removes the global GV2 and GUI instances)"
-# Check if the user (i.e. Georg) wants extra GV2 backwards-compat
-AC_ARG_WITH(gvars2_compat,   [  --with-gvars2-compat    add extra GVars2 
backwards compatibility])
-if test "$with_gvars2_compat" == "yes"
-then
-       AC_MSG_NOTICE([Extra GVars2 compat enabled. ])
-        AC_SUBST(use_gvars2_compat,yes)
-else
-       AC_MSG_NOTICE([Extra GVars2 compat not enabled. ])
-        AC_SUBST(use_gvars2_compat,no)
-fi
-
-
-
-
 
################################################################################
 #
 # Basic dialogue box functionality

Index: main.cc
===================================================================
RCS file: /cvsroot/libcvd/gvars3/main.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- main.cc     11 Feb 2007 00:09:14 -0000      1.14
+++ main.cc     1 Feb 2008 14:57:35 -0000       1.15
@@ -19,19 +19,9 @@
     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifdef GVARS2_COMPAT
-
-#include <GVars2.h>
-#include <GUI.h>
-GVars2 GV2;
-GUI GUI(&GV2);
-
-#else
-
 #include <gvars3/GUI.h>
 #include <gvars3/instances.h>
 using namespace GVars3;
-#endif
 
 #include <gvars3/GUI_readline.h>
 #include <unistd.h>

Index: gvars3/instances.h
===================================================================
RCS file: /cvsroot/libcvd/gvars3/gvars3/instances.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gvars3/instances.h  8 May 2006 19:13:43 -0000       1.8
+++ gvars3/instances.h  1 Feb 2008 14:57:36 -0000       1.9
@@ -21,13 +21,8 @@
 
 #include <gvars3/GUI.h>
 
-#ifdef GVARS2_COMPAT
-extern GVars3::GVars2 GV2;
-extern class GVars3::GUI GUI;
-#else
 namespace GVars3
 {
   extern GVars2 GV2;
   extern class GUI GUI;
 };
-#endif

Index: src/GUI_readline.cc
===================================================================
RCS file: /cvsroot/libcvd/gvars3/src/GUI_readline.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/GUI_readline.cc 22 Oct 2007 22:20:44 -0000      1.9
+++ src/GUI_readline.cc 1 Feb 2008 14:57:36 -0000       1.10
@@ -29,9 +29,6 @@
 #include <readline/history.h>
 
 using namespace std;
-#ifdef GVARS2_COMPAT
-#define GUI ::GUI
-#endif
 
 namespace GVars3
 {

Index: src/inst.cc
===================================================================
RCS file: /cvsroot/libcvd/gvars3/src/inst.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/inst.cc 18 Oct 2007 16:25:34 -0000      1.12
+++ src/inst.cc 1 Feb 2008 14:57:36 -0000       1.13
@@ -19,7 +19,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef GVARS2_COMPAT
 #include <gvars3/instances.h>
 
 #ifdef GUI_HAVE_FLTK
@@ -109,4 +108,3 @@
 
 
 }
-#endif

Index: src/inst_headless.cc
===================================================================
RCS file: /cvsroot/libcvd/gvars3/src/inst_headless.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/inst_headless.cc        18 Oct 2007 16:23:25 -0000      1.1
+++ src/inst_headless.cc        1 Feb 2008 14:57:36 -0000       1.2
@@ -19,7 +19,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef GVARS2_COMPAT
 #include <gvars3/instances.h>
 
 
@@ -47,4 +46,3 @@
 
 
 }
-#endif

Index: gvars2_compat/GStringUtil.h
===================================================================
RCS file: gvars2_compat/GStringUtil.h
diff -N gvars2_compat/GStringUtil.h
--- gvars2_compat/GStringUtil.h 8 May 2006 18:11:47 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-/*                       
-       GStringUtil.h: compatibility header for GVars2-based code
-
-       This file is part of the GVars3 Library.
-
-       Copyright (C) 2005 The Authors
-
-       This library is free software; you can redistribute it and/or
-       modify it under the terms of the GNU Lesser General Public
-       License as published by the Free Software Foundation; either
-       version 2.1 of the License, or (at your option) any later version.
-
-       This library is distributed in the hope that it will be useful,
-       but WITHOUT ANY WARRANTY; without even the implied warranty of
-       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-       Lesser General Public License for more details.
-
-       You should have received a copy of the GNU Lesser General Public
-       License along with this library; if not, write to the Free Software
-       Foundation, Inc., 
-       51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef __GSTRINGUTIL_WRAPPER_H
-#define __GSTRINGUTIL_WRAPPER_H
-#include <gvars3/GStringUtil.h>
-using GVars3::UncommentString;
-using GVars3::ChopAndUnquoteString;
-using GVars3::ParseAndAllocate;
-#endif

Index: gvars2_compat/GUI.h
===================================================================
RCS file: gvars2_compat/GUI.h
diff -N gvars2_compat/GUI.h
--- gvars2_compat/GUI.h 8 May 2006 18:11:47 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-/*                       
-       GUI.h: compatibility header for GVars2-based code
-
-       This file is part of the GVars3 Library.
-
-       Copyright (C) 2005 The Authors
-
-       This library is free software; you can redistribute it and/or
-       modify it under the terms of the GNU Lesser General Public
-       License as published by the Free Software Foundation; either
-       version 2.1 of the License, or (at your option) any later version.
-
-       This library is distributed in the hope that it will be useful,
-       but WITHOUT ANY WARRANTY; without even the implied warranty of
-       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-       Lesser General Public License for more details.
-
-       You should have received a copy of the GNU Lesser General Public
-       License along with this library; if not, write to the Free Software
-       Foundation, Inc., 
-       51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef __GUI_WRAPPER_H
-#define __GUI_WRAPPER_H
-#include <gvars3/GUI.h>
-using GVars3::GUI;
-#endif

Index: gvars2_compat/GUI_Motif.h
===================================================================
RCS file: gvars2_compat/GUI_Motif.h
diff -N gvars2_compat/GUI_Motif.h
--- gvars2_compat/GUI_Motif.h   8 May 2006 18:11:47 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-/*                       
-       GUI_Motif.h: compatibility header for GVars2-based code
-
-       This file is part of the GVars3 Library.
-
-       Copyright (C) 2005 The Authors
-
-       This library is free software; you can redistribute it and/or
-       modify it under the terms of the GNU Lesser General Public
-       License as published by the Free Software Foundation; either
-       version 2.1 of the License, or (at your option) any later version.
-
-       This library is distributed in the hope that it will be useful,
-       but WITHOUT ANY WARRANTY; without even the implied warranty of
-       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-       Lesser General Public License for more details.
-
-       You should have received a copy of the GNU Lesser General Public
-       License along with this library; if not, write to the Free Software
-       Foundation, Inc., 
-       51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef __GUI_MOTIF_WRAPPER_H
-#define __GUI_MOTIF_WRAPPER_H
-#include <gvars3/GUI_Motif.h>
-using GVars3::GUI_Motif;
-#endif

Index: gvars2_compat/GVars2.h
===================================================================
RCS file: gvars2_compat/GVars2.h
diff -N gvars2_compat/GVars2.h
--- gvars2_compat/GVars2.h      8 May 2006 18:11:47 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-/*                       
-       GVars2.h: compatibility header for GVars2-based code
-
-       This file is part of the GVars3 Library.
-
-       Copyright (C) 2005 The Authors
-
-       This library is free software; you can redistribute it and/or
-       modify it under the terms of the GNU Lesser General Public
-       License as published by the Free Software Foundation; either
-       version 2.1 of the License, or (at your option) any later version.
-
-       This library is distributed in the hope that it will be useful,
-       but WITHOUT ANY WARRANTY; without even the implied warranty of
-       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-       Lesser General Public License for more details.
-
-       You should have received a copy of the GNU Lesser General Public
-       License along with this library; if not, write to the Free Software
-       Foundation, Inc., 
-       51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef __GVARS2_H
-#define __GVARS2_H
-#include <gvars3/gvars3.h>
-using namespace TooN;
-using GVars3::GVars2;
-using GVars3::gvar2_double;
-using GVars3::gvar2_int;
-using GVars3::gvar2_string;
-using GVars3::gvar2_Matrix;
-using GVars3::gvar2_Vector;
-#endif