Commit 27c086bd authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Added trailing newline, hopefully will fix the problem with esac

Mon Mar 16 01:33:36 1998  Owen Taylor  <owt1@cornell.edu>

	* gtk-config.in: Added trailing newline, hopefully will
	  fix the problem with esac disappearing.

	* gtk/Makefile.am (test-debug): Improved test targets
	  will work with --enable-shared
    	    [From:  Raja R Harinath  <harinath@cs.umn.edu>]

  	* gtk.m4: Not all shells understand $(...).  Use `...` instead.
    	    [From:  Raja R Harinath  <harinath@cs.umn.edu>]
	- use AM_PATH_PROG instead of AM_CHECK_PROG, so the user
	  can specify programs not in their path.

	* Makefile.am: added gtk.m4 to EXTRA_DIST
parent c91f2c0c
Mon Mar 16 01:33:36 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added trailing newline, hopefully will
fix the problem with esac disappearing.
* gtk/Makefile.am (test-debug): Improved test targets
will work with --enable-shared
[From: Raja R Harinath <harinath@cs.umn.edu>]
* gtk.m4: Not all shells understand $(...). Use `...` instead.
[From: Raja R Harinath <harinath@cs.umn.edu>]
- use AM_PATH_PROG instead of AM_CHECK_PROG, so the user
can specify programs not in their path.
* Makefile.am: added gtk.m4 to EXTRA_DIST
Sun Mar 15 23:44:10 1998 Tim Janik <timj@gimp.org>
* gtk/gtkwidget.h:
......
Mon Mar 16 01:33:36 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added trailing newline, hopefully will
fix the problem with esac disappearing.
* gtk/Makefile.am (test-debug): Improved test targets
will work with --enable-shared
[From: Raja R Harinath <harinath@cs.umn.edu>]
* gtk.m4: Not all shells understand $(...). Use `...` instead.
[From: Raja R Harinath <harinath@cs.umn.edu>]
- use AM_PATH_PROG instead of AM_CHECK_PROG, so the user
can specify programs not in their path.
* Makefile.am: added gtk.m4 to EXTRA_DIST
Sun Mar 15 23:44:10 1998 Tim Janik <timj@gimp.org>
* gtk/gtkwidget.h:
......
Mon Mar 16 01:33:36 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added trailing newline, hopefully will
fix the problem with esac disappearing.
* gtk/Makefile.am (test-debug): Improved test targets
will work with --enable-shared
[From: Raja R Harinath <harinath@cs.umn.edu>]
* gtk.m4: Not all shells understand $(...). Use `...` instead.
[From: Raja R Harinath <harinath@cs.umn.edu>]
- use AM_PATH_PROG instead of AM_CHECK_PROG, so the user
can specify programs not in their path.
* Makefile.am: added gtk.m4 to EXTRA_DIST
Sun Mar 15 23:44:10 1998 Tim Janik <timj@gimp.org>
* gtk/gtkwidget.h:
......
Mon Mar 16 01:33:36 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added trailing newline, hopefully will
fix the problem with esac disappearing.
* gtk/Makefile.am (test-debug): Improved test targets
will work with --enable-shared
[From: Raja R Harinath <harinath@cs.umn.edu>]
* gtk.m4: Not all shells understand $(...). Use `...` instead.
[From: Raja R Harinath <harinath@cs.umn.edu>]
- use AM_PATH_PROG instead of AM_CHECK_PROG, so the user
can specify programs not in their path.
* Makefile.am: added gtk.m4 to EXTRA_DIST
Sun Mar 15 23:44:10 1998 Tim Janik <timj@gimp.org>
* gtk/gtkwidget.h:
......
Mon Mar 16 01:33:36 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added trailing newline, hopefully will
fix the problem with esac disappearing.
* gtk/Makefile.am (test-debug): Improved test targets
will work with --enable-shared
[From: Raja R Harinath <harinath@cs.umn.edu>]
* gtk.m4: Not all shells understand $(...). Use `...` instead.
[From: Raja R Harinath <harinath@cs.umn.edu>]
- use AM_PATH_PROG instead of AM_CHECK_PROG, so the user
can specify programs not in their path.
* Makefile.am: added gtk.m4 to EXTRA_DIST
Sun Mar 15 23:44:10 1998 Tim Janik <timj@gimp.org>
* gtk/gtkwidget.h:
......
Mon Mar 16 01:33:36 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added trailing newline, hopefully will
fix the problem with esac disappearing.
* gtk/Makefile.am (test-debug): Improved test targets
will work with --enable-shared
[From: Raja R Harinath <harinath@cs.umn.edu>]
* gtk.m4: Not all shells understand $(...). Use `...` instead.
[From: Raja R Harinath <harinath@cs.umn.edu>]
- use AM_PATH_PROG instead of AM_CHECK_PROG, so the user
can specify programs not in their path.
* Makefile.am: added gtk.m4 to EXTRA_DIST
Sun Mar 15 23:44:10 1998 Tim Janik <timj@gimp.org>
* gtk/gtkwidget.h:
......
Mon Mar 16 01:33:36 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added trailing newline, hopefully will
fix the problem with esac disappearing.
* gtk/Makefile.am (test-debug): Improved test targets
will work with --enable-shared
[From: Raja R Harinath <harinath@cs.umn.edu>]
* gtk.m4: Not all shells understand $(...). Use `...` instead.
[From: Raja R Harinath <harinath@cs.umn.edu>]
- use AM_PATH_PROG instead of AM_CHECK_PROG, so the user
can specify programs not in their path.
* Makefile.am: added gtk.m4 to EXTRA_DIST
Sun Mar 15 23:44:10 1998 Tim Janik <timj@gimp.org>
* gtk/gtkwidget.h:
......
......@@ -8,6 +8,7 @@ EXTRA_DIST = \
Makefile.sgml \
gtkdocs_fix \
gtkfaq.sgml \
gtk-config.txt \
gtk_tut.sgml \
gtk_tut_it.sgml \
debugging.txt \
......
......@@ -65,13 +65,13 @@ This macro:
is later than MINIMUM-VERSION. (A default version will be used
if not specified)
* If the required version was found, sets the GDK_CFLAGS variable to
the output of `gtk-config --cflags` and the GDK_LIBS variable to
* If the required version was found, sets the GTK_CFLAGS variable to
the output of `gtk-config --cflags` and the GTK_LIBS variable to
the output of `gtk-config --libs`, and calls AC_SUBST() for these
variables so they can be used in generated makefiles, and then
executes ACTION-IF-FOUND.
* If the required version was not found, sets GDK_CFLAGS and GDK_LIBS
* If the required version was not found, sets GTK_CFLAGS and GTK_LIBS
to empty strings, and executes ACTION-IF-NOT-FOUND.
This macro is in file 'gtk.m4' which is installed in $datadir/aclocal.
......
......@@ -26,4 +26,4 @@ case $1 in
echo "${usage}" 1>&2
exit 1
;;
esac
\ No newline at end of file
esac
......@@ -8,13 +8,13 @@ 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)
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 --cflags`
GTK_LIBS=`$GTK_CONFIG --libs`
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
......
......@@ -263,7 +263,7 @@ testinput_DEPENDENCIES = $(DEPS)
testselection_DEPENDENCIES = $(DEPS)
simple_DEPENDENCIES = $(DEPS)
.PHONY: files
.PHONY: files test test-debug
files:
@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
......@@ -271,7 +271,11 @@ files:
done
test: testgtk
( CWD=`pwd` ; cd $(srcdir) ; $$CWD/testgtk )
builddir=`pwd`; cd $(top_builddir); top_builddir=`pwd`; \
cd $$builddir; cd $(srcdir); \
$(SHELL) $$top_builddir/libtool --mode=execute $$builddir/testgtk
test-debug: testgtk
( CWD=`pwd` ; cd $(srcdir) ; gdb $$CWD/testgtk )
builddir=`pwd`; cd $(top_builddir); top_builddir=`pwd`; \
cd $$builddir; cd $(srcdir); \
$(SHELL) $$top_builddir/libtool --mode=execute gdb $$builddir/testgtk
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