Add submake files for all the utilities in src/main

diff --git a/configure b/configure
index 2061e2b..8d593bb 100755 (executable)
--- a/configure
+++ b/configure
@@ -15595,7 +15595,7 @@ $as_echo "#define WITH_UDPFROMTO /**/" >>confdefs.h
 fi
 
 
-CHECKRAD=checkrad.pl
+CHECKRAD=checkrad
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -15638,8 +15638,8 @@ fi
 
 
 if test "x$ac_cv_path_PERL" = "x"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl not found - Simultaneous-Use and checkrad.pl may not work" >&5
-$as_echo "$as_me: WARNING: perl not found - Simultaneous-Use and checkrad.pl may not work" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl not found - Simultaneous-Use and checkrad may not work" >&5
+$as_echo "$as_me: WARNING: perl not found - Simultaneous-Use and checkrad may not work" >&2;}
 fi
 # Extract the first word of "snmpget", so it can be a program name with args.
 set dummy snmpget; ac_word=$2
@@ -15682,8 +15682,8 @@ fi
 
 
 if test "x$ac_cv_path_SNMPGET" = "x"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: snmpget not found - Simultaneous-Use and checkrad.pl may not work" >&5
-$as_echo "$as_me: WARNING: snmpget not found - Simultaneous-Use and checkrad.pl may not work" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: snmpget not found - Simultaneous-Use and checkrad may not work" >&5
+$as_echo "$as_me: WARNING: snmpget not found - Simultaneous-Use and checkrad may not work" >&2;}
 fi
 
 # Extract the first word of "snmpwalk", so it can be a program name with args.
@@ -15727,8 +15727,8 @@ fi
 
 
 if test "x$ac_cv_path_SNMPWALK" = "x"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: snmpwalk not found - Simultaneous-Use and checkrad.pl may not work" >&5
-$as_echo "$as_me: WARNING: snmpwalk not found - Simultaneous-Use and checkrad.pl may not work" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: snmpwalk not found - Simultaneous-Use and checkrad may not work" >&5
+$as_echo "$as_me: WARNING: snmpwalk not found - Simultaneous-Use and checkrad may not work" >&2;}
 fi
 
 # Extract the first word of "rusers", so it can be a program name with args.
@@ -18538,7 +18538,7 @@ USE_STATIC_LIBS=$enable_static
   unset ac_cv_env_LIBS_set
   unset ac_cv_env_LIBS_value
 
-  ac_config_files="$ac_config_files ./Make.inc ./src/include/build-radpaths-h ./src/main/Makefile ./src/main/radsniff.mk ./src/main/checkrad.pl ./src/main/radlast ./src/main/radtest ./scripts/rc.radiusd ./scripts/radiusd.cron.daily ./scripts/radiusd.cron.monthly ./scripts/cryptpasswd ./raddb/dictionary ./raddb/radrelay.conf ./raddb/radiusd.conf"
+  ac_config_files="$ac_config_files ./Make.inc ./src/include/build-radpaths-h ./src/main/Makefile ./src/main/radsniff.mk ./src/main/checkrad ./src/main/radlast ./src/main/radtest ./scripts/rc.radiusd ./scripts/radiusd.cron.daily ./scripts/radiusd.cron.monthly ./scripts/cryptpasswd ./raddb/dictionary ./raddb/radrelay.conf ./raddb/radiusd.conf"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -19626,7 +19626,7 @@ do
     "./src/include/build-radpaths-h") CONFIG_FILES="$CONFIG_FILES ./src/include/build-radpaths-h" ;;
     "./src/main/Makefile") CONFIG_FILES="$CONFIG_FILES ./src/main/Makefile" ;;
     "./src/main/radsniff.mk") CONFIG_FILES="$CONFIG_FILES ./src/main/radsniff.mk" ;;
-    "./src/main/checkrad.pl") CONFIG_FILES="$CONFIG_FILES ./src/main/checkrad.pl" ;;
+    "./src/main/checkrad") CONFIG_FILES="$CONFIG_FILES ./src/main/checkrad" ;;
     "./src/main/radlast") CONFIG_FILES="$CONFIG_FILES ./src/main/radlast" ;;
     "./src/main/radtest") CONFIG_FILES="$CONFIG_FILES ./src/main/radtest" ;;
     "./scripts/rc.radiusd") CONFIG_FILES="$CONFIG_FILES ./scripts/rc.radiusd" ;;
