gEDA-cvs: CVS update: configure.ac

[cvspsrv@xxxxxxxx]

  User: danmc   
  Date: 06/09/23 23:57:58

  Modified:    .        configure.ac
  Log:
  Improve gdlib detection.  Now instead of just dropping gd support
  
  if gdlib is not found, have configure error out with a message
  
  that tells the user what needs to be fixed or what feature will
  
  be missing if --disable-gd is used.  
  
  
  
  Also add a variable to libgeda.pc.in so pkg-config can determine
  
  if libgeda was compiled with gdlib support.  This makes determination
  
  of this by gschem more robust.
  
  
  
  
  Revision  Changes    Path
  1.33      +17 -11    eda/geda/gaf/gschem/configure.ac
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: configure.ac
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/configure.ac,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -b -r1.32 -r1.33
  --- configure.ac	22 Sep 2006 18:48:08 -0000	1.32
  +++ configure.ac	24 Sep 2006 03:57:58 -0000	1.33
  @@ -1,3 +1,5 @@
  +# $Id: configure.ac,v 1.33 2006/09/24 03:57:58 danmc Exp $
  +#
   # Process this file with autoconf to produce a configure script.
   AC_INIT
   AC_CONFIG_SRCDIR([src/gschem.c])
  @@ -239,20 +241,24 @@
   # built with libgd support.
   #
   
  -haslibgd=`echo $LIBGEDA_LIBS | grep gd`
  -if test "$haslibgd" != ""; then
  -   # Check disable-gd command line flag value
  -   if test "$no_gd" = "yes"; then
  -      echo found libgd, but disabling gd support
  -      LIBGD=no
  +if test "X$no_gd" != "Xyes"; then
  +	AC_MSG_CHECKING([if libgeda was compiled with gdlib])
  +	haslibgd=`$PKG_CONFIG --variable=LIBGEDA_HASGD libgeda`
  +	if test "$haslibgd" != "yes"; then
  +		AC_ERROR([You have requested that gdlib be
  +used but libgeda was not compiled with libgd support.  You can
  +either recompile libgeda with gdlib support or you can disable
  +gdlib (which disables png export) with --disable-gd
  +])
      else 
  -      AC_DEFINE(HAS_LIBGD, 1, [Define if you have libgd installed])
  +		AC_MSG_RESULT([yes])
         LIBGD=yes
      fi
   else
         LIBGD=no
   fi
   
  +
   # 
   # Check for libgd end
   ############################################################################
  
  
  


_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs