diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | configure.in | 2 |
8 files changed, 50 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2000-07-26 Robert Brady <rwb197@zepler.org> + + * configure.in: Cause GETTEXT_PACKAGE to be consistent in config.h + and po/Makefile, was installing and looking for them under gtk20 + and gtk2 respectively. + 2000-07-25 Havoc Pennington <hp@redhat.com> * gtk/testtext.c: Comment out some stuff that depends on the rest @@ -104,6 +110,7 @@ 2000-07-25 Havoc Pennington <hp@redhat.com> +>>>>>>> 1.1355 * gtk/gtkprogressbar.h: Implement new sane, 5-function API for using GtkProgressBar. See Changes-2.0.txt for details. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 834ef6b06a..62e9630f5d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2000-07-26 Robert Brady <rwb197@zepler.org> + + * configure.in: Cause GETTEXT_PACKAGE to be consistent in config.h + and po/Makefile, was installing and looking for them under gtk20 + and gtk2 respectively. + 2000-07-25 Havoc Pennington <hp@redhat.com> * gtk/testtext.c: Comment out some stuff that depends on the rest @@ -104,6 +110,7 @@ 2000-07-25 Havoc Pennington <hp@redhat.com> +>>>>>>> 1.1355 * gtk/gtkprogressbar.h: Implement new sane, 5-function API for using GtkProgressBar. See Changes-2.0.txt for details. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 834ef6b06a..62e9630f5d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2000-07-26 Robert Brady <rwb197@zepler.org> + + * configure.in: Cause GETTEXT_PACKAGE to be consistent in config.h + and po/Makefile, was installing and looking for them under gtk20 + and gtk2 respectively. + 2000-07-25 Havoc Pennington <hp@redhat.com> * gtk/testtext.c: Comment out some stuff that depends on the rest @@ -104,6 +110,7 @@ 2000-07-25 Havoc Pennington <hp@redhat.com> +>>>>>>> 1.1355 * gtk/gtkprogressbar.h: Implement new sane, 5-function API for using GtkProgressBar. See Changes-2.0.txt for details. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 834ef6b06a..62e9630f5d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2000-07-26 Robert Brady <rwb197@zepler.org> + + * configure.in: Cause GETTEXT_PACKAGE to be consistent in config.h + and po/Makefile, was installing and looking for them under gtk20 + and gtk2 respectively. + 2000-07-25 Havoc Pennington <hp@redhat.com> * gtk/testtext.c: Comment out some stuff that depends on the rest @@ -104,6 +110,7 @@ 2000-07-25 Havoc Pennington <hp@redhat.com> +>>>>>>> 1.1355 * gtk/gtkprogressbar.h: Implement new sane, 5-function API for using GtkProgressBar. See Changes-2.0.txt for details. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 834ef6b06a..62e9630f5d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2000-07-26 Robert Brady <rwb197@zepler.org> + + * configure.in: Cause GETTEXT_PACKAGE to be consistent in config.h + and po/Makefile, was installing and looking for them under gtk20 + and gtk2 respectively. + 2000-07-25 Havoc Pennington <hp@redhat.com> * gtk/testtext.c: Comment out some stuff that depends on the rest @@ -104,6 +110,7 @@ 2000-07-25 Havoc Pennington <hp@redhat.com> +>>>>>>> 1.1355 * gtk/gtkprogressbar.h: Implement new sane, 5-function API for using GtkProgressBar. See Changes-2.0.txt for details. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 834ef6b06a..62e9630f5d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2000-07-26 Robert Brady <rwb197@zepler.org> + + * configure.in: Cause GETTEXT_PACKAGE to be consistent in config.h + and po/Makefile, was installing and looking for them under gtk20 + and gtk2 respectively. + 2000-07-25 Havoc Pennington <hp@redhat.com> * gtk/testtext.c: Comment out some stuff that depends on the rest @@ -104,6 +110,7 @@ 2000-07-25 Havoc Pennington <hp@redhat.com> +>>>>>>> 1.1355 * gtk/gtkprogressbar.h: Implement new sane, 5-function API for using GtkProgressBar. See Changes-2.0.txt for details. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 834ef6b06a..62e9630f5d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2000-07-26 Robert Brady <rwb197@zepler.org> + + * configure.in: Cause GETTEXT_PACKAGE to be consistent in config.h + and po/Makefile, was installing and looking for them under gtk20 + and gtk2 respectively. + 2000-07-25 Havoc Pennington <hp@redhat.com> * gtk/testtext.c: Comment out some stuff that depends on the rest @@ -104,6 +110,7 @@ 2000-07-25 Havoc Pennington <hp@redhat.com> +>>>>>>> 1.1355 * gtk/gtkprogressbar.h: Implement new sane, 5-function API for using GtkProgressBar. See Changes-2.0.txt for details. diff --git a/configure.in b/configure.in index f802b4a7d8..da136a3c35 100644 --- a/configure.in +++ b/configure.in @@ -72,7 +72,7 @@ PACKAGE=gtk+ GETTEXT_PACKAGE=gtk20 AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"gtk2") +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE") # Save this value here, since automake will set cflags later cflags_set=${CFLAGS+set} |