@@ -20988,7 +20988,7 @@ _LT_EOF
  ;;
     "stamp-h":C) echo timestamp > src/include/stamp-h ;;
     "build-radpaths-h":C) (cd ./src/include && /bin/sh ./build-radpaths-h) ;;
-    "main-chmod":C) (cd ./src/main   && chmod +x checkrad.pl radlast radtest) ;;
+    "main-chmod":C) (cd ./src/main   && chmod +x checkrad radlast radtest) ;;
     "scripts-chmod":C) (cd ./scripts    && chmod +x rc.radiusd radiusd.cron.daily radiusd.cron.monthly cryptpasswd) ;;
 
   esac

diff --git a/configure.in b/configure.in
index 43203d2..6ef8170 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -494,19 +494,19 @@ dnl #  1. Checks for programs
 dnl #
 dnl #############################################################
 
-CHECKRAD=checkrad.pl
+CHECKRAD=checkrad
 AC_PATH_PROG(PERL, perl, /usr/local/bin/perl)
 if test "x$ac_cv_path_PERL" = "x"; then
-  AC_MSG_WARN(perl not found - Simultaneous-Use and checkrad.pl may not work)
+  AC_MSG_WARN(perl not found - Simultaneous-Use and checkrad may not work)
 fi
 AC_PATH_PROG(SNMPGET, snmpget)
 if test "x$ac_cv_path_SNMPGET" = "x"; then
-  AC_MSG_WARN(snmpget not found - Simultaneous-Use and checkrad.pl may not work)
+  AC_MSG_WARN(snmpget not found - Simultaneous-Use and checkrad may not work)
 fi
 
 AC_PATH_PROG(SNMPWALK, snmpwalk)
 if test "x$ac_cv_path_SNMPWALK" = "x"; then
-  AC_MSG_WARN(snmpwalk not found - Simultaneous-Use and checkrad.pl may not work)
+  AC_MSG_WARN(snmpwalk not found - Simultaneous-Use and checkrad may not work)
 fi
 
 AC_PATH_PROG(RUSERS, rusers, /usr/bin/rusers)
@@ -1280,7 +1280,7 @@ dnl #############################################################
 
 AC_CONFIG_COMMANDS([stamp-h], [echo timestamp > src/include/stamp-h])
 AC_CONFIG_COMMANDS([build-radpaths-h], [(cd ./src/include && /bin/sh ./build-radpaths-h)])
-AC_CONFIG_COMMANDS([main-chmod], [(cd ./src/main   && chmod +x checkrad.pl radlast radtest)])
+AC_CONFIG_COMMANDS([main-chmod], [(cd ./src/main   && chmod +x checkrad radlast radtest)])
 AC_CONFIG_COMMANDS([scripts-chmod], [(cd ./scripts    && chmod +x rc.radiusd radiusd.cron.daily radiusd.cron.monthly cryptpasswd)])
 
 dnl #
