Commit c8e5c809 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Added a new mechanism for GTK-dependent programs to find out about the

Thu Mar 12 18:01:03 1998  Owen Taylor  <owt1@cornell.edu>

	* gtk.m4 gtk-config.in Makefile.am configure.in:
	  Added a new mechanism for GTK-dependent programs to
	  find out about the installed GTK. (Does not remove
	  any current functionality)

	* gtk+-xconfig.in: Was no longer used for anything.
parent 9b4919dc
......@@ -3,11 +3,16 @@
SRC_SUBDIRS = glib gdk gtk
SUBDIRS = $(SRC_SUBDIRS) docs
bin_SCRIPTS = gtk-config
EXTRA_DIST = \
gtk+.prj \
makecopyright \
TODO
m4datadir = $(datadir)/aclocal
m4data_DATA = gtk.m4
.PHONY: files populate checkin release
files:
......
......@@ -128,12 +128,12 @@ else
AC_DEFINE(XINPUT_NONE)
fi
AC_SUBST(x_cflags)
AC_SUBST(x_includes)
AC_SUBST(x_ldflags)
AC_SUBST(x_libs)
AC_SUBST(xinput_progs)
AC_SUBST(GTK_VERSION)
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
......@@ -260,4 +260,5 @@ if test $gtk_ok = no; then
AC_DEFINE(NO_FD_SET)
fi
AC_OUTPUT(Makefile gtk+.xconfig docs/Makefile gdk/Makefile gtk/Makefile)
AC_OUTPUT([Makefile gtk-config docs/Makefile gdk/Makefile gtk/Makefile],
[chmod +x gtk-config])
X_CFLAGS = @x_cflags@
X_LDFLAGS = @x_ldflags@
X_LIBS = @x_libs@
#!/bin/sh
prefix=@prefix@
exec_prefix=@exec_prefix@
usage="\
Usage: gtk-config [--version] [--libs] [--cflags]"
if test $# -ne 1 ; then
echo "${usage}" 1>&2
exit 1
fi
case $1 in
--version)
echo @GTK_VERSION@
;;
--cflags)
echo -I@includedir@ @x_cflags@
;;
--libs)
echo -L@libdir@ @x_ldflags@ -lgtk -lgdk -lglib @x_libs@ -lm
;;
*)
echo "${usage}" 1>&2
exit 1
;;
esac
\ No newline at end of file
# Configure paths for GTK+
# Owen Taylor 97-11-3
dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
dnl
AC_DEFUN(AM_PATH_GTK,
[dnl
dnl Get the cflags and libraries from the gtk-config script
dnl
AC_CHECK_PROG(GTK_CONFIG, gtk-config, gtk-config, no)
ifelse($1 , ,min_gtk_version=$1,min_gtk_version=0.99.5)
AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
no_gtk=""
if test "$GTK_CONFIG" != "no" ; then
GTK_CFLAGS=$($GTK_CONFIG --cflags)
GTK_LIBS=$($GTK_CONFIG --libs)
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
dnl
dnl Now check if the installed GTK is sufficiently new. (Also sanity
dnl checks the results of gtk-config to some extent
dnl
AC_TRY_RUN([
#include <gtk/gtk.h>
#include <stdio.h>
int
main ()
{
int major, minor, micro;
if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_gtk_version");
exit(1);
}
return !((gtk_major_version > major) ||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
}
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
else
no_gtk=yes
fi
if test x$no_gtk == x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
GTK_CFLAGS=""
GTK_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
])
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