diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2014-05-26 00:08:43 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2014-05-26 00:08:43 +0300 |
commit | 558af9479298c0adf996a72326ec0bced0f2e572 (patch) | |
tree | f839a6a795b5ceb19a275de64f7421335ceef56e | |
parent | b146a3aa2a81db4e344f23dc9f89f5e682603e91 (diff) | |
download | radius-558af9479298c0adf996a72326ec0bced0f2e572.tar.gz radius-558af9479298c0adf996a72326ec0bced0f2e572.tar.bz2 |
Fix build system
* bootstrap (gnulib_extra_files): Remove "missing".
* gint: Upgrade.
* client/pam_radius/Makefile.am: Use AM_CPPFLAGS instead of INCLUDES.
* radscripts/radscripts.m4: Use [] for quoting.
* lib/Makefile.am: Likewise.
* radiusd/Makefile.am: Likewise.
* radlast/Makefile.am: Likewise.
* radscm/Makefile.am: Likewise.
* radtest/Makefile.am: Likewise.
* raduse/Makefile.am: Likewise.
* radwho/Makefile.am: Likewise.
* radzap/Makefile.am: Likewise.
* snmplib/Makefile.am: Likewise.
* sql/Makefile.am: Likewise.
-rw-r--r-- | .gitignore | 2 | ||||
-rwxr-xr-x | bootstrap | 1 | ||||
-rw-r--r-- | client/pam_radius/Makefile.am | 3 | ||||
m--------- | gint | 0 | ||||
-rw-r--r-- | lib/Makefile.am | 3 | ||||
-rw-r--r-- | radiusd/Makefile.am | 6 | ||||
-rw-r--r-- | radlast/Makefile.am | 3 | ||||
-rw-r--r-- | radscm/Makefile.am | 6 | ||||
-rw-r--r-- | radscripts/radscripts.m4 | 1 | ||||
-rw-r--r-- | radtest/Makefile.am | 2 | ||||
-rw-r--r-- | raduse/Makefile.am | 2 | ||||
-rw-r--r-- | radwho/Makefile.am | 3 | ||||
-rw-r--r-- | radzap/Makefile.am | 2 | ||||
-rw-r--r-- | snmplib/Makefile.am | 2 | ||||
-rw-r--r-- | sql/Makefile.am | 2 |
15 files changed, 19 insertions, 19 deletions
@@ -9,8 +9,8 @@ .emacs* .libs ABOUT-NLS -INSTALL ChangeLog +INSTALL Makefile Makefile.in aclocal.m4 @@ -105,7 +105,6 @@ tests_base=tests # Extra files from gnulib, which override files from other sources. gnulib_extra_files=" $build_aux/install-sh - $build_aux/missing $build_aux/mdate-sh $build_aux/texinfo.tex $build_aux/depcomp diff --git a/client/pam_radius/Makefile.am b/client/pam_radius/Makefile.am index 6bc6dee9..d96a7dc3 100644 --- a/client/pam_radius/Makefile.am +++ b/client/pam_radius/Makefile.am @@ -22,8 +22,7 @@ pam_LTLIBRARIES = @BUILD_PAM_RADIUS_LA@ EXTRA_LTLIBRARIES = pam_radius.la pam_radius_la_SOURCES = pam_radius.c pam_radius_la_LIBADD = -lpam @LIBGNURADIUS@ @LTLIBINTL@ -INCLUDES = @RADIUS_INCLUDE_PATH@ -AM_CPPFLAGS=@PATHFLAGS@ +AM_CPPFLAGS=@RADIUS_INCLUDE_PATH@ @PATHFLAGS@ pam_radius_la_LDFLAGS = -module -avoid-version -no-undefined -rpath $(pamdir) \ -Wl,-Bsymbolic diff --git a/gint b/gint -Subproject a5774356a1c12d1bcb55b6322710e347e1604fc +Subproject fd86bf7d44b0c970771830692ae7491447ebe8b diff --git a/lib/Makefile.am b/lib/Makefile.am index 1ae6e79a..05b42bba 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -79,12 +79,11 @@ localedir = $(datadir)/locale VERSION_SCRIPT=$(srcdir)/gnuradius.vers libgnuradius_la_LDFLAGS = --version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ @VERSION_SCRIPT_OPTION@ -AM_CPPFLAGS=-DLOCALEDIR=\"$(localedir)\" @PATHFLAGS@ +AM_CPPFLAGS=@RADIUS_INCLUDE_PATH@ -DLOCALEDIR=\"$(localedir)\" @PATHFLAGS@ BUILT_SOURCES=users_gram.c users_lex.c MAINTAINERCLEANFILES=users_gram.c users_gram.h users_lex.c MOSTLYCLEANFILES= -INCLUDES=@RADIUS_INCLUDE_PATH@ EXTRA_DIST=users.y users.l gnuradius.vers numtostr.c intprops.h noinst_HEADERS=users_gram.h diff --git a/radiusd/Makefile.am b/radiusd/Makefile.am index a5c03eb4..2b0691b1 100644 --- a/radiusd/Makefile.am +++ b/radiusd/Makefile.am @@ -48,9 +48,11 @@ radiusd_SOURCES = \ radiusd_LDADD = @LEXLIB@ @SQLLIB@ ../snmplib/libradsnmp.a @RADIUSD_LDADD_LIST@ @LIBGNURADIUS@ @LIBRADEXTRA@ @READLINE_LIBS@ @LIBINTL@ BUILT_SOURCES = config.c rewrite.c MAINTAINERCLEANFILES=config.c rewrite.c y.output -INCLUDES = @RADIUS_INCLUDE_PATH@ @GUILE_INCLUDES@ AM_CFLAGS=@OPTFLAGS@ -AM_CPPFLAGS=@PATHFLAGS@ -DRADIUS_DATADIR=\"$(pkgdatadir)/$(VERSION)\" -DRADIUS_LIBDIR=\"$(pkglibdir)/$(VERSION)\" +AM_CPPFLAGS=\ + @RADIUS_INCLUDE_PATH@ @GUILE_INCLUDES@\ + @PATHFLAGS@\ + -DRADIUS_DATADIR=\"$(pkgdatadir)/$(VERSION)\" -DRADIUS_LIBDIR=\"$(pkglibdir)/$(VERSION)\" EXTRA_DIST = config.y rewrite.y .gdbinit YLWRAP = $(SHELL) $(top_srcdir)/scripts/gylwrap diff --git a/radlast/Makefile.am b/radlast/Makefile.am index 311fc507..aa094f57 100644 --- a/radlast/Makefile.am +++ b/radlast/Makefile.am @@ -15,6 +15,5 @@ bin_PROGRAMS = radlast radlast_SOURCES = radlast.c radlast_LDADD = @LIBGNURADIUS@ @LIBRADEXTRA@ @LIBINTL@ -INCLUDES = @RADIUS_INCLUDE_PATH@ -AM_CPPFLAGS=@PATHFLAGS@ +AM_CPPFLAGS=@RADIUS_INCLUDE_PATH@ @PATHFLAGS@ diff --git a/radscm/Makefile.am b/radscm/Makefile.am index 551188ca..c548bade 100644 --- a/radscm/Makefile.am +++ b/radscm/Makefile.am @@ -55,8 +55,9 @@ EXTRA_DIST=ttl.scm ipalloc.scm radsession.in \ gnuradius.scm4 radiusd.scm4 CLEANFILES = radsession gnuradius.scm radiusd.scm DISTCLEANFILES= -INCLUDES = @RADIUS_INCLUDE_PATH@ -I$(srcdir) -I. @GUILE_INCLUDES@ -AM_CPPFLAGS=-DDATADIR=\"$(sitedir)\" +AM_CPPFLAGS=\ + @RADIUS_INCLUDE_PATH@ -I$(srcdir) -I. @GUILE_INCLUDES@\ + -DDATADIR=\"$(sitedir)\" radsession: $(srcdir)/radsession.in $(AM_V_GEN)sed 's,GUILE_BINDIR,$(GUILE_BINDIR),;s,SCHEMEDIR,$(sitedir),;s,PACKAGE_STRING,$(PACKAGE_STRING),' $? > $@ @@ -78,5 +79,6 @@ install-data-hook: fi; \ cd $$here +MAINTAINERCLEANFILES= include ../gint/gint.mk diff --git a/radscripts/radscripts.m4 b/radscripts/radscripts.m4 index a1f358d4..cd81c7e8 100644 --- a/radscripts/radscripts.m4 +++ b/radscripts/radscripts.m4 @@ -17,6 +17,7 @@ dnl dnl You should have received a copy of the GNU General Public License dnl along with GNU Radius. If not, see <http://www.gnu.org/licenses/>. changecom(%%) +changequote([,]) define([SHIFT],[[shift]]) define([TEST],[[ [ $1 ] ]]) define([OPT_HELP],[-h|--h|--he|--hel|--help]) diff --git a/radtest/Makefile.am b/radtest/Makefile.am index 13df34d1..9df1087e 100644 --- a/radtest/Makefile.am +++ b/radtest/Makefile.am @@ -16,6 +16,6 @@ bin_PROGRAMS = radtest radtest_SOURCES = main.c gram.y input.l radtest.h runtime.c completion.c radtest_LDADD = @LIBGNURADIUS@ @LIBRADEXTRA@ ../lib/libradextra.a @READLINE_LIBS@ @LIBINTL@ noinst_HEADERS = gram.h -INCLUDES = @RADIUS_INCLUDE_PATH@ -I$(srcdir) +AM_CPPFLAGS = @RADIUS_INCLUDE_PATH@ -I$(srcdir) AM_YFLAGS = -vdt diff --git a/raduse/Makefile.am b/raduse/Makefile.am index 8092bf37..bf232176 100644 --- a/raduse/Makefile.am +++ b/raduse/Makefile.am @@ -12,5 +12,5 @@ bin_PROGRAMS = raduse raduse_SOURCES = raduse.c session.c stat.c raduse.h raduse_LDADD = ../snmplib/libradsnmp.a ../lib/liblog.la ../lib/librad.la ../lib/libdebug.la @LIBINTL@ -INCLUDES = @RADIUS_INCLUDE_PATH@ +AM_CPPFLAGS = @RADIUS_INCLUDE_PATH@ diff --git a/radwho/Makefile.am b/radwho/Makefile.am index 53ea58c2..e5ab25a0 100644 --- a/radwho/Makefile.am +++ b/radwho/Makefile.am @@ -14,6 +14,5 @@ bin_PROGRAMS = radwho radwho_SOURCES = radwho.c radwho_LDADD = @LIBGNURADIUS@ @LIBRADEXTRA@ @LIBINTL@ -INCLUDES = @RADIUS_INCLUDE_PATH@ -AM_CPPFLAGS=@PATHFLAGS@ +AM_CPPFLAGS=@PATHFLAGS@ @RADIUS_INCLUDE_PATH@ diff --git a/radzap/Makefile.am b/radzap/Makefile.am index 47ec788f..8af81920 100644 --- a/radzap/Makefile.am +++ b/radzap/Makefile.am @@ -14,5 +14,5 @@ bin_PROGRAMS = radzap radzap_SOURCES = radzap.c radzap_LDADD = @LIBGNURADIUS@ @LIBRADEXTRA@ @LIBINTL@ -INCLUDES = @RADIUS_INCLUDE_PATH@ +AM_CPPFLAGS = @RADIUS_INCLUDE_PATH@ diff --git a/snmplib/Makefile.am b/snmplib/Makefile.am index 7452355b..4d962d57 100644 --- a/snmplib/Makefile.am +++ b/snmplib/Makefile.am @@ -17,5 +17,5 @@ libradsnmp_a_SOURCES=asn1.c snmp_mem.c snmp_oid.c snmp_pdu.c \ snmp_recv.c snmp_send.c snmp_sess.c snmp_var.c \ snmp_err.c snmp_mib.c -INCLUDES = @RADIUS_INCLUDE_PATH@ +AM_CPPFLAGS = @RADIUS_INCLUDE_PATH@ diff --git a/sql/Makefile.am b/sql/Makefile.am index a38d84a7..9d6998c1 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -19,7 +19,7 @@ EXTRA_DIST=\ odbc.c DISTCLEANFILES = modlist.h -INCLUDES=@RADIUS_INCLUDE_PATH@ +AM_CPPFLAGS=@RADIUS_INCLUDE_PATH@ libsql_la_SOURCES=disp.c libsql_la_LIBADD=@SQL_LTLIBOBJS@ |