diff options
| author | Owen Taylor <owt1@cornell.edu> | 1998-04-04 00:12:58 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-04-04 00:12:58 +0000 |
| commit | b1446447fc2ea7edfb6e7415b0509d63a71233ba (patch) | |
| tree | d267e13198662afb84b461d17ded3899fcc7288d /gtk.m4 | |
| parent | 308adaa6db894924e40246d83c7096493c73aa2c (diff) | |
| download | gtk+-b1446447fc2ea7edfb6e7415b0509d63a71233ba.tar.gz | |
Added flags --prefix[=dir] and --exec-prefix[=DIR] which allow querying
Fri Apr 3 18:33:47 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added flags --prefix[=dir] and
--exec-prefix[=DIR] which allow querying and overriding the
configured-in prefix and exec-prefix.
* gtk.m4: Added configure flags --with-gtk-prefix=
and --with-gtk-exec-prefix= to set the --prefix and
--exec-prefix argumetns to gtk.m4
Diffstat (limited to 'gtk.m4')
| -rw-r--r-- | gtk.m4 | 22 |
1 files changed, 20 insertions, 2 deletions
@@ -8,13 +8,31 @@ AC_DEFUN(AM_PATH_GTK, [dnl dnl Get the cflags and libraries from the gtk-config script dnl +AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], + gtk_config_prefix="$withval", gtk_config_prefix="") +AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], + gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") + + if test x$gtk_config_exec_prefix != x ; then + gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config + fi + fi + if test x$gtk_config_prefix != x ; then + gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_prefix/bin/gtk-config + fi + fi + AC_PATH_PROG(GTK_CONFIG, gtk-config, no) min_gtk_version=ifelse([$1], ,0.99.7,$1) 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` + GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` + GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" |