[Gaim-commits] SF.net SVN: gaim: [17398] trunk

[<nos...@us...>]

Revision: 17398
          http://svn.sourceforge.net/gaim/?rev=17398&view=rev
Author:   nosnilmot
Date:     2006-09-29 13:22:46 -0700 (Fri, 29 Sep 2006)

Log Message:
-----------
Don't install config.h, no-one out-of-tree should be using our config.h
anyway. This resolves Fedora bug # 205206

Also make sure our public headers don't depend on it

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/gtk/gtkpluginpref.h

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2006-09-29 13:04:01 UTC (rev 17397)
+++ trunk/Makefile.am	2006-09-29 20:22:46 UTC (rev 17398)
@@ -28,8 +28,7 @@
 		gtk/plugins/win32/winprefs/winprefs.c \
 		po/Makefile.mingw
 
-gaimincludedir=$(includedir)/gaim
-nodist_gaiminclude_HEADERS = config.h
+noinst_HEADERS = config.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gaim.pc

Modified: trunk/gtk/gtkpluginpref.h
===================================================================
--- trunk/gtk/gtkpluginpref.h	2006-09-29 13:04:01 UTC (rev 17397)
+++ trunk/gtk/gtkpluginpref.h	2006-09-29 20:22:46 UTC (rev 17398)
@@ -26,10 +26,6 @@
 #ifndef _GAIM_GTKPLUGINPREF_H_
 #define _GAIM_GTKPLUGINPREF_H_
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "pluginpref.h"
 
 #include "gtkgaim.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.