summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorwl <wl>2005-04-30 07:03:13 +0000
committerwl <wl>2005-04-30 07:03:13 +0000
commitec489443c547a071b108cd48b9f4d62cffb23faf (patch)
tree120a1aa2d7ab27ce93887d99e7ecfbd90fe25855 /configure
parent92c348a91936ad6e8a9e78bcc70b2fec8d0fa685 (diff)
downloadgroff-ec489443c547a071b108cd48b9f4d62cffb23faf.tar.gz
AC_TYPE_SIGNAL from current autoconf can fail if CC=g++.
* aclocal.m4 (GROFF_TYPE_SIGNAL): New function. * configure.ac: Use GROFF_TYPE_SIGNAL, not AC_TYPE_SIGNAL. * configure, src/include/config.hin: Regenerated. * PROBLEMS: Updated. Update getopt files. * src/include/getopt.h, src/libs/libgroff/getopt.c, src/libs/libgroff/getopt1.c: Updated from GNU libc CVS. * src/include/getopt_int.h: New file (from GNU libc CVS). * src/include/groff-getopt.h: Updated. * src/include/Makefile.sub (HDRS): Add getopt_int.h. * font/devutf8/NOTES: Updated. Bug fix for Win32 relocatable code. Based on a patch from Keith Marshall. * src/libs/libgroff/maxpathname.cpp (PATH_MAX): Test for `_MAX_PATH' also. * src/libs/libgroff/relocate.c (DEBUG): Define it conditionally. (searchpath) [_WIN32]: Use `_fullpath', not `realpath'.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure55
1 files changed, 36 insertions, 19 deletions
diff --git a/configure b/configure
index 845617b1..b0452396 100755
--- a/configure
+++ b/configure
@@ -8285,35 +8285,42 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-if test "${ac_cv_type_signal+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+echo "$as_me:$LINENO: checking for return type of signal handlers" >&5
+echo $ECHO_N "checking for return type of signal handlers... $ECHO_C" >&6
+ for groff_declaration in \
+ 'extern "C" void (*signal (int, void (*)(int)))(int);' \
+ 'extern "C" void (*signal (int, void (*)(int)) throw ())(int);' \
+ 'void (*signal ()) ();'
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+
+ /* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+
+
#include <sys/types.h>
#include <signal.h>
#ifdef signal
# undef signal
#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
+$groff_declaration
+
int
main ()
{
+
+
int i;
+
+
;
return 0;
}
+
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -8337,23 +8344,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_type_signal=void
+ break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_signal=int
+continue
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6
+ done
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
+ if test -n "$groff_declaration"; then
+ echo "$as_me:$LINENO: result: void" >&5
+echo "${ECHO_T}void" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define RETSIGTYPE void
_ACEOF
+ else
+ echo "$as_me:$LINENO: result: int" >&5
+echo "${ECHO_T}int" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define RETSIGTYPE int
+_ACEOF
+ fi
echo "$as_me:$LINENO: checking struct exception" >&5
echo $ECHO_N "checking struct exception... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF