diff --git a/Makefile.in b/Makefile.in index 3596b4a1b..176da8354 100644 --- a/Makefile.in +++ b/Makefile.in @@ -169,7 +169,7 @@ debugclean: distclean: my_clean my_distclean @LUA_DIST_CLEAN@ @PCAP_DIST_CLEAN@ @PCRE_DIST_CLEAN@ @DNET_DIST_CLEAN@ nbase_dist_clean nsock_dist_clean @NSELIB_DIST_CLEAN@ @ZENMAP_DIST_CLEAN@ my_distclean: - rm -f Makefile Makefile.bak makefile.dep config.h stamp-h stamp-h.in \ + rm -f Makefile Makefile.bak makefile.dep nmap_config.h stamp-h stamp-h.in \ config.cache config.log config.status install-nmap: $(TARGET) diff --git a/configure b/configure index cb77572ce..5d9f4d847 100755 --- a/configure +++ b/configure @@ -1806,7 +1806,7 @@ libpcapdir=libpcap pcredir=libpcre -ac_config_headers="$ac_config_headers config.h" +ac_config_headers="$ac_config_headers nmap_config.h" ac_aux_dir= @@ -8985,7 +8985,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case $ac_config_target in - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "nmap_config.h") CONFIG_HEADERS="$CONFIG_HEADERS nmap_config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 diff --git a/configure.ac b/configure.ac index 367e0b8b6..9e5bf616e 100644 --- a/configure.ac +++ b/configure.ac @@ -33,8 +33,8 @@ AC_SUBST(libpcapdir) pcredir=libpcre AC_SUBST(pcredir) -dnl use config.h instead of -D macros -AC_CONFIG_HEADER(config.h) +dnl use nmap_config.h instead of -D macros +AC_CONFIG_HEADER(nmap_config.h) dnl Host specific hacks AC_CANONICAL_HOST diff --git a/nmap.h b/nmap.h index 56c0256bd..278b8663e 100644 --- a/nmap.h +++ b/nmap.h @@ -110,7 +110,7 @@ #endif #ifdef HAVE_CONFIG_H -#include "config.h" +#include "nmap_config.h" #else #ifdef WIN32 #include "nmap_winconfig.h" diff --git a/config.h.in b/nmap_config.h.in similarity index 98% rename from config.h.in rename to nmap_config.h.in index ccefd8da2..55f93ceb9 100644 --- a/config.h.in +++ b/nmap_config.h.in @@ -1,6 +1,6 @@ /*************************************************************************** - * config.h.in -- Autoconf uses this template, combined with the configure * - * script knowledge about system capabilities, to build the config.h * + * nmap_config.h.in -- Autoconf uses this template, combined with the * + * configure script knowledge about system capabilities, to build this * * include file that lets nmap better understand system particulars. * * * ***********************IMPORTANT NMAP LICENSE TERMS************************ diff --git a/nmap_error.h b/nmap_error.h index 27fb1d34a..415c75b34 100644 --- a/nmap_error.h +++ b/nmap_error.h @@ -106,7 +106,7 @@ #endif #ifdef HAVE_CONFIG_H -#include "config.h" +#include "nmap_config.h" #else #ifdef WIN32 #include "nmap_winconfig.h" diff --git a/nmap_tty.cc b/nmap_tty.cc index f9c98f095..675726b05 100644 --- a/nmap_tty.cc +++ b/nmap_tty.cc @@ -97,7 +97,7 @@ ***************************************************************************/ #ifndef WIN32 -#include "config.h" +#include "nmap_config.h" #endif #include diff --git a/targets.h b/targets.h index 183b5b27d..0b598accf 100644 --- a/targets.h +++ b/targets.h @@ -103,7 +103,7 @@ #define TARGETS_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include "nmap_config.h" #else #ifdef WIN32 #include "nmap_winconfig.h" diff --git a/tcpip.h b/tcpip.h index dc1e5e235..bac6fa5d3 100644 --- a/tcpip.h +++ b/tcpip.h @@ -105,7 +105,7 @@ #define TCPIP_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include "nmap_config.h" #endif #include "nbase.h" diff --git a/utils.h b/utils.h index 08f24172d..07b900b31 100644 --- a/utils.h +++ b/utils.h @@ -119,7 +119,7 @@ #include #include -#include "config.h" +#include "nmap_config.h" #endif #if HAVE_UNISTD_H