[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-100-g64cdf2b)
The branch, master has been updated
via 64cdf2bd7250e97749a308e19916c1d65c9a2c95 (commit)
via ee7200f0f784699344e8ef8bb332e4a0486eeda4 (commit)
via 1a4c656b3aea2a0cd58b57f836e97b96078f0bb2 (commit)
from 74227a00faff800831eb04c31a04760216ebc12b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gschem/Makefile.am | 11 +-----
gschem/autogen.sh | 52 ++++++++---------------------
gschem/{configure.ac.in => configure.ac} | 3 +-
libgeda/Makefile.am | 9 +----
libgeda/autogen.sh | 52 ++++++++---------------------
libgeda/{configure.ac.in => configure.ac} | 6 +--
libgeda/src/o_embed.c | 2 -
libgeda/src/o_picture.c | 5 ---
libgeda/src/s_log.c | 3 --
libgeda/src/s_toplevel.c | 3 --
libgeda/src/u_basic.c | 3 --
11 files changed, 35 insertions(+), 114 deletions(-)
rename gschem/{configure.ac.in => configure.ac} (99%)
rename libgeda/{configure.ac.in => configure.ac} (98%)
=================
Commit Messages
=================
commit 64cdf2bd7250e97749a308e19916c1d65c9a2c95
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Use a static configure.ac and constant gettext version.
:100644 100644 893e86e... c2d3373... M gschem/Makefile.am
:100755 100755 b222a1f... a987ad5... M gschem/autogen.sh
:000000 100644 0000000... 36b786f... A gschem/configure.ac
:100644 000000 70bcbb9... 0000000... D gschem/configure.ac.in
:100644 100644 7b2bef1... 57ced64... M libgeda/Makefile.am
:100755 100755 b222a1f... 0c54e28... M libgeda/autogen.sh
:000000 100644 0000000... 896ae97... A libgeda/configure.ac
:100644 000000 ff17f41... 0000000... D libgeda/configure.ac.in
commit ee7200f0f784699344e8ef8bb332e4a0486eeda4
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Don't use stdarg.h.
A number of files in libgeda include stdarg.h, but none of them
actually use it.
:100644 100644 2c7e4c8... ff17f41... M libgeda/configure.ac.in
:100644 100644 3412577... 372a6f6... M libgeda/src/s_log.c
:100644 100644 a9e09e9... 24f9e54... M libgeda/src/s_toplevel.c
:100644 100644 ee977ba... e2ca032... M libgeda/src/u_basic.c
commit 1a4c656b3aea2a0cd58b57f836e97b96078f0bb2
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Don't use libgen.h
Since we now use GLib's functions to get the basename, basename(3)
from libgen is no longer required.
:100644 100644 386bf05... 2c7e4c8... M libgeda/configure.ac.in
:100644 100644 4682b49... 1ce58cc... M libgeda/src/o_embed.c
:100644 100644 21c0ff1... c3853b9... M libgeda/src/o_picture.c
=========
Changes
=========
commit 64cdf2bd7250e97749a308e19916c1d65c9a2c95
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Use a static configure.ac and constant gettext version.
diff --git a/gschem/Makefile.am b/gschem/Makefile.am
index 893e86e..c2d3373 100644
--- a/gschem/Makefile.am
+++ b/gschem/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = include lib intl src po scheme bitmap scripts examples \
tests docs data
-EXTRA_DIST = BUGS ChangeLog-1.0 autogen.sh config.rpath configure.ac.in \
+EXTRA_DIST = BUGS ChangeLog-1.0 autogen.sh config.rpath \
icon-theme-installer desktop-i18n
#proto:
@@ -16,12 +16,6 @@ maintainer-clean-local:
intl/config.charset intl/Makefile.in intl/ChangeLog \
po/*.sed po/*.header po/*.sin po/*.template po/Rules-quot
-
-# Special rule to make sure that configure.ac is recreated when configure.ac.in
-# changes.
-configure.ac: configure.ac.in
- ./autogen.sh recreate_configure_only
-
ACLOCAL_AMFLAGS = -I m4
MOSTLYCLEANFILES = *.log core FILE *~
@@ -29,6 +23,5 @@ CLEANFILES = *.log core FILE *~
DISTCLEANFILES = *.log core FILE *~ prototype.bak
MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in configure config.h.in \
config.status aclocal.m4 config.guess config.rpath \
- config.sub depcomp install-sh missing mkinstalldirs \
- configure.ac
+ config.sub depcomp install-sh missing mkinstalldirs
DISTCHECK_CONFIGURE_FLAGS = --disable-update-desktop-database
diff --git a/gschem/autogen.sh b/gschem/autogen.sh
index b222a1f..a987ad5 100755
--- a/gschem/autogen.sh
+++ b/gschem/autogen.sh
@@ -6,16 +6,7 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-configure_script=configure.ac.in
-
-# If "recreate_configure_only" is specified on the command line as the first
-# argument, then enter a special mode to rebuild configure only. If we add
-# arguments to this script, then this has to be made a bit more intelligent.
-if test "$1" = "recreate_configure_only"; then
- recreate_configure_only=1
-else
- recreate_configure_only=0
-fi
+configure_script=configure.ac
# Automake required version
AM_1=1 # Major number
@@ -139,15 +130,6 @@ xlc )
am_opt=--include-deps;;
esac
-# Create the configure.ac from the configure.ac.in file.
-# The below line to get the gettext version isn't the most robust construct
-# because if gettext changes its version output format, this will break.
-echo autogen.sh creating configure.ac
-installed_gettext_version=`gettext --version | grep gettext | awk '{print $4}'`
-cat $configure_script | \
- sed "s/%INSTALLED_GETTEXT_VERSION%/$installed_gettext_version/" > configure.ac
-configure_script=configure.ac
-
for coin in $srcdir/$configure_script
do
dr=`dirname $coin`
@@ -159,20 +141,17 @@ do
aclocalinclude="$ACLOCAL_FLAGS -I m4"
- if test "$recreate_configure_only" = "0"; then
- # Only run these if we are NOT in the recreate_configure_only mode
- if grep "^AM_GNU_GETTEXT" $configure_script >/dev/null; then
- echo "autogen.sh running: autopoint ..."
- echo "no" | autopoint --force
- fi
- if grep "^AX_DESKTOP_I18N" $configure_script >/dev/null; then
- echo "autogen.sh running: desktop-i18n ..."
- ./desktop-i18n --setup
- fi
- if grep "^AM_PROG_LIBTOOL" $configure_script >/dev/null; then
- echo "autogen.sh running: libtoolize ..."
- $LIBTOOLIZE --force --copy
- fi
+ if grep "^AM_GNU_GETTEXT" $configure_script >/dev/null; then
+ echo "autogen.sh running: autopoint ..."
+ echo "no" | autopoint --force
+ fi
+ if grep "^AX_DESKTOP_I18N" $configure_script >/dev/null; then
+ echo "autogen.sh running: desktop-i18n ..."
+ ./desktop-i18n --setup
+ fi
+ if grep "^AM_PROG_LIBTOOL" $configure_script >/dev/null; then
+ echo "autogen.sh running: libtoolize ..."
+ $LIBTOOLIZE --force --copy
fi
echo "autogen.sh running: aclocal $aclocalinclude ..."
@@ -188,11 +167,8 @@ do
autoheader
fi
- if test "$recreate_configure_only" = "0"; then
- # Only run these if we are NOT in the recreate_configure_only mode
- echo "autogen.sh running: automake $am_opt ..."
- automake --copy --add-missing --gnu $am_opt
- fi
+ echo "autogen.sh running: automake $am_opt ..."
+ automake --copy --add-missing --gnu $am_opt
echo "autogen.sh running: autoconf ..."
autoconf
diff --git a/gschem/configure.ac b/gschem/configure.ac
new file mode 100644
index 0000000..36b786f
--- /dev/null
+++ b/gschem/configure.ac
@@ -0,0 +1,532 @@
+# Process this file with autoconf to produce a configure script.
+AC_INIT
+AC_CONFIG_SRCDIR([src/gschem.c])
+AC_CONFIG_MACRO_DIR([m4])
+AC_PREREQ(2.54)
+
+PACKAGE=geda-gschem
+DOTTED_VERSION=1.5.2
+DATE_VERSION=20090328
+echo Configuring $PACKAGE version $DOTTED_VERSION.$DATE_VERSION
+
+# Initialize automake
+AM_INIT_AUTOMAKE($PACKAGE, $DOTTED_VERSION, no-define)
+AC_CONFIG_HEADER([config.h])
+
+# Call this to make autoconf and friends happy
+AC_GNU_SOURCE
+
+#########################################################################
+# Command line flags start
+#
+# --disable-stroke : turn off stroke support
+AC_ARG_ENABLE(stroke,
+ [ --disable-stroke Disable stroke support (don't use LibStroke at all)], [ if test $enableval = "no"; then
+ no_stroke=yes
+ fi ])
+
+# Change default location for rc files
+AC_ARG_WITH(rcdir, [ --with-rcdir=path Change where the system-*rc files are installed], [opt_rcdir=$withval])
+
+# Change default location for XDG files (.desktop and icons)
+AC_ARG_WITH(xdgdatadir, [ --with-xdgdatadir=path Change where the .desktop file and theme icons are installed [[DATADIR]]], [opt_xdgdatadir=$withval])
+
+# Allow the user to specify where there libstroke library lives
+AC_ARG_WITH(stroke, [ --with-stroke=DIR Tell configure where to find libstroke], [opt_stroke=$withval])
+
+#
+# Command line flags end
+#########################################################################
+
+#########################################################################
+#
+# Misc win32 / mingw checks and variables start
+AC_CANONICAL_HOST
+
+# Figure out if we are building on win32 and what environment.
+case $host_os in
+ *mingw32* ) echo "Configuring for mingw"; MINGW=yes ;;
+esac
+
+if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
+ MINGW="yes"
+ MINGW_CFLAGS="-mms-bitfields -mwindows"
+else
+ # Unix host
+ MINGW="no"
+ MINGW_CFLAGS=
+fi
+
+#
+# Misc win32 / mingw checks and variables end
+#########################################################################
+
+# Checks for programs.
+AC_PROG_CC
+AM_CONDITIONAL(CCISGCC, test "$GCC" = "yes")
+AC_PROG_CPP
+AC_PROG_MAKE_SET
+
+
+############################################################################
+# Update desktop database utility start
+#
+
+AC_ARG_ENABLE(update-desktop-database,
+ AC_HELP_STRING([--disable-update-desktop-database],
+ [do not update desktop file database after installation]),,
+ enable_update_desktop_database=yes)
+
+AM_CONDITIONAL(ENABLE_UPDATE_DESKTOP_DATABASE,
+ test x$enable_update_desktop_database = xyes)
+
+if test x$enable_update_desktop_database = xyes ; then
+ AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, [update-desktop-database], no)
+ if test $UPDATE_DESKTOP_DATABASE = no; then
+ AC_MSG_ERROR([Cannot find update-desktop-database, make sure it is installed and in your PATH, or configure with --disable-update-desktop-database])
+ fi
+fi
+
+#
+# Update desktop database utility end
+############################################################################
+
+############################################################################
+# Check for guile start
+
+# 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
+
+PKG_CHECK_MODULES(GUILE, [guile-1.8], GUILE_PC="yes", no_GUILE_PC="yes")
+
+if test "$GUILE_PC" = "yes"
+then
+
+ GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
+
+else
+
+ # Find about the installed guile
+ GUILE_FLAGS
+ GUILE_VERSION=`$GUILE_CONFIG info guileversion`
+
+fi
+
+# Check Guile version
+guile_need_major=1
+guile_need_minor=8
+guile_need_version="$guile_need_major[].$guile_need_minor.0"
+
+AC_MSG_CHECKING([Guile version >= $guile_need_version])
+
+guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
+guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
+AC_MSG_RESULT($GUILE_VERSION)
+
+if test "$guile_need_major" -gt "$guile_major" \
+ || (test "$guile_need_major" -eq "$guile_major" \
+ && test "$guile_need_minor" -gt "$guile_minor"); then
+ AC_MSG_ERROR([Guile version >= $guile_need_version is required.])
+fi
+
+#
+# Check for guile end
+############################################################################
+
+############################################################################
+# Check for mics things start
+#
+# Checking for rint in math library
+AC_CHECK_LIB(m, rint, AC_DEFINE(HAS_RINT, 1, [If your math library has rint in it, define this]), no_RINT="yes")
+
+# Checking for dynamic lib
+AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
+#
+# Check for mics things start
+############################################################################
+
+############################################################################
+# Check for gtk+ start
+#
+
+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0], GTK="yes", no_GTK="yes")
+
+# This next bit of code figures out what gtk we need to use.
+if test "$GTK" = "yes"
+then
+ GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion`
+
+ # Search for glib
+ PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0], GLIB="yes", no_GLIB="yes")
+ if test "$GLIB" != "yes"
+ then
+ AC_MSG_ERROR([Cannot find glib 2.12.0 or later, please install it and rerun ./configure.])
+ fi
+ GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
+
+ # Search for gthread
+ PKG_CHECK_MODULES(GTHREAD, [gthread-2.0], GTHREAD="yes", no_GTHREAD="yes")
+ if test "$GTHREAD" = "yes"
+ then
+ AC_DEFINE(HAVE_GTHREAD, 1, [If gthread support is installed, define this])
+ fi
+
+else
+ GTK_VERSION=""
+fi
+
+if test "$GTK_VERSION" = ""
+then
+ AC_MSG_ERROR([Cannot find gtk+ 2.10.0 or later, please install it and rerun ./configure.])
+fi
+
+#
+# Check for gtk+ end
+############################################################################
+
+############################################################################
+# Check for cairo start
+#
+
+PKG_CHECK_MODULES(CAIRO, [cairo >= 1.2.0], CAIRO="yes", no_CAIRO="yes")
+
+if test "$CAIRO" = "yes"
+then
+ CAIRO_VERSION=`$PKG_CONFIG cairo --modversion`
+else
+ AC_MSG_ERROR([Cannot find cairo 1.2.0 or later, please install or configure with --disable-cairo])
+fi
+
+#
+# Check for cairo end
+############################################################################
+
+############################################################################
+# Check for libgeda start
+#
+PKG_CHECK_MODULES(LIBGEDA, [libgeda >= $DATE_VERSION], LIBGEDA="yes",
+ no_LIBGEDA="yes")
+
+if test "$LIBGEDA" = "yes"
+then
+ LIBGEDA_VERSION=`$PKG_CONFIG libgeda --modversion`
+else
+ AC_MSG_ERROR([libgeda detection error: $LIBGEDA_PKG_ERRORS])
+fi
+
+#
+# Check for libgeda end
+############################################################################
+
+############################################################################
+# Check for libstroke start
+#
+
+# user specified --with-stroke
+if eval "test x$opt_stroke != x"; then
+ LIBSTROKE_LIBS="-L$opt_stroke/lib"
+ LIBSTROKE_CFLAGS="-I$opt_stroke/include"
+fi
+
+# only check if the user has not disable strokes
+if test "$no_stroke" != "yes"; then
+ save_cppflags="$CPPFLAGS"
+ save_ldflags="$LDFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBSTROKE_CFLAGS"
+ LDFLAGS="$LDFLAGS $LIBSTROKE_LIBS"
+ AC_CHECK_LIB(stroke, stroke_init, LIBSTROKE="yes", LIBSTROKE="no")
+ CPPFLAGS="$save_cppflags"
+ LDFLAGS="$save_ldflags"
+fi
+
+if test "$LIBSTROKE" = "yes"; then
+ AC_DEFINE(HAS_LIBSTROKE, 1, [Define if you have libstroke installed])
+ if eval "test x$opt_stroke = x"; then
+ LIBSTROKE_LIBS="-lstroke"
+ LIBSTROKE_CFLAGS=""
+ else
+ LIBSTROKE_LIBS="$LIBSTROKE_LIBS -lstroke"
+ # LIBSTROKE_CFLAGS set above
+ fi
+fi
+
+if test "$no_stroke" = "yes"; then
+ echo "** **"
+ echo "** Disabling libstroke by request **"
+ echo "** **"
+ LIBSTROKE_LIB=""
+ LIBSTROKE_CFLAGS=""
+ LIBSTROKE="no"
+fi
+
+#
+# Check for libstroke end
+############################################################################
+
+############################################################################
+# Check for doxygen start
+#
+# Doxygen is a utility for generating html and latex documentation
+# from c source code files.
+
+# search for Doxygen
+AC_PATH_PROG(DOXYGEN, doxygen, no, ${PATH})
+
+if test "$DOXYGEN" = "no"; then
+ # doxygen is not available on the system
+ echo "** Cannot find Doxygen! **"
+ echo "** Documentation creation disabled **"
+ DOXYGEN=echo
+
+ # prevent from weaving the nw files
+ # but does not prevent from processing gschemdoc
+ builddoc=false
+else
+ # doxygen is available on the system.
+ # now checking if the tools for Texinfo files processing
+ # is installed.
+ # The docs can be either processed to produce dvi, html or info
+ # with texi2dvi, texi2html or makeinfo respectively
+ # Note : these tests on makeinfo and texi2dvi are no more
+ # needed as automake makes them for us
+
+ # enable the creation of html and latex documents.
+ builddoc=true
+fi
+
+# depending on variable builddoc, weaving is performed or not
+# using conditionnal in docs/Makefile.in
+AM_CONDITIONAL(BUILDDOC, test x$builddoc = xtrue)
+
+#
+# Check for doxygen end
+#########################################################################
+
+#########################################################################
+# Check for groff start
+#
+
+# search for groff
+AC_PATH_PROG(GROFF, groff, no, ${PATH})
+if test $GROFF = "no"; then
+ echo "Cannot find groff, some documentation will not be created."
+fi
+
+#
+# Check for groff end
+#########################################################################
+
+#########################################################################
+# Checks for header files start
+#
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_HEADER_DIRENT
+AC_CHECK_HEADERS(unistd.h string.h stdlib.h \
+ stdarg.h assert.h fcntl.h errno.h sys/param.h)
+
+# Check for locale.h
+
+# Set USE_NLS
+AM_NLS
+AC_CHECK_HEADER([locale.h],
+ [AC_DEFINE([HAVE_LOCALE_H], 1, [Define if you have locale.h])],
+ [
+ if test "$USE_NLS" = "yes"; then
+ AC_MSG_ERROR([Cannot find useful locale.h, and nls support is enabled. Try compiling with --disable-nls])
+ fi
+ ])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+
+# Checks for library functions.
+AC_TYPE_SIGNAL
+AC_CHECK_FUNCS(strstr getuid getgid)
+
+AC_MSG_CHECKING([for optarg in unistd.h])
+AC_TRY_COMPILE(
+[#include <unistd.h>],
+[ char *string = optarg; int i = optind; ],
+optarg_found=yes,
+optarg_found=no)
+AC_MSG_RESULT($optarg_found)
+
+if test $optarg_found = yes; then
+ AC_DEFINE(OPTARG_IN_UNISTD, 1, [Define if you have optarg in unistd.h])
+fi
+
+#
+# Checks for header files end
+#########################################################################
+
+#########################################################################
+#
+
+# ------------- dmalloc -------------------
+dnl dmalloc checks
+with_dmalloc="no"
+AC_MSG_CHECKING([if dmalloc debugging should be enabled])
+AC_ARG_ENABLE([dmalloc],
+[ --enable-dmalloc Compile and link with dmalloc for malloc debugging [[default=no]]],
+[
+if test "X$enable_dmalloc" != "Xno" ; then
+ AC_MSG_RESULT([yes])
+ AC_CHECK_HEADER(dmalloc.h,,
+ AC_ERROR([You have requested dmalloc debugging but dmalloc.h could not be found]))
+ AC_CHECK_LIB(dmalloc,main,,
+ AC_ERROR([You have requested dmalloc debugging but -ldmalloc could not be found]))
+ DMALLOC_LIBS="-ldmalloc"
+ with_dmalloc="yes"
+else
+ AC_MSG_RESULT([no])
+ DMALLOC_LIBS=""
+fi
+],
+[
+ AC_MSG_RESULT([no])
+ DMALLOC_LIBS=""
+])
+
+# ------------- ElectricFence -------------------
+dnl ElectricFence checks
+with_efence="no"
+AC_MSG_CHECKING([if ElectricFence debugging should be enabled])
+AC_ARG_ENABLE([efence],
+[ --enable-efence Link with ElectricFence for malloc debugging [[default=no]]],
+[
+if test "X$enable_efence" != "Xno" ; then
+ AC_MSG_RESULT([yes])
+ AC_CHECK_LIB(efence,main,,
+ AC_ERROR([You have requested ElectricFence debugging but -lefence could not be found]))
+ with_efence="yes"
+else
+ AC_MSG_RESULT([no])
+fi
+],
+[
+AC_MSG_RESULT([no])
+])
+
+#
+#########################################################################
+#########################################################################
+# gEDA/gaf specific setup start
+#
+
+DATADIR=gEDA
+GEDADATADIR=$datadir/$DATADIR
+
+if eval "test x$opt_rcdir = x"; then
+ # path was not specified with --with-rcdir
+ AC_DEFINE_UNQUOTED(GEDARCDIR, "none", [gEDA/gaf's rc directory])
+ GEDARCDIR=$GEDADATADIR
+else
+ # path WAS specified with --with-rcdir
+ AC_DEFINE_UNQUOTED(GEDARCDIR, "$opt_rcdir", [gEDA/gaf's rc directory])
+ GEDARCDIR="$opt_rcdir"
+fi
+
+if test x$opt_xdgdatadir = x; then
+ # path was not specified with --with-xdgdatadir
+ XDGDATADIR='${datadir}'
+else
+ # path WAS specified with --with-xdgdatadir
+ XDGDATADIR="$opt_xdgdatadir"
+fi
+AC_SUBST(XDGDATADIR)
+
+# Expand the prefix variable
+# I don't like the way this is done, but it works (I hope).
+if eval "test x$prefix = xNONE"; then
+ dprefix=$ac_default_prefix
+else
+ dprefix=$prefix
+fi
+
+gedatopdir=$dprefix/share/$DATADIR
+expandgedadatadir=`echo $gedatopdir`
+
+gedadocdir=$dprefix/share/doc/geda-doc
+# --with-docdir : tells where to store documentation if not default
+AC_ARG_WITH(docdir,
+ [ --with-docdir Where to store documentation if not default.],
+ gedadocdir=$withval)
+expandgedadocdir=`echo $gedadocdir`
+GEDADOCDIR=$expandgedadocdir
+AC_SUBST(GEDADOCDIR)
+
+# this has to be expanded ( no ${prefix} ) --
+AC_DEFINE_UNQUOTED(GEDADATADIR, "$gedatopdir", [gEDA/gaf's data directory])
+AC_DEFINE_UNQUOTED(DATE_VERSION, "$DATE_VERSION", [Currently running date version of gEDA/gaf])
+AC_DEFINE_UNQUOTED(DOTTED_VERSION, "$DOTTED_VERSION", [Currently running dotted version of gEDA/gaf])
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package])
+
+#
+# gEDA/gaf specify things which need to setup
+#########################################################################
+
+# Initialized gettext
+AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.16])
+
+AX_DESKTOP_I18N
+
+# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
+GSCHEM_CFLAGS="$MINGW_CFLAGS $LIBSTROKE_CFLAGS $LIBGEDA_CFLAGS $GLIB_CFLAGS $GTK_CFLAGS $GTHREAD_CFLAGS $GUILE_CFLAGS"
+GSCHEM_LDFLAGS="$LIBSTROKE_LIBS $LIBGEDA_LIBS $GLIB_LIBS $GTK_LIBS $DMALLOC_LIBS $GTHREAD_LIBS $GUILE_LIBS"
+
+# Makefile.in variable substitution
+AC_SUBST(DATE_VERSION)
+AC_SUBST(DOTTED_VERSION)
+AC_SUBST(GSCHEM_CFLAGS)
+AC_SUBST(GSCHEM_LDFLAGS)
+AC_SUBST(GEDADATADIR)
+AC_SUBST(GEDARCDIR)
+AC_SUBST(GUILEINTERP)
+AC_SUBST(INDENT)
+
+# Create all the necessary derived files
+AC_CONFIG_FILES([Makefile
+ po/Makefile.in
+ intl/Makefile
+ src/Makefile
+ include/Makefile
+ scheme/Makefile
+ bitmap/Makefile
+ scripts/Makefile
+ scripts/config.sh
+ examples/Makefile
+ docs/Makefile
+ lib/Makefile
+ tests/Makefile
+ data/Makefile
+ lib/system-gschemrc ])
+
+
+AC_OUTPUT
+
+expandedGEDADATADIR=`eval "echo $GEDADATADIR"`
+expandedGEDARCDIR=`eval "echo $GEDARCDIR"`
+expandedXDGDATADIR=`eval "echo $XDGDATADIR"`
+expandedGEDADOCDIR=`eval "echo $GEDADOCDIR"`
+
+AC_MSG_RESULT([
+** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION:
+
+ GTK+ library version: $GTK_VERSION
+ CAIRO library version: $CAIRO_VERSION
+ GUILE library version: $GUILE_VERSION
+ libgeda library version: $LIBGEDA_VERSION
+ libstroke library: $LIBSTROKE
+ mingw build: $MINGW
+ data directory: $expandedGEDADATADIR
+ rc directory: $expandedGEDARCDIR
+ xdg directory: $expandedXDGDATADIR
+ documentation directory: $expandedGEDADOCDIR
+ dmalloc debugging: $with_dmalloc
+ ElectricFence debugging: $with_efence
+])
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
deleted file mode 100644
index 70bcbb9..0000000
--- a/gschem/configure.ac.in
+++ /dev/null
@@ -1,533 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-AC_INIT
-AC_CONFIG_SRCDIR([src/gschem.c])
-AC_CONFIG_MACRO_DIR([m4])
-AC_PREREQ(2.54)
-
-PACKAGE=geda-gschem
-DOTTED_VERSION=1.5.2
-DATE_VERSION=20090328
-echo Configuring $PACKAGE version $DOTTED_VERSION.$DATE_VERSION
-
-# Initialize automake
-AM_INIT_AUTOMAKE($PACKAGE, $DOTTED_VERSION, no-define)
-AC_CONFIG_HEADER([config.h])
-AC_SUBST([CONFIG_DEPENDENCIES], ['$(top_srcdir)/configure.ac.in'])
-
-# Call this to make autoconf and friends happy
-AC_GNU_SOURCE
-
-#########################################################################
-# Command line flags start
-#
-# --disable-stroke : turn off stroke support
-AC_ARG_ENABLE(stroke,
- [ --disable-stroke Disable stroke support (don't use LibStroke at all)], [ if test $enableval = "no"; then
- no_stroke=yes
- fi ])
-
-# Change default location for rc files
-AC_ARG_WITH(rcdir, [ --with-rcdir=path Change where the system-*rc files are installed], [opt_rcdir=$withval])
-
-# Change default location for XDG files (.desktop and icons)
-AC_ARG_WITH(xdgdatadir, [ --with-xdgdatadir=path Change where the .desktop file and theme icons are installed [[DATADIR]]], [opt_xdgdatadir=$withval])
-
-# Allow the user to specify where there libstroke library lives
-AC_ARG_WITH(stroke, [ --with-stroke=DIR Tell configure where to find libstroke], [opt_stroke=$withval])
-
-#
-# Command line flags end
-#########################################################################
-
-#########################################################################
-#
-# Misc win32 / mingw checks and variables start
-AC_CANONICAL_HOST
-
-# Figure out if we are building on win32 and what environment.
-case $host_os in
- *mingw32* ) echo "Configuring for mingw"; MINGW=yes ;;
-esac
-
-if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
- MINGW="yes"
- MINGW_CFLAGS="-mms-bitfields -mwindows"
-else
- # Unix host
- MINGW="no"
- MINGW_CFLAGS=
-fi
-
-#
-# Misc win32 / mingw checks and variables end
-#########################################################################
-
-# Checks for programs.
-AC_PROG_CC
-AM_CONDITIONAL(CCISGCC, test "$GCC" = "yes")
-AC_PROG_CPP
-AC_PROG_MAKE_SET
-
-
-############################################################################
-# Update desktop database utility start
-#
-
-AC_ARG_ENABLE(update-desktop-database,
- AC_HELP_STRING([--disable-update-desktop-database],
- [do not update desktop file database after installation]),,
- enable_update_desktop_database=yes)
-
-AM_CONDITIONAL(ENABLE_UPDATE_DESKTOP_DATABASE,
- test x$enable_update_desktop_database = xyes)
-
-if test x$enable_update_desktop_database = xyes ; then
- AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, [update-desktop-database], no)
- if test $UPDATE_DESKTOP_DATABASE = no; then
- AC_MSG_ERROR([Cannot find update-desktop-database, make sure it is installed and in your PATH, or configure with --disable-update-desktop-database])
- fi
-fi
-
-#
-# Update desktop database utility end
-############################################################################
-
-############################################################################
-# Check for guile start
-
-# 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
-
-PKG_CHECK_MODULES(GUILE, [guile-1.8], GUILE_PC="yes", no_GUILE_PC="yes")
-
-if test "$GUILE_PC" = "yes"
-then
-
- GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
-
-else
-
- # Find about the installed guile
- GUILE_FLAGS
- GUILE_VERSION=`$GUILE_CONFIG info guileversion`
-
-fi
-
-# Check Guile version
-guile_need_major=1
-guile_need_minor=8
-guile_need_version="$guile_need_major[].$guile_need_minor.0"
-
-AC_MSG_CHECKING([Guile version >= $guile_need_version])
-
-guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
-guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
-AC_MSG_RESULT($GUILE_VERSION)
-
-if test "$guile_need_major" -gt "$guile_major" \
- || (test "$guile_need_major" -eq "$guile_major" \
- && test "$guile_need_minor" -gt "$guile_minor"); then
- AC_MSG_ERROR([Guile version >= $guile_need_version is required.])
-fi
-
-#
-# Check for guile end
-############################################################################
-
-############################################################################
-# Check for mics things start
-#
-# Checking for rint in math library
-AC_CHECK_LIB(m, rint, AC_DEFINE(HAS_RINT, 1, [If your math library has rint in it, define this]), no_RINT="yes")
-
-# Checking for dynamic lib
-AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
-#
-# Check for mics things start
-############################################################################
-
-############################################################################
-# Check for gtk+ start
-#
-
-PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0], GTK="yes", no_GTK="yes")
-
-# This next bit of code figures out what gtk we need to use.
-if test "$GTK" = "yes"
-then
- GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion`
-
- # Search for glib
- PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0], GLIB="yes", no_GLIB="yes")
- if test "$GLIB" != "yes"
- then
- AC_MSG_ERROR([Cannot find glib 2.12.0 or later, please install it and rerun ./configure.])
- fi
- GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
-
- # Search for gthread
- PKG_CHECK_MODULES(GTHREAD, [gthread-2.0], GTHREAD="yes", no_GTHREAD="yes")
- if test "$GTHREAD" = "yes"
- then
- AC_DEFINE(HAVE_GTHREAD, 1, [If gthread support is installed, define this])
- fi
-
-else
- GTK_VERSION=""
-fi
-
-if test "$GTK_VERSION" = ""
-then
- AC_MSG_ERROR([Cannot find gtk+ 2.10.0 or later, please install it and rerun ./configure.])
-fi
-
-#
-# Check for gtk+ end
-############################################################################
-
-############################################################################
-# Check for cairo start
-#
-
-PKG_CHECK_MODULES(CAIRO, [cairo >= 1.2.0], CAIRO="yes", no_CAIRO="yes")
-
-if test "$CAIRO" = "yes"
-then
- CAIRO_VERSION=`$PKG_CONFIG cairo --modversion`
-else
- AC_MSG_ERROR([Cannot find cairo 1.2.0 or later, please install or configure with --disable-cairo])
-fi
-
-#
-# Check for cairo end
-############################################################################
-
-############################################################################
-# Check for libgeda start
-#
-PKG_CHECK_MODULES(LIBGEDA, [libgeda >= $DATE_VERSION], LIBGEDA="yes",
- no_LIBGEDA="yes")
-
-if test "$LIBGEDA" = "yes"
-then
- LIBGEDA_VERSION=`$PKG_CONFIG libgeda --modversion`
-else
- AC_MSG_ERROR([libgeda detection error: $LIBGEDA_PKG_ERRORS])
-fi
-
-#
-# Check for libgeda end
-############################################################################
-
-############################################################################
-# Check for libstroke start
-#
-
-# user specified --with-stroke
-if eval "test x$opt_stroke != x"; then
- LIBSTROKE_LIBS="-L$opt_stroke/lib"
- LIBSTROKE_CFLAGS="-I$opt_stroke/include"
-fi
-
-# only check if the user has not disable strokes
-if test "$no_stroke" != "yes"; then
- save_cppflags="$CPPFLAGS"
- save_ldflags="$LDFLAGS"
- CPPFLAGS="$CPPFLAGS $LIBSTROKE_CFLAGS"
- LDFLAGS="$LDFLAGS $LIBSTROKE_LIBS"
- AC_CHECK_LIB(stroke, stroke_init, LIBSTROKE="yes", LIBSTROKE="no")
- CPPFLAGS="$save_cppflags"
- LDFLAGS="$save_ldflags"
-fi
-
-if test "$LIBSTROKE" = "yes"; then
- AC_DEFINE(HAS_LIBSTROKE, 1, [Define if you have libstroke installed])
- if eval "test x$opt_stroke = x"; then
- LIBSTROKE_LIBS="-lstroke"
- LIBSTROKE_CFLAGS=""
- else
- LIBSTROKE_LIBS="$LIBSTROKE_LIBS -lstroke"
- # LIBSTROKE_CFLAGS set above
- fi
-fi
-
-if test "$no_stroke" = "yes"; then
- echo "** **"
- echo "** Disabling libstroke by request **"
- echo "** **"
- LIBSTROKE_LIB=""
- LIBSTROKE_CFLAGS=""
- LIBSTROKE="no"
-fi
-
-#
-# Check for libstroke end
-############################################################################
-
-############################################################################
-# Check for doxygen start
-#
-# Doxygen is a utility for generating html and latex documentation
-# from c source code files.
-
-# search for Doxygen
-AC_PATH_PROG(DOXYGEN, doxygen, no, ${PATH})
-
-if test "$DOXYGEN" = "no"; then
- # doxygen is not available on the system
- echo "** Cannot find Doxygen! **"
- echo "** Documentation creation disabled **"
- DOXYGEN=echo
-
- # prevent from weaving the nw files
- # but does not prevent from processing gschemdoc
- builddoc=false
-else
- # doxygen is available on the system.
- # now checking if the tools for Texinfo files processing
- # is installed.
- # The docs can be either processed to produce dvi, html or info
- # with texi2dvi, texi2html or makeinfo respectively
- # Note : these tests on makeinfo and texi2dvi are no more
- # needed as automake makes them for us
-
- # enable the creation of html and latex documents.
- builddoc=true
-fi
-
-# depending on variable builddoc, weaving is performed or not
-# using conditionnal in docs/Makefile.in
-AM_CONDITIONAL(BUILDDOC, test x$builddoc = xtrue)
-
-#
-# Check for doxygen end
-#########################################################################
-
-#########################################################################
-# Check for groff start
-#
-
-# search for groff
-AC_PATH_PROG(GROFF, groff, no, ${PATH})
-if test $GROFF = "no"; then
- echo "Cannot find groff, some documentation will not be created."
-fi
-
-#
-# Check for groff end
-#########################################################################
-
-#########################################################################
-# Checks for header files start
-#
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_HEADER_DIRENT
-AC_CHECK_HEADERS(unistd.h string.h stdlib.h \
- stdarg.h assert.h fcntl.h errno.h sys/param.h)
-
-# Check for locale.h
-
-# Set USE_NLS
-AM_NLS
-AC_CHECK_HEADER([locale.h],
- [AC_DEFINE([HAVE_LOCALE_H], 1, [Define if you have locale.h])],
- [
- if test "$USE_NLS" = "yes"; then
- AC_MSG_ERROR([Cannot find useful locale.h, and nls support is enabled. Try compiling with --disable-nls])
- fi
- ])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-
-# Checks for library functions.
-AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(strstr getuid getgid)
-
-AC_MSG_CHECKING([for optarg in unistd.h])
-AC_TRY_COMPILE(
-[#include <unistd.h>],
-[ char *string = optarg; int i = optind; ],
-optarg_found=yes,
-optarg_found=no)
-AC_MSG_RESULT($optarg_found)
-
-if test $optarg_found = yes; then
- AC_DEFINE(OPTARG_IN_UNISTD, 1, [Define if you have optarg in unistd.h])
-fi
-
-#
-# Checks for header files end
-#########################################################################
-
-#########################################################################
-#
-
-# ------------- dmalloc -------------------
-dnl dmalloc checks
-with_dmalloc="no"
-AC_MSG_CHECKING([if dmalloc debugging should be enabled])
-AC_ARG_ENABLE([dmalloc],
-[ --enable-dmalloc Compile and link with dmalloc for malloc debugging [[default=no]]],
-[
-if test "X$enable_dmalloc" != "Xno" ; then
- AC_MSG_RESULT([yes])
- AC_CHECK_HEADER(dmalloc.h,,
- AC_ERROR([You have requested dmalloc debugging but dmalloc.h could not be found]))
- AC_CHECK_LIB(dmalloc,main,,
- AC_ERROR([You have requested dmalloc debugging but -ldmalloc could not be found]))
- DMALLOC_LIBS="-ldmalloc"
- with_dmalloc="yes"
-else
- AC_MSG_RESULT([no])
- DMALLOC_LIBS=""
-fi
-],
-[
- AC_MSG_RESULT([no])
- DMALLOC_LIBS=""
-])
-
-# ------------- ElectricFence -------------------
-dnl ElectricFence checks
-with_efence="no"
-AC_MSG_CHECKING([if ElectricFence debugging should be enabled])
-AC_ARG_ENABLE([efence],
-[ --enable-efence Link with ElectricFence for malloc debugging [[default=no]]],
-[
-if test "X$enable_efence" != "Xno" ; then
- AC_MSG_RESULT([yes])
- AC_CHECK_LIB(efence,main,,
- AC_ERROR([You have requested ElectricFence debugging but -lefence could not be found]))
- with_efence="yes"
-else
- AC_MSG_RESULT([no])
-fi
-],
-[
-AC_MSG_RESULT([no])
-])
-
-#
-#########################################################################
-#########################################################################
-# gEDA/gaf specific setup start
-#
-
-DATADIR=gEDA
-GEDADATADIR=$datadir/$DATADIR
-
-if eval "test x$opt_rcdir = x"; then
- # path was not specified with --with-rcdir
- AC_DEFINE_UNQUOTED(GEDARCDIR, "none", [gEDA/gaf's rc directory])
- GEDARCDIR=$GEDADATADIR
-else
- # path WAS specified with --with-rcdir
- AC_DEFINE_UNQUOTED(GEDARCDIR, "$opt_rcdir", [gEDA/gaf's rc directory])
- GEDARCDIR="$opt_rcdir"
-fi
-
-if test x$opt_xdgdatadir = x; then
- # path was not specified with --with-xdgdatadir
- XDGDATADIR='${datadir}'
-else
- # path WAS specified with --with-xdgdatadir
- XDGDATADIR="$opt_xdgdatadir"
-fi
-AC_SUBST(XDGDATADIR)
-
-# Expand the prefix variable
-# I don't like the way this is done, but it works (I hope).
-if eval "test x$prefix = xNONE"; then
- dprefix=$ac_default_prefix
-else
- dprefix=$prefix
-fi
-
-gedatopdir=$dprefix/share/$DATADIR
-expandgedadatadir=`echo $gedatopdir`
-
-gedadocdir=$dprefix/share/doc/geda-doc
-# --with-docdir : tells where to store documentation if not default
-AC_ARG_WITH(docdir,
- [ --with-docdir Where to store documentation if not default.],
- gedadocdir=$withval)
-expandgedadocdir=`echo $gedadocdir`
-GEDADOCDIR=$expandgedadocdir
-AC_SUBST(GEDADOCDIR)
-
-# this has to be expanded ( no ${prefix} ) --
-AC_DEFINE_UNQUOTED(GEDADATADIR, "$gedatopdir", [gEDA/gaf's data directory])
-AC_DEFINE_UNQUOTED(DATE_VERSION, "$DATE_VERSION", [Currently running date version of gEDA/gaf])
-AC_DEFINE_UNQUOTED(DOTTED_VERSION, "$DOTTED_VERSION", [Currently running dotted version of gEDA/gaf])
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package])
-
-#
-# gEDA/gaf specify things which need to setup
-#########################################################################
-
-# Initialized gettext
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([%INSTALLED_GETTEXT_VERSION%])
-
-AX_DESKTOP_I18N
-
-# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
-GSCHEM_CFLAGS="$MINGW_CFLAGS $LIBSTROKE_CFLAGS $LIBGEDA_CFLAGS $GLIB_CFLAGS $GTK_CFLAGS $GTHREAD_CFLAGS $GUILE_CFLAGS"
-GSCHEM_LDFLAGS="$LIBSTROKE_LIBS $LIBGEDA_LIBS $GLIB_LIBS $GTK_LIBS $DMALLOC_LIBS $GTHREAD_LIBS $GUILE_LIBS"
-
-# Makefile.in variable substitution
-AC_SUBST(DATE_VERSION)
-AC_SUBST(DOTTED_VERSION)
-AC_SUBST(GSCHEM_CFLAGS)
-AC_SUBST(GSCHEM_LDFLAGS)
-AC_SUBST(GEDADATADIR)
-AC_SUBST(GEDARCDIR)
-AC_SUBST(GUILEINTERP)
-AC_SUBST(INDENT)
-
-# Create all the necessary derived files
-AC_CONFIG_FILES([Makefile
- po/Makefile.in
- intl/Makefile
- src/Makefile
- include/Makefile
- scheme/Makefile
- bitmap/Makefile
- scripts/Makefile
- scripts/config.sh
- examples/Makefile
- docs/Makefile
- lib/Makefile
- tests/Makefile
- data/Makefile
- lib/system-gschemrc ])
-
-
-AC_OUTPUT
-
-expandedGEDADATADIR=`eval "echo $GEDADATADIR"`
-expandedGEDARCDIR=`eval "echo $GEDARCDIR"`
-expandedXDGDATADIR=`eval "echo $XDGDATADIR"`
-expandedGEDADOCDIR=`eval "echo $GEDADOCDIR"`
-
-AC_MSG_RESULT([
-** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION:
-
- GTK+ library version: $GTK_VERSION
- CAIRO library version: $CAIRO_VERSION
- GUILE library version: $GUILE_VERSION
- libgeda library version: $LIBGEDA_VERSION
- libstroke library: $LIBSTROKE
- mingw build: $MINGW
- data directory: $expandedGEDADATADIR
- rc directory: $expandedGEDARCDIR
- xdg directory: $expandedXDGDATADIR
- documentation directory: $expandedGEDADOCDIR
- dmalloc debugging: $with_dmalloc
- ElectricFence debugging: $with_efence
-])
diff --git a/libgeda/Makefile.am b/libgeda/Makefile.am
index 7b2bef1..57ced64 100644
--- a/libgeda/Makefile.am
+++ b/libgeda/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = po data docs include intl lib scheme share src
-EXTRA_DIST = HACKING BUGS ChangeLog-1.0 autogen.sh configure.ac.in \
+EXTRA_DIST = HACKING BUGS ChangeLog-1.0 autogen.sh \
icon-theme-installer desktop-i18n po/domain.mak.in
pkgconfigdir = $(libdir)/pkgconfig
@@ -17,18 +17,13 @@ distclean-local:
maintainer-clean-local:
-rm -rf autom4te.cache
-# Special rule to make sure that configure.ac is recreated when configure.ac.in
-# changes.
-configure.ac: configure.ac.in
- ./autogen.sh recreate_configure_only
-
MOSTLYCLEANFILES = *.log core FILE *~
CLEANFILES = *.log core FILE *~
DISTCLEANFILES = *.log core FILE *~ prototype.bak libgeda.pc po/domain.mak
MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in configure config.h.in \
config.status aclocal.m4 libgeda.pc config.guess \
config.sub depcomp install-sh ltmain.sh missing \
- mkinstalldirs configure.ac
+ mkinstalldirs
DISTCHECK_CONFIGURE_FLAGS = --disable-update-mime-database
diff --git a/libgeda/autogen.sh b/libgeda/autogen.sh
index b222a1f..0c54e28 100755
--- a/libgeda/autogen.sh
+++ b/libgeda/autogen.sh
@@ -6,16 +6,7 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-configure_script=configure.ac.in
-
-# If "recreate_configure_only" is specified on the command line as the first
-# argument, then enter a special mode to rebuild configure only. If we add
-# arguments to this script, then this has to be made a bit more intelligent.
-if test "$1" = "recreate_configure_only"; then
- recreate_configure_only=1
-else
- recreate_configure_only=0
-fi
+configure_script=configure.ac
# Automake required version
AM_1=1 # Major number
@@ -139,15 +130,6 @@ xlc )
am_opt=--include-deps;;
esac
-# Create the configure.ac from the configure.ac.in file.
-# The below line to get the gettext version isn't the most robust construct
-# because if gettext changes its version output format, this will break.
-echo autogen.sh creating configure.ac
-installed_gettext_version=`gettext --version | grep gettext | awk '{print $4}'`
-cat $configure_script | \
- sed "s/%INSTALLED_GETTEXT_VERSION%/$installed_gettext_version/" > configure.ac
-configure_script=configure.ac
-
for coin in $srcdir/$configure_script
do
dr=`dirname $coin`
@@ -159,20 +141,17 @@ do
aclocalinclude="$ACLOCAL_FLAGS -I m4"
- if test "$recreate_configure_only" = "0"; then
- # Only run these if we are NOT in the recreate_configure_only mode
- if grep "^AM_GNU_GETTEXT" $configure_script >/dev/null; then
- echo "autogen.sh running: autopoint ..."
- echo "no" | autopoint --force
- fi
- if grep "^AX_DESKTOP_I18N" $configure_script >/dev/null; then
- echo "autogen.sh running: desktop-i18n ..."
- ./desktop-i18n --setup
- fi
- if grep "^AM_PROG_LIBTOOL" $configure_script >/dev/null; then
- echo "autogen.sh running: libtoolize ..."
- $LIBTOOLIZE --force --copy
- fi
+ if grep "^AM_GNU_GETTEXT" $configure_script >/dev/null; then
+ echo "autogen.sh running: autopoint ..."
+ echo "no" | autopoint --force
+ fi
+ if grep "^AX_DESKTOP_I18N" $configure_script >/dev/null; then
+ echo "autogen.sh running: desktop-i18n ..."
+ ./desktop-i18n --setup
+ fi
+ if grep "^AM_PROG_LIBTOOL" $configure_script >/dev/null; then
+ echo "autogen.sh running: libtoolize ..."
+ $LIBTOOLIZE --force --copy
fi
echo "autogen.sh running: aclocal $aclocalinclude ..."
@@ -188,11 +167,8 @@ do
autoheader
fi
- if test "$recreate_configure_only" = "0"; then
- # Only run these if we are NOT in the recreate_configure_only mode
- echo "autogen.sh running: automake $am_opt ..."
- automake --copy --add-missing --gnu $am_opt
- fi
+ echo "autogen.sh running: automake $am_opt ..."
+ automake --copy --add-missing --gnu $am_opt
echo "autogen.sh running: autoconf ..."
autoconf
diff --git a/libgeda/configure.ac b/libgeda/configure.ac
new file mode 100644
index 0000000..896ae97
--- /dev/null
+++ b/libgeda/configure.ac
@@ -0,0 +1,469 @@
+# Process this file with autoconf to produce a configure script.
+AC_INIT
+AC_CONFIG_SRCDIR([src/libgeda.c])
+AC_CONFIG_MACRO_DIR([m4])
+AC_PREREQ(2.54)
+
+PACKAGE=libgeda
+DOTTED_VERSION=1.5.2
+DATE_VERSION=20090328
+SHARED_LIBRARY_VERSION=36:0:0
+echo Configuring $PACKAGE version $DOTTED_VERSION.$DATE_VERSION
+
+# Init automake
+AM_INIT_AUTOMAKE($PACKAGE, $DOTTED_VERSION, no-define)
+AC_CONFIG_HEADER([config.h])
+
+# Call this to make autoconf and friends happy
+AC_GNU_SOURCE
+
+# Init libtool
+AC_LIBTOOL_WIN32_DLL
+AM_PROG_LIBTOOL
+
+#########################################################################
+# Command line flags start
+#
+
+# Change default location for rc files
+AC_ARG_WITH(rcdir, [ --with-rcdir=path Change where the system-*rc files are installed], [opt_rcdir=$withval])
+
+# Change default location for XDG files (MIME and Icons)
+AC_ARG_WITH(xdgdatadir, [ --with-xdgdatadir=path Change where the theme icons and mime registrations are installed [[DATADIR]]], [opt_xdgdatadir=$withval])
+
+# Change default location for KDE data files (KDE MIME registrations)
+AC_ARG_WITH(kdedatadir, [ --with-kdedatadir=path Change where the KDE mime registrations are installed [[DATADIR]]], [opt_kdedatadir=$withval])
+
+#
+# Command line flags end
+#########################################################################
+
+# Checks for libraries.
+#########################################################################
+#
+# Misc win32 / mingw checks and variables start
+
+# Figure out if we are building on win32 and what environment.
+case $host_os in
+ *mingw32* ) echo "Configuring for mingw"; MINGW=yes ;;
+esac
+
+if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
+ MINGW_LIBTOOL_FLAGS="-no-undefined"
+ MINGW_CFLAGS="-mms-bitfields"
+ MINGW="yes"
+else
+ # Unix host
+ MINGW_LIBTOOL_FLAGS=
+ MINGW_CFLAGS=
+ MINGW="no"
+fi
+
+#
+# Misc win32 / mingw checks and variables end
+#########################################################################
+
+# Checks for programs.
+AC_PROG_CC
+AM_CONDITIONAL(CCISGCC, test "$GCC" = "yes")
+AC_PROG_CPP
+AC_PROG_MAKE_SET
+
+############################################################################
+# Internationalisation start
+#
+# Set USE_NLS
+AC_GEDA_MACRO_CHECK([AM_NLS], [nls.m4])
+AM_NLS
+
+# Set package name for translations
+so_major=`echo "$SHARED_LIBRARY_VERSION" | sed 's/:.*//'`
+GETTEXT_PACKAGE=$PACKAGE$so_major
+AH_TEMPLATE([GETTEXT_PACKAGE], [Name of this program's gettext domain])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"])
+AC_SUBST(GETTEXT_PACKAGE)
+
+# Initialise gettext
+AC_GEDA_MACRO_CHECK([AM_GNU_GETTEXT], [gettext.m4])
+AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.16])
+
+# Setup desktop-i18n
+AX_DESKTOP_I18N
+
+#
+# Internationalisation end
+#########################################################################
+
+############################################################################
+# Check for pkg-config start
+#
+
+# 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
+
+#
+# Check for pkg-config end
+############################################################################
+
+############################################################################
+# Check for guile start
+#
+
+PKG_CHECK_MODULES(GUILE, [guile-1.8], GUILE_PC="yes", no_GUILE_PC="yes")
+
+if test "$GUILE_PC" = "yes"
+then
+
+ GUILE_LDFLAGS=$GUILE_LIBS
+ GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
+
+else
+
+ # Find about the installed guile
+ AC_GEDA_MACRO_CHECK([GUILE_FLAGS], [guile.m4])
+ GUILE_FLAGS
+ GUILE_VERSION=`$GUILE_CONFIG info guileversion`
+
+fi
+
+# Check Guile version
+guile_need_major=1
+guile_need_minor=8
+guile_need_version="$guile_need_major[].$guile_need_minor.0"
+
+AC_MSG_CHECKING([Guile version >= $guile_need_version])
+
+guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
+guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
+AC_MSG_RESULT($GUILE_VERSION)
+
+if test "$guile_need_major" -gt "$guile_major" \
+ || (test "$guile_need_major" -eq "$guile_major" \
+ && test "$guile_need_minor" -gt "$guile_minor"); then
+ AC_MSG_ERROR([Guile version >= $guile_need_version is required.])
+fi
+
+#
+# Check for guile end
+############################################################################
+
+############################################################################
+# Check for mics things start
+#
+# Checking for rint in math library
+AC_CHECK_LIB(m, rint, AC_DEFINE(HAS_RINT, 1, [If your math library has rint in it, define this]), no_RINT="yes")
+
+# Checking for dynamic lib
+AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
+#
+# Check for mics things start
+############################################################################
+
+############################################################################
+# Check for glib start
+#
+
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0], GLIB="yes", no_GLIB="yes")
+
+# This next bit of code figures out what glib we need to use.
+if test "$GLIB" != "yes"
+then
+ AC_MSG_ERROR([Cannot find glib 2.12.0 or later, please install it and rerun ./configure.])
+fi
+GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
+
+#
+# Check for glib end
+############################################################################
+
+############################################################################
+# Check for gdk-pixbuf
+#
+
+PKG_CHECK_MODULES(GDK_PIXBUF, [gdk-pixbuf-2.0 >= 0.15.0], GDK_PIXBUF="yes", no_GDK_PIXBUF="yes")
+
+# This next bit of code figures out what gtk we need to use.
+if test "$GDK_PIXBUF" = "yes"
+then
+
+ AC_DEFINE(HAS_GDK_PIXBUF, 1, [If gdk-pixbuf has been installed, define this])
+ GDK_PIXBUF_CFLAGS=$GDK_PIXBUF_CFLAGS
+ GDK_PIXBUF_LIBS=$GDK_PIXBUF_LIBS
+ GDK_PIXBUF_VERSION=`$PKG_CONFIG gdk-pixbuf-2.0 --modversion`
+
+fi
+
+if test "$GDK_PIXBUF_VERSION" = ""
+then
+ AC_MSG_ERROR([Cannot find gdk-pixbuf, please make sure it is installed.])
+fi
+
+#
+# Check for gdk-pixbuf end
+############################################################################
+
+
+
+############################################################################
+# Check for doxygen start
+#
+
+# Doxygen is a utility for generating html and latex documentation
+# from c source code files.
+
+# search for Doxygen
+AC_PATH_PROG(DOXYGEN, doxygen, no, ${PATH})
+
+if test "$DOXYGEN" = "no"; then
+ # doxygen is not available on the system
+ echo "** Cannot find Doxygen! **"
+ echo "** Documentation creation disabled **"
+ DOXYGEN=echo
+
+ # prevent from creating html and latex documents.
+ # but does not prevent from processing gschemdoc
+ builddoc=false
+else
+ # doxygen is available on the system.
+ # now checking if the tools for Texinfo files processing
+ # is installed.
+ # The docs can be either processed to produce dvi, html or info
+ # with texi2dvi, texi2html or makeinfo respectively
+ # Note : these tests on makeinfo and texi2dvi are no more
+ # needed as automake makes them for us
+
+ # enable the creation of html and latex documents.
+ builddoc=true
+fi
+
+# depending on variable builddoc, weaving is performed or not
+# using conditionnal in docs/Makefile.in
+AM_CONDITIONAL(BUILDDOC, test x$builddoc = xtrue)
+
+#
+# Check for doxygen end
+#########################################################################
+
+#########################################################################
+# Checks for header files start
+#
+
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_HEADER_DIRENT
+AC_CHECK_HEADERS(unistd.h string.h stdlib.h assert.h fcntl.h errno.h)
+
+AC_MSG_CHECKING([for optarg in unistd.h])
+AC_TRY_COMPILE(
+[#include <unistd.h>],
+[ char *string = optarg; int i = optind; ],
+optarg_found=yes,
+optarg_found=no)
+AC_MSG_RESULT($optarg_found)
+if test $optarg_found = yes; then
+ AC_DEFINE(OPTARG_IN_UNISTD, 1, [Define if you have optarg in unistd.h])
+fi
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+
+# Checks for library functions.
+AC_TYPE_SIGNAL
+AC_CHECK_FUNCS(strstr chown getlogin)
+
+#
+# Checks for header files end
+#########################################################################
+
+#########################################################################
+#
+
+# ------------- dmalloc -------------------
+dnl dmalloc checks
+with_dmalloc="no"
+AC_MSG_CHECKING([if dmalloc debugging should be enabled])
+AC_ARG_ENABLE([dmalloc],
+[ --enable-dmalloc Compile and link with dmalloc for malloc debugging [[default=no]]],
+[
+if test "X$enable_dmalloc" != "Xno" ; then
+ AC_MSG_RESULT([yes])
+ AC_CHECK_HEADER(dmalloc.h,,
+ AC_ERROR([You have requested dmalloc debugging but dmalloc.h could not be found]))
+ AC_CHECK_LIB(dmalloc,main,,
+ AC_ERROR([You have requested dmalloc debugging but -ldmalloc could not be found]))
+ DMALLOC_LIBS="-ldmalloc"
+ with_dmalloc="yes"
+else
+ AC_MSG_RESULT([no])
+ DMALLOC_LIBS=""
+fi
+],
+[
+ AC_MSG_RESULT([no])
+ DMALLOC_LIBS=""
+])
+
+# ------------- ElectricFence -------------------
+dnl ElectricFence checks
+with_efence="no"
+AC_MSG_CHECKING([if ElectricFence debugging should be enabled])
+AC_ARG_ENABLE([efence],
+[ --enable-efence Link with ElectricFence for malloc debugging [[default=no]]],
+[
+if test "X$enable_efence" != "Xno" ; then
+ AC_MSG_RESULT([yes])
+ AC_CHECK_LIB(efence,main,,
+ AC_ERROR([You have requested ElectricFence debugging but -lefence could not be found]))
+ with_efence="yes"
+else
+ AC_MSG_RESULT([no])
+fi
+],
+[
+AC_MSG_RESULT([no])
+])
+
+#
+#########################################################################
+
+#########################################################################
+# gEDA/gaf specific setup start
+#
+
+DATADIR=gEDA
+GEDADATADIR=$datadir/$DATADIR
+
+if eval "test x$opt_rcdir = x"; then
+ # path was not specified with --with-rcdir
+ AC_DEFINE_UNQUOTED(GEDARCDIR, "none", [gEDA/gaf's rc directory])
+ GEDARCDIR=$GEDADATADIR
+else
+ # path WAS specified with --with-rcdir
+ AC_DEFINE_UNQUOTED(GEDARCDIR, "$opt_rcdir", [gEDA/gaf's rc directory])
+ GEDARCDIR="$opt_rcdir"
+fi
+
+if test x$opt_xdgdatadir = x; then
+ # path was not specified with --with-xdgdatadir
+ XDGDATADIR='${datadir}'
+else
+ # path WAS specified with --with-xdgdatadir
+ XDGDATADIR="$opt_xdgdatadir"
+fi
+AC_SUBST(XDGDATADIR)
+
+if test x$opt_kdedatadir = x; then
+ # path was not specified with --with-kdedatadir
+ KDEDATADIR='${datadir}'
+else
+ # path WAS specified with --with-kdedatadir
+ KDEDATADIR="$opt_kdedatadir"
+fi
+AC_SUBST(KDEDATADIR)
+
+# Defs for libary symbol files
+#
+# Expand the prefix variable
+if eval "test x$prefix = xNONE"; then
+ dprefix=$ac_default_prefix
+else
+ dprefix=$prefix
+fi
+
+gedatopdir=$dprefix/share/$DATADIR
+expandgedadatadir=`echo $gedatopdir`
+
+# this has to be expanded ( no ${prefix} ) --
+AC_DEFINE_UNQUOTED(GEDADATADIR, "$gedatopdir", [gEDA/gaf's data directory])
+AC_DEFINE_UNQUOTED(DATE_VERSION, "$DATE_VERSION", [Currently running date version of gEDA/gaf])
+AC_DEFINE_UNQUOTED(DOTTED_VERSION, "$DOTTED_VERSION", [Currently running dotted version of gEDA/gaf])
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package])
+
+#
+# gEDA/gaf specify things which need to setup
+#########################################################################
+
+#########################################################################
+# Update mime database utility start
+#
+# Adapted from gnome-control-center.
+#
+
+AC_ARG_ENABLE(update-mime-database,
+ AC_HELP_STRING([--disable-update-mime-database],
+ [do not update mime database after installation]),,
+ enable_update_mime_database=yes)
+
+AM_CONDITIONAL(ENABLE_UPDATE_MIME_DATABASE,
+ test x$enable_update_mime_database = xyes)
+
+if test x$enable_update_mime_database = xyes ; then
+ AC_PATH_PROG(UPDATE_MIME_DATABASE, [update-mime-database], no)
+ if test $UPDATE_MIME_DATABASE = no; then
+ AC_MSG_ERROR([Cannot find update-mime-database, make sure it is installed and in your PATH, or configure with --disable-update-mime-database])
+ fi
+fi
+
+#
+# Update mime database utility end
+#########################################################################
+
+# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
+LIBGEDA_CFLAGS="$MINGW_CFLAGS $GUILE_CFLAGS $GLIB_CFLAGS $X_CFLAGS $GDK_PIXBUF_CFLAGS"
+LIBGEDA_LDFLAGS="$MINGW_LDFLAGS $GUILE_LDFLAGS $GLIB_LIBS $DMALLOC_LIBS $GDK_PIXBUF_LIBS"
+LIBTOOL_FLAGS="-version-info $SHARED_LIBRARY_VERSION $MINGW_LIBTOOL_FLAGS"
+
+# Makefile.in variable substitution
+AC_SUBST(DATE_VERSION)
+AC_SUBST(DOTTED_VERSION)
+AC_SUBST(LIBGEDA_CFLAGS)
+AC_SUBST(LIBGEDA_LDFLAGS)
+AC_SUBST(LIBTOOL_FLAGS)
+AC_SUBST(GEDADATADIR)
+AC_SUBST(GEDARCDIR)
+AC_SUBST(PATHSEP)
+AC_SUBST(OTHERPATHSEP)
+AC_SUBST(GUILEINTERP)
+AC_SUBST(INDENT)
+
+# Create all the necessary derived files
+AC_CONFIG_FILES([Makefile
+ src/Makefile
+ include/Makefile
+ docs/Makefile
+ data/Makefile
+ intl/Makefile
+ po/domain.mak
+ po/Makefile.in
+ libgeda.pc
+ share/Makefile
+ lib/Makefile
+ scheme/Makefile ])
+
+AC_OUTPUT
+
+expandedGEDADATADIR=`eval "echo $GEDADATADIR"`
+expandedGEDARCDIR=`eval "echo $GEDARCDIR"`
+expandedXDGDATADIR=`eval "echo $XDGDATADIR"`
+expandedKDEDATADIR=`eval "echo $KDEDATADIR"`
+
+AC_MSG_RESULT([
+** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION
+
+ GLIB library version: $GLIB_VERSION
+ GDK-PIXBUF (png output): $GDK_PIXBUF_VERSION
+ GUILE library version: $GUILE_VERSION
+ mingw build: $MINGW
+ data directory: $expandedGEDADATADIR
+ rc directory: $expandedGEDARCDIR
+ xdg data directory: $expandedXDGDATADIR
+ KDE data directory: $expandedKDEDATADIR
+ LIBGEDA .so version: $SHARED_LIBRARY_VERSION
+ dmalloc debugging: $with_dmalloc
+ ElectricFence debugging: $with_efence
+])
+
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
deleted file mode 100644
index ff17f41..0000000
--- a/libgeda/configure.ac.in
+++ /dev/null
@@ -1,470 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-AC_INIT
-AC_CONFIG_SRCDIR([src/libgeda.c])
-AC_CONFIG_MACRO_DIR([m4])
-AC_PREREQ(2.54)
-
-PACKAGE=libgeda
-DOTTED_VERSION=1.5.2
-DATE_VERSION=20090328
-SHARED_LIBRARY_VERSION=36:0:0
-echo Configuring $PACKAGE version $DOTTED_VERSION.$DATE_VERSION
-
-# Init automake
-AM_INIT_AUTOMAKE($PACKAGE, $DOTTED_VERSION, no-define)
-AC_CONFIG_HEADER([config.h])
-AC_SUBST([CONFIG_DEPENDENCIES], ['$(top_srcdir)/configure.ac.in'])
-
-# Call this to make autoconf and friends happy
-AC_GNU_SOURCE
-
-# Init libtool
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-
-#########################################################################
-# Command line flags start
-#
-
-# Change default location for rc files
-AC_ARG_WITH(rcdir, [ --with-rcdir=path Change where the system-*rc files are installed], [opt_rcdir=$withval])
-
-# Change default location for XDG files (MIME and Icons)
-AC_ARG_WITH(xdgdatadir, [ --with-xdgdatadir=path Change where the theme icons and mime registrations are installed [[DATADIR]]], [opt_xdgdatadir=$withval])
-
-# Change default location for KDE data files (KDE MIME registrations)
-AC_ARG_WITH(kdedatadir, [ --with-kdedatadir=path Change where the KDE mime registrations are installed [[DATADIR]]], [opt_kdedatadir=$withval])
-
-#
-# Command line flags end
-#########################################################################
-
-# Checks for libraries.
-#########################################################################
-#
-# Misc win32 / mingw checks and variables start
-
-# Figure out if we are building on win32 and what environment.
-case $host_os in
- *mingw32* ) echo "Configuring for mingw"; MINGW=yes ;;
-esac
-
-if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
- MINGW_LIBTOOL_FLAGS="-no-undefined"
- MINGW_CFLAGS="-mms-bitfields"
- MINGW="yes"
-else
- # Unix host
- MINGW_LIBTOOL_FLAGS=
- MINGW_CFLAGS=
- MINGW="no"
-fi
-
-#
-# Misc win32 / mingw checks and variables end
-#########################################################################
-
-# Checks for programs.
-AC_PROG_CC
-AM_CONDITIONAL(CCISGCC, test "$GCC" = "yes")
-AC_PROG_CPP
-AC_PROG_MAKE_SET
-
-############################################################################
-# Internationalisation start
-#
-# Set USE_NLS
-AC_GEDA_MACRO_CHECK([AM_NLS], [nls.m4])
-AM_NLS
-
-# Set package name for translations
-so_major=`echo "$SHARED_LIBRARY_VERSION" | sed 's/:.*//'`
-GETTEXT_PACKAGE=$PACKAGE$so_major
-AH_TEMPLATE([GETTEXT_PACKAGE], [Name of this program's gettext domain])
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"])
-AC_SUBST(GETTEXT_PACKAGE)
-
-# Initialise gettext
-AC_GEDA_MACRO_CHECK([AM_GNU_GETTEXT], [gettext.m4])
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([%INSTALLED_GETTEXT_VERSION%])
-
-# Setup desktop-i18n
-AX_DESKTOP_I18N
-
-#
-# Internationalisation end
-#########################################################################
-
-############################################################################
-# Check for pkg-config start
-#
-
-# 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
-
-#
-# Check for pkg-config end
-############################################################################
-
-############################################################################
-# Check for guile start
-#
-
-PKG_CHECK_MODULES(GUILE, [guile-1.8], GUILE_PC="yes", no_GUILE_PC="yes")
-
-if test "$GUILE_PC" = "yes"
-then
-
- GUILE_LDFLAGS=$GUILE_LIBS
- GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
-
-else
-
- # Find about the installed guile
- AC_GEDA_MACRO_CHECK([GUILE_FLAGS], [guile.m4])
- GUILE_FLAGS
- GUILE_VERSION=`$GUILE_CONFIG info guileversion`
-
-fi
-
-# Check Guile version
-guile_need_major=1
-guile_need_minor=8
-guile_need_version="$guile_need_major[].$guile_need_minor.0"
-
-AC_MSG_CHECKING([Guile version >= $guile_need_version])
-
-guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
-guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
-AC_MSG_RESULT($GUILE_VERSION)
-
-if test "$guile_need_major" -gt "$guile_major" \
- || (test "$guile_need_major" -eq "$guile_major" \
- && test "$guile_need_minor" -gt "$guile_minor"); then
- AC_MSG_ERROR([Guile version >= $guile_need_version is required.])
-fi
-
-#
-# Check for guile end
-############################################################################
-
-############################################################################
-# Check for mics things start
-#
-# Checking for rint in math library
-AC_CHECK_LIB(m, rint, AC_DEFINE(HAS_RINT, 1, [If your math library has rint in it, define this]), no_RINT="yes")
-
-# Checking for dynamic lib
-AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
-#
-# Check for mics things start
-############################################################################
-
-############################################################################
-# Check for glib start
-#
-
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0], GLIB="yes", no_GLIB="yes")
-
-# This next bit of code figures out what glib we need to use.
-if test "$GLIB" != "yes"
-then
- AC_MSG_ERROR([Cannot find glib 2.12.0 or later, please install it and rerun ./configure.])
-fi
-GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
-
-#
-# Check for glib end
-############################################################################
-
-############################################################################
-# Check for gdk-pixbuf
-#
-
-PKG_CHECK_MODULES(GDK_PIXBUF, [gdk-pixbuf-2.0 >= 0.15.0], GDK_PIXBUF="yes", no_GDK_PIXBUF="yes")
-
-# This next bit of code figures out what gtk we need to use.
-if test "$GDK_PIXBUF" = "yes"
-then
-
- AC_DEFINE(HAS_GDK_PIXBUF, 1, [If gdk-pixbuf has been installed, define this])
- GDK_PIXBUF_CFLAGS=$GDK_PIXBUF_CFLAGS
- GDK_PIXBUF_LIBS=$GDK_PIXBUF_LIBS
- GDK_PIXBUF_VERSION=`$PKG_CONFIG gdk-pixbuf-2.0 --modversion`
-
-fi
-
-if test "$GDK_PIXBUF_VERSION" = ""
-then
- AC_MSG_ERROR([Cannot find gdk-pixbuf, please make sure it is installed.])
-fi
-
-#
-# Check for gdk-pixbuf end
-############################################################################
-
-
-
-############################################################################
-# Check for doxygen start
-#
-
-# Doxygen is a utility for generating html and latex documentation
-# from c source code files.
-
-# search for Doxygen
-AC_PATH_PROG(DOXYGEN, doxygen, no, ${PATH})
-
-if test "$DOXYGEN" = "no"; then
- # doxygen is not available on the system
- echo "** Cannot find Doxygen! **"
- echo "** Documentation creation disabled **"
- DOXYGEN=echo
-
- # prevent from creating html and latex documents.
- # but does not prevent from processing gschemdoc
- builddoc=false
-else
- # doxygen is available on the system.
- # now checking if the tools for Texinfo files processing
- # is installed.
- # The docs can be either processed to produce dvi, html or info
- # with texi2dvi, texi2html or makeinfo respectively
- # Note : these tests on makeinfo and texi2dvi are no more
- # needed as automake makes them for us
-
- # enable the creation of html and latex documents.
- builddoc=true
-fi
-
-# depending on variable builddoc, weaving is performed or not
-# using conditionnal in docs/Makefile.in
-AM_CONDITIONAL(BUILDDOC, test x$builddoc = xtrue)
-
-#
-# Check for doxygen end
-#########################################################################
-
-#########################################################################
-# Checks for header files start
-#
-
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_HEADER_DIRENT
-AC_CHECK_HEADERS(unistd.h string.h stdlib.h assert.h fcntl.h errno.h)
-
-AC_MSG_CHECKING([for optarg in unistd.h])
-AC_TRY_COMPILE(
-[#include <unistd.h>],
-[ char *string = optarg; int i = optind; ],
-optarg_found=yes,
-optarg_found=no)
-AC_MSG_RESULT($optarg_found)
-if test $optarg_found = yes; then
- AC_DEFINE(OPTARG_IN_UNISTD, 1, [Define if you have optarg in unistd.h])
-fi
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-
-# Checks for library functions.
-AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(strstr chown getlogin)
-
-#
-# Checks for header files end
-#########################################################################
-
-#########################################################################
-#
-
-# ------------- dmalloc -------------------
-dnl dmalloc checks
-with_dmalloc="no"
-AC_MSG_CHECKING([if dmalloc debugging should be enabled])
-AC_ARG_ENABLE([dmalloc],
-[ --enable-dmalloc Compile and link with dmalloc for malloc debugging [[default=no]]],
-[
-if test "X$enable_dmalloc" != "Xno" ; then
- AC_MSG_RESULT([yes])
- AC_CHECK_HEADER(dmalloc.h,,
- AC_ERROR([You have requested dmalloc debugging but dmalloc.h could not be found]))
- AC_CHECK_LIB(dmalloc,main,,
- AC_ERROR([You have requested dmalloc debugging but -ldmalloc could not be found]))
- DMALLOC_LIBS="-ldmalloc"
- with_dmalloc="yes"
-else
- AC_MSG_RESULT([no])
- DMALLOC_LIBS=""
-fi
-],
-[
- AC_MSG_RESULT([no])
- DMALLOC_LIBS=""
-])
-
-# ------------- ElectricFence -------------------
-dnl ElectricFence checks
-with_efence="no"
-AC_MSG_CHECKING([if ElectricFence debugging should be enabled])
-AC_ARG_ENABLE([efence],
-[ --enable-efence Link with ElectricFence for malloc debugging [[default=no]]],
-[
-if test "X$enable_efence" != "Xno" ; then
- AC_MSG_RESULT([yes])
- AC_CHECK_LIB(efence,main,,
- AC_ERROR([You have requested ElectricFence debugging but -lefence could not be found]))
- with_efence="yes"
-else
- AC_MSG_RESULT([no])
-fi
-],
-[
-AC_MSG_RESULT([no])
-])
-
-#
-#########################################################################
-
-#########################################################################
-# gEDA/gaf specific setup start
-#
-
-DATADIR=gEDA
-GEDADATADIR=$datadir/$DATADIR
-
-if eval "test x$opt_rcdir = x"; then
- # path was not specified with --with-rcdir
- AC_DEFINE_UNQUOTED(GEDARCDIR, "none", [gEDA/gaf's rc directory])
- GEDARCDIR=$GEDADATADIR
-else
- # path WAS specified with --with-rcdir
- AC_DEFINE_UNQUOTED(GEDARCDIR, "$opt_rcdir", [gEDA/gaf's rc directory])
- GEDARCDIR="$opt_rcdir"
-fi
-
-if test x$opt_xdgdatadir = x; then
- # path was not specified with --with-xdgdatadir
- XDGDATADIR='${datadir}'
-else
- # path WAS specified with --with-xdgdatadir
- XDGDATADIR="$opt_xdgdatadir"
-fi
-AC_SUBST(XDGDATADIR)
-
-if test x$opt_kdedatadir = x; then
- # path was not specified with --with-kdedatadir
- KDEDATADIR='${datadir}'
-else
- # path WAS specified with --with-kdedatadir
- KDEDATADIR="$opt_kdedatadir"
-fi
-AC_SUBST(KDEDATADIR)
-
-# Defs for libary symbol files
-#
-# Expand the prefix variable
-if eval "test x$prefix = xNONE"; then
- dprefix=$ac_default_prefix
-else
- dprefix=$prefix
-fi
-
-gedatopdir=$dprefix/share/$DATADIR
-expandgedadatadir=`echo $gedatopdir`
-
-# this has to be expanded ( no ${prefix} ) --
-AC_DEFINE_UNQUOTED(GEDADATADIR, "$gedatopdir", [gEDA/gaf's data directory])
-AC_DEFINE_UNQUOTED(DATE_VERSION, "$DATE_VERSION", [Currently running date version of gEDA/gaf])
-AC_DEFINE_UNQUOTED(DOTTED_VERSION, "$DOTTED_VERSION", [Currently running dotted version of gEDA/gaf])
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package])
-
-#
-# gEDA/gaf specify things which need to setup
-#########################################################################
-
-#########################################################################
-# Update mime database utility start
-#
-# Adapted from gnome-control-center.
-#
-
-AC_ARG_ENABLE(update-mime-database,
- AC_HELP_STRING([--disable-update-mime-database],
- [do not update mime database after installation]),,
- enable_update_mime_database=yes)
-
-AM_CONDITIONAL(ENABLE_UPDATE_MIME_DATABASE,
- test x$enable_update_mime_database = xyes)
-
-if test x$enable_update_mime_database = xyes ; then
- AC_PATH_PROG(UPDATE_MIME_DATABASE, [update-mime-database], no)
- if test $UPDATE_MIME_DATABASE = no; then
- AC_MSG_ERROR([Cannot find update-mime-database, make sure it is installed and in your PATH, or configure with --disable-update-mime-database])
- fi
-fi
-
-#
-# Update mime database utility end
-#########################################################################
-
-# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
-LIBGEDA_CFLAGS="$MINGW_CFLAGS $GUILE_CFLAGS $GLIB_CFLAGS $X_CFLAGS $GDK_PIXBUF_CFLAGS"
-LIBGEDA_LDFLAGS="$MINGW_LDFLAGS $GUILE_LDFLAGS $GLIB_LIBS $DMALLOC_LIBS $GDK_PIXBUF_LIBS"
-LIBTOOL_FLAGS="-version-info $SHARED_LIBRARY_VERSION $MINGW_LIBTOOL_FLAGS"
-
-# Makefile.in variable substitution
-AC_SUBST(DATE_VERSION)
-AC_SUBST(DOTTED_VERSION)
-AC_SUBST(LIBGEDA_CFLAGS)
-AC_SUBST(LIBGEDA_LDFLAGS)
-AC_SUBST(LIBTOOL_FLAGS)
-AC_SUBST(GEDADATADIR)
-AC_SUBST(GEDARCDIR)
-AC_SUBST(PATHSEP)
-AC_SUBST(OTHERPATHSEP)
-AC_SUBST(GUILEINTERP)
-AC_SUBST(INDENT)
-
-# Create all the necessary derived files
-AC_CONFIG_FILES([Makefile
- src/Makefile
- include/Makefile
- docs/Makefile
- data/Makefile
- intl/Makefile
- po/domain.mak
- po/Makefile.in
- libgeda.pc
- share/Makefile
- lib/Makefile
- scheme/Makefile ])
-
-AC_OUTPUT
-
-expandedGEDADATADIR=`eval "echo $GEDADATADIR"`
-expandedGEDARCDIR=`eval "echo $GEDARCDIR"`
-expandedXDGDATADIR=`eval "echo $XDGDATADIR"`
-expandedKDEDATADIR=`eval "echo $KDEDATADIR"`
-
-AC_MSG_RESULT([
-** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION
-
- GLIB library version: $GLIB_VERSION
- GDK-PIXBUF (png output): $GDK_PIXBUF_VERSION
- GUILE library version: $GUILE_VERSION
- mingw build: $MINGW
- data directory: $expandedGEDADATADIR
- rc directory: $expandedGEDARCDIR
- xdg data directory: $expandedXDGDATADIR
- KDE data directory: $expandedKDEDATADIR
- LIBGEDA .so version: $SHARED_LIBRARY_VERSION
- dmalloc debugging: $with_dmalloc
- ElectricFence debugging: $with_efence
-])
-
commit ee7200f0f784699344e8ef8bb332e4a0486eeda4
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Don't use stdarg.h.
A number of files in libgeda include stdarg.h, but none of them
actually use it.
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index 2c7e4c8..ff17f41 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -256,8 +256,7 @@ AM_CONDITIONAL(BUILDDOC, test x$builddoc = xtrue)
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_HEADER_DIRENT
-AC_CHECK_HEADERS(unistd.h string.h stdlib.h stdarg.h assert.h fcntl.h \
- errno.h)
+AC_CHECK_HEADERS(unistd.h string.h stdlib.h assert.h fcntl.h errno.h)
AC_MSG_CHECKING([for optarg in unistd.h])
AC_TRY_COMPILE(
diff --git a/libgeda/src/s_log.c b/libgeda/src/s_log.c
index 3412577..372a6f6 100644
--- a/libgeda/src/s_log.c
+++ b/libgeda/src/s_log.c
@@ -27,9 +27,6 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
diff --git a/libgeda/src/s_toplevel.c b/libgeda/src/s_toplevel.c
index a9e09e9..24f9e54 100644
--- a/libgeda/src/s_toplevel.c
+++ b/libgeda/src/s_toplevel.c
@@ -24,9 +24,6 @@
#ifdef HAVE_STRING_H
#include <string.h>
#endif
-#ifdef HAVE_STRARG_H
-#include <stdarg.h>
-#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
diff --git a/libgeda/src/u_basic.c b/libgeda/src/u_basic.c
index ee977ba..e2ca032 100644
--- a/libgeda/src/u_basic.c
+++ b/libgeda/src/u_basic.c
@@ -24,9 +24,6 @@
#ifdef HAVE_STRING_H
#include <string.h>
#endif
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
commit 1a4c656b3aea2a0cd58b57f836e97b96078f0bb2
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Don't use libgen.h
Since we now use GLib's functions to get the basename, basename(3)
from libgen is no longer required.
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index 386bf05..2c7e4c8 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -257,7 +257,7 @@ AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_HEADER_DIRENT
AC_CHECK_HEADERS(unistd.h string.h stdlib.h stdarg.h assert.h fcntl.h \
- errno.h libgen.h)
+ errno.h)
AC_MSG_CHECKING([for optarg in unistd.h])
AC_TRY_COMPILE(
diff --git a/libgeda/src/o_embed.c b/libgeda/src/o_embed.c
index 4682b49..1ce58cc 100644
--- a/libgeda/src/o_embed.c
+++ b/libgeda/src/o_embed.c
@@ -26,8 +26,6 @@
#include <stdio.h>
-#include <libgen.h>
-
#include "libgeda_priv.h"
#ifdef HAVE_LIBDMALLOC
diff --git a/libgeda/src/o_picture.c b/libgeda/src/o_picture.c
index 21c0ff1..c3853b9 100644
--- a/libgeda/src/o_picture.c
+++ b/libgeda/src/o_picture.c
@@ -30,11 +30,6 @@
#endif
#include <math.h>
-/* for basename(3) */
-#ifdef HAVE_LIBGEN_H
-#include <libgen.h>
-#endif
-
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgeda_priv.h"
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs