From 815f157c05ebc20e91a050823f048a977b8ae103 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 21 Jan 2009 17:47:03 +0000 Subject: CWS-TOOLING: integrate CWS configuretoplevel 2009-01-19 15:47:39 +0100 rene r266508 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@266428 (milestone: DEV300:m39) 2009-01-18 00:35:31 +0100 rene r266462 : #i10000# Mac OS X "of course" has other paths... 2009-01-16 13:24:23 +0100 rene r266415 : make OS2 use STLport... 2009-01-15 22:08:38 +0100 rene r266393 : STLport for FreeBSD 2009-01-15 01:23:51 +0100 rene r266333 : #i98048# harmonize STL default; default to *NOT* use STLport 2009-01-09 22:44:43 +0100 rene r266120 : #i97428# try to find out XLIB via pkg-config 2009-01-09 22:41:18 +0100 rene r266119 : #i97827# fail when we don't find make 2008-12-27 01:19:34 +0100 rene r265812 : add make (dis)clean; force /bin/sh as we source *Enc.Set.sh 2008-12-27 01:16:31 +0100 rene r265811 : fix makefile.rc for config.*/config_office move 2008-12-26 22:37:54 +0100 rene r265810 : #i91641# in some cases, we also need the -Xbootclasspath at the second javac call 2008-12-26 17:55:11 +0100 rene r265806 : actually commit Makefile.in 2008-12-25 19:24:24 +0100 rene r265803 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@265758 (milestone: DEV300:m38) 2008-12-10 22:51:06 +0100 rene r265232 : #i96912# revert, cws swffixes02 has the right fix 2008-12-08 18:47:10 +0100 rene r265014 : xulrunner has no /plugin or /nspr 2008-12-08 17:51:28 +0100 rene r265013 : i96912# fix --with-system-mozilla 2008-12-05 13:05:55 +0100 rene r264903 : #i95339# 2008-12-04 17:53:53 +0100 rene r264865 : fix merge error #i80238# add help for --with-epm 2008-12-04 17:44:28 +0100 rene r264864 : #i91641# fix build with JDKs already including a version of rhino which conflicts with our ancient one 2008-12-04 17:40:48 +0100 rene r264863 : i93429# check for sanity for expand.exe 2008-12-04 17:34:20 +0100 rene r264862 : config_office changes from m33 to m37 2008-12-04 17:28:55 +0100 rene r264861 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@264807 (milestone: DEV300:m37) 2008-12-04 16:49:03 +0100 rene r264856 : fix cws. part 5 2008-12-04 16:45:06 +0100 rene r264855 : fix cws, part 4 2008-12-04 16:01:49 +0100 rene r264850 : fix cws, part 3 2008-12-04 15:14:12 +0100 rene r264848 : fix cws, part 2 --- acinclude.m4 | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 acinclude.m4 (limited to 'acinclude.m4') diff --git a/acinclude.m4 b/acinclude.m4 new file mode 100644 index 000000000000..71f01544d11b --- /dev/null +++ b/acinclude.m4 @@ -0,0 +1,138 @@ +dnl @synopsis AX_FUNC_WHICH_GETSPNAM_R +dnl +dnl Determines which historical variant of the getspnam_r() call +dnl (taking four or five arguments) is available on the system +dnl and sets NEW_SHADOW_API=YES if there are five arguments. +dnl +dnl Originally named "AX_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten +dnl for AX_FUNC_WHICH_GETSPNAM_R +dnl +dnl @author Caolan McNamara +dnl @author Daniel Richard G. +dnl @version 2006-05-01 +dnl @license LGPL + +AC_DEFUN([AX_FUNC_WHICH_GETSPNAM_R], [ + + AC_LANG_PUSH(C) + AC_MSG_CHECKING([how many arguments getspnam_r() takes]) + + AC_CACHE_VAL(ac_cv_func_which_getspnam_r, [ + +################################################################ + +ac_cv_func_which_getspnam_r=unknown + +# +# ONE ARGUMENT (sanity check) +# + +# This should fail, as there is no variant of getspnam_r() that takes +# a single argument. If it actually compiles, then we can assume that +# netdb.h is not declaring the function, and the compiler is thereby +# assuming an implicit prototype. In which case, we're out of luck. +# +AC_COMPILE_IFELSE( + AC_LANG_PROGRAM( + [[ + #include + #include + ]], + [[ + const char *name = "myname"; + getspnam_r(name) /* ; */ + ]]), + ac_cv_func_which_getspnam_r=no) + +# +# FIVE ARGUMENTS +# + +if test "$ac_cv_func_which_getspnam_r" = "unknown"; then + +AC_COMPILE_IFELSE( + AC_LANG_PROGRAM( + [[ + #include + #include + ]], + [[ + char buffer[[]] = { '\0' }; + struct spwd spwdStruct; + const char *name = "myname"; + getspnam_r(name, &spwdStruct, buffer, sizeof buffer, 0) /* ; */ + ]]), + ac_cv_func_which_getspnam_r=five) + +fi + +# +# FOUR ARGUMENTS +# + +if test "$ac_cv_func_which_getspnam_r" = "unknown"; then + +AC_COMPILE_IFELSE( + AC_LANG_PROGRAM( + [[ + #include + #include + ]], + [[ + char buffer[[]] = { '\0' }; + struct spwd spwdStruct; + const char *name = "myname"; + getspnam_r(name, &spwdStruct, buffer, sizeof buffer) /* ; */ + ]]), + ac_cv_func_which_getspnam_r=four) + +fi + +################################################################ + +]) dnl end AC_CACHE_VAL + +case "$ac_cv_func_which_getspnam_r" in + five) + AC_MSG_RESULT([five]) + NEW_SHADOW_API=YES + ;; + + four) + AC_MSG_RESULT([four]) + ;; + + no) + AC_MSG_RESULT([cannot find function declaration in shadow.h]) + ;; + + unknown) + AC_MSG_RESULT([can't tell]) + ;; + + *) + AC_MSG_ERROR([internal error]) + ;; +esac + +AC_LANG_POP(C) + +]) dnl end AC_DEFUN + +dnl PKG_CHECK_MODULES_MACHACK is like PKG_CHECK_MODULES but sneaks in an extra +dnl argument between the first and second, denoting a program to call instead of +dnl pkg-config on Mac OS X (aka Darwin): +AC_DEFUN([PKG_CHECK_MODULES_MACHACK], +[if test "$_os" = "Darwin"; then + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$2 --cflags` + AC_MSG_RESULT($$1_CFLAGS) + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$2 --libs` + AC_MSG_RESULT($$1_LIBS) + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + PKG_CHECK_MODULES($1, $3, $4, $5, $6) + fi +]) -- cgit v1.2.3