aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel de Icaza <miguel@gnu.org>2000-04-11 05:34:18 +0800
committerMiguel de Icaza <miguel@src.gnome.org>2000-04-11 05:34:18 +0800
commitce76b4034c6ad5b74e69d1f687b9789d649b9c02 (patch)
tree1fa933d3edde3402656ebe483e9fd26bd2d0cb75
parent506a60d0c134e83ff6015dc353baaa3b95356df5 (diff)
downloadgsoc2013-evolution-ce76b4034c6ad5b74e69d1f687b9789d649b9c02.tar
gsoc2013-evolution-ce76b4034c6ad5b74e69d1f687b9789d649b9c02.tar.gz
gsoc2013-evolution-ce76b4034c6ad5b74e69d1f687b9789d649b9c02.tar.bz2
gsoc2013-evolution-ce76b4034c6ad5b74e69d1f687b9789d649b9c02.tar.lz
gsoc2013-evolution-ce76b4034c6ad5b74e69d1f687b9789d649b9c02.tar.xz
gsoc2013-evolution-ce76b4034c6ad5b74e69d1f687b9789d649b9c02.tar.zst
gsoc2013-evolution-ce76b4034c6ad5b74e69d1f687b9789d649b9c02.zip
Update to support --disable-threads correctly.
2000-04-10 Miguel de Icaza <miguel@gnu.org> * configure.in (GNOME_PRINT_CFLAGS): Update to support --disable-threads correctly. svn path=/trunk/; revision=2381
-rw-r--r--ChangeLog5
-rw-r--r--configure.in8
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 76fc77d72e..b34af90153 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-10 Miguel de Icaza <miguel@gnu.org>
+
+ * configure.in (GNOME_PRINT_CFLAGS): Update to support
+ --disable-threads correctly.
+
2000-04-10 Chris Toshok <toshok@helixcode.com>
* addressbook/backend/pas/pas-backend-file.c
diff --git a/configure.in b/configure.in
index 901bb405f7..5fed2fd6e1 100644
--- a/configure.in
+++ b/configure.in
@@ -165,6 +165,10 @@ else
AC_MSG_ERROR(Did not find gdkpixbuf installed)
fi
+dnl
+dnl Notice that this is a hack, and we wont be able to use this forever, but
+dnl at least for some time
+dnl
if $have_pthread; then
THREADS_LIBS="$PTHREAD_LIB `glib-config --libs gthread`"
THREADS_CFLAGS="`glib-config --cflags gthread`"
@@ -192,8 +196,8 @@ BONOBO_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gnomecanv
AC_SUBST(BONOBO_GNOME_LIBS)
AC_SUBST(BONOBO_GNOME_CFLAGS)
-BONOBO_HTML_GNOME_LIBS="`gnome-config --libs bonobo libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` `glib-config --libs gthread`"
-BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` `glib-config --cflags gthread`"
+BONOBO_HTML_GNOME_LIBS="`gnome-config --libs bonobo libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_LIBS"
+BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_CFLAGS"
AC_SUBST(BONOBO_HTML_GNOME_LIBS)
AC_SUBST(BONOBO_HTML_GNOME_CFLAGS)