From: Alan T. DeKok Date: Wed, 25 Jan 2012 17:02:50 +0000 (+0100) Subject: Start integrating new build system with "configure" X-Git-Tag: release_3_0_0_beta0~373 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14f5367a32d232809c21bd89e48e1fb5c563a165;p=thirdparty%2Ffreeradius-server.git Start integrating new build system with "configure" Have the "all.mk" files generated by "configure". --- diff --git a/src/modules/rlm_krb5/all.mk b/src/modules/rlm_krb5/all.mk deleted file mode 100644 index 0d51b1c931f..00000000000 --- a/src/modules/rlm_krb5/all.mk +++ /dev/null @@ -1,2 +0,0 @@ -TARGET = rlm_krb5.a -SOURCES = rlm_krb5.c diff --git a/src/modules/rlm_krb5/all.mk.in b/src/modules/rlm_krb5/all.mk.in new file mode 100644 index 00000000000..ad55f3c6d25 --- /dev/null +++ b/src/modules/rlm_krb5/all.mk.in @@ -0,0 +1,2 @@ +TARGET = @targetname@.a +SOURCES = rlm_krb5.c diff --git a/src/modules/rlm_krb5/configure b/src/modules/rlm_krb5/configure index bdc9c51c184..7bc5618ee1d 100755 --- a/src/modules/rlm_krb5/configure +++ b/src/modules/rlm_krb5/configure @@ -4036,7 +4036,7 @@ krb5_cflags="${krb5_h_cflags} $SMART_CFLAGS" unset ac_cv_env_LIBS_set unset ac_cv_env_LIBS_value - ac_config_files="$ac_config_files Makefile" + ac_config_files="$ac_config_files Makefile all.mk" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure diff --git a/src/modules/rlm_krb5/configure.in b/src/modules/rlm_krb5/configure.in index 2b69b37a74c..65f2e691482 100644 --- a/src/modules/rlm_krb5/configure.in +++ b/src/modules/rlm_krb5/configure.in @@ -107,3 +107,4 @@ AC_SUBST(krb5_cflags) AC_SUBST(krb5_ldflags) AC_SUBST(targetname) AC_OUTPUT(Makefile) +AC_OUTPUT(all.mk) diff --git a/src/modules/rlm_ldap/all.mk b/src/modules/rlm_ldap/all.mk deleted file mode 100644 index 53db5b53252..00000000000 --- a/src/modules/rlm_ldap/all.mk +++ /dev/null @@ -1,5 +0,0 @@ -TARGET = rlm_ldap.a -SOURCES = rlm_ldap.c - -SRC_CFLAGS = -DHAVE_LDAP_START_TLS -DHAVE_LDAP_INITIALIZE -DLDAP_DEPRECATED -DLDAP_SET_REBIND_PROC_ARGS=3 -TGT_LDLIBS = -lldap_r diff --git a/src/modules/rlm_ldap/all.mk.in b/src/modules/rlm_ldap/all.mk.in new file mode 100644 index 00000000000..9854a3c031f --- /dev/null +++ b/src/modules/rlm_ldap/all.mk.in @@ -0,0 +1,5 @@ +TARGET = rlm_ldap.a +SOURCES = rlm_ldap.c @edir@ + +SRC_CFLAGS = @ldap_cflags@ +TGT_LDLIBS = @ldap_ldflags@ diff --git a/src/modules/rlm_ldap/configure b/src/modules/rlm_ldap/configure index 8fc6c38d872..3bec0f3da54 100755 --- a/src/modules/rlm_ldap/configure +++ b/src/modules/rlm_ldap/configure @@ -3937,7 +3937,7 @@ ldap_cflags="$SMART_CFLAGS -DLDAP_DEPRECATED -DLDAP_SET_REBIND_PROC_ARGS=$ac_cv_ unset ac_cv_env_LIBS_set unset ac_cv_env_LIBS_value - ac_config_files="$ac_config_files Makefile" + ac_config_files="$ac_config_files Makefile all.mk" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure diff --git a/src/modules/rlm_ldap/configure.in b/src/modules/rlm_ldap/configure.in index b998e76c677..007b3ed6a33 100644 --- a/src/modules/rlm_ldap/configure.in +++ b/src/modules/rlm_ldap/configure.in @@ -179,3 +179,4 @@ AC_SUBST(ldap_ldflags) AC_SUBST(ldap_cflags) AC_SUBST(targetname) AC_OUTPUT(Makefile) +AC_OUTPUT(all.mk) diff --git a/src/modules/rlm_pam/all.mk b/src/modules/rlm_pam/all.mk deleted file mode 100644 index 8a6455ee87b..00000000000 --- a/src/modules/rlm_pam/all.mk +++ /dev/null @@ -1,2 +0,0 @@ -TARGET = rlm_pam.a -SOURCES = rlm_pam.c diff --git a/src/modules/rlm_pam/configure b/src/modules/rlm_pam/configure index 5098c1aabd7..dd226b46f4e 100755 --- a/src/modules/rlm_pam/configure +++ b/src/modules/rlm_pam/configure @@ -3546,7 +3546,7 @@ ac_config_headers="$ac_config_headers config.h" unset ac_cv_env_LIBS_set unset ac_cv_env_LIBS_value - ac_config_files="$ac_config_files Makefile" + ac_config_files="$ac_config_files Makefile all,mk" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure diff --git a/src/modules/rlm_pam/configure.in b/src/modules/rlm_pam/configure.in index d4572f28c75..8faa53ef8f3 100644 --- a/src/modules/rlm_pam/configure.in +++ b/src/modules/rlm_pam/configure.in @@ -49,3 +49,4 @@ AC_SUBST(pam_cflags) AC_SUBST(targetname) AC_CONFIG_HEADER(config.h) AC_OUTPUT(Makefile) +AC_OUTPUT(all.mk) diff --git a/src/modules/rlm_perl/all.mk b/src/modules/rlm_perl/all.mk deleted file mode 100644 index 117ade95e2e..00000000000 --- a/src/modules/rlm_perl/all.mk +++ /dev/null @@ -1,5 +0,0 @@ -TARGET = rlm_perl.a -SOURCES = rlm_perl.c - -SRC_CFLAGS = `perl -MExtUtils::Embed -e ccopts` -TGT_LDLIBS = `perl -MExtUtils::Embed -e ldopts` diff --git a/src/modules/rlm_perl/all.mk.in b/src/modules/rlm_perl/all.mk.in new file mode 100644 index 00000000000..2fcd156e149 --- /dev/null +++ b/src/modules/rlm_perl/all.mk.in @@ -0,0 +1,5 @@ +TARGET = @targetname@.a +SOURCES = rlm_perl.c + +SRC_CFLAGS = @perl_cflags@ +TGT_LDLIBS = @perl_ldflags@ diff --git a/src/modules/rlm_perl/configure b/src/modules/rlm_perl/configure index bf1e0f2fe2c..71b67598f1d 100755 --- a/src/modules/rlm_perl/configure +++ b/src/modules/rlm_perl/configure @@ -3387,7 +3387,7 @@ ac_config_headers="$ac_config_headers config.h" unset ac_cv_env_LIBS_set unset ac_cv_env_LIBS_value - ac_config_files="$ac_config_files Makefile" + ac_config_files="$ac_config_files Makefile all.mk" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure diff --git a/src/modules/rlm_perl/configure.in b/src/modules/rlm_perl/configure.in index 51bf9a6faba..3f9b5ba0d38 100644 --- a/src/modules/rlm_perl/configure.in +++ b/src/modules/rlm_perl/configure.in @@ -90,3 +90,4 @@ AC_CONFIG_HEADER(config.h) AC_SUBST(targetname) AC_OUTPUT(Makefile) +AC_OUTPUT(all.mk) diff --git a/src/modules/rlm_python/all.mk b/src/modules/rlm_python/all.mk deleted file mode 100644 index 7c5c09149b0..00000000000 --- a/src/modules/rlm_python/all.mk +++ /dev/null @@ -1,5 +0,0 @@ -TARGET = rlm_python.a -SOURCES = rlm_python.c - -TGT_LDLIBS = -L/System/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/config -ldl -lpython2.6 -lm -SRC_CFLAGS = -I/System/Library/Frameworks/Python.framework/Versions/2.6/include/python2.6 diff --git a/src/modules/rlm_python/all.mk.in b/src/modules/rlm_python/all.mk.in new file mode 100644 index 00000000000..ebc8204c976 --- /dev/null +++ b/src/modules/rlm_python/all.mk.in @@ -0,0 +1,5 @@ +TARGET = @targetname.a +SOURCES = rlm_python.c + +TGT_LDLIBS = @python_ldflags@ +SRC_CFLAGS = @python_cflags@ diff --git a/src/modules/rlm_python/configure b/src/modules/rlm_python/configure index b6701923850..ee7ad7b89ce 100755 --- a/src/modules/rlm_python/configure +++ b/src/modules/rlm_python/configure @@ -3388,7 +3388,7 @@ fi unset ac_cv_env_LIBS_set unset ac_cv_env_LIBS_value - ac_config_files="$ac_config_files Makefile" + ac_config_files="$ac_config_files Makefile all.mk" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure diff --git a/src/modules/rlm_python/configure.in b/src/modules/rlm_python/configure.in index 5e2106e86d0..c72c20881e7 100644 --- a/src/modules/rlm_python/configure.in +++ b/src/modules/rlm_python/configure.in @@ -115,3 +115,4 @@ AC_SUBST(python_ldflags) AC_SUBST(python_cflags) AC_SUBST(targetname) AC_OUTPUT(Makefile) +AC_OUTPUT(all.mk)