gEDA-cvs: CVS update: ChangeLog

[cvspsrv@xxxxxxxx]

  User: ahvezda 
  Date: 05/03/13 22:43:35

  Modified:    .        ChangeLog configure.ac
  Log:
  Removed gtk+ 1.2.x tests from configure.ac files.  Minor symbol tweaks.
  
  
  
  
  Revision  Changes    Path
  1.106     +5 -0      eda/geda/devel/utils/ChangeLog
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/utils/ChangeLog,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -b -r1.105 -r1.106
  --- ChangeLog	9 Mar 2005 04:07:36 -0000	1.105
  +++ ChangeLog	14 Mar 2005 03:43:35 -0000	1.106
  @@ -1,3 +1,8 @@
  +2005-03-13 Ales Hvezda   <ahvezda@xxxxxxxxxxxxx>
  +
  +        * configure.ac: Removed all tests for gtk+ 1.2.x and fixed error 
  +        message if gtk+ 2.2.x is not found.
  +
   2005-03-08 Ales Hvezda   <ahvezda@xxxxxxxxxxxxx>
   
           * configure.ac: Bumped version to 20050313
  
  
  
  1.19      +5 -30     eda/geda/devel/utils/configure.ac
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: configure.ac
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/utils/configure.ac,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- configure.ac	9 Mar 2005 04:07:36 -0000	1.18
  +++ configure.ac	14 Mar 2005 03:43:35 -0000	1.19
  @@ -21,10 +21,6 @@
   # Change default location for rc files
   AC_ARG_WITH(rcdir, [  --with-rcdir=path       Change where the system-*rc files are installed], [opt_rcdir=$withval])
   
  -# Force a specific version of gtk+ (or in this case a specific version of
  -# glib)
  -AC_ARG_WITH(gtk12, [  --with-gtk12            Force the use of gtk+ 1.2.x], [opt_gtkver=1.2])
  -
   # --with-docdir : tells where to store documentation if not default
   # defined below 
   # 
  @@ -98,7 +94,7 @@
   ############################################################################
   
   ############################################################################
  -# Check for gtk+ 1.2 and 2.2 start
  +# Check for gtk+ 2.2 start
   # 
   
   # Check for pkg-config
  @@ -107,14 +103,10 @@
      AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
   fi
   
  -# Search for gtk+ 2.2.x first (only if we are not forcing the gtk+ to 1.2)
  -if test "$opt_gtkver" != "1.2"
  -then
  -   PKG_CHECK_MODULES(GTK22, gtk+-2.0 >= 2.2.0, GTK22="yes", no_GTK22="yes")
  -fi
  +PKG_CHECK_MODULES(GTK22, gtk+-2.0 >= 2.2.0, GTK22="yes", no_GTK22="yes")
   
   # This next bit of code figures out what gtk we need to use.
  -if test "$GTK22" = "yes" -a "$opt_gtkver" != "1.2"
  +if test "$GTK22" = "yes"
   then
   
      AC_DEFINE(HAS_GTK22, 1, [If gtk+ 2.2.x has been installed, define this])
  @@ -133,29 +125,12 @@
      GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
   
   else
  -
  -   # Search for gtk+ 1.2 now 
  -   PKG_CHECK_MODULES(GTK12, gtk+ >= 1.2.3, GTK12="yes", no_GTK12="yes")
  -
  -   AC_DEFINE(HAS_GTK12, 1, [If gtk+ 1.2.x has been installed, define this])
  -   GTK_CFLAGS=$GTK12_CFLAGS
  -   GTK_LIBS=$GTK12_LIBS
  -   GTK_VERSION=`$PKG_CONFIG gtk+ --modversion`
  -
  -   # Search for glib
  -   PKG_CHECK_MODULES(GLIB12, glib >= 1.2.3, GLIB12="yes", no_GLIB12="yes")
  -   if test "$GLIB12" != "yes"
  -   then
  -       AC_MSG_ERROR([Cannot find glib >= 1.2.3, install it and rerun ./configure.])
  -   fi
  -   GLIB_CFLAGS=$GLIB12_CFLAGS
  -   GLIB_LIBS=$GLIB12_LIBS
  -   GLIB_VERSION=`$PKG_CONFIG glib --modversion`
  +   GTK_VERSION=""
   fi
   
   if test "$GTK_VERSION" = ""
   then
  -   AC_MSG_ERROR([Cannot find gtk+ 2.2.x or gtk+ 1.2.x, install one of them.])
  +   AC_MSG_ERROR([Cannot find gtk+ 2.2.x or later, please install gtk+.])
   fi
   
   #