AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 05:01:09 +00:00
Code Issues Projects Releases Wiki Activity

Added trailing newline, hopefully will fix the problem with esac

Browse Source 
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
This commit is contained in:
Owen Taylor 1998-03-16 06:36:05 +00:00 committed by Owen Taylor
parent c91f2c0cfa
commit 27c086bd95
12 changed files with 127 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
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:

16
ChangeLog.pre-2-0
View File

@ -1,3 +1,19 @@
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:

16
ChangeLog.pre-2-10
View File

@ -1,3 +1,19 @@
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:

16
ChangeLog.pre-2-2
View File

@ -1,3 +1,19 @@
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:

16
ChangeLog.pre-2-4
View File

@ -1,3 +1,19 @@
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:

16
ChangeLog.pre-2-6
View File

@ -1,3 +1,19 @@
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:

16
ChangeLog.pre-2-8
View File

@ -1,3 +1,19 @@
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:

1
docs/Makefile.am
View File

@ -8,6 +8,7 @@ EXTRA_DIST = \
Makefile.sgml \
gtkdocs_fix \
gtkfaq.sgml \
gtk-config.txt \
gtk_tut.sgml \
gtk_tut_it.sgml \
debugging.txt \

6
docs/gtk-config.txt
View File

@ -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.

2
gtk-config.in
View File

@ -26,4 +26,4 @@ case $1 in
echo "${usage}" 1>&2
exit 1
;;
esac
esac

6
gtk.m4
View File

@ -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"

10
gtk/Makefile.am
View File

@ -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