Set up CFLAGS on Unix too

This commit is contained in:
Berke Viktor 2013-04-02 22:35:42 -07:00
parent 9c49254abd
commit 14b089ef90
2 changed files with 3 additions and 3 deletions

View File

@ -191,7 +191,7 @@ if test "$glib" = no; then
AC_MSG_ERROR(Cannot find GLib!) AC_MSG_ERROR(Cannot find GLib!)
fi fi
COMMON_CFLAGS="$GLIB_CFLAGS" COMMON_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
COMMON_LIBS="$GLIB_LIBS" COMMON_LIBS="$GLIB_LIBS"
COMMON_LIBS="$COMMON_LIBS -lgmodule-2.0 -lgobject-2.0" COMMON_LIBS="$COMMON_LIBS -lgmodule-2.0 -lgobject-2.0"
@ -222,7 +222,7 @@ dnl ** GNOME ************************************************************
dnl ********************************************************************* dnl *********************************************************************
GUI_LIBS="$GUI_LIBS $GTK_LIBS" GUI_LIBS="$GUI_LIBS $GTK_LIBS"
GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS" GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
#if test "$gnome" = yes; then #if test "$gnome" = yes; then
# AC_PATH_PROG(pkgconfigpath, pkg-config) # AC_PATH_PROG(pkgconfigpath, pkg-config)

View File

@ -2,7 +2,7 @@ localedir = $(datadir)/locale
bin_PROGRAMS = hexchat bin_PROGRAMS = hexchat
AM_CPPFLAGS = $(GUI_CFLAGS) -DG_DISABLE_CAST_CHECKS -DLOCALEDIR=\"$(localedir)\" AM_CPPFLAGS = $(GUI_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
hexchat_LDADD = ../common/libhexchatcommon.a $(GUI_LIBS) hexchat_LDADD = ../common/libhexchatcommon.a $(GUI_LIBS)