genconfig.sh -> configure

miniupnpd/INSTALL

@@ -1,5 +1,5 @@
 MiniUPnP project.
-(c) 2006-2019 Thomas Bernard
+(c) 2006-2020 Thomas Bernard
 Homepage : http://miniupnp.free.fr/
 Mirror: https://miniupnp.tuxfamily.org/
 github: https://github.com/miniupnp/miniupnp
@@ -11,12 +11,11 @@ web forum https://miniupnp.tuxfamily.org/ if you need more information.
 ================================ *BSD/pf =================================
 To Build and Install :
 
+- first use ./configure
+  For more details about options :
+  > ./configure -h
+  then edit config.h to fine tune to your preferences.
 - use BSD make to compile.
-- you can first 'make config.h' then edit config.h to your preferences and
-  finally 'make'
-  Alternatively to editing config.h, options can be passed to genconfig.sh
-  For more details :
-  > ./genconfig.sh -h
 - add "rdr-anchor miniupnpd" or/and "anchor miniupnpd" lines to /etc/pf.conf
   (Since OpenBSD 4.7, rdr-anchor lines are no longer used and should be
   removed, leaving only the anchor lines).
@@ -39,9 +38,8 @@ To Build and Install :
 
 =========================== *BSD,*Solaris/ipf =============================
 
-genconfig.sh and the Makefile try to detect wether ipf or pf should be
-used. If it fails, edit config.h and Makefile by hand.
-In Makefile, the FWNAME variable value should be pf or ipf.
+configure tries to detect wether ipf or pf should be
+used. If it fails, you can use ./configure --firewall=ipf
 Installation steps are allmost the same as with pf.
 
 *Solaris users would be interested in reading informations from :
@@ -50,9 +48,8 @@ http://blogs.sun.com/avalon/category/IPFilter
 ============================= Mac OS X/ipfw ===============================
 
 - To enable non standard compilation options,
-  > ./genconfig.sh -h
-  Or edit config.h after it has been generated by genconfig.sh
-- use 'bsdmake' (if available) or 'make -f Makefile.macosx' to build
+  > ./configure -h
+- use either 'bsdmake -f Makefile.bsd' (if available) or 'make' to build
 
 ============================== Mac OS X/pf ================================
 
@@ -63,9 +60,9 @@ Xcode Preferences menu or using 'xcode-select --install' command)
 
 You need to download xnu sources : https://opensource.apple.com/tarballs/xnu/
 - If version of xnu >= 4570,
-  > ./genconfig.sh
+  > ./configure
   Then edit config.h, adding line "#define PFVAR_NEW_STYLE" to it.
-> INCLUDES="-I.../xnu/bsd -I.../xnu/libkern" make -f Makefile.macosx
+> INCLUDES="-I.../xnu/bsd -I.../xnu/libkern" make
 
 ============================ Linux/netfilter ==============================
 To Build and install :
@@ -80,14 +77,14 @@ To Build and install :
   This script must allways be run before the daemon
   to set up initial rules and chains.
 - Build and edit the config.h file
-  > make -f Makefile.linux config.h
+  > ./configure
   > vi config.h
 - Build the daemon
-  > make -f Makefile.linux
+  > make
   If not using iptables from your system,
-  > IPTABLESPATH=/path/to/iptables-1.4.1 make -f Makefile.linux
+  > IPTABLESPATH=/path/to/iptables-1.4.1 make
 - install as root using :
-  > make -f Makefile.linux install
+  > make install
 - A miniupnpd script should be installed to /etc/init.d
   and the configuration files to /etc/miniupnpd
 - anytime, you can use the netfilter/iptables_flush.sh
@@ -111,7 +108,7 @@ How to get libiptc with its headers on debian :
   > ./configure --enable-static
   > make
 - it is now possible to compile miniupnpd using the following command :
-  > IPTABLESPATH=/path/to/iptables-x.x.x make -f Makefile.linux
+  > IPTABLESPATH=/path/to/iptables-x.x.x make
 
 ======================== Linux/netfilter nftables =========================
 
@@ -120,7 +117,8 @@ install the required development libraries. For debian :
  > apt-get install libnftnl-dev libmnl-dev
 
 To build :
- > make -f Makefile.linux_nft
+ > ./configure --firewall=nftables
+ > make
 (first clean any old config if you built the netfilter/iptables version
 previoulsy)
 
@@ -195,8 +193,6 @@ On linux systems, one could also use the command
 
 More simple, use the genuuid makefile target :
 > make genuuid
-or
-> make -f Makefile.linux genuuid
 This target is needed by the "install" target, so it is done automatically
 during install.
 

miniupnpd/Makefile.bsd

@@ -8,10 +8,9 @@
 # This Makefile should work for *BSD and SunOS/Solaris.
 # On Mac OS X, use "bsdmake" to build.
 # This Makefile is NOT compatible with GNU Make.
-# Linux users, please use Makefile.linux :
-#  make -f Makefile.linux
+# Linux users, please use Makefile.linux
 #
-# options can be passed to genconfig.sh through CONFIG_OPTIONS :
+# options can be passed to configure through CONFIG_OPTIONS :
 # $ CONFIG_OPTIONS="--ipv6 --igd2" make
 #
 
@@ -225,8 +224,8 @@ testminissdp:	config.h $(TESTMINISSDPOBJS)
 # BSDmake :
 #	$(CC) $(CFLAGS) -o $@ $>
 
