From: Owen Taylor Date: Mon, 16 Mar 1998 06:36:05 +0000 (+0000) Subject: Added trailing newline, hopefully will fix the problem with esac X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=27c086bd95025961e1a873c8916c73903a37ec89;p=~andy%2Fgtk Added trailing newline, hopefully will fix the problem with esac Mon Mar 16 01:33:36 1998 Owen Taylor * 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 ] * gtk.m4: Not all shells understand $(...). Use `...` instead. [From: Raja R Harinath ] - 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 --- diff --git a/ChangeLog b/ChangeLog index 68f7e9a97..83c8fc09d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +Mon Mar 16 01:33:36 1998 Owen Taylor + + * 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 ] + + * gtk.m4: Not all shells understand $(...). Use `...` instead. + [From: Raja R Harinath ] + - 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 * gtk/gtkwidget.h: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 68f7e9a97..83c8fc09d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,19 @@ +Mon Mar 16 01:33:36 1998 Owen Taylor + + * 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 ] + + * gtk.m4: Not all shells understand $(...). Use `...` instead. + [From: Raja R Harinath ] + - 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 * gtk/gtkwidget.h: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 68f7e9a97..83c8fc09d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,19 @@ +Mon Mar 16 01:33:36 1998 Owen Taylor + + * 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 ] + + * gtk.m4: Not all shells understand $(...). Use `...` instead. + [From: Raja R Harinath ] + - 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 * gtk/gtkwidget.h: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 68f7e9a97..83c8fc09d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,19 @@ +Mon Mar 16 01:33:36 1998 Owen Taylor + + * 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 ] + + * gtk.m4: Not all shells understand $(...). Use `...` instead. + [From: Raja R Harinath ] + - 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 * gtk/gtkwidget.h: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 68f7e9a97..83c8fc09d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,19 @@ +Mon Mar 16 01:33:36 1998 Owen Taylor + + * 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 ] + + * gtk.m4: Not all shells understand $(...). Use `...` instead. + [From: Raja R Harinath ] + - 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 * gtk/gtkwidget.h: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 68f7e9a97..83c8fc09d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,19 @@ +Mon Mar 16 01:33:36 1998 Owen Taylor + + * 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 ] + + * gtk.m4: Not all shells understand $(...). Use `...` instead. + [From: Raja R Harinath ] + - 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 * gtk/gtkwidget.h: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 68f7e9a97..83c8fc09d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,19 @@ +Mon Mar 16 01:33:36 1998 Owen Taylor + + * 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 ] + + * gtk.m4: Not all shells understand $(...). Use `...` instead. + [From: Raja R Harinath ] + - 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 * gtk/gtkwidget.h: diff --git a/docs/Makefile.am b/docs/Makefile.am index db06cafbb..ecf1ad7c6 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -8,6 +8,7 @@ EXTRA_DIST = \ Makefile.sgml \ gtkdocs_fix \ gtkfaq.sgml \ + gtk-config.txt \ gtk_tut.sgml \ gtk_tut_it.sgml \ debugging.txt \ diff --git a/docs/gtk-config.txt b/docs/gtk-config.txt index 5e3b6da67..508969342 100644 --- a/docs/gtk-config.txt +++ b/docs/gtk-config.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. diff --git a/gtk-config.in b/gtk-config.in index 251f6275d..db0f4d3d7 100644 --- a/gtk-config.in +++ b/gtk-config.in @@ -26,4 +26,4 @@ case $1 in echo "${usage}" 1>&2 exit 1 ;; -esac \ No newline at end of file +esac diff --git a/gtk.m4 b/gtk.m4 index cba6514b4..f6f933cc4 100644 --- a/gtk.m4 +++ b/gtk.m4 @@ -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" diff --git a/gtk/Makefile.am b/gtk/Makefile.am index d85cae191..0c367b36e 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -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