updated the build process to support solaris 11

This commit is contained in:
SJ 2012-08-10 13:04:54 +02:00
parent 8c90552cff
commit b026e02474
9 changed files with 22 additions and 7 deletions

View File

@ -26,7 +26,7 @@ SUBDIRS = @SUBDIRS@
RECURSIVE_TARGETS = all-recursive install-recursive clean-recursive distclean-recursive RECURSIVE_TARGETS = all-recursive install-recursive clean-recursive distclean-recursive
MAKE = `which make` MAKE = `which @MAKE@`
INSTALL = @INSTALL@ INSTALL = @INSTALL@

8
configure vendored
View File

@ -610,6 +610,7 @@ libclamav_extra_libs
mysql_obj mysql_obj
mysql_libs mysql_libs
mysql_includes mysql_includes
MAKE
SUBDIRS SUBDIRS
RUNNING_USER RUNNING_USER
OBJS OBJS
@ -2030,7 +2031,7 @@ ac_config_headers="$ac_config_headers piler-config.h"
CONFIGURE_PARAMS_FILE=params.h CONFIGURE_PARAMS_FILE=params.h
rm -f $CONFIGURE_PARAMS_FILE; echo "#define CONFIGURE_PARAMS \"Build Date: "`date`"\nConfigure command: ./configure $@\"" > $CONFIGURE_PARAMS_FILE rm -f $CONFIGURE_PARAMS_FILE; echo "#define CONFIGURE_PARAMS \"Build Date: "`date`\\nConfigure command: ./configure $@\""" > $CONFIGURE_PARAMS_FILE
ac_ext=c ac_ext=c
ac_cpp='$CPP $CPPFLAGS' ac_cpp='$CPP $CPPFLAGS'
@ -3402,6 +3403,7 @@ done
have_libclamav="no" have_libclamav="no"
have_libtool="no" have_libtool="no"
have_clamd="no" have_clamd="no"
@ -3423,6 +3425,10 @@ os=`uname -s`
id_bin="id" id_bin="id"
MAKE="make"
if test "$os" = "SunOS"; then MAKE="gmake"; fi
SUBDIRS="src etc util init.d test" SUBDIRS="src etc util init.d test"

View File

@ -3,7 +3,7 @@ AC_CONFIG_SRCDIR([src/piler.c])
AC_CONFIG_HEADER(piler-config.h) AC_CONFIG_HEADER(piler-config.h)
CONFIGURE_PARAMS_FILE=params.h CONFIGURE_PARAMS_FILE=params.h
rm -f $CONFIGURE_PARAMS_FILE; echo "#define CONFIGURE_PARAMS \"Build Date: "`date`"\nConfigure command: ./configure $@\"" > $CONFIGURE_PARAMS_FILE rm -f $CONFIGURE_PARAMS_FILE; echo "#define CONFIGURE_PARAMS \"Build Date: "`date`\\nConfigure command: ./configure $@\""" > $CONFIGURE_PARAMS_FILE
dnl Checks for programs. dnl Checks for programs.
AC_PROG_CC AC_PROG_CC
@ -22,6 +22,7 @@ AC_SUBST(LIBDIR)
AC_SUBST(OBJS) AC_SUBST(OBJS)
AC_SUBST(RUNNING_USER) AC_SUBST(RUNNING_USER)
AC_SUBST(SUBDIRS) AC_SUBST(SUBDIRS)
AC_SUBST(MAKE)
AC_SUBST(mysql_includes) AC_SUBST(mysql_includes)
AC_SUBST(mysql_libs) AC_SUBST(mysql_libs)
AC_SUBST(mysql_obj) AC_SUBST(mysql_obj)
@ -50,6 +51,10 @@ os=`uname -s`
id_bin="id" id_bin="id"
MAKE="make"
if test "$os" = "SunOS"; then MAKE="gmake"; fi
dnl SUBDIRS="src etc util perl init.d templates history contrib/stat" dnl SUBDIRS="src etc util perl init.d templates history contrib/stat"
SUBDIRS="src etc util init.d test" SUBDIRS="src etc util init.d test"

View File

@ -43,7 +43,7 @@ piler: piler.c libpiler.a
libpiler.a: $(OBJS) $(MYSQL_OBJS) libpiler.a: $(OBJS) $(MYSQL_OBJS)
ar cr libpiler.a $(OBJS) $(MYSQL_OBJS) ar cr libpiler.a $(OBJS) $(MYSQL_OBJS)
ranlib libpiler.a ranlib libpiler.a
$(CC) -shared -Wl -o libpiler.so.$(LIBPILER_VERSION) $(OBJS) $(MYSQL_OBJS) $(LIBS) @LDFLAGS@ $(CC) -shared -Wl -o libpiler.so.$(LIBPILER_VERSION) $(OBJS) $(MYSQL_OBJS)
ln -sf libpiler.so.$(LIBPILER_VERSION) libpiler.so ln -sf libpiler.so.$(LIBPILER_VERSION) libpiler.so
ln -sf libpiler.so.$(LIBPILER_VERSION) libpiler.so.$(PILER_VERSION) ln -sf libpiler.so.$(LIBPILER_VERSION) libpiler.so.$(PILER_VERSION)
@ -60,8 +60,8 @@ pilerexport: pilerexport.c libpiler.a
pilerpurge: pilerpurge.c libpiler.a pilerpurge: pilerpurge.c libpiler.a
$(CC) $(CFLAGS) $(INCDIR) $(DEFS) -o $@ $< -lpiler $(LIBS) $(LIBDIR) $(CC) $(CFLAGS) $(INCDIR) $(DEFS) -o $@ $< -lpiler $(LIBS) $(LIBDIR)
pilerconf: pilerconf.c cfg.o misc.o tai.o pilerconf: pilerconf.c libpiler.a
$(CC) $(CFLAGS) $(INCDIR) $(DEFS) -o $@ $^ $(LIBDIR) $(CC) $(CFLAGS) $(INCDIR) $(DEFS) -o $@ $< -lpiler $(LIBS) $(LIBDIR)
reindex: reindex.c libpiler.a reindex: reindex.c libpiler.a
$(CC) $(CFLAGS) $(INCDIR) $(DEFS) -o $@ $< -lpiler $(LIBS) $(LIBDIR) $(CC) $(CFLAGS) $(INCDIR) $(DEFS) -o $@ $< -lpiler $(LIBS) $(LIBDIR)

View File

@ -13,7 +13,7 @@
#define VERSION "0.1.20" #define VERSION "0.1.20"
#define BUILD 679 #define BUILD 681
#define HOSTID "mailarchiver" #define HOSTID "mailarchiver"

View File

@ -5,6 +5,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <strings.h>
#include <time.h> #include <time.h>
#include <syslog.h> #include <syslog.h>
#include <piler.h> #include <piler.h>

View File

@ -5,6 +5,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <strings.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/socket.h> #include <sys/socket.h>

View File

@ -5,6 +5,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <strings.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

View File

@ -5,6 +5,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <strings.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>