Get rid of HAVE_CONFIG_H for cmake. Fix one case where it was still used.
authorJörg Mayer <jmayer@loplof.de>
Fri, 28 Sep 2012 14:24:52 +0000 (14:24 -0000)
committerJörg Mayer <jmayer@loplof.de>
Fri, 28 Sep 2012 14:24:52 +0000 (14:24 -0000)
svn path=/trunk/; revision=45191

CMakeLists.txt
epan/dissectors/packet-btsap.c

index ab649d12b2228410a9ff6c21d39b4498075bc3ee..02fa116a5217fc2fd9dccd7fbdb529ed8d14c4f8 100644 (file)
@@ -182,7 +182,6 @@ if(ENABLE_EXTRA_GCC_CHECKS)   # This overrides -Werror
 endif()
 
 add_definitions(
-       -DHAVE_CONFIG_H
        -DG_DISABLE_DEPRECATED
        -DG_DISABLE_SINGLE_INCLUDES
 )
index 83fc8418f41e35b3faadbac7d781084c4b44d32b..77433530498aa1e588786cd93f57129840e1fa0a 100644 (file)
@@ -24,9 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <epan/packet.h>
 #include <epan/prefs.h>