| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | From 45b97b474ce2d0ad56828db11edde8562bb47a43 Mon Sep 17 00:00:00 2001 |
| 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> |
| 3 | Date: Tue, 2 Dec 2014 02:33:53 +0900 |
| 4 | Subject: [PATCH] Modify configure.in and etc/Makefile.am |
| 5 | |
| 6 | this patch is from Fedora to fix error: |
| 7 | "conftest.c:26:9: error: unknown type name 'not'" |
| 8 | |
| Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 9 | Upstream-Status: Pending |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 10 | |
| 11 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> |
| 12 | --- |
| 13 | configure.in | 6 +++++- |
| 14 | etc/Makefile.am | 9 ++++++--- |
| 15 | etc/radiusclient.conf.in | 2 +- |
| 16 | 3 files changed, 12 insertions(+), 5 deletions(-) |
| 17 | |
| 18 | diff --git a/configure.in b/configure.in |
| 19 | index 812f640..3a8af99 100644 |
| 20 | --- a/configure.in |
| 21 | +++ b/configure.in |
| 22 | @@ -29,6 +29,9 @@ AC_SUBST(LIBVERSION) |
| 23 | pkgsysconfdir=${sysconfdir}/$PACKAGE |
| 24 | AC_SUBST(pkgsysconfdir) |
| 25 | |
| 26 | +pkgdatadir=${datadir}/$PACKAGE |
| 27 | +AC_SUBST(pkgdatadir) |
| 28 | + |
| 29 | AC_PROG_LIBTOOL |
| 30 | |
| 31 | AC_PROG_CC |
| 32 | @@ -118,7 +121,8 @@ then |
| 33 | ], |
| 34 | AC_MSG_RESULT(yes) |
| 35 | AC_DEFINE(HAVE_STRUCT_UTSNAME_DOMAINNAME), |
| 36 | - AC_MSG_RESULT(no) |
| 37 | + AC_MSG_RESULT(no), |
| 38 | + AC_MSG_RESULT(assume no), |
| 39 | ) |
| 40 | fi |
| 41 | |
| 42 | diff --git a/etc/Makefile.am b/etc/Makefile.am |
| 43 | index 39b6975..a3c403f 100644 |
| 44 | --- a/etc/Makefile.am |
| 45 | +++ b/etc/Makefile.am |
| 46 | @@ -14,9 +14,11 @@ CLEANFILES = *~ radiusclient.conf |
| 47 | |
| 48 | sbindir = @sbindir@ |
| 49 | pkgsysconfdir = @pkgsysconfdir@ |
| 50 | -pkgsysconf_DATA = issue port-id-map radiusclient.conf \ |
| 51 | - dictionary dictionary.ascend dictionary.compat dictionary.merit \ |
| 52 | - dictionary.sip |
| 53 | +pkgsysconf_DATA = issue port-id-map radiusclient.conf |
| 54 | + |
| 55 | +pkgdatadir = @pkgdatadir@ |
| 56 | +pkgdata_DATA = dictionary dictionary.ascend dictionary.compat \ |
| 57 | + dictionary.merit dictionary.sip |
| 58 | |
| 59 | EXTRA_DIST = issue port-id-map dictionary dictionary.ascend \ |
| 60 | dictionary.compat dictionary.merit servers radiusclient.conf.in \ |
| 61 | @@ -25,6 +27,7 @@ EXTRA_DIST = issue port-id-map dictionary dictionary.ascend \ |
| 62 | radiusclient.conf: radiusclient.conf.in |
| 63 | sed -e 's|@sbin''dir@|$(sbindir)|g' \ |
| 64 | -e 's|@pkgsysconf''dir@|$(pkgsysconfdir)|g' \ |
| 65 | + -e 's|@pkgdata''dir@|$(pkgdatadir)|g' \ |
| 66 | <$(srcdir)/radiusclient.conf.in >radiusclient.conf |
| 67 | |
| 68 | install-data-local: servers |
| 69 | diff --git a/etc/radiusclient.conf.in b/etc/radiusclient.conf.in |
| 70 | index 948bc2f..aac9973 100644 |
| 71 | --- a/etc/radiusclient.conf.in |
| 72 | +++ b/etc/radiusclient.conf.in |
| 73 | @@ -47,7 +47,7 @@ servers @pkgsysconfdir@/servers |
| 74 | |
| 75 | # dictionary of allowed attributes and values |
| 76 | # just like in the normal RADIUS distributions |
| 77 | -dictionary @pkgsysconfdir@/dictionary |
| 78 | +dictionary @pkgdatadir@/dictionary |
| 79 | |
| 80 | # program to call for a RADIUS authenticated login |
| 81 | login_radius @sbindir@/login.radius |
| 82 | -- |
| 83 | 1.8.4.2 |
| 84 | |