[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.1-20081221-181-gb47b0d1)
The branch, master has been updated
via b47b0d1276a9535e3a66e4f8535f6c552849490f (commit)
via 09e4b6a6c3fb7d9a95340f4de4a2b84193318f33 (commit)
via ee250c9bd2e88bf352a03d1719603b7d54fe430c (commit)
via 0cfeefc37856c30fc57f9ca803ffb1f7f11310e7 (commit)
from c05d63f61ffc08bb130bca8f14e4c429240938d1 (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
=========
gattrib/configure.ac | 4 ++--
gnetlist/configure.ac | 21 +++++++++++++++++++--
gschem/configure.ac.in | 4 ++--
gsymcheck/configure.ac | 21 +++++++++++++++++++--
libgeda/configure.ac.in | 30 ++++++++++++++----------------
libgeda/libgeda.pc.in | 3 ++-
utils/configure.ac | 46 ++++++++++++++--------------------------------
utils/src/Makefile.am | 2 --
8 files changed, 72 insertions(+), 59 deletions(-)
=================
Commit Messages
=================
commit b47b0d1276a9535e3a66e4f8535f6c552849490f
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jan 13 23:58:45 2009 +0000
libgeda: Ensure we build a shared DLL on MINGW32.
Pass -no-undefined to libtool, and initalise in configure.ac.in
with LT_INIT([win32-dll],[shared]). Tested not to affect Linux.
:100644 100644 1b009e3... ca1ce43... M libgeda/configure.ac.in
commit 09e4b6a6c3fb7d9a95340f4de4a2b84193318f33
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jan 13 23:58:41 2009 +0000
libgeda: Define libraries necessary for statically linking libgeda
Following removal of extraneous CFLAGS and LIBS from libgeda's pkg-config
file, there are problems statically linking the library. We actually need
to provide a list of required libraries to link with for static linking,
and would ordinarily use Requires.private for that.
Since guile 1.6 doesn't use pkg-config, avoid around the problem by adding
guile's LIBS to libgeda.pc's Libs.private.
:100644 100644 978edec... df4b32c... M libgeda/libgeda.pc.in
commit ee250c9bd2e88bf352a03d1719603b7d54fe430c
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jan 13 23:58:30 2009 +0000
Avoid underlinking of apps due to missing explicit depends
These went unnoticed because the apps were resolving the necessary
symbols when pulling in libgeda and its dependencies.
Fix applications using GLib and guile within the suite to explicitly
pull in the appropriate CFLAGS and LIBS. This commit removes some
LDFLAGS and LIBS from grenum, since they weren't being used.
:100644 100644 ee307f8... 48b188b... M gattrib/configure.ac
:100644 100644 99b912b... 659609f... M gnetlist/configure.ac
:100644 100644 7fbd3d9... ea37c5b... M gschem/configure.ac.in
:100644 100644 6faddb1... 79ed053... M gsymcheck/configure.ac
:100644 100644 48898a7... 437eca2... M utils/configure.ac
:100644 100644 f35ee46... f2602fd... M utils/src/Makefile.am
commit 0cfeefc37856c30fc57f9ca803ffb1f7f11310e7
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jan 13 23:58:05 2009 +0000
libgeda, utils: Check for same glib version as rest of suite; 2.8.x
:100644 100644 c2e8443... 1b009e3... M libgeda/configure.ac.in
:100644 100644 c41ecfb... 48898a7... M utils/configure.ac
=========
Changes
=========
commit b47b0d1276a9535e3a66e4f8535f6c552849490f
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jan 13 23:58:45 2009 +0000
libgeda: Ensure we build a shared DLL on MINGW32.
Pass -no-undefined to libtool, and initalise in configure.ac.in
with LT_INIT([win32-dll],[shared]). Tested not to affect Linux.
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index 1b009e3..ca1ce43 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -18,7 +18,7 @@ AC_SUBST([CONFIG_DEPENDENCIES], ['$(top_srcdir)/configure.ac.in'])
AC_GNU_SOURCE
# Init libtool
-AM_PROG_LIBTOOL
+LT_INIT([win32-dll],[shared])
#########################################################################
# Command line flags start
@@ -48,10 +48,12 @@ case $host_os in
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
@@ -435,8 +437,8 @@ fi
# 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="$GUILE_LDFLAGS $GLIB_LIBS $DMALLOC_LIBS $GDK_PIXBUF_LIBS"
-LIBTOOL_FLAGS="-version-info $SHARED_LIBRARY_VERSION"
+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)
commit 09e4b6a6c3fb7d9a95340f4de4a2b84193318f33
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jan 13 23:58:41 2009 +0000
libgeda: Define libraries necessary for statically linking libgeda
Following removal of extraneous CFLAGS and LIBS from libgeda's pkg-config
file, there are problems statically linking the library. We actually need
to provide a list of required libraries to link with for static linking,
and would ordinarily use Requires.private for that.
Since guile 1.6 doesn't use pkg-config, avoid around the problem by adding
guile's LIBS to libgeda.pc's Libs.private.
diff --git a/libgeda/libgeda.pc.in b/libgeda/libgeda.pc.in
index 978edec..df4b32c 100644
--- a/libgeda/libgeda.pc.in
+++ b/libgeda/libgeda.pc.in
@@ -6,7 +6,8 @@ includedir=@includedir@
Name: libgeda
Description: gEDA/gaf's core library
Requires:
-Requires.private: gdk-pixbuf-2.0
+Requires.private: glib-2.0 gdk-pixbuf-2.0
Version: @DATE_VERSION@
Libs: -L${libdir} -lgeda
+Libs.private: @GUILE_LIBS@
Cflags: -I${includedir} @GUILE_CFLAGS@
commit ee250c9bd2e88bf352a03d1719603b7d54fe430c
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jan 13 23:58:30 2009 +0000
Avoid underlinking of apps due to missing explicit depends
These went unnoticed because the apps were resolving the necessary
symbols when pulling in libgeda and its dependencies.
Fix applications using GLib and guile within the suite to explicitly
pull in the appropriate CFLAGS and LIBS. This commit removes some
LDFLAGS and LIBS from grenum, since they weren't being used.
diff --git a/gattrib/configure.ac b/gattrib/configure.ac
index ee307f8..48b188b 100644
--- a/gattrib/configure.ac
+++ b/gattrib/configure.ac
@@ -425,8 +425,8 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package])
#########################################################################
# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
-GATTRIB_CFLAGS="$MINGW_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $LIBGEDA_CFLAGS $GTHREAD_CFLAGS"
-GATTRIB_LDFLAGS="$GTK_LIBS $GLIB_LIBS $LIBGEDA_LIBS $GTHREAD_LIBS"
+GATTRIB_CFLAGS="$MINGW_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $LIBGEDA_CFLAGS $GTHREAD_CFLAGS $GUILE_CFLAGS"
+GATTRIB_LDFLAGS="$GTK_LIBS $GLIB_LIBS $LIBGEDA_LIBS $GTHREAD_LIBS $GUILE_LIBS"
# Makefile.in variable substitution
AC_SUBST(DATE_VERSION)
diff --git a/gnetlist/configure.ac b/gnetlist/configure.ac
index 99b912b..659609f 100644
--- a/gnetlist/configure.ac
+++ b/gnetlist/configure.ac
@@ -248,6 +248,23 @@ fi
# Check for libgeda end
############################################################################
+############################################################################
+# Check for glib start
+#
+
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.8.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.8.0 or later, please install it and rerun ./configure.])
+fi
+GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
+
+#
+# Check for glib end
+############################################################################
+
#########################################################################
# Checks for header files start
#
@@ -392,8 +409,8 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package])
#########################################################################
# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
-GNETLIST_CFLAGS="$LIBGEDA_CFLAGS"
-GNETLIST_LDFLAGS="$LIBGEDA_LIBS $DMALLOC_LIBS"
+GNETLIST_CFLAGS="$GLIB_CFLAGS $LIBGEDA_CFLAGS $GUILE_CFLAGS"
+GNETLIST_LDFLAGS="$GLIB_LIBS $LIBGEDA_LIBS $DMALLOC_LIBS $GUILE_LIBS"
# Makefile.in variable substitution
AC_SUBST(DATE_VERSION)
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index 7fbd3d9..ea37c5b 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -523,8 +523,8 @@ AM_GNU_GETTEXT_VERSION([%INSTALLED_GETTEXT_VERSION%])
#AM_GLIB_GNU_GETTEXT
# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
-GSCHEM_CFLAGS="$MINGW_CFLAGS $LIBSTROKE_CFLAGS $LIBGEDA_CFLAGS $GTK_CFLAGS $GTHREAD_CFLAGS"
-GSCHEM_LDFLAGS="$LIBSTROKE_LIBS $LIBGEDA_LIBS $GTK_LIBS $DMALLOC_LIBS $GTHREAD_LIBS"
+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)
diff --git a/gsymcheck/configure.ac b/gsymcheck/configure.ac
index 6faddb1..79ed053 100644
--- a/gsymcheck/configure.ac
+++ b/gsymcheck/configure.ac
@@ -158,6 +158,23 @@ fi
# Check for libgeda end
############################################################################
+############################################################################
+# Check for glib start
+#
+
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.8.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.8.0 or later, please install it and rerun ./configure.])
+fi
+GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
+
+#
+# Check for glib end
+############################################################################
+
#########################################################################
# Checks for header files start
#
@@ -252,8 +269,8 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package])
#########################################################################
# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
-GSYMCHECK_CFLAGS="$LIBGEDA_CFLAGS"
-GSYMCHECK_LDFLAGS="$LIBGEDA_LIBS"
+GSYMCHECK_CFLAGS="$GLIB_CFLAGS $LIBGEDA_CFLAGS $GUILE_CFLAGS"
+GSYMCHECK_LDFLAGS="$GLIB_LIBS $LIBGEDA_LIBS $GUILE_LIBS"
# Makefile.in variable substitution
AC_SUBST(DATE_VERSION)
diff --git a/utils/configure.ac b/utils/configure.ac
index 48898a7..437eca2 100644
--- a/utils/configure.ac
+++ b/utils/configure.ac
@@ -391,17 +391,16 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package])
#########################################################################
# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
-GSCHLAS_CFLAGS="$LIBGEDA_CFLAGS"
-GSCHLAS_LDFLAGS="$LIBGEDA_LIBS"
+GSCHLAS_CFLAGS="$GLIB_CFLAGS $LIBGEDA_CFLAGS $GUILE_CFLAGS"
+GSCHLAS_LDFLAGS="$GLIB_LIBS $LIBGEDA_LIBS $GUILE_LIBS"
CONVERT_SYM_CFLAGS="$LIBGEDA_CFLAGS"
-SARLACC_SCHEM_CFLAGS="$LIBGEDA_CFLAGS"
+SARLACC_SCHEM_CFLAGS="$GLIB_CFLAGS $LIBGEDA_CFLAGS"
+SARLACC_SCHEM_LIBS="$GLIB_LIBS $LIBGEDA_CFLAGS"
GMK_SYM_CFLASG=""
SMASH_MEGAFILE_CFLAGS=""
OLIB_CFLAGS=""
GSCH2PCB_CFLAGS="$GLIB_CFLAGS"
GSCH2PCB_LDFLAGS="$GLIB_LIBS"
-GRENUM_CFLAGS="$LIBGEDA_CFLAGS"
-GRENUM_LDFLAGS="$GLIB_LIBS"
# Makefile.in variable substitution
AC_SUBST(DATE_VERSION)
@@ -410,10 +409,11 @@ AC_SUBST(GSCHLAS_CFLAGS)
AC_SUBST(GSCHLAS_LDFLAGS)
AC_SUBST(CONVERT_SYM_CFLAGS)
AC_SUBST(SARLACC_SCHEM_CFLAGS)
+AC_SUBST(SARLACC_SCHEM_LDFLAGS)
+AC_SUBST(GMK_SYM_CFLAGS)
+AC_SUBST(GMK_SYM_LDFLAGS)
AC_SUBST(GSCH2PCB_CFLAGS)
AC_SUBST(GSCH2PCB_LDFLAGS)
-AC_SUBST(GRENUM_CFLAGS)
-AC_SUBST(GRENUM_LDFLAGS)
AC_SUBST(GEDARCDIR)
AC_SUBST(GEDADATADIR)
AC_SUBST(GEDADOCDIR)
diff --git a/utils/src/Makefile.am b/utils/src/Makefile.am
index f35ee46..f2602fd 100644
--- a/utils/src/Makefile.am
+++ b/utils/src/Makefile.am
@@ -19,12 +19,10 @@ grenum_SOURCES = grenum.c grenum.h
convert_sym_CFLAGS = @CONVERT_SYM_CFLAGS@ $(AM_CFLAGS)
sarlacc_schem_CFLAGS = @SARLACC_SCHEM_CFLAGS@ $(AM_CFLAGS)
gsch2pcb_CFLAGS = @GSCH2PCB_CFLAGS@ $(AM_CFLAGS)
-grenum_CFLAGS = @GRENUM_CFLAGS@ $(AM_CFLAGS)
convert_sym_LDADD = -lm
olib_LDADD = -lm
gsch2pcb_LDADD = @GSCH2PCB_LDFLAGS@
-grenum_LDADD = @GRENUM_LDFLAGS@
MOSTLYCLEANFILES = *.log *.ps core FILE *~ olib.c
CLEANFILES = *.log *.ps core FILE *~ olib.c
commit 0cfeefc37856c30fc57f9ca803ffb1f7f11310e7
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jan 13 23:58:05 2009 +0000
libgeda, utils: Check for same glib version as rest of suite; 2.8.x
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index c2e8443..1b009e3 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -184,24 +184,20 @@ AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
############################################################################
############################################################################
-# Check for glib 2.4 start
-#
+# Check for glib start
+#
+
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.8.0, GLIB="yes", no_GLIB="yes")
-# Search for glib
-PKG_CHECK_MODULES(GLIB24, glib-2.0 >= 2.4.0, GLIB24="yes", no_GLIB24="yes")
-if test "$GLIB24" != "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.4.x, install it and rerun ./configure.
-You may find the following error output (if any) useful:
-$GLIB24_PKG_ERRORS
-])
+ AC_MSG_ERROR([Cannot find glib 2.8.0 or later, please install it and rerun ./configure.])
fi
-GLIB_CFLAGS=$GLIB24_CFLAGS
-GLIB_LIBS=$GLIB24_LIBS
GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
-#
-# Check for glib 2.4 end
+#
+# Check for glib end
############################################################################
############################################################################
diff --git a/utils/configure.ac b/utils/configure.ac
index c41ecfb..48898a7 100644
--- a/utils/configure.ac
+++ b/utils/configure.ac
@@ -194,38 +194,20 @@ fi
############################################################################
############################################################################
-# Check for glib 2.4 start
+# Check for glib 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
-
-# Search for glib 2.4.x first (only if we are not forcing the glib to 1.2)
-if test "$opt_gtkver" != "1.2"
-then
- PKG_CHECK_MODULES(GLIB24, glib-2.0 >= 2.4.0, GLIB24="yes", no_GLIB24="yes")
-fi
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.8.0, GLIB="yes", no_GLIB="yes")
# This next bit of code figures out what glib we need to use.
-if test "$GLIB24" = "yes" -a "$opt_gtkver" != "1.2"
+if test "$GLIB" != "yes"
then
- GLIB_CFLAGS=$GLIB24_CFLAGS
- GLIB_LIBS=$GLIB24_LIBS
- GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
-else
- GLIB_VERSION=""
+ AC_MSG_ERROR([Cannot find glib 2.8.0 or later, please install it and rerun ./configure.])
fi
+GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
-if test "$GLIB_VERSION" = ""
-then
- AC_MSG_ERROR([Cannot find glib 2.4.x, install one of them.])
-fi
-
-#
-# Check for glib 2.4 end
+#
+# Check for glib end
############################################################################
#########################################################################
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs