Commit 607949ed authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Separate out GLIB_LIBS and GLIB_DEPLIBS. This may fix the --with-glib

Wed Jan 27 17:05:40 1999  Owen Taylor  <otaylor@redhat.com>

	* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
	may fix the --with-glib option. GLIB_LIBS are
	the libs to link example programs against, while
	GLIB_DEPLIBS are dependency libraries.
parent 342e557c
Wed Jan 27 17:05:40 1999 Owen Taylor <otaylor@redhat.com>
* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
may fix the --with-glib option. GLIB_LIBS are
the libs to link example programs against, while
GLIB_DEPLIBS are dependency libraries.
Wed Jan 20 11:19:00 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c: Use floor() instead of truncating
......
Wed Jan 27 17:05:40 1999 Owen Taylor <otaylor@redhat.com>
* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
may fix the --with-glib option. GLIB_LIBS are
the libs to link example programs against, while
GLIB_DEPLIBS are dependency libraries.
Wed Jan 20 11:19:00 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c: Use floor() instead of truncating
......
Wed Jan 27 17:05:40 1999 Owen Taylor <otaylor@redhat.com>
* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
may fix the --with-glib option. GLIB_LIBS are
the libs to link example programs against, while
GLIB_DEPLIBS are dependency libraries.
Wed Jan 20 11:19:00 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c: Use floor() instead of truncating
......
Wed Jan 27 17:05:40 1999 Owen Taylor <otaylor@redhat.com>
* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
may fix the --with-glib option. GLIB_LIBS are
the libs to link example programs against, while
GLIB_DEPLIBS are dependency libraries.
Wed Jan 20 11:19:00 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c: Use floor() instead of truncating
......
Wed Jan 27 17:05:40 1999 Owen Taylor <otaylor@redhat.com>
* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
may fix the --with-glib option. GLIB_LIBS are
the libs to link example programs against, while
GLIB_DEPLIBS are dependency libraries.
Wed Jan 20 11:19:00 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c: Use floor() instead of truncating
......
Wed Jan 27 17:05:40 1999 Owen Taylor <otaylor@redhat.com>
* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
may fix the --with-glib option. GLIB_LIBS are
the libs to link example programs against, while
GLIB_DEPLIBS are dependency libraries.
Wed Jan 20 11:19:00 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c: Use floor() instead of truncating
......
Wed Jan 27 17:05:40 1999 Owen Taylor <otaylor@redhat.com>
* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
may fix the --with-glib option. GLIB_LIBS are
the libs to link example programs against, while
GLIB_DEPLIBS are dependency libraries.
Wed Jan 20 11:19:00 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c: Use floor() instead of truncating
......
......@@ -193,6 +193,7 @@ if test x$with_glib = x ; then
glib_cflags=`$GLIB_CONFIG glib gmodule --cflags`
glib_libs=`$GLIB_CONFIG glib gmodule --libs`
GLIB_LIBS="$glib_libs"
GLIB_DEPLIBS="$glib_libs"
else
# Use uninstalled glib (assume they got the version right)
......@@ -219,8 +220,9 @@ else
;;
esac
GLIB_CFLAGS="-I$glib_dir"
GLIB_LIBS=$glib_dir/libglib-$glib_release.la
GLIB_CFLAGS="-I$glib_dir -I$glib_dir/gmodule"
GLIB_LIBS="$glib_dir/libglib.la $glib_dir/gmodule.la"
GLIB_DEPLIBS=
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
......@@ -228,6 +230,7 @@ fi
AC_SUBST(glib_cflags)
AC_SUBST(glib_libs)
AC_SUBST(GLIB_DEPLIBS)
# Find the X11 include and library directories
AC_PATH_X
......
......@@ -67,7 +67,7 @@ LDADDS = \
libgdk_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
@GLIB_LIBS@ \
@GLIB_DEPLIBS@ \
@x_ldflags@ \
@x_libs@ \
-lm
......
......@@ -305,7 +305,7 @@ stamp-m: @REBUILD@ $(srcdir)/gtkmarshal.list $(srcdir)/genmarshal.pl
libgtk_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-release $(LT_RELEASE) \
@GLIB_LIBS@ \
@GLIB_DEPLIBS@ \
@x_ldflags@ \
@x_libs@ \
-lm
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment