gEDA-cvs: CVS update: ChangeLog

[cvspsrv@xxxxxxxx]

  User: cnieves 
  Date: 05/02/23 18:39:10

  Modified:    .        ChangeLog configure.ac
  Log:
  Added temporary GDK dependency. Fixed CLI compilation error 
  
  when gdk_init was not found when linking.
  
  
  
  
  Revision  Changes    Path
  1.254     +6 -0      eda/geda/devel/libgeda/ChangeLog
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/libgeda/ChangeLog,v
  retrieving revision 1.253
  retrieving revision 1.254
  diff -u -b -r1.253 -r1.254
  --- ChangeLog	22 Feb 2005 20:42:31 -0000	1.253
  +++ ChangeLog	23 Feb 2005 23:39:09 -0000	1.254
  @@ -1,3 +1,9 @@
  +2005-02-23  Carlos Nieves Onega <cnieves@xxxxxxxxxx>
  +
  +	* configure.ac, noweb/o_picture.nw:
  +	Added temporary GDK dependency. Fixed CLI compilation error
  +	when gdk_init was not found when linking.
  +	
   2005-02-22  Carlos Nieves Onega <cnieves@xxxxxxxxxx>
   
           * noweb/o_picture.nw: Fix character conversion.
  
  
  
  1.18      +38 -2     eda/geda/devel/libgeda/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/libgeda/configure.ac,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- configure.ac	21 Feb 2005 05:38:49 -0000	1.17
  +++ configure.ac	23 Feb 2005 23:39:10 -0000	1.18
  @@ -269,6 +269,42 @@
   ############################################################################
   
   ############################################################################
  +# Check for gdk 
  +# 
  +
  +# Check for pkg-config
  +AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
  +if test $PKG_CONFIG = no; then
  +   AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
  +fi
  +
  +# Search for gdk (only if we are not forcing the gtk+ to 1.2)
  +if test "$opt_gtkver" != "1.2"
  +then
  +   PKG_CHECK_MODULES(GDK, gdk >= 0.15.0, GDK="yes", no_GDK="yes")
  +fi
  +
  +# This next bit of code figures out what gtk we need to use.
  +if test "$GDK" = "yes" -a "$opt_gtkver" != "1.2"
  +then
  +
  +   AC_DEFINE(HAS_GDK, 1, [If gdk has been installed, define this])
  +   GDK_CFLAGS=$GDK_CFLAGS
  +   GDK_LIBS=$GDK_LIBS
  +   GDK_VERSION=`$PKG_CONFIG gdk-2.0 --modversion`
  +
  +fi
  +
  +if test "$GDK_VERSION" = ""
  +then
  +   AC_MSG_ERROR([Cannot find gdk.])
  +fi
  +
  +# 
  +# Check for gdk end
  +############################################################################
  +
  +############################################################################
   # Check for gdk-pixbuf 
   # 
   
  @@ -576,8 +612,8 @@
   
   
   # Finally create the final CFLAGS and LDFLAGS for use in the makefiles
  -LIBGEDA_CFLAGS="$MINGW_CFLAGS $GUILE_CFLAGS $GDGEDA_CFLAGS $GTK_CFLAGS $X_CFLAGS $GDK_PIXBUF_CFLAGS"
  -LIBGEDA_LDFLAGS="$GUILE_LDFLAGS $GDGEDA_LIBS $GLIB_LIBS $MINGW_LIBS $DMALLOC_LIBS $GDK_PIXBUF_LIBS"
  +LIBGEDA_CFLAGS="$MINGW_CFLAGS $GUILE_CFLAGS $GDGEDA_CFLAGS $GTK_CFLAGS $X_CFLAGS $GDK_PIXBUF_CFLAGS $GDK_CFLAGS"
  +LIBGEDA_LDFLAGS="$GUILE_LDFLAGS $GDGEDA_LIBS $GLIB_LIBS $MINGW_LIBS $DMALLOC_LIBS $GDK_PIXBUF_LIBS $GDK_LIBS"
   LIBTOOL_FLAGS="-version-info $SHARED_LIBRARY_VERSION"
   
   # Makefile.in variable substitution