X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=builder;h=ac46689e0656b7a2e32bc206d9113a227b25ccd5;hb=59bc0af84afab70ad80d23be5383e3d081c99790;hp=369db0e063f6a734be68c2e31d5dfc84641a4755;hpb=19be607e6baf32a6cb60d1a8812d753930d55d9e;p=moonshot.git

diff --git a/builder b/builder
index 369db0e..ac46689 100755
--- a/builder
+++ b/builder
@@ -68,7 +68,12 @@ def command_output(args) :
 
 def build(package):
     with current_directory(package):
-        run_cmd(('autoreconf', '-i', '-f'))
+        try: os.makedirs( "m4")
+        except OSError: pass
+        #On Centos, freeradius produces an invalid configure script
+        # They check in a configure script anyway so we don't need autoconf
+        if package != "freeradius-server":
+            run_cmd(('autoreconf', '-i', '-f'))
         configure_command = [
                                       './configure'] + configure_opts
         if len(schroot_command) > 0:
@@ -81,7 +86,10 @@ def build(package):
             try: os.mkdir('doc/api')
             except: pass
             #Currently freeradius's make dist is broken
-            if not package == "freeradius-server":
+            if package == "freeradius-server":
+                run_cmd(root_command + " git archive --prefix=freeradius-server/ HEAD |gzip -9 >freeradius-server.tar.gz", shell=True)
+                run_cmd('cp *.tar.gz freeradius-server.spec ' +dist_dir, shell=True)
+            else: #not specially handled
                 run_cmd(root_command +' make dist-gzip', shell=True)
                 run_cmd('cp *.tar.gz ' +dist_dir, shell=True)
         run_cmd(schroot_command + ' make -j3', shell=True)
@@ -140,12 +148,12 @@ prefix = options.prefix
 root_command = options.root_command
 dist = options.dist
 configure_opts = ['--prefix', prefix,
-                  "LDFLAGS=-Wl,-L"+prefix+"/lib -Wl,-L/usr/lib/freeradius"
-                  + " -Wl,-rpath="+prefix+"/lib",
+                  "LDFLAGS=-Wl,-L"+prefix+"/lib -Wl,-rpath="+prefix+"/lib",
                   'CPPFLAGS=-I '+prefix+'/include',
                   '--with-system-libtool', '--with-system-libltdl',
                   '--enable-tls', '--with-gssapi='+prefix,
                   "--with-xmltooling="+prefix, 
+                  '--with-systemdsystemunitdir=' + prefix+'/lib/systemd',
                   ]
 if options.configure_opts is not None: 
     configure_opts.extend(options.configure_opts)