diff --git a/ChangeLog b/ChangeLog index 58381de793..f753aa4038 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2000-07-31 Stanislav Brabec + + * gdk/gdk.c: #ifdef G_ENABLE_DEBUG around gdk_arg_debug_cb and + gdk_arg_no_debug_cb to fix compilation problem with --disable-debug. + + * gdk/Makefile.am: Link gdk against actually compiled gdk_pixbuf-1.3, + not gdk_pixbuf. + 2000-07-30 Pablo Saratxaga * configure.in,po/{sp,sr}.po: Added Serbian files diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 58381de793..f753aa4038 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2000-07-31 Stanislav Brabec + + * gdk/gdk.c: #ifdef G_ENABLE_DEBUG around gdk_arg_debug_cb and + gdk_arg_no_debug_cb to fix compilation problem with --disable-debug. + + * gdk/Makefile.am: Link gdk against actually compiled gdk_pixbuf-1.3, + not gdk_pixbuf. + 2000-07-30 Pablo Saratxaga * configure.in,po/{sp,sr}.po: Added Serbian files diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 58381de793..f753aa4038 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2000-07-31 Stanislav Brabec + + * gdk/gdk.c: #ifdef G_ENABLE_DEBUG around gdk_arg_debug_cb and + gdk_arg_no_debug_cb to fix compilation problem with --disable-debug. + + * gdk/Makefile.am: Link gdk against actually compiled gdk_pixbuf-1.3, + not gdk_pixbuf. + 2000-07-30 Pablo Saratxaga * configure.in,po/{sp,sr}.po: Added Serbian files diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 58381de793..f753aa4038 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2000-07-31 Stanislav Brabec + + * gdk/gdk.c: #ifdef G_ENABLE_DEBUG around gdk_arg_debug_cb and + gdk_arg_no_debug_cb to fix compilation problem with --disable-debug. + + * gdk/Makefile.am: Link gdk against actually compiled gdk_pixbuf-1.3, + not gdk_pixbuf. + 2000-07-30 Pablo Saratxaga * configure.in,po/{sp,sr}.po: Added Serbian files diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 58381de793..f753aa4038 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2000-07-31 Stanislav Brabec + + * gdk/gdk.c: #ifdef G_ENABLE_DEBUG around gdk_arg_debug_cb and + gdk_arg_no_debug_cb to fix compilation problem with --disable-debug. + + * gdk/Makefile.am: Link gdk against actually compiled gdk_pixbuf-1.3, + not gdk_pixbuf. + 2000-07-30 Pablo Saratxaga * configure.in,po/{sp,sr}.po: Added Serbian files diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 58381de793..f753aa4038 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2000-07-31 Stanislav Brabec + + * gdk/gdk.c: #ifdef G_ENABLE_DEBUG around gdk_arg_debug_cb and + gdk_arg_no_debug_cb to fix compilation problem with --disable-debug. + + * gdk/Makefile.am: Link gdk against actually compiled gdk_pixbuf-1.3, + not gdk_pixbuf. + 2000-07-30 Pablo Saratxaga * configure.in,po/{sp,sr}.po: Added Serbian files diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 58381de793..f753aa4038 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2000-07-31 Stanislav Brabec + + * gdk/gdk.c: #ifdef G_ENABLE_DEBUG around gdk_arg_debug_cb and + gdk_arg_no_debug_cb to fix compilation problem with --disable-debug. + + * gdk/Makefile.am: Link gdk against actually compiled gdk_pixbuf-1.3, + not gdk_pixbuf. + 2000-07-30 Pablo Saratxaga * configure.in,po/{sp,sr}.po: Added Serbian files diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 02f7333b26..74a22fe00b 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -33,7 +33,7 @@ LDFLAGS = @STRIP_BEGIN@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -export-dynamic \ -rpath @prefix@/lib \ - -L../gdk-pixbuf/.libs -lgdk_pixbuf \ + -L../gdk-pixbuf/.libs -lgdk_pixbuf-1.3 \ @PANGO_LIBS@ \ @GLIB_DEPLIBS@ \ @more_ldflags@ \ diff --git a/gdk/gdk.c b/gdk/gdk.c index 6bbae5d77b..6860146a16 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -212,6 +212,7 @@ gdk_arg_context_parse (GdkArgContext *context, gint *argc, gchar ***argv) } } +#ifdef G_ENABLE_DEBUG static void gdk_arg_debug_cb (const char *key, const char *value, gpointer user_data) { @@ -227,6 +228,7 @@ gdk_arg_no_debug_cb (const char *key, const char *value, gpointer user_data) (GDebugKey *) gdk_debug_keys, gdk_ndebug_keys); } +#endif /* G_ENABLE_DEBUG */ static void gdk_arg_name_cb (const char *key, const char *value, gpointer user_data)