-config.h:	genconfig.sh VERSION
-	./genconfig.sh $(CONFIG_OPTIONS)
+config.h:	configure VERSION
+	./configure $(CONFIG_OPTIONS)
 
 .SUFFIXES:	.o .c
 .c.o:

miniupnpd/Makefile.linux

@@ -1,25 +1,25 @@
 # $Id: Makefile.linux,v 1.95 2017/12/12 11:40:14 nanard Exp $
 # MiniUPnP project
-# (c) 2006-2019 Thomas Bernard
-# http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+# (c) 2006-2020 Thomas Bernard
+# http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/
 # Author : Thomas Bernard
 # for use with GNU Make
 #
-# options can be passed to genconfig.sh through CONFIG_OPTIONS :
-# $ CONFIG_OPTIONS="--ipv6 --igd2" make -f Makefile.linux
+# options can be passed to configure through CONFIG_OPTIONS :
+# $ CONFIG_OPTIONS="--ipv6 --igd2" make
 #
 # To install use :
-# $ DESTDIR=/dummyinstalldir make -f Makefile.linux install
+# $ DESTDIR=/dummyinstalldir make install
 # or :
-# $ INSTALLPREFIX=/usr/local make -f Makefile.linux install
+# $ INSTALLPREFIX=/usr/local make install
 # or :
-# $ make -f Makefile.linux install
+# $ make install
 # (default INSTALLPREFIX is /usr)
 #
 # if your system hasn't iptables libiptc headers and binary correctly
 # installed, you need to get iptables sources from http://netfilter.org/
 # ./configure them and build them then miniupnpd will build using :
-# $ IPTABLESPATH=/path/to/iptables-1.4.1 make -f Makefile.linux
+# $ IPTABLESPATH=/path/to/iptables-1.4.1 make
 #
 CONFIG_OPTIONS += --firewall=iptables
 #CFLAGS = -O -g -DDEBUG
@@ -286,8 +286,8 @@ testminissdp:	testminissdp.o minissdp.o upnputils.o upnpglobalvars.o \
 
 miniupnpdctl:	miniupnpdctl.o
 
-config.h:	genconfig.sh VERSION
-	./genconfig.sh $(CONFIG_OPTIONS)
+config.h:	configure VERSION
+	./configure $(CONFIG_OPTIONS)
 
 depend:	config.h
 	makedepend -f$(MAKEFILE_LIST) -Y \

miniupnpd/Makefile.linux_nft

@@ -1,18 +1,18 @@
 # MiniUPnP project
 # (c) 2015 Tomofumi Hayashi
-# http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+# http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/
 # Author : Tomofumi Hayashi
 # for use with GNU Make
 #
-# options can be passed to genconfig.sh through CONFIG_OPTIONS :
-# $ CONFIG_OPTIONS="--ipv6 --igd2" make -f Makefile.linux
+# options can be passed to configure through CONFIG_OPTIONS :
+# $ CONFIG_OPTIONS="--ipv6 --igd2" make
 #
 # To install use :
-# $ DESTDIR=/dummyinstalldir make -f Makefile.linux_nft install
+# $ DESTDIR=/dummyinstalldir make install
 # or :
-# $ INSTALLPREFIX=/usr/local make -f Makefile.linux_nft install
+# $ INSTALLPREFIX=/usr/local make install
 # or :
-# $ make -f Makefile.linux install
+# $ make install
 # (default INSTALLPREFIX is /usr)
 #
 #
@@ -163,8 +163,8 @@ testportinuse:	testportinuse.o portinuse.o getifaddr.o \
 
 miniupnpdctl:	miniupnpdctl.o
 
-config.h:	genconfig.sh VERSION
-	./genconfig.sh $(CONFIG_OPTIONS)
+config.h:	configure VERSION
+	./configure $(CONFIG_OPTIONS)
 
 depend:	config.h
 	makedepend -f$(MAKEFILE_LIST) -Y \

miniupnpd/Makefile.macosx

@@ -124,8 +124,8 @@ testasyncsendto: config.h $(TEST_ASYNCSENDTO_OBJS)
 testportinuse: config.h $(TEST_PORTINUSE_OBJS)
 	$(CC) $(CFLAGS) -o $@ $(TEST_PORTINUSE_OBJS)
 
-config.h: genconfig.sh
-	./genconfig.sh
+config.h: configure VERSION
+	./configure
 
 .SUFFIXES: .o .c
 .c.o:

miniupnpd/Makefile.sunos

@@ -1,6 +1,6 @@
 # $Id: Makefile,v 1.88 2016/02/10 20:32:43 nanard Exp $
 # MiniUPnP project
-# http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+# http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/
 # Author: Thomas Bernard
 #
 # Makefile for miniupnpd (MiniUPnP daemon)
@@ -10,7 +10,7 @@
 # Linux users, please use Makefile.linux :
 #  make -f Makefile.linux
 #
-# options can be passed to genconfig.sh through CONFIG_OPTIONS :
+# options can be passed to configure through CONFIG_OPTIONS :
 # $ CONFIG_OPTIONS="--ipv6 --igd2" make
 #
 
@@ -191,8 +191,8 @@ testportinuse:	config.h $(TESTPORTINUSEOBJS)
 # BSDmake :
 #	$(CC) $(CFLAGS) -o $@ $>
 
-config.h:	genconfig.sh VERSION
-	./genconfig.sh $(CONFIG_OPTIONS)
+config.h:	configure VERSION
+	./configure $(CONFIG_OPTIONS)
 
 .SUFFIXES:	.o .c
 .c.o: