From a89444b19b0ceb41db8db6cfa4e6fa77e26d7759 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Sat, 6 Jul 2013 16:50:36 +0300 Subject: [PATCH] Added support of Darwin platform. --- include/stg/os_int.h | 2 +- projects/rlm_stg/build | 82 +++---- projects/rscriptd/build | 82 +++---- projects/sgauth/build | 82 +++---- projects/sgauthstress/build | 146 +++++------ projects/sgconf/build | 94 ++++---- projects/sgconf_xml/build | 94 ++++---- projects/sgconv/build | 150 ++++++------ projects/stargazer/Makefile | 5 + projects/stargazer/build | 227 +++++++++--------- projects/stargazer/main.cpp | 6 +- projects/stargazer/plugins/Makefile.in | 11 +- .../plugins/authorization/ao/Makefile | 4 +- stglibs/pinger.lib/include/stg/pinger.h | 2 +- .../include/stg/scriptexecuter.h | 2 +- stglibs/scriptexecuter.lib/scriptexecuter.c | 4 +- 16 files changed, 508 insertions(+), 485 deletions(-) diff --git a/include/stg/os_int.h b/include/stg/os_int.h index cc017b84..00ab3fad 100644 --- a/include/stg/os_int.h +++ b/include/stg/os_int.h @@ -31,7 +31,7 @@ #include #endif -#ifdef FREE_BSD5 +#if defined(FREE_BSD5) || defined(DARWIN) #include #endif diff --git a/projects/rlm_stg/build b/projects/rlm_stg/build index 91fe7d9d..6459cdb9 100755 --- a/projects/rlm_stg/build +++ b/projects/rlm_stg/build @@ -53,15 +53,15 @@ fi if [ "$OS" = "unknown" ] then - echo "#############################################################################" - echo "# Sorry, but rlm_stg currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #" - echo "#############################################################################" + printf "#############################################################################\n" + printf "# Sorry, but rlm_stg currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #\n" + printf "#############################################################################\n" exit 1 fi -echo "#############################################################################" -echo " Building rlm_stg for $sys $release" -echo "#############################################################################" +printf "#############################################################################\n" +printf " Building rlm_stg for $sys $release\n" +printf "#############################################################################\n" STG_LIBS="crypto.lib common.lib" @@ -95,32 +95,32 @@ then CXX=g++ fi -echo -n "Checking CC... " +printf "Checking CC... " $CC --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CC not found" + printf "FAIL!\n" + printf "$CC not found\n" exit; fi -echo "found" -echo -n "Checking CXX... " +printf "found\n" +printf "Checking CXX... " $CXX --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CXX not found" + printf "FAIL!\n" + printf "$CXX not found\n" exit; fi -echo "found" +printf "found\n" -echo -n "Checking endianess... " -echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c +printf "Checking endianess... " +printf "int main() { int probe = 0x00000001; return *(char *)&probe; }\n" > build_check.c $CC $CFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "Endianess checking failed" + printf "FAIL!\n" + printf "Endianess checking failed\n" exit; else ./fake @@ -129,39 +129,39 @@ else ARCH=le CXXFLAGS="$CXXFLAGS -DARCH_LE" CFLAGS="$CFLAGS -DARCH_LE" - echo "Little Endian" + printf "Little Endian\n" else ARCH=be CXXFLAGS="$CXXFLAGS -DARCH_BE" CFLAGS="$CFLAGS -DARCH_BE" - echo "Big Endian" + printf "Big Endian\n" fi fi rm -f fake -echo "OS=$OS" > $CONFFILE -echo "STG_TIME=yes" >> $CONFFILE -echo "DEBUG=$DEBUG" >> $CONFFILE -echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE -echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE -echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE -echo "DIR_INCLUDE=\$(DIR_BUILD)/../../include" >> $CONFFILE -echo "ARCH=$ARCH" >> $CONFFILE -echo "DEFS=$DEFS" >> $CONFFILE -echo -n "STG_LIBS=" >> $CONFFILE +printf "OS=$OS\n" > $CONFFILE +printf "STG_TIME=yes\n" >> $CONFFILE +printf "DEBUG=$DEBUG\n" >> $CONFFILE +printf "DIR_BUILD=$BUILD_DIR\n" >> $CONFFILE +printf "DIR_LIB=\$(DIR_BUILD)/../../lib\n" >> $CONFFILE +printf "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs\n" >> $CONFFILE +printf "DIR_INCLUDE=\$(DIR_BUILD)/../../include\n" >> $CONFFILE +printf "ARCH=$ARCH\n" >> $CONFFILE +printf "DEFS=$DEFS\n" >> $CONFFILE +printf "STG_LIBS=" >> $CONFFILE for lib in $STG_LIBS do - echo -n "$lib " >> $CONFFILE + printf "$lib " >> $CONFFILE done -echo "" >> $CONFFILE -echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE -echo "CFLAGS=$CFLAGS" >> $CONFFILE -echo "LDFLAGS=$LDFLAGS" >> $CONFFILE -echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE -echo "PREFIX=$PREFIX" >> $CONFFILE -echo "BIN_MODE=$BIN_MODE" >> $CONFFILE -echo "DATA_MODE=$DATA_MODE" >> $CONFFILE -echo "DIR_MODE=$DIR_MODE" >> $CONFFILE -echo "OWNER=$OWNER" >> $CONFFILE +printf "\n" >> $CONFFILE +printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE +printf "CFLAGS=$CFLAGS\n" >> $CONFFILE +printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE +printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE +printf "PREFIX=$PREFIX\n" >> $CONFFILE +printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE +printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE +printf "DIR_MODE=$DIR_MODE\n" >> $CONFFILE +printf "OWNER=$OWNER\n" >> $CONFFILE $MAKE $MAKEOPTS diff --git a/projects/rscriptd/build b/projects/rscriptd/build index ea3914c7..c7aa090d 100755 --- a/projects/rscriptd/build +++ b/projects/rscriptd/build @@ -53,15 +53,15 @@ fi if [ "$OS" = "unknown" ] then - echo "#############################################################################" - echo "# Sorry, but rscriptd currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #" - echo "#############################################################################" + printf "#############################################################################\n" + printf "# Sorry, but rscriptd currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #\n" + printf "#############################################################################\n" exit 1 fi -echo "#############################################################################" -echo " Building rscriptd for $sys $release" -echo "#############################################################################" +printf "#############################################################################\n" +printf " Building rscriptd for $sys $release\n" +printf "#############################################################################\n" STG_LIBS="logger.lib locker.lib @@ -100,32 +100,32 @@ then CXX=g++ fi -echo -n "Checking CC... " +printf "Checking CC... " $CC --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CC not found" + printf "FAIL!\n" + printf "$CC not found\n" exit; fi -echo "found" -echo -n "Checking CXX... " +printf "found\n" +printf "Checking CXX... " $CXX --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CXX not found" + printf "FAIL!\n" + printf "$CXX not found\n" exit; fi -echo "found" +printf "found\n" -echo -n "Checking endianess... " -echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c +printf "Checking endianess... " +printf "int main() { int probe = 0x00000001; return *(char *)&probe; }\n" > build_check.c $CC $CFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "Endianess checking failed" + printf "FAIL!\n" + printf "Endianess checking failed\n" exit; else ./fake @@ -134,41 +134,41 @@ else ARCH=le CXXFLAGS="$CXXFLAGS -DARCH_LE" CFLAGS="$CFLAGS -DARCH_LE" - echo "Little Endian" + printf "Little Endian\n" else ARCH=be CXXFLAGS="$CXXFLAGS -DARCH_BE" CFLAGS="$CFLAGS -DARCH_BE" - echo "Big Endian" + printf "Big Endian\n" fi fi rm -f fake rm -f build_check.c -echo "OS=$OS" > $CONFFILE -echo "STG_TIME=yes" >> $CONFFILE -echo "DEBUG=$DEBUG" >> $CONFFILE -echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE -echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE -echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE -echo "DIR_INCLUDE=\$(DIR_BUILD)/../../include" >> $CONFFILE -echo "ARCH=$ARCH" >> $CONFFILE -echo "DEFS=$DEFS" >> $CONFFILE -echo -n "STG_LIBS=" >> $CONFFILE +printf "OS=$OS\n" > $CONFFILE +printf "STG_TIME=yes\n" >> $CONFFILE +printf "DEBUG=$DEBUG\n" >> $CONFFILE +printf "DIR_BUILD=$BUILD_DIR\n" >> $CONFFILE +printf "DIR_LIB=\$(DIR_BUILD)/../../lib\n" >> $CONFFILE +printf "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs\n" >> $CONFFILE +printf "DIR_INCLUDE=\$(DIR_BUILD)/../../include\n" >> $CONFFILE +printf "ARCH=$ARCH\n" >> $CONFFILE +printf "DEFS=$DEFS\n" >> $CONFFILE +printf "STG_LIBS=" >> $CONFFILE for lib in $STG_LIBS do - echo -n "$lib " >> $CONFFILE + printf "$lib " >> $CONFFILE done -echo "" >> $CONFFILE -echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE -echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE -echo "CFLAGS=$CFLAGS" >> $CONFFILE -echo "LDFLAGS=$LDFLAGS" >> $CONFFILE -echo "PREFIX=$PREFIX" >> $CONFFILE -echo "BIN_MODE=$BIN_MODE" >> $CONFFILE -echo "DATA_MODE=$DATA_MODE" >> $CONFFILE -echo "DIR_MODE=$DIR_MODE" >> $CONFFILE -echo "OWNER=$OWNER" >> $CONFFILE +printf "\n" >> $CONFFILE +printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE +printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE +printf "CFLAGS=$CFLAGS\n" >> $CONFFILE +printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE +printf "PREFIX=$PREFIX\n" >> $CONFFILE +printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE +printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE +printf "DIR_MODE=$DIR_MODE\n" >> $CONFFILE +printf "OWNER=$OWNER\n" >> $CONFFILE $MAKE $MAKEOPTS diff --git a/projects/sgauth/build b/projects/sgauth/build index 8b79bc52..5ea022a2 100755 --- a/projects/sgauth/build +++ b/projects/sgauth/build @@ -53,15 +53,15 @@ fi if [ "$OS" = "unknown" ] then - echo "#############################################################################" - echo "# Sorry, but sgauth currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #" - echo "#############################################################################" + printf "#############################################################################\n" + printf "# Sorry, but sgauth currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #\n" + printf "#############################################################################\n" exit 1 fi -echo "#############################################################################" -echo " Building sgauth for $sys $release" -echo "#############################################################################" +printf "#############################################################################\n" +printf " Building sgauth for $sys $release\n" +printf "#############################################################################\n" STG_LIBS="crypto.lib common.lib @@ -98,32 +98,32 @@ then CXX=g++ fi -echo -n "Checking CC... " +printf "Checking CC... " $CC --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CC not found" + printf "FAIL!\n" + printf "$CC not found\n" exit; fi -echo "found" -echo -n "Checking CXX... " +printf "found\n" +printf "Checking CXX... " $CXX --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CXX not found" + printf "FAIL!\n" + printf "$CXX not found\n" exit; fi -echo "found" +printf "found\n" -echo -n "Checking endianess... " -echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c +printf "Checking endianess... " +printf "int main() { int probe = 0x00000001; return *(char *)&probe; }\n" > build_check.c $CC $CFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "Endianess checking failed" + printf "FAIL!\n" + printf "Endianess checking failed\n" exit; else ./fake @@ -132,40 +132,40 @@ else ARCH=le CXXFLAGS="$CXXFLAGS -DARCH_LE" CFLAGS="$CFLAGS -DARCH_LE" - echo "Little Endian" + printf "Little Endian\n" else ARCH=be CXXFLAGS="$CXXFLAGS -DARCH_BE" CFLAGS="$CFLAGS -DARCH_BE" - echo "Big Endian" + printf "Big Endian\n" fi fi rm -f fake rm -f build_check.c -echo "OS=$OS" > $CONFFILE -echo "STG_TIME=yes" >> $CONFFILE -echo "DEBUG=$DEBUG" >> $CONFFILE -echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE -echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE -echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE -echo "DIR_INCLUDE=\$(DIR_BUILD)/../../include" >> $CONFFILE -echo "ARCH=$ARCH" >> $CONFFILE -echo "DEFS=$DEFS" >> $CONFFILE -echo -n "STG_LIBS=" >> $CONFFILE +printf "OS=$OS\n" > $CONFFILE +printf "STG_TIME=yes\n" >> $CONFFILE +printf "DEBUG=$DEBUG\n" >> $CONFFILE +printf "DIR_BUILD=$BUILD_DIR\n" >> $CONFFILE +printf "DIR_LIB=\$(DIR_BUILD)/../../lib\n" >> $CONFFILE +printf "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs\n" >> $CONFFILE +printf "DIR_INCLUDE=\$(DIR_BUILD)/../../include\n" >> $CONFFILE +printf "ARCH=$ARCH\n" >> $CONFFILE +printf "DEFS=$DEFS\n" >> $CONFFILE +printf "STG_LIBS=" >> $CONFFILE for lib in $STG_LIBS do - echo -n "$lib " >> $CONFFILE + printf "$lib " >> $CONFFILE done -echo "" >> $CONFFILE -echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE -echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE -echo "CFLAGS=$CFLAGS" >> $CONFFILE -echo "LDFLAGS=$LDFLAGS" >> $CONFFILE -echo "PREFIX=$PREFIX" >> $CONFFILE -echo "BIN_MODE=$BIN_MODE" >> $CONFFILE -echo "DATA_MODE=$DATA_MODE" >> $CONFFILE -echo "DIR_MODE=$DIR_MODE" >> $CONFFILE -echo "OWNER=$OWNER" >> $CONFFILE +printf "\n" >> $CONFFILE +printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE +printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE +printf "CFLAGS=$CFLAGS\n" >> $CONFFILE +printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE +printf "PREFIX=$PREFIX\n" >> $CONFFILE +printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE +printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE +printf "DIR_MODE=$DIR_MODE\n" >> $CONFFILE +printf "OWNER=$OWNER\n" >> $CONFFILE $MAKE $MAKEOPTS diff --git a/projects/sgauthstress/build b/projects/sgauthstress/build index 6f26a17e..2b145659 100755 --- a/projects/sgauthstress/build +++ b/projects/sgauthstress/build @@ -59,15 +59,15 @@ fi if [ "$OS" = "unknown" ] then - echo "################################################################################" - echo "# Sorry, but sgauthstress currently supported by Linux, FreeBSD 4.x-8.x #" - echo "################################################################################" + printf "################################################################################\n" + printf "# Sorry, but sgauthstress currently supported by Linux, FreeBSD 4.x-8.x #\n" + printf "################################################################################\n" exit 1 fi -echo "#############################################################################" -echo " Building sgauthstress for $sys $release" -echo "#############################################################################" +printf "#############################################################################\n" +printf " Building sgauthstress for $sys $release\n" +printf "#############################################################################\n" STG_LIBS="logger.lib locker.lib @@ -108,32 +108,32 @@ then CXX=g++ fi -echo -n "Checking CC... " +printf "Checking CC... " $CC --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CC not found" + printf "FAIL!\n" + printf "$CC not found\n" exit; fi -echo "found" -echo -n "Checking CXX... " +printf "found\n" +printf "Checking CXX... " $CXX --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CXX not found" + printf "FAIL!\n" + printf "$CXX not found\n" exit; fi -echo "found" +printf "found\n" -echo -n "Checking endianess... " -echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c +printf "Checking endianess... " +printf "int main() { int probe = 0x00000001; return *(char *)&probe; }\n" > build_check.c $CC $CFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "Endianess checking failed" + printf "FAIL!\n" + printf "Endianess checking failed\n" exit; else ./fake @@ -142,103 +142,103 @@ else ARCH=le CXXFLAGS="$CXXFLAGS -DARCH_LE" CFLAGS="$CFLAGS -DARCH_LE" - echo "Little Endian" + printf "Little Endian\n" else ARCH=be CXXFLAGS="$CXXFLAGS -DARCH_BE" CFLAGS="$CFLAGS -DARCH_BE" - echo "Big Endian" + printf "Big Endian\n" fi fi rm -f fake rm -f build_check.c -echo -n "Checking for -lfbclient... " +printf "Checking for -lfbclient... " $CC $CFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_FBCLIENT=no - echo "no" + printf "no\n" else CHECK_FBCLIENT=yes - echo "yes" + printf "yes\n" fi rm -f fake -echo -n "Checking for mysql_config... " +printf "Checking for mysql_config... " MYSQL_VERSION=`mysql_config --version 2> /dev/null` if [ $? != 0 ] then - echo "no"; - echo -n "Checking for -lmysqlclient... " + printf "no\n"; + printf "Checking for -lmysqlclient... " $CC $CFLAGS $LDFLAGS build_check.c -lmysqlclient_r $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_MYSQLCLIENT=no - echo "no" + printf "no\n" else CHECK_MYSQLCLIENT=yes - echo "yes" + printf "yes\n" fi rm -f fake else - echo "yes" - echo -n "Checking for mysql_config --cflags... " + printf "yes\n" + printf "Checking for mysql_config --cflags... " MYSQL_CFLAGS=`mysql_config --cflags 2> /dev/null` if [ $? != 0 ] then CHECK_MYSQLCLIENT=no - echo "no" + printf "no\n" else - echo "[$MYSQL_CFLAGS]" - echo -n "Checking for mysql_config --libs_r... " + printf "[$MYSQL_CFLAGS]\n" + printf "Checking for mysql_config --libs_r... " MYSQL_LDFLAGS=`mysql_config --libs_r 2> /dev/null` if [ $? != 0 ] then CHECK_MYSQLCLIENT=no - echo "no" + printf "no\n" else CHECK_MYSQLCLIENT=yes - echo "[$MYSQL_LDFLAGS]" + printf "[$MYSQL_LDFLAGS]\n" fi fi fi -echo -n "Checking for pg_config... " +printf "Checking for pg_config... " PG_VERSION=`pg_config --version 2> /dev/null` if [ $? != 0 ] then - echo "no"; - echo -n "Checking for -lpq... " + printf "no\n"; + printf "Checking for -lpq... " $CC $CFLAGS $LDFLAGS build_check.c -lpq $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_PQ=no - echo "no" + printf "no\n" else CHECK_PQ=yes - echo "yes" + printf "yes\n" fi rm -f fake else - echo "yes"; - echo -n "Checking for pg_config --includedir... " + printf "yes\n"; + printf "Checking for pg_config --includedir... " PG_CFLAGS=`pg_config --includedir 2> /dev/null` if [ $? != 0 ] then CHECK_PQ=no - echo "no" + printf "no\n" else - echo "[$PG_CFLAGS]" - echo -n "Checking for pg_config --libdir... " + printf "[$PG_CFLAGS]\n" + printf "Checking for pg_config --libdir... " PG_LDFLAGS=`pg_config --libdir 2> /dev/null` if [ $? != 0 ] then CHECK_PQ=no - echo "no" + printf "no\n" else CHECK_PQ=yes - echo "[$PG_LDFLAGS]" + printf "[$PG_LDFLAGS]\n" fi fi fi @@ -265,36 +265,36 @@ then store/mysql" fi -echo "OS=$OS" > $CONFFILE -echo "STG_TIME=yes" >> $CONFFILE -echo "DEBUG=$DEBUG" >> $CONFFILE -echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE -echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE -echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE -echo "DIR_INCLUDE=\$(DIR_BUILD)/../../include" >> $CONFFILE -echo "DIR_MOD=\$(DIR_BUILD)/../stargazer/modules" >> $CONFFILE -echo "DIR_PLUGINS=\$(DIR_BUILD)/../stargazer/plugins" >> $CONFFILE -echo "ARCH=$ARCH" >> $CONFFILE -echo "DEFS=$DEFS" >> $CONFFILE -echo -n "STG_LIBS=" >> $CONFFILE +printf "OS=$OS\n" > $CONFFILE +printf "STG_TIME=yes\n" >> $CONFFILE +printf "DEBUG=$DEBUG\n" >> $CONFFILE +printf "DIR_BUILD=$BUILD_DIR\n" >> $CONFFILE +printf "DIR_LIB=\$(DIR_BUILD)/../../lib\n" >> $CONFFILE +printf "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs\n" >> $CONFFILE +printf "DIR_INCLUDE=\$(DIR_BUILD)/../../include\n" >> $CONFFILE +printf "DIR_MOD=\$(DIR_BUILD)/../stargazer/modules\n" >> $CONFFILE +printf "DIR_PLUGINS=\$(DIR_BUILD)/../stargazer/plugins\n" >> $CONFFILE +printf "ARCH=$ARCH\n" >> $CONFFILE +printf "DEFS=$DEFS\n" >> $CONFFILE +printf "STG_LIBS=" >> $CONFFILE for lib in $STG_LIBS do - echo -n "$lib " >> $CONFFILE + printf "$lib " >> $CONFFILE done -echo "" >> $CONFFILE -echo -n "PLUGINS=" >> $CONFFILE +printf "\n" >> $CONFFILE +printf "PLUGINS=" >> $CONFFILE for plugin in $PLUGINS do - echo -n "$plugin " >> $CONFFILE + printf "$plugin " >> $CONFFILE done -echo "" >> $CONFFILE -echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE -echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE -echo "CFLAGS=$CFLAGS" >> $CONFFILE -echo "LDFLAGS=$LDFLAGS" >> $CONFFILE -echo "PREFIX=$PREFIX" >> $CONFFILE -echo "BIN_MODE=$BIN_MODE" >> $CONFFILE -echo "DATA_MODE=$DATA_MODE" >> $CONFFILE -echo "DIR_MODE=$DIR_MODE" >> $CONFFILE -echo "OWNER=$OWNER" >> $CONFFILE +printf "\n" >> $CONFFILE +printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE +printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE +printf "CFLAGS=$CFLAGS\n" >> $CONFFILE +printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE +printf "PREFIX=$PREFIX\n" >> $CONFFILE +printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE +printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE +printf "DIR_MODE=$DIR_MODE\n" >> $CONFFILE +printf "OWNER=$OWNER\n" >> $CONFFILE $MAKE $MAKEOPTS diff --git a/projects/sgconf/build b/projects/sgconf/build index a8a675be..47706a94 100755 --- a/projects/sgconf/build +++ b/projects/sgconf/build @@ -53,15 +53,15 @@ fi if [ "$OS" = "unknown" ] then - echo "#############################################################################" - echo "# Sorry, but sgconf currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #" - echo "#############################################################################" + printf "#############################################################################\n" + printf "# Sorry, but sgconf currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #\n" + printf "#############################################################################\n" exit 1 fi -echo "#############################################################################" -echo " Building sgconf for $sys $release" -echo "#############################################################################" +printf "#############################################################################\n" +printf " Building sgconf for $sys $release\n" +printf "#############################################################################\n" STG_LIBS="conffiles.lib crypto.lib @@ -97,32 +97,32 @@ then CXX=g++ fi -echo -n "Checking CC... " +printf "Checking CC... " $CC --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CC not found" + printf "FAIL!\n" + printf "$CC not found\n" exit; fi -echo "found" -echo -n "Checking CXX... " +printf "found\n" +printf "Checking CXX... " $CXX --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CXX not found" + printf "FAIL!\n" + printf "$CXX not found\n" exit; fi -echo "found" +printf "found\n" -echo -n "Checking endianess... " -echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c +printf "Checking endianess... " +printf "int main() { int probe = 0x00000001; return *(char *)&probe; }\n" > build_check.c $CC $CFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "Endianess checking failed" + printf "FAIL!\n" + printf "Endianess checking failed\n" exit; else ./fake @@ -131,61 +131,61 @@ else ARCH=le CXXFLAGS="$CXXFLAGS -DARCH_LE" CFLAGS="$CFLAGS -DARCH_LE" - echo "Little Endian" + printf "Little Endian\n" else ARCH=be CXXFLAGS="$CXXFLAGS -DARCH_BE" CFLAGS="$CFLAGS -DARCH_BE" - echo "Big Endian" + printf "Big Endian\n" fi fi rm -f fake -echo -n "Checking for -lexpat... " -echo "int main() { return 0; }" > build_check.c +printf "Checking for -lexpat... " +printf "int main() { return 0; }\n" > build_check.c $CC $CFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_EXPAT=no - echo "no" + printf "no\n" else CHECK_EXPAT=yes - echo "yes" + printf "yes\n" fi rm -f fake rm -f build_check.c if [ "$CHECK_EXPAT" != "yes" ] then - echo "-lexpat not found!" + printf "-lexpat not found!\n" exit 1 fi -echo "OS=$OS" > $CONFFILE -echo "STG_TIME=yes" >> $CONFFILE -echo "DEBUG=$DEBUG" >> $CONFFILE -echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE -echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE -echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE -echo "DIR_INCLUDE=\$(DIR_BUILD)/../../include" >> $CONFFILE -echo "ARCH=$ARCH" >> $CONFFILE -echo "CHECK_EXPAT=$CHECK_EXPAT" >> $CONFFILE -echo "DEFS=$DEFS" >> $CONFFILE -echo -n "STG_LIBS=" >> $CONFFILE +printf "OS=$OS\n" > $CONFFILE +printf "STG_TIME=yes\n" >> $CONFFILE +printf "DEBUG=$DEBUG\n" >> $CONFFILE +printf "DIR_BUILD=$BUILD_DIR\n" >> $CONFFILE +printf "DIR_LIB=\$(DIR_BUILD)/../../lib\n" >> $CONFFILE +printf "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs\n" >> $CONFFILE +printf "DIR_INCLUDE=\$(DIR_BUILD)/../../include\n" >> $CONFFILE +printf "ARCH=$ARCH\n" >> $CONFFILE +printf "CHECK_EXPAT=$CHECK_EXPAT\n" >> $CONFFILE +printf "DEFS=$DEFS\n" >> $CONFFILE +printf "STG_LIBS=" >> $CONFFILE for lib in $STG_LIBS do - echo -n "$lib " >> $CONFFILE + printf "$lib " >> $CONFFILE done -echo "" >> $CONFFILE -echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE -echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE -echo "CFLAGS=$CFLAGS" >> $CONFFILE -echo "LDFLAGS=$LDFLAGS" >> $CONFFILE -echo "PREFIX=$PREFIX" >> $CONFFILE -echo "BIN_MODE=$BIN_MODE" >> $CONFFILE -echo "DATA_MODE=$DATA_MODE" >> $CONFFILE -echo "DIR_MODE=$DIR_MODE" >> $CONFFILE -echo "OWNER=$OWNER" >> $CONFFILE +printf "\n" >> $CONFFILE +printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE +printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE +printf "CFLAGS=$CFLAGS\n" >> $CONFFILE +printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE +printf "PREFIX=$PREFIX\n" >> $CONFFILE +printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE +printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE +printf "DIR_MODE=$DIR_MODE\n" >> $CONFFILE +printf "OWNER=$OWNER\n" >> $CONFFILE $MAKE $MAKEOPTS diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build index 6816a436..e9cfb40b 100755 --- a/projects/sgconf_xml/build +++ b/projects/sgconf_xml/build @@ -53,15 +53,15 @@ fi if [ "$OS" = "unknown" ] then - echo "#############################################################################" - echo "# Sorry, but sgconf currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #" - echo "#############################################################################" + printf "#############################################################################\n" + printf "# Sorry, but sgconf currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #\n" + printf "#############################################################################\n" exit 1 fi -echo "#############################################################################" -echo " Building sgconf for $sys $release" -echo "#############################################################################" +printf "#############################################################################\n" +printf " Building sgconf for $sys $release\n" +printf "#############################################################################\n" STG_LIBS="conffiles.lib crypto.lib @@ -97,32 +97,32 @@ then CXX=g++ fi -echo -n "Checking CC... " +printf "Checking CC... " $CC --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CC not found" + printf "FAIL!\n" + printf "$CC not found\n" exit; fi -echo "found" -echo -n "Checking CXX... " +printf "found\n" +printf "Checking CXX... " $CXX --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CXX not found" + printf "FAIL!\n" + printf "$CXX not found\n" exit; fi -echo "found" +printf "found\n" -echo -n "Checking endianess... " -echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c +printf "Checking endianess... " +printf "int main() { int probe = 0x00000001; return *(char *)&probe; }\n" > build_check.c $CC $CFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "Endianess checking failed" + printf "FAIL!\n" + printf "Endianess checking failed\n" exit; else ./fake @@ -131,61 +131,61 @@ else ARCH=le CXXFLAGS="$CXXFLAGS -DARCH_LE" CFLAGS="$CFLAGS -DARCH_LE" - echo "Little Endian" + printf "Little Endian\n" else ARCH=be CXXFLAGS="$CXXFLAGS -DARCH_BE" CFLAGS="$CFLAGS -DARCH_BE" - echo "Big Endian" + printf "Big Endian\n" fi fi rm -f fake -echo -n "Checking for -lexpat... " -echo "int main() { return 0; }" > build_check.c +printf "Checking for -lexpat... " +printf "int main() { return 0; }\n" > build_check.c $CC $CXXFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_EXPAT=no - echo "no" + printf "no\n" else CHECK_EXPAT=yes - echo "yes" + printf "yes\n" fi rm -f fake rm -f build_check.c if [ "$CHECK_EXPAT" != "yes" ] then - echo "-lexpat not found!" + printf "-lexpat not found!\n" exit 1 fi -echo "OS=$OS" > $CONFFILE -echo "STG_TIME=yes" >> $CONFFILE -echo "DEBUG=$DEBUG" >> $CONFFILE -echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE -echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE -echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE -echo "DIR_INCLUDE=\$(DIR_BUILD)/../../include" >> $CONFFILE -echo "ARCH=$ARCH" >> $CONFFILE -echo "CHECK_EXPAT=$CHECK_EXPAT" >> $CONFFILE -echo "DEFS=$DEFS" >> $CONFFILE -echo -n "STG_LIBS=" >> $CONFFILE +printf "OS=$OS\n" > $CONFFILE +printf "STG_TIME=yes\n" >> $CONFFILE +printf "DEBUG=$DEBUG\n" >> $CONFFILE +printf "DIR_BUILD=$BUILD_DIR\n" >> $CONFFILE +printf "DIR_LIB=\$(DIR_BUILD)/../../lib\n" >> $CONFFILE +printf "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs\n" >> $CONFFILE +printf "DIR_INCLUDE=\$(DIR_BUILD)/../../include\n" >> $CONFFILE +printf "ARCH=$ARCH\n" >> $CONFFILE +printf "CHECK_EXPAT=$CHECK_EXPAT\n" >> $CONFFILE +printf "DEFS=$DEFS\n" >> $CONFFILE +printf "STG_LIBS=" >> $CONFFILE for lib in $STG_LIBS do - echo -n "$lib " >> $CONFFILE + printf "$lib " >> $CONFFILE done -echo "" >> $CONFFILE -echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE -echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE -echo "CFLAGS=$CFLAGS" >> $CONFFILE -echo "LDFLAGS=$LDFLAGS" >> $CONFFILE -echo "PREFIX=$PREFIX" >> $CONFFILE -echo "BIN_MODE=$BIN_MODE" >> $CONFFILE -echo "DATA_MODE=$DATA_MODE" >> $CONFFILE -echo "DIR_MODE=$DIR_MODE" >> $CONFFILE -echo "OWNER=$OWNER" >> $CONFFILE +printf "\n" >> $CONFFILE +printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE +printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE +printf "CFLAGS=$CFLAGS\n" >> $CONFFILE +printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE +printf "PREFIX=$PREFIX\n" >> $CONFFILE +printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE +printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE +printf "DIR_MODE=$DIR_MODE\n" >> $CONFFILE +printf "OWNER=$OWNER\n" >> $CONFFILE $MAKE $MAKEOPTS diff --git a/projects/sgconv/build b/projects/sgconv/build index 5084bd0d..7e430be2 100755 --- a/projects/sgconv/build +++ b/projects/sgconv/build @@ -54,15 +54,15 @@ fi if [ "$OS" = "unknown" ] then - echo "#############################################################################" - echo "# Sorry, but sgconv currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #" - echo "#############################################################################" + printf "#############################################################################\n" + printf "# Sorry, but sgconv currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #\n" + printf "#############################################################################\n" exit 1 fi -echo "#############################################################################" -echo " Building sgconv for $sys $release" -echo "#############################################################################" +printf "#############################################################################\n" +printf " Building sgconv for $sys $release\n" +printf "#############################################################################\n" STG_LIBS="logger.lib locker.lib @@ -103,32 +103,32 @@ then CXX=g++ fi -echo -n "Checking CC... " +printf "Checking CC... " $CC --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CC not found" + printf "FAIL!\n" + printf "$CC not found\n" exit; fi -echo "found" -echo -n "Checking CXX... " +printf "found\n" +printf "Checking CXX... " $CXX --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CXX not found" + printf "FAIL!\n" + printf "$CXX not found\n" exit; fi -echo "found" +printf "found\n" -echo -n "Checking endianess... " -echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c +printf "Checking endianess... " +printf "int main() { int probe = 0x00000001; return *(char *)&probe; }\n" > build_check.c $CC $CFLAGS $LDFLAGS -L/usr/lib/mysql -L/usr/local/lib/mysql build_check.c -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "Endianess checking failed" + printf "FAIL!\n" + printf "Endianess checking failed\n" exit; else ./fake @@ -137,102 +137,102 @@ else ARCH=le CXXFLAGS="$CXXFLAGS -DARCH_LE" CFLAGS="$CFLAGS -DARCH_LE" - echo "Little Endian" + printf "Little Endian\n" else ARCH=be CXXFLAGS="$CXXFLAGS -DARCH_BE" CFLAGS="$CFLAGS -DARCH_BE" - echo "Big Endian" + printf "Big Endian\n" fi fi rm -f fake -echo -n "Checking for -lfbclient... " +printf "Checking for -lfbclient... " $CC $CFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_FBCLIENT=no - echo "no" + printf "no\n" else CHECK_FBCLIENT=yes - echo "yes" + printf "yes\n" fi rm -f fake -echo -n "Checking for mysql_config... " +printf "Checking for mysql_config... " MYSQL_VERSION=`mysql_config --version 2> /dev/null` if [ $? != 0 ] then - echo "no"; - echo -n "Checking for -lmysqlclient... " + printf "no\n"; + printf "Checking for -lmysqlclient... " $CC $CFLAGS $LDFLAGS build_check.c -lmysqlclient_r $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_MYSQLCLIENT=no - echo "no" + printf "no\n" else CHECK_MYSQLCLIENT=yes - echo "yes" + printf "yes\n" fi rm -f fake else - echo "yes" - echo -n "Checking for mysql_config --cflags... " + printf "yes\n" + printf "Checking for mysql_config --cflags... " MYSQL_CFLAGS=`mysql_config --cflags 2> /dev/null` if [ $? != 0 ] then CHECK_MYSQLCLIENT=no - echo "no" + printf "no\n" else - echo "[$MYSQL_CFLAGS]" - echo -n "Checking for mysql_config --libs_r... " + printf "[$MYSQL_CFLAGS]\n" + printf "Checking for mysql_config --libs_r... " MYSQL_LDFLAGS=`mysql_config --libs_r 2> /dev/null` if [ $? != 0 ] then CHECK_MYSQLCLIENT=no - echo "no" + printf "no\n" else CHECK_MYSQLCLIENT=yes - echo "[$MYSQL_LDFLAGS]" + printf "[$MYSQL_LDFLAGS]\n" fi fi fi -echo -n "Checking for pg_config... " +printf "Checking for pg_config... " PG_VERSION=`pg_config --version 2> /dev/null` if [ $? != 0 ] then - echo "no"; - echo -n "Checking for -lpq... " + printf "no\n"; + printf "Checking for -lpq... " $CC $CFLAGS $LDFLAGS build_check.c -lpq $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_PQ=no - echo "no" + printf "no\n" else CHECK_PQ=yes - echo "yes" + printf "yes\n" fi rm -f fake else - echo "yes"; - echo -n "Checking for pg_config --includedir... " + printf "yes\n"; + printf "Checking for pg_config --includedir... " PG_CFLAGS=`pg_config --includedir 2> /dev/null` if [ $? != 0 ] then CHECK_PQ=no - echo "no" + printf "no\n" else - echo "[$PG_CFLAGS]" - echo -n "Checking for pg_config --libdir... " + printf "[$PG_CFLAGS]\n" + printf "Checking for pg_config --libdir... " PG_LDFLAGS=`pg_config --libdir 2> /dev/null` if [ $? != 0 ] then CHECK_PQ=no - echo "no" + printf "no\n" else CHECK_PQ=yes - echo "[$PG_LDFLAGS]" + printf "[$PG_LDFLAGS]\n" fi fi fi @@ -259,40 +259,40 @@ then store/mysql" fi -echo "OS=$OS" > $CONFFILE -echo "STG_TIME=yes" >> $CONFFILE -echo "DEBUG=$DEBUG" >> $CONFFILE -echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE -echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE -echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE -echo "DIR_INCLUDE=\$(DIR_BUILD)/../../include" >> $CONFFILE -echo "DIR_MOD=\$(DIR_BUILD)/../stargazer/modules" >> $CONFFILE -echo "DIR_PLUGINS=\$(DIR_BUILD)/../stargazer/plugins" >> $CONFFILE -echo "ARCH=$ARCH" >> $CONFFILE -echo "CHECK_FBCLIENT=$CHECK_FBCLIENT" >> $CONFFILE -echo "DEFS=$DEFS" >> $CONFFILE -echo -n "STG_LIBS=" >> $CONFFILE +printf "OS=$OS\n" > $CONFFILE +printf "STG_TIME=yes\n" >> $CONFFILE +printf "DEBUG=$DEBUG\n" >> $CONFFILE +printf "DIR_BUILD=$BUILD_DIR\n" >> $CONFFILE +printf "DIR_LIB=\$(DIR_BUILD)/../../lib\n" >> $CONFFILE +printf "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs\n" >> $CONFFILE +printf "DIR_INCLUDE=\$(DIR_BUILD)/../../include\n" >> $CONFFILE +printf "DIR_MOD=\$(DIR_BUILD)/../stargazer/modules\n" >> $CONFFILE +printf "DIR_PLUGINS=\$(DIR_BUILD)/../stargazer/plugins\n" >> $CONFFILE +printf "ARCH=$ARCH\n" >> $CONFFILE +printf "CHECK_FBCLIENT=$CHECK_FBCLIENT\n" >> $CONFFILE +printf "DEFS=$DEFS\n" >> $CONFFILE +printf "STG_LIBS=" >> $CONFFILE for lib in $STG_LIBS do - echo -n "$lib " >> $CONFFILE + printf "$lib " >> $CONFFILE done -echo "" >> $CONFFILE -echo -n "PLUGINS=" >> $CONFFILE +printf "\n" >> $CONFFILE +printf "PLUGINS=" >> $CONFFILE for plugin in $PLUGINS do - echo -n "$plugin " >> $CONFFILE + printf "$plugin " >> $CONFFILE done -echo "" >> $CONFFILE -echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE -echo "CFLAGS=$CFLAGS" >> $CONFFILE -echo "LDFLAGS=$LDFLAGS" >> $CONFFILE -echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE -echo "PREFIX=$PREFIX" >> $CONFFILE -echo "BIN_MODE=$BIN_MODE" >> $CONFFILE -echo "DATA_MODE=$DATA_MODE" >> $CONFFILE -echo "DIR_MODE=$DIR_MODE" >> $CONFFILE -echo "OWNER=$OWNER" >> $CONFFILE -echo "VAR_DIR=$VAR_DIR" >> $CONFFILE +printf "\n" >> $CONFFILE +printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE +printf "CFLAGS=$CFLAGS\n" >> $CONFFILE +printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE +printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE +printf "PREFIX=$PREFIX\n" >> $CONFFILE +printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE +printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE +printf "DIR_MODE=$DIR_MODE\n" >> $CONFFILE +printf "OWNER=$OWNER\n" >> $CONFFILE +printf "VAR_DIR=$VAR_DIR\n" >> $CONFFILE mkdir -p ../stargazer/modules diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile index 9dfc0b51..aa2b6f90 100644 --- a/projects/stargazer/Makefile +++ b/projects/stargazer/Makefile @@ -47,7 +47,12 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS)))) CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS) CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS) + +ifneq ($(OS),darwin) LDFLAGS += -Wl,-E $(STGLIBS_LIBS) +endif + +LDFLAGS += $(STGLIBS_LIBS) .PHONY: all clean distclean libs plugins install uninstall install-bin install-data all: libs plugins $(PROG) diff --git a/projects/stargazer/build b/projects/stargazer/build index a323148b..2061d538 100755 --- a/projects/stargazer/build +++ b/projects/stargazer/build @@ -72,17 +72,24 @@ then MAKE="gmake" fi +if [ "$sys" = "Darwin" ] +then + OS=darwin + ETC_DIR="./inst/freebsd/etc/stargazer" + MAKE="gmake" +fi + if [ "$OS" = "unknown" ] then - echo "#############################################################################" - echo "# Sorry, but stargazer currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #" - echo "#############################################################################" + printf "#############################################################################\n" + printf "# Sorry, but stargazer currently supported by Linux, FreeBSD 4.x, 5.x, 6.x #\n" + printf "#############################################################################\n" exit 1 fi -echo "#############################################################################" -echo " Building STG 2.4 for $sys $release" -echo "#############################################################################" +printf "#############################################################################\n" +printf " Building STG 2.4 for $sys $release\n" +printf "#############################################################################\n" STG_LIBS="logger.lib locker.lib @@ -116,12 +123,18 @@ else DEFS="$DEFS -DFREE_BSD" LIB_THREAD=-lc_r else - DEFS="$DEFS -DFREE_BSD5" if [ "$OS" = "bsd7" ] then + DEFS="$DEFS -DFREE_BSD5" LIB_THREAD=-lpthread else - LIB_THREAD=-lc_r + if [ "$OS" == "darwin" ] + then + DEFS="$DEFS -DDARWIN" + LIB_THREAD=-lpthread + else + LIB_THREAD=-lc_r + fi fi fi PLUGINS="$PLUGINS @@ -139,32 +152,32 @@ then CXX=g++ fi -echo -n "Checking CC... " +printf "Checking CC... " $CC --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CC not found" + printf "FAIL!\n" + printf "$CC not found\n" exit; fi -echo "found" -echo -n "Checking CXX... " +printf "found\n" +printf "Checking CXX... " $CXX --version > /dev/null 2> /dev/null if [ $? != 0 ] then - echo "FAIL!" - echo "$CXX not found" + printf "FAIL!\n" + printf "$CXX not found\n" exit; fi -echo "found" +printf "found\n" -echo -n "Checking endianess... " -echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c +printf "Checking endianess... " +printf "int main() { int probe = 0x00000001; return *(char *)&probe; }\n" > build_check.c $CC $CFLAGS $LDFLAGS build_check.c -o fake if [ $? != 0 ] then - echo "FAIL!" - echo "Endianess checking failed" + printf "FAIL!\n" + printf "Endianess checking failed\n" exit; else ./fake @@ -173,179 +186,179 @@ else ARCH=le CXXFLAGS="$CXXFLAGS -DARCH_LE" CFLAGS="$CFLAGS -DARCH_LE" - echo "Little Endian" + printf "Little Endian\n" else ARCH=be CXXFLAGS="$CXXFLAGS -DARCH_BE" CFLAGS="$CFLAGS -DARCH_BE" - echo "Big Endian" + printf "Big Endian\n" fi fi rm -f fake -echo -n "Checking for -lexpat... " -echo "int main() { return 0; }" > build_check.c +printf "Checking for -lexpat... " +printf "int main() { return 0; }\n" > build_check.c $CC $CFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_EXPAT=no - echo "no" + printf "no\n" else CHECK_EXPAT=yes - echo "yes" + printf "yes\n" fi rm -f fake -echo -n "Checking for -lfbclient... " +printf "Checking for -lfbclient... " $CC $CFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_FBCLIENT=no - echo "no" + printf "no\n" else CHECK_FBCLIENT=yes - echo "yes" + printf "yes\n" fi rm -f fake -echo -n "Checking for mysql_config... " +printf "Checking for mysql_config... " MYSQL_VERSION=`mysql_config --version 2> /dev/null` if [ $? != 0 ] then - echo "no"; - echo -n "Checking for -lmysqlclient... " + printf "no\n"; + printf "Checking for -lmysqlclient... " $CC $CFLAGS $LDFLAGS build_check.c -lmysqlclient_r $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_MYSQLCLIENT=no - echo "no" + printf "no\n" else CHECK_MYSQLCLIENT=yes - echo "yes" + printf "yes\n" fi rm -f fake else - echo "yes" - echo -n "Checking for mysql_config --cflags... " + printf "yes\n" + printf "Checking for mysql_config --cflags... " MYSQL_CFLAGS=`mysql_config --cflags 2> /dev/null` if [ $? != 0 ] then CHECK_MYSQLCLIENT=no - echo "no" + printf "no\n" else - echo "[$MYSQL_CFLAGS]" - echo -n "Checking for mysql_config --libs_r... " + printf "[$MYSQL_CFLAGS]\n" + printf "Checking for mysql_config --libs_r... " MYSQL_LDFLAGS=`mysql_config --libs_r 2> /dev/null` if [ $? != 0 ] then CHECK_MYSQLCLIENT=no - echo "no" + printf "no\n" else CHECK_MYSQLCLIENT=yes - echo "[$MYSQL_LDFLAGS]" + printf "[$MYSQL_LDFLAGS]\n" fi fi fi -echo -n "Checking for pg_config... " +printf "Checking for pg_config... " PG_VERSION=`pg_config --version 2> /dev/null` if [ $? != 0 ] then - echo "no"; - echo -n "Checking for -lpq... " + printf "no\n"; + printf "Checking for -lpq... " $CC $CFLAGS $LDFLAGS build_check.c -lpq $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_PQ=no - echo "no" + printf "no\n" else CHECK_PQ=yes - echo "yes" + printf "yes\n" fi rm -f fake else - echo "yes"; - echo -n "Checking for pg_config --includedir... " + printf "yes\n"; + printf "Checking for pg_config --includedir... " PG_CFLAGS=`pg_config --includedir 2> /dev/null` if [ $? != 0 ] then CHECK_PQ=no - echo "no" + printf "no\n" else - echo "[$PG_CFLAGS]" - echo -n "Checking for pg_config --libdir... " + printf "[$PG_CFLAGS]\n" + printf "Checking for pg_config --libdir... " PG_LDFLAGS=`pg_config --libdir 2> /dev/null` if [ $? != 0 ] then CHECK_PQ=no - echo "no" + printf "no\n" else CHECK_PQ=yes - echo "[$PG_LDFLAGS]" + printf "[$PG_LDFLAGS]\n" fi fi fi -echo -n "Checking for xmlrpc-c-config... " +printf "Checking for xmlrpc-c-config... " XMLRPCC_VERSION=`xmlrpc-c-config $XMLRPC_FEATURES --version 2> /dev/null` if [ $? != 0 ] then - echo "no"; - echo -n "Checking for -lxmlrpc... " + printf "no\n"; + printf "Checking for -lxmlrpc... " $CC $CFLAGS $LDFLAGS build_check.c -lxmlrpc $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_XMLRPC=no - echo "no" + printf "no\n" else CHECK_XMLRPC=yes - echo "yes" + printf "yes\n" fi rm -f fake elif [ "$XMLRPCC_VERSION" \< "$MIN_XMLRPCC_VERSION" ] then - echo "no (need at least $MIN_XMLRPCC_VERSION, actual $XMLRPCC_VERSION)"; + printf "no (need at least $MIN_XMLRPCC_VERSION, actual $XMLRPCC_VERSION)\n"; CHECK_XMLRPC=no else - echo "yes (version $XMLRPCC_VERSION)"; - echo -n "Checking for xmlrpc-c-config --cflags... " + printf "yes (version $XMLRPCC_VERSION)\n"; + printf "Checking for xmlrpc-c-config --cflags... " XMLRPC_CFLAGS=`xmlrpc-c-config $XMLRPC_FEATURES --cflags 2> /dev/null` if [ $? != 0 ] then CHECK_XMLRPC=no - echo "no" + printf "no\n" else - echo "[$XMLRPC_CFLAGS]" - echo -n "Checking for xmlrpc-c-config --libs... " + printf "[$XMLRPC_CFLAGS]\n" + printf "Checking for xmlrpc-c-config --libs... " XMLRPC_LDFLAGS=`xmlrpc-c-config $XMLRPC_FEATURES --libs 2> /dev/null` if [ $? != 0 ] then CHECK_XMLRPC=no - echo "no" + printf "no\n" else CHECK_XMLRPC=yes - echo "[$XMLRPC_LDFLAGS]" + printf "[$XMLRPC_LDFLAGS]\n" fi fi fi if [ "$OS" = "linux" ] then - echo -n "Checking for linux/netfilter_ipv4/ip_queue.h... " - echo "#include " > build_check.c - echo "#include " >> build_check.c - echo "int main() { return 0; }" >> build_check.c + printf "Checking for linux/netfilter_ipv4/ip_queue.h... " + printf "#include \n" > build_check.c + printf "#include \n" >> build_check.c + printf "int main() { return 0; }\n" >> build_check.c $CC $CFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_IP_QUEUE_H=no - echo "no" + printf "no\n" else CHECK_IP_QUEUE_H=yes DEFS="$DEFS -DHAS_IP_QUEUE_H" PLUGINS="$PLUGINS capture/ipq_linux" - echo "yes" + printf "yes\n" fi rm -f fake fi @@ -354,7 +367,7 @@ rm -f build_check.c if [ "$CHECK_EXPAT" != "yes" ] then - echo "-lexpat not found!" + printf "-lexpat not found!\n" exit 1 fi @@ -384,45 +397,45 @@ then configuration/rpcconfig" fi -echo "OS=$OS" > $CONFFILE -echo "STG_TIME=yes" >> $CONFFILE -echo "DEBUG=$DEBUG" >> $CONFFILE -echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE -echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE -echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE -echo "DIR_INCLUDE=\$(DIR_BUILD)/../../include" >> $CONFFILE -echo "DIR_MOD=\$(DIR_BUILD)/modules" >> $CONFFILE -echo "DIR_PLUGINS=\$(DIR_BUILD)/plugins" >> $CONFFILE -echo "ARCH=$ARCH" >> $CONFFILE -echo "CHECK_EXPAT=$CHECK_EXPAT" >> $CONFFILE -echo "CHECK_FBCLIENT=$CHECK_FBCLIENT" >> $CONFFILE -echo "CHECK_MYSQLCLIENT=$CHECK_MYSQLCLIENT" >> $CONFFILE -echo "CHECK_PQ=$CHECK_PQ" >> $CONFFILE -echo "CHECK_XMLRPC=$CHECK_XMLRPC" >> $CONFFILE -echo "DEFS=$DEFS" >> $CONFFILE -echo -n "STG_LIBS=" >> $CONFFILE +printf "OS=$OS\n" > $CONFFILE +printf "STG_TIME=yes\n" >> $CONFFILE +printf "DEBUG=$DEBUG\n" >> $CONFFILE +printf "DIR_BUILD=$BUILD_DIR\n" >> $CONFFILE +printf "DIR_LIB=\$(DIR_BUILD)/../../lib\n" >> $CONFFILE +printf "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs\n" >> $CONFFILE +printf "DIR_INCLUDE=\$(DIR_BUILD)/../../include\n" >> $CONFFILE +printf "DIR_MOD=\$(DIR_BUILD)/modules\n" >> $CONFFILE +printf "DIR_PLUGINS=\$(DIR_BUILD)/plugins\n" >> $CONFFILE +printf "ARCH=$ARCH\n" >> $CONFFILE +printf "CHECK_EXPAT=$CHECK_EXPAT\n" >> $CONFFILE +printf "CHECK_FBCLIENT=$CHECK_FBCLIENT\n" >> $CONFFILE +printf "CHECK_MYSQLCLIENT=$CHECK_MYSQLCLIENT\n" >> $CONFFILE +printf "CHECK_PQ=$CHECK_PQ\n" >> $CONFFILE +printf "CHECK_XMLRPC=$CHECK_XMLRPC\n" >> $CONFFILE +printf "DEFS=$DEFS\n" >> $CONFFILE +printf "STG_LIBS=" >> $CONFFILE for lib in $STG_LIBS do - echo -n "$lib " >> $CONFFILE + printf "$lib " >> $CONFFILE done -echo "" >> $CONFFILE -echo -n "PLUGINS=" >> $CONFFILE +printf "\n" >> $CONFFILE +printf "PLUGINS=" >> $CONFFILE for plugin in $PLUGINS do - echo -n "$plugin " >> $CONFFILE + printf "$plugin " >> $CONFFILE done -echo "" >> $CONFFILE -echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE -echo "CFLAGS=$CFLAGS" >> $CONFFILE -echo "LDFLAGS=$LDFLAGS" >> $CONFFILE -echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE -echo "PREFIX=$PREFIX" >> $CONFFILE -echo "BIN_MODE=$BIN_MODE" >> $CONFFILE -echo "DATA_MODE=$DATA_MODE" >> $CONFFILE -echo "DIR_MODE=$DIR_MODE" >> $CONFFILE -echo "OWNER=$OWNER" >> $CONFFILE -echo "VAR_DIR=$VAR_DIR" >> $CONFFILE -echo "ETC_DIR=$ETC_DIR" >> $CONFFILE +printf "\n" >> $CONFFILE +printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE +printf "CFLAGS=$CFLAGS\n" >> $CONFFILE +printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE +printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE +printf "PREFIX=$PREFIX\n" >> $CONFFILE +printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE +printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE +printf "DIR_MODE=$DIR_MODE\n" >> $CONFFILE +printf "OWNER=$OWNER\n" >> $CONFFILE +printf "VAR_DIR=$VAR_DIR\n" >> $CONFFILE +printf "ETC_DIR=$ETC_DIR\n" >> $CONFFILE mkdir -p modules @@ -430,5 +443,5 @@ if [ "$1" != "debug" ] then $MAKE $MAKEOPTS else - echo -e "\n\n\nDebug build. Type $MAKE explicitly" + printf "\n\n\nDebug build. Type $MAKE explicitly\n" fi diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp index eb61e2d5..11fad552 100644 --- a/projects/stargazer/main.cpp +++ b/projects/stargazer/main.cpp @@ -106,7 +106,7 @@ else } } //----------------------------------------------------------------------------- -#ifdef LINUX +#if defined(LINUX) || defined(DARWIN) int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings) #else int StartScriptExecuter(char *, int msgKey, int * msgID, SETTINGS_IMPL * settings) @@ -151,7 +151,7 @@ switch (executerPid) case 0: delete settings; -#ifdef LINUX +#if defined(LINUX) || defined(DARWIN) Executer(*msgID, executerPid, procName); #else Executer(*msgID, executerPid); @@ -160,7 +160,7 @@ switch (executerPid) default: if (executersPid.empty()) { -#ifdef LINUX +#if defined(LINUX) || defined(DARWIN) Executer(*msgID, executerPid, NULL); #else Executer(*msgID, executerPid); diff --git a/projects/stargazer/plugins/Makefile.in b/projects/stargazer/plugins/Makefile.in index 70954a2a..dd1e124a 100644 --- a/projects/stargazer/plugins/Makefile.in +++ b/projects/stargazer/plugins/Makefile.in @@ -9,18 +9,23 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS)))) LN = ln STGLIBS_INCS = $(addprefix -I ../../../../../stglibs/,$(addsuffix .lib/include,$(STGLIBS))) -STGLIBS_LIBS = $(addprefix -L ../../../../../stglibs/,$(addsuffix .lib,$(STGLIBS))) +STGLIBS_PATHS = $(addprefix -L ../../../../../stglibs/,$(addsuffix .lib,$(STGLIBS))) -LIBS += $(addprefix -lstg,$(STGLIBS)) +STGLIBS_LIBS = $(addprefix -lstg,$(STGLIBS)) CXXFLAGS += -fPIC $(STGLIBS_INCS) CFLAGS += -fPIC $(STGLIBS_INCS) + +ifneq ($(OS),darwin) LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg +else +LDFLAGS += -dynamiclib -undefined suppress -flat_namespace -Wl,-rpath,$(PREFIX)/usr/lib/stg +endif all: $(PROG) $(PROG): $(OBJS) - $(CXX) $^ $(STGLIBS_LIBS) $(LIBS) $(LDFLAGS) -o $(PROG) + $(CXX) $^ $(STGLIBS_PATHS) $(STGLIBS_LIBS) $(LIBS) $(LDFLAGS) -o $(PROG) $(LN) -fs "`pwd`/$(PROG)" $(DIR_MOD)/$(PROG) clean: diff --git a/projects/stargazer/plugins/authorization/ao/Makefile b/projects/stargazer/plugins/authorization/ao/Makefile index 1a7697e3..0e356aa1 100644 --- a/projects/stargazer/plugins/authorization/ao/Makefile +++ b/projects/stargazer/plugins/authorization/ao/Makefile @@ -8,10 +8,10 @@ PROG = mod_auth_ao.so SRCS = ./ao.cpp -STGLIBS = common \ +STGLIBS = scriptexecuter \ logger \ locker \ - scriptexecuter + common include ../../Makefile.in diff --git a/stglibs/pinger.lib/include/stg/pinger.h b/stglibs/pinger.lib/include/stg/pinger.h index b25f6847..91608dbb 100644 --- a/stglibs/pinger.lib/include/stg/pinger.h +++ b/stglibs/pinger.lib/include/stg/pinger.h @@ -18,7 +18,7 @@ #include #endif -#if defined (FREE_BSD) || defined (FREE_BSD5) +#if defined (FREE_BSD) || defined (FREE_BSD5) || defined(DARWIN) #include #include #include diff --git a/stglibs/scriptexecuter.lib/include/stg/scriptexecuter.h b/stglibs/scriptexecuter.lib/include/stg/scriptexecuter.h index 41b02a2f..947669c7 100644 --- a/stglibs/scriptexecuter.lib/include/stg/scriptexecuter.h +++ b/stglibs/scriptexecuter.lib/include/stg/scriptexecuter.h @@ -6,7 +6,7 @@ extern "C" { #endif int ScriptExec(const char * str); -#ifdef LINUX +#if defined(LINUX) || defined(DARWIN) void Executer(int msgID, pid_t pid, char * procName); #else void Executer(int msgID, pid_t pid); diff --git a/stglibs/scriptexecuter.lib/scriptexecuter.c b/stglibs/scriptexecuter.lib/scriptexecuter.c index bf45105a..728082ae 100644 --- a/stglibs/scriptexecuter.lib/scriptexecuter.c +++ b/stglibs/scriptexecuter.lib/scriptexecuter.c @@ -40,7 +40,7 @@ if (msgsnd(msgid, (void *)&sd, MAX_SCRIPT_LEN, 0) < 0) return 0; } //----------------------------------------------------------------------------- -#ifdef LINUX +#if defined(LINUX) || defined(DARWIN) void Executer(int msgID, pid_t pid, char * procName) #else void Executer(int msgID, pid_t pid) @@ -56,7 +56,7 @@ if (pid) return; nonstop = 1; -#ifdef LINUX +#if defined(LINUX) || defined(DARWIN) memset(procName, 0, strlen(procName)); strcpy(procName, "stg-exec"); #else -- 2.44.2