|
|
@@ -2,17 +2,17 @@ dnl |
|
|
dnl Copyright (c) 2012-2015 Red Hat.
|
|
|
dnl Copyright (c) 2008 Aconex. All Rights Reserved.
|
|
|
dnl Copyright (c) 2000-2004,2008 Silicon Graphics, Inc. All Rights Reserved.
|
|
|
-dnl
|
|
|
+dnl
|
|
|
dnl This program is free software; you can redistribute it and/or modify it
|
|
|
dnl under the terms of the GNU General Public License as published by the
|
|
|
dnl Free Software Foundation; either version 2 of the License, or (at your
|
|
|
dnl option) any later version.
|
|
|
-dnl
|
|
|
+dnl
|
|
|
dnl This program is distributed in the hope that it will be useful, but
|
|
|
dnl WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
|
dnl or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
dnl for more details.
|
|
|
-dnl
|
|
|
+dnl
|
|
|
|
|
|
dnl unpacking check - this file must exist
|
|
|
AC_INIT(src/include/pcp/pmapi.h)
|
|
|
@@ -214,7 +214,7 @@ else |
|
|
build_os=`echo $build_os | sed '[s/^\([^-][^-]*\)-.*$/\1/]'`
|
|
|
fi
|
|
|
|
|
|
-echo Building on $build for $target
|
|
|
+echo Building on $build for $target
|
|
|
echo "Build: os=$build_os cpu=$build_cpu"
|
|
|
echo "Target: os=$target_os cpu=$target_cpu"
|
|
|
|
|
|
@@ -310,6 +310,12 @@ then |
|
|
export CFLAGS="-fPIC -fno-strict-aliasing -D_GNU_SOURCE -D_NETBSD_SOURCE"
|
|
|
pcp_platform_paths='/usr/pkg/bin'
|
|
|
pcp_ps_all_flags=auxww
|
|
|
+elif test $target_os = openbsd
|
|
|
+then
|
|
|
+ AC_DEFINE(IS_OPENBSD, [1], [Platform is OpenBSD])
|
|
|
+ export CFLAGS="-fPIC -fno-strict-aliasing -D_GNU_SOURCE"
|
|
|
+ pcp_platform_paths='/usr/local/bin'
|
|
|
+ pcp_ps_all_flags=auxww
|
|
|
else
|
|
|
echo
|
|
|
echo "FATAL ERROR: need platform-specific customization for \"$target_os\""
|
|
|
@@ -995,7 +1001,7 @@ enable_qt=false |
|
|
qt_release=release
|
|
|
AS_IF([test "x$do_qt" != "xno"], [
|
|
|
enable_qt=true
|
|
|
-
|
|
|
+
|
|
|
if test -z "$QMAKE"
|
|
|
then
|
|
|
AC_PATH_PROGS(QMAKE, [qmake-qt5 qmake-qt4 qmake],, [$QTDIR/bin:/usr/bin:/usr/lib64/qt5/bin:/usr/lib/qt5/bin:/usr/lib64/qt4/bin:/usr/lib/qt4/bin])
|
|
|
@@ -1045,7 +1051,7 @@ dnl note: all makefiles in this package use the gmake syntax |
|
|
if test -z "$MAKE"
|
|
|
then
|
|
|
AC_PATH_PROG(MAKE, gmake)
|
|
|
- if test -z "$MAKE"
|
|
|
+ if test -z "$MAKE"
|
|
|
then
|
|
|
# look elsewhere ...
|
|
|
AC_MSG_CHECKING([for GNU make elsewhere])
|
|
|
@@ -1074,7 +1080,7 @@ then |
|
|
fi
|
|
|
fi
|
|
|
AC_MSG_RESULT($MAKE)
|
|
|
- fi
|
|
|
+ fi
|
|
|
fi
|
|
|
make=$MAKE
|
|
|
AC_SUBST(make)
|
|
|
@@ -1197,7 +1203,7 @@ then |
|
|
AC_MSG_WARN([PackageMaker not found, mac packages will not be made])
|
|
|
fi
|
|
|
else
|
|
|
- AC_MSG_RESULT([ no])
|
|
|
+ AC_MSG_RESULT([ no])
|
|
|
fi
|
|
|
else
|
|
|
package_maker="$PACKAGE_MAKER"
|
|
|
@@ -1440,27 +1446,27 @@ AC_CHECK_HEADERS(sys/statvfs.h sys/statfs.h sys/mount.h) |
|
|
dnl Check if we have <sys/endian.h> ... standard way
|
|
|
AC_MSG_CHECKING([for sys/endian.h ])
|
|
|
AC_TRY_COMPILE(
|
|
|
-[
|
|
|
- #include <sys/endian.h>
|
|
|
+[
|
|
|
+ #include <sys/endian.h>
|
|
|
],
|
|
|
[
|
|
|
], AC_DEFINE(HAVE_SYS_ENDIAN_H, [1], [sys/endian.h]) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
|
|
|
|
|
|
dnl Check if we have <machine/endian.h> ... MacOSX way
|
|
|
AC_MSG_CHECKING([for machine/endian.h ])
|
|
|
AC_TRY_COMPILE(
|
|
|
-[
|
|
|
- #include <machine/endian.h>
|
|
|
+[
|
|
|
+ #include <machine/endian.h>
|
|
|
],
|
|
|
[
|
|
|
], AC_DEFINE(HAVE_MACHINE_ENDIAN_H, [1], [machine/endian.h]) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
|
|
|
|
|
|
dnl Check if we have <sys/endian.h> ... IRIX strangeness
|
|
|
AC_MSG_CHECKING([for sys/endian.h (IRIX variant) ])
|
|
|
AC_TRY_COMPILE(
|
|
|
-[
|
|
|
+[
|
|
|
#include <standards.h>
|
|
|
- #include <sys/endian.h>
|
|
|
+ #include <sys/endian.h>
|
|
|
],
|
|
|
[
|
|
|
], AC_DEFINE(HAVE_SYS_ENDIAN_H, [1], [IRIX sys/endian.h]) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
|
|
|
@@ -1759,9 +1765,9 @@ fi |
|
|
dnl check if we have a type for the pointer's size integer (__psint_t)
|
|
|
AC_MSG_CHECKING([for __psint_t ])
|
|
|
AC_TRY_COMPILE(
|
|
|
-[
|
|
|
+[
|
|
|
#include <sys/types.h>
|
|
|
- #include <stdlib.h>
|
|
|
+ #include <stdlib.h>
|
|
|
#include <stddef.h>
|
|
|
], [ __psint_t psint; ],
|
|
|
AC_DEFINE(HAVE___PSINT_T, [1], [__psint_t type]) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
|
|
|
@@ -2205,7 +2211,7 @@ then |
|
|
AC_MSG_CHECKING([where pthread_create() is defined])
|
|
|
for cand in "" pthreads pthread ; do
|
|
|
savedLIBS=$LIBS
|
|
|
- if test -n "$cand"
|
|
|
+ if test -n "$cand"
|
|
|
then
|
|
|
LIBS=`echo $LIBS -l$cand`
|
|
|
fi
|
|
|
@@ -2567,7 +2573,7 @@ AC_TRY_LINK([#include <sys/wait.h>], |
|
|
], AC_DEFINE(HAVE_WAIT_INCLUDES_SIGNAL, [1], [indirect signal.h]))
|
|
|
|
|
|
dnl check for name and type of time fields in struct stat
|
|
|
-dnl IRIX example timespec_t st_mtim;
|
|
|
+dnl IRIX example timespec_t st_mtim;
|
|
|
dnl Linux example struct timespec st_mtim;
|
|
|
dnl Darwin example struct timespec st_mtimespec;
|
|
|
dnl Solaris example timestruc_t st_mtim;
|
|
|
@@ -2882,7 +2888,7 @@ AC_ARG_WITH(demosdir,[AC_HELP_STRING([--with-demosdir],[run directory [DATADIR/p |
|
|
[pcp_demos_dir=$pcp_share_dir/demos])
|
|
|
AC_SUBST(pcp_demos_dir)
|
|
|
|
|
|
-if test -z "$XCONFIRM"
|
|
|
+if test -z "$XCONFIRM"
|
|
|
then
|
|
|
AC_PATH_PROG(ac_xconfirm_prog, xconfirm, $pcp_bin_dir/pmconfirm)
|
|
|
else
|
|
|
@@ -3066,7 +3072,7 @@ AC_TRY_COMPILE([ |
|
|
], [ struct timespec foo; ],
|
|
|
AC_DEFINE(HAVE_STRUCT_TIMESPEC, [1], [timespec type]) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
|
|
|
|
|
|
-dnl check if we have IRIX style altzone
|
|
|
+dnl check if we have IRIX style altzone
|
|
|
AC_MSG_CHECKING([for altzone in time.h])
|
|
|
AC_TRY_COMPILE([
|
|
|
#include <time.h>
|
|
|
@@ -3135,7 +3141,7 @@ AC_SUBST(HAVE_ZLIB, [$have_zlib]) |
|
|
dnl Check if we have AI_ADDRCONFIG
|
|
|
AC_MSG_CHECKING([for AI_ADDRCONFIG])
|
|
|
AC_TRY_COMPILE(
|
|
|
-[
|
|
|
+[
|
|
|
#include <netdb.h>
|
|
|
int test = AI_ADDRCONFIG;
|
|
|
],
|
|
|
|