@@ -1306,7 +1306,7 @@ AC_OUTPUT(\
        ./src/include/build-radpaths-h \
        ./src/main/Makefile \
        ./src/main/radsniff.mk \
-       ./src/main/checkrad.pl \
+       ./src/main/checkrad \
        ./src/main/radlast \
        ./src/main/radtest \
        ./scripts/rc.radiusd \

diff --git a/src/main/.gitignore b/src/main/.gitignore
index 94c9c21..67fb2aa 100644 (file)
--- a/src/main/.gitignore
+++ b/src/main/.gitignore
@@ -1,6 +1,6 @@
 Makefile
 radsniff.mk
-checkrad.pl
+checkrad
 radclient
 radiusd
 radlast

diff --git a/src/main/all.mk b/src/main/all.mk
index df78ee3..bcd546a 100644 (file)
--- a/src/main/all.mk
+++ b/src/main/all.mk
@@ -1,2 +1,3 @@
-SUBMAKEFILES := radclient.mk radiusd.mk radsniff.mk radmin.mk radwho.mk
+SUBMAKEFILES := radclient.mk radiusd.mk radsniff.mk radmin.mk radattr.mk \
+radconf2xml.mk radwho.mk radlast.mk radtest.mk radzap.mk checkrad.mk dhclient.mk
 

diff --git a/src/main/checkrad.pl.in b/src/main/checkrad.in
similarity index 99%
rename from src/main/checkrad.pl.in
rename to src/main/checkrad.in
index 7e32014..c1d23a6 100644 (file)
--- a/src/main/checkrad.pl.in
+++ b/src/main/checkrad.in
@@ -1,6 +1,6 @@
 #!@PERL@
 #
-# checkrad.pl  See if a user is (still) logged in on a certain port.
+# checkrad     See if a user is (still) logged in on a certain port.
 #
 #              This is used by the FreeRADIUS server to check
 #              if its idea of a user logged in on a certain port/nas

diff --git a/src/main/checkrad.mk b/src/main/checkrad.mk
new file mode 100644 (file)
index 0000000..3462a2c
--- /dev/null
+++ b/src/main/checkrad.mk
@@ -0,0 +1,7 @@
+install: install.checkrad
+
+.PHONY: install.checkrad
+
+install.checkrad:
+       @echo INSTALL checkrad
+       $(INSTALL) -m 755 src/main/checkrad $(R)$(sbindir)
\ No newline at end of file

diff --git a/src/main/dhclient.mk b/src/main/dhclient.mk
new file mode 100644 (file)
index 0000000..4b873c6
--- /dev/null
+++ b/src/main/dhclient.mk
@@ -0,0 +1,6 @@
+TARGET         := dhclient
+SOURCES                := dhclient.c
+
+TGT_PREREQS    := libfreeradius-radius.a
+TGT_LDLIBS     := $(LIBS)
+

diff --git a/src/main/radattr.mk b/src/main/radattr.mk
new file mode 100644 (file)
index 0000000..84be39e
--- /dev/null
+++ b/src/main/radattr.mk
@@ -0,0 +1,6 @@
+TARGET         := radattr
+SOURCES                := radattr.c
+
+TGT_PREREQS    := libfreeradius-radius.a
+TGT_LDLIBS     := $(LIBS)
+

diff --git a/src/main/radconf2xml.mk b/src/main/radconf2xml.mk
new file mode 100644 (file)
index 0000000..98576b0
--- /dev/null
+++ b/src/main/radconf2xml.mk
@@ -0,0 +1,6 @@
+TARGET         := radconf2xml
+SOURCES                := radconf2xml.c util.c log.c conffile.c
+
+TGT_PREREQS    := libfreeradius-radius.a
+TGT_LDLIBS     := $(LIBS)
+

diff --git a/src/main/radlast.mk b/src/main/radlast.mk
new file mode 100644 (file)
index 0000000..6a93ba8
--- /dev/null
+++ b/src/main/radlast.mk
@@ -0,0 +1,7 @@
+install: install.radlast
+
+.PHONY: install.radlast
+
+install.radlast:
+       @echo INSTALL radlast
+       $(INSTALL) -m 755 src/main/radlast $(R)$(bindir)
\ No newline at end of file

diff --git a/src/main/radtest.mk b/src/main/radtest.mk
new file mode 100644 (file)
index 0000000..401bf64
--- /dev/null
+++ b/src/main/radtest.mk
@@ -0,0 +1,7 @@
+install: install.radtest
+
+.PHONY: install.radtest
+
+install.radtest:
+       @echo INSTALL radtest
+       $(INSTALL) -m 755 src/main/radtest $(R)$(bindir)
\ No newline at end of file

diff --git a/src/main/radzap.mk b/src/main/radzap.mk
new file mode 100644 (file)
index 0000000..9f78d09
--- /dev/null
+++ b/src/main/radzap.mk
@@ -0,0 +1,7 @@
+install: install.radzap
+
+.PHONY: install.radzap
+
+install.radzap:
+       @echo INSTALL radzap
+       $(INSTALL) -m 755 src/main/radzap $(R)$(bindir)
\ No newline at end of file