qulogic/pidgin

Fix possible clash of config headers

8 months ago, Elliott Sales de Andrade
563e7a17c220
Parents 35ac55f4809d
Children da916e6d1b4b
Fix possible clash of config headers

Both GLib and GStreamer have a config file called `config.h` and use the `HAVE_CONFIG_H` macro to conditionally include them.

Normally, this works out fine, but if they are subprojects, we may accidentally trigger including a different `config.h`. This is normally harmless, but it causes a bunch of warnings because we define `GETTEXT_PACKAGE` on the command-line, and it won't match the one in a different project.

However, we only include this file in source files, not headers, and it's always created, so there's no need to conditionally include it or define the macro. We can also rename it so it can't clash with other instances as well.

Testing Done:
Compiled with subprojects and stopped seeing many warnings about `GETTEXT_PACKAGE` and other generic variables being re-defined due to GStreamer's `config.h`.

Reviewed at https://reviews.imfreedom.org/r/2707/
41 files changed, 45 insertions(+), 90 deletions(-)
  • +1 -1
    finch/finchnotifications.c
  • +2 -2
    finch/gntconv.c
  • +1 -1
    finch/gntdebug.c
  • +1 -1
    finch/gntmedia.c
  • +2 -1
    finch/libfinch.c
  • +1 -3
    finch/plugins/gntclipboard/gntclipboard.c
  • +2 -4
    libpurple/core.c
  • +2 -4
    libpurple/plugins.c
  • +1 -1
    libpurple/plugins/notification-sound/notification-sound.c
  • +1 -3
    libpurple/prefs.c
  • +1 -1
    libpurple/protocols/bonjour/bonjour_ft.c
  • +1 -1
    libpurple/protocols/jabber/jabber.c
  • +0 -2
    libpurple/protocols/jabber/jabber.h
  • +1 -1
    libpurple/protocols/jabber/jingle/rtp.c
  • +0 -2
    libpurple/protocols/jabber/jingle/rtp.h
  • +1 -1
    libpurple/protocols/jabber/si.c
  • +1 -1
    libpurple/protocols/jabber/useravatar.c
  • +1 -1
    libpurple/protocols/jabber/xmpp.c
  • +1 -3
    libpurple/util.c
  • +1 -1
    libpurple/win32/libc_interface.c
  • +3 -0
    libpurple/win32/win32dep.c
  • +0 -2
    libpurple/win32/win32dep.h
  • +2 -6
    meson.build
  • +2 -3
    pidgin/gtkblist.c
  • +1 -3
    pidgin/gtkconv.c
  • +1 -3
    pidgin/gtkdialogs.c
  • +1 -3
    pidgin/gtkidle.c
  • +1 -3
    pidgin/gtkmedia.c
  • +1 -3
    pidgin/gtkutils.c
  • +1 -3
    pidgin/libpidgin.c
  • +1 -3
    pidgin/pidginabout.c
  • +1 -3
    pidgin/pidginapplication.c
  • +1 -3
    pidgin/pidgindebug.c
  • +1 -3
    pidgin/pidginui.c
  • +1 -3
    pidgin/plugins/disco/gtkdisco.c
  • +1 -1
    pidgin/plugins/gestures/stroke-draw.c
  • +1 -1
    pidgin/plugins/gestures/stroke.c
  • +1 -3
    pidgin/prefs/pidginprefs.c
  • +1 -3
    pidgin/prefs/pidginvvprefs.c
  • +0 -2
    pidgin/win32/gtkwin32dep.h
  • +1 -1
    pidgin/win32/winpidgin.c
    • --- a/finch/finchnotifications.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/finch/finchnotifications.c Wed Oct 25 20:26:35 2023 -0500
    @@ -20,7 +20,7 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    -#include <config.h>
    +#include <purpleconfig.h>
    #include <glib.h>
    #include <glib/gi18n-lib.h>
    --- a/finch/gntconv.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/finch/gntconv.c Wed Oct 25 20:26:35 2023 -0500
    @@ -20,6 +20,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include "purpleconfig.h"
    +
    #include NCURSES_HEADER
    #include <errno.h>
    @@ -46,8 +48,6 @@
    #define PREF_CHAT PREF_ROOT "/chats"
    #define PREF_USERLIST PREF_CHAT "/userlist"
    -#include "config.h"
    -
    static void generate_send_to_menu(FinchConv *ggc);
    static int color_message_receive;
    --- a/finch/gntdebug.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/finch/gntdebug.c Wed Oct 25 20:26:35 2023 -0500
    @@ -20,7 +20,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#include <config.h>
    +#include <purpleconfig.h>
    #include <glib.h>
    #include <glib/gi18n-lib.h>
    --- a/finch/gntmedia.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/finch/gntmedia.c Wed Oct 25 20:26:35 2023 -0500
    @@ -20,7 +20,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#include <config.h>
    +#include <purpleconfig.h>
    #include <glib/gi18n-lib.h>
    --- a/finch/libfinch.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/finch/libfinch.c Wed Oct 25 20:26:35 2023 -0500
    @@ -20,6 +20,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include "purpleconfig.h"
    +
    #include <errno.h>
    #include <glib.h>
    @@ -36,7 +38,6 @@
    #include "gntprefs.h"
    #include "libfinch.h"
    -#include "config.h"
    #include "package_revision.h"
    static gboolean
    --- a/finch/plugins/gntclipboard/gntclipboard.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/finch/plugins/gntclipboard/gntclipboard.c Wed Oct 25 20:26:35 2023 -0500
    @@ -18,9 +18,7 @@
    #define _POSIX_C_SOURCE 200809L /* Needed to get kill(2). */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif /* HAVE_CONFIG_H */
    +#include <purpleconfig.h>
    #include <glib.h>
    #include <glib/gi18n-lib.h>
    --- a/libpurple/core.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/core.c Wed Oct 25 20:26:35 2023 -0500
    @@ -19,14 +19,12 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <purpleconfig.h>
    +
    #include <glib/gi18n-lib.h>
    #define G_SETTINGS_ENABLE_BACKEND
    #include <gio/gsettingsbackend.h>
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif /* HAVE_CONFIG_H */
    -
    #include "cmds.h"
    #include "connection.h"
    #include "conversations.h"
    --- a/libpurple/plugins.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/plugins.c Wed Oct 25 20:26:35 2023 -0500
    @@ -20,11 +20,9 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#include <glib/gi18n-lib.h>
    +#include <purpleconfig.h>
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif /* HAVE_CONFIG_H */
    +#include <glib/gi18n-lib.h>
    #include "core.h"
    #include "debug.h"
    --- a/libpurple/plugins/notification-sound/notification-sound.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/plugins/notification-sound/notification-sound.c Wed Oct 25 20:26:35 2023 -0500
    @@ -19,7 +19,7 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    -#include <config.h>
    +#include <purpleconfig.h>
    #include <glib/gi18n-lib.h>
    --- a/libpurple/prefs.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/prefs.c Wed Oct 25 20:26:35 2023 -0500
    @@ -21,9 +21,7 @@
    *
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif /* HAVE_CONFIG_H */
    +#include <purpleconfig.h>
    #include <string.h>
    #include <stdio.h>
    --- a/libpurple/protocols/bonjour/bonjour_ft.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/protocols/bonjour/bonjour_ft.c Wed Oct 25 20:26:35 2023 -0500
    @@ -20,7 +20,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
    */
    -#include <config.h>
    +#include <purpleconfig.h>
    #include <sys/types.h>
    --- a/libpurple/protocols/jabber/jabber.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/protocols/jabber/jabber.c Wed Oct 25 20:26:35 2023 -0500
    @@ -21,7 +21,7 @@
    *
    */
    -#include <config.h>
    +#include <purpleconfig.h>
    #include <errno.h>
    --- a/libpurple/protocols/jabber/jabber.h Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/protocols/jabber/jabber.h Wed Oct 25 20:26:35 2023 -0500
    @@ -57,8 +57,6 @@
    #include <gio/gio.h>
    #include <libsoup/soup.h>
    -#include <config.h>
    -
    #include <purple.h>
    #include "namespaces.h"
    --- a/libpurple/protocols/jabber/jingle/rtp.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/protocols/jabber/jingle/rtp.c Wed Oct 25 20:26:35 2023 -0500
    @@ -22,7 +22,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#include <config.h>
    +#include <purpleconfig.h>
    #include <glib/gi18n-lib.h>
    --- a/libpurple/protocols/jabber/jingle/rtp.h Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/protocols/jabber/jingle/rtp.h Wed Oct 25 20:26:35 2023 -0500
    @@ -25,8 +25,6 @@
    #ifndef PURPLE_JABBER_JINGLE_RTP_H
    #define PURPLE_JABBER_JINGLE_RTP_H
    -#include "config.h"
    -
    #include <glib.h>
    #include <glib-object.h>
    --- a/libpurple/protocols/jabber/si.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/protocols/jabber/si.c Wed Oct 25 20:26:35 2023 -0500
    @@ -22,7 +22,7 @@
    *
    */
    -#include <config.h>
    +#include <purpleconfig.h>
    #include <errno.h>
    #include <sys/types.h>
    --- a/libpurple/protocols/jabber/useravatar.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/protocols/jabber/useravatar.c Wed Oct 25 20:26:35 2023 -0500
    @@ -21,7 +21,7 @@
    *
    */
    -#include <config.h>
    +#include <purpleconfig.h>
    #include <glib/gi18n-lib.h>
    --- a/libpurple/protocols/jabber/xmpp.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/protocols/jabber/xmpp.c Wed Oct 25 20:26:35 2023 -0500
    @@ -20,7 +20,7 @@
    *
    */
    -#include <config.h>
    +#include <purpleconfig.h>
    #include <glib/gi18n-lib.h>
    --- a/libpurple/util.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/util.c Wed Oct 25 20:26:35 2023 -0500
    @@ -17,9 +17,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif /* HAVE_CONFIG_H */
    +#include <purpleconfig.h>
    #include <glib/gi18n-lib.h>
    --- a/libpurple/win32/libc_interface.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/win32/libc_interface.c Wed Oct 25 20:26:35 2023 -0500
    @@ -19,7 +19,7 @@
    *
    */
    -#include <config.h>
    +#include <purpleconfig.h>
    #include <glib/gi18n-lib.h>
    #include <winsock2.h>
    --- a/libpurple/win32/win32dep.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/win32/win32dep.c Wed Oct 25 20:26:35 2023 -0500
    @@ -22,6 +22,9 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    *
    */
    +
    +#include "purpleconfig.h"
    +
    #include "win32/win32dep.h"
    #include <winuser.h>
    --- a/libpurple/win32/win32dep.h Wed Oct 25 18:56:35 2023 -0500
    +++ b/libpurple/win32/win32dep.h Wed Oct 25 20:26:35 2023 -0500
    @@ -23,8 +23,6 @@
    #ifndef PURPLE_WIN32_WIN32DEP_H
    #define PURPLE_WIN32_WIN32DEP_H
    -#include <config.h>
    -
    #include <winsock2.h>
    #include <windows.h>
    #include <shlobj.h>
    --- a/meson.build Wed Oct 25 18:56:35 2023 -0500
    +++ b/meson.build Wed Oct 25 20:26:35 2023 -0500
    @@ -43,7 +43,6 @@
    find_program('xgettext')
    add_project_arguments([
    - '-DHAVE_CONFIG_H=1',
    '-DVERSION="@0@"'.format(meson.project_version()),
    '-DDISPLAY_VERSION="@0@"'.format(meson.project_version()),
    '-DPURPLE_WEBSITE="https://pidgin.im/"',
    @@ -192,7 +191,6 @@
    else
    enable_introspection = false
    endif
    -conf.set('ENABLE_INTROSPECTION', enable_introspection)
    #######################################################################
    # Check Pidgin dependencies
    @@ -406,7 +404,6 @@
    kwallet = disabler()
    else
    add_project_arguments([
    - '-DHAVE_CONFIG_H=1',
    '-DDISPLAY_VERSION="@0@"'.format(meson.project_version()),
    '-DPURPLE_WEBSITE="https://pidgin.im/"',
    f'-DGETTEXT_PACKAGE="@GETTEXT_PACKAGE@"'],
    @@ -465,7 +462,7 @@
    endif
    conf.set('DEBUG', enable_debug)
    -# So that config.h may be found.
    +# So that purpleconfig.h may be found.
    toplevel_inc = include_directories('.')
    subdir('libpurple')
    @@ -475,8 +472,7 @@
    subdir('doc')
    subdir('po')
    -configure_file(output : 'config.h',
    - configuration : conf)
    +configure_file(output: 'purpleconfig.h', configuration: conf)
    config_home = get_option('devenv-config-dir')
    if config_home == ''
    --- a/pidgin/gtkblist.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/gtkblist.c Wed Oct 25 20:26:35 2023 -0500
    @@ -19,9 +19,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    *
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +
    +#include <purpleconfig.h>
    #include <glib/gi18n-lib.h>
    --- a/pidgin/gtkconv.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/gtkconv.c Wed Oct 25 20:26:35 2023 -0500
    @@ -20,9 +20,7 @@
    *
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <purpleconfig.h>
    #include <glib/gi18n-lib.h>
    --- a/pidgin/gtkdialogs.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/gtkdialogs.c Wed Oct 25 20:26:35 2023 -0500
    @@ -19,9 +19,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <purpleconfig.h>
    #include <glib/gi18n-lib.h>
    --- a/pidgin/gtkidle.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/gtkidle.c Wed Oct 25 20:26:35 2023 -0500
    @@ -16,9 +16,7 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <purpleconfig.h>
    #include "gtkidle.h"
    --- a/pidgin/gtkmedia.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/gtkmedia.c Wed Oct 25 20:26:35 2023 -0500
    @@ -19,9 +19,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <purpleconfig.h>
    #include <glib/gi18n-lib.h>
    --- a/pidgin/gtkutils.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/gtkutils.c Wed Oct 25 20:26:35 2023 -0500
    @@ -19,9 +19,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <purpleconfig.h>
    #include <errno.h>
    --- a/pidgin/libpidgin.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/libpidgin.c Wed Oct 25 20:26:35 2023 -0500
    @@ -20,9 +20,7 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <purpleconfig.h>
    #include <glib/gi18n-lib.h>
    --- a/pidgin/pidginabout.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/pidginabout.c Wed Oct 25 20:26:35 2023 -0500
    @@ -20,9 +20,7 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <purpleconfig.h>
    #ifdef HAVE_MESON_CONFIG
    #include "meson-config.h"
    --- a/pidgin/pidginapplication.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/pidginapplication.c Wed Oct 25 20:26:35 2023 -0500
    @@ -20,9 +20,7 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <purpleconfig.h>
    #include <glib.h>
    #include <glib/gi18n-lib.h>
    --- a/pidgin/pidgindebug.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/pidgindebug.c Wed Oct 25 20:26:35 2023 -0500
    @@ -19,9 +19,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <purpleconfig.h>
    #include <glib/gi18n-lib.h>
    #include <glib/gstdio.h>
    --- a/pidgin/pidginui.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/pidginui.c Wed Oct 25 20:26:35 2023 -0500
    @@ -26,9 +26,7 @@
    #define G_SETTINGS_ENABLE_BACKEND
    #include <gio/gsettingsbackend.h>
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <purpleconfig.h>
    #include "pidginui.h"
    --- a/pidgin/plugins/disco/gtkdisco.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/plugins/disco/gtkdisco.c Wed Oct 25 20:26:35 2023 -0500
    @@ -20,9 +20,7 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <purpleconfig.h>
    #include <glib/gi18n-lib.h>
    --- a/pidgin/plugins/gestures/stroke-draw.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/plugins/gestures/stroke-draw.c Wed Oct 25 20:26:35 2023 -0500
    @@ -4,7 +4,7 @@
    See the file COPYING for distribution information.
    */
    -#include "config.h"
    +#include "purpleconfig.h"
    #ifdef HAVE_UNISTD_H
    #include <unistd.h>
    --- a/pidgin/plugins/gestures/stroke.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/plugins/gestures/stroke.c Wed Oct 25 20:26:35 2023 -0500
    @@ -7,7 +7,7 @@
    This file contains the stroke recognition algorithm.
    */
    -#include "config.h"
    +#include "purpleconfig.h"
    #ifdef HAVE_UNISTD_H
    #include <unistd.h>
    --- a/pidgin/prefs/pidginprefs.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/prefs/pidginprefs.c Wed Oct 25 20:26:35 2023 -0500
    @@ -20,9 +20,7 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <purpleconfig.h>
    #include <errno.h>
    #include <math.h>
    --- a/pidgin/prefs/pidginvvprefs.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/prefs/pidginvvprefs.c Wed Oct 25 20:26:35 2023 -0500
    @@ -20,9 +20,7 @@
    * along with this program; if not, see <https://www.gnu.org/licenses/>.
    */
    -#ifdef HAVE_CONFIG_H
    -#include <config.h>
    -#endif
    +#include <purpleconfig.h>
    #include <math.h>
    --- a/pidgin/win32/gtkwin32dep.h Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/win32/gtkwin32dep.h Wed Oct 25 20:26:35 2023 -0500
    @@ -20,8 +20,6 @@
    #ifndef _GTKWIN32DEP_H_
    #define _GTKWIN32DEP_H_
    -#include <config.h>
    -
    #include <windows.h>
    #include <gtk/gtk.h>
    --- a/pidgin/win32/winpidgin.c Wed Oct 25 18:56:35 2023 -0500
    +++ b/pidgin/win32/winpidgin.c Wed Oct 25 20:26:35 2023 -0500
    @@ -30,7 +30,7 @@
    * at runtime if needed and dynamically loads libpidgin via LoadLibrary().
    */
    -#include "config.h"
    +#include "purpleconfig.h"
    #include <windows.h>
    #include <shellapi.h>