mirror of
https://github.com/nmap/nmap.git
synced 2025-12-07 21:21:31 +00:00
Moving Nmap's config.h[.in] to nmap_config.h[.in]
This commit is contained 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@
|
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:
|
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
|
config.cache config.log config.status
|
||||||
|
|
||||||
install-nmap: $(TARGET)
|
install-nmap: $(TARGET)
|
||||||
|
|||||||
4
configure
vendored
4
configure
vendored
@@ -1806,7 +1806,7 @@ libpcapdir=libpcap
|
|||||||
pcredir=libpcre
|
pcredir=libpcre
|
||||||
|
|
||||||
|
|
||||||
ac_config_headers="$ac_config_headers config.h"
|
ac_config_headers="$ac_config_headers nmap_config.h"
|
||||||
|
|
||||||
|
|
||||||
ac_aux_dir=
|
ac_aux_dir=
|
||||||
@@ -8985,7 +8985,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
|
|||||||
for ac_config_target in $ac_config_targets
|
for ac_config_target in $ac_config_targets
|
||||||
do
|
do
|
||||||
case $ac_config_target in
|
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" ;;
|
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||||
|
|
||||||
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
||||||
|
|||||||
@@ -33,8 +33,8 @@ AC_SUBST(libpcapdir)
|
|||||||
pcredir=libpcre
|
pcredir=libpcre
|
||||||
AC_SUBST(pcredir)
|
AC_SUBST(pcredir)
|
||||||
|
|
||||||
dnl use config.h instead of -D macros
|
dnl use nmap_config.h instead of -D macros
|
||||||
AC_CONFIG_HEADER(config.h)
|
AC_CONFIG_HEADER(nmap_config.h)
|
||||||
|
|
||||||
dnl Host specific hacks
|
dnl Host specific hacks
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
|
|||||||
2
nmap.h
2
nmap.h
@@ -110,7 +110,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "config.h"
|
#include "nmap_config.h"
|
||||||
#else
|
#else
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#include "nmap_winconfig.h"
|
#include "nmap_winconfig.h"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* config.h.in -- Autoconf uses this template, combined with the configure *
|
* nmap_config.h.in -- Autoconf uses this template, combined with the *
|
||||||
* script knowledge about system capabilities, to build the config.h *
|
* configure script knowledge about system capabilities, to build this *
|
||||||
* include file that lets nmap better understand system particulars. *
|
* include file that lets nmap better understand system particulars. *
|
||||||
* *
|
* *
|
||||||
***********************IMPORTANT NMAP LICENSE TERMS************************
|
***********************IMPORTANT NMAP LICENSE TERMS************************
|
||||||
@@ -106,7 +106,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "config.h"
|
#include "nmap_config.h"
|
||||||
#else
|
#else
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#include "nmap_winconfig.h"
|
#include "nmap_winconfig.h"
|
||||||
|
|||||||
@@ -97,7 +97,7 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
#include "config.h"
|
#include "nmap_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|||||||
@@ -103,7 +103,7 @@
|
|||||||
#define TARGETS_H
|
#define TARGETS_H
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "config.h"
|
#include "nmap_config.h"
|
||||||
#else
|
#else
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#include "nmap_winconfig.h"
|
#include "nmap_winconfig.h"
|
||||||
|
|||||||
2
tcpip.h
2
tcpip.h
@@ -105,7 +105,7 @@
|
|||||||
#define TCPIP_H
|
#define TCPIP_H
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "config.h"
|
#include "nmap_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nbase.h"
|
#include "nbase.h"
|
||||||
|
|||||||
Reference in New Issue
Block a user