mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-21 08:42:23 +00:00
60d77f3c22
instead of guessing the correct FreeBSD version values write a configure macro to detect it.
54 lines
1.7 KiB
Plaintext
54 lines
1.7 KiB
Plaintext
--- configure.in.orig 2010-08-14 21:50:15.000000000 +0200
|
|
+++ configure.in 2010-08-14 21:53:26.000000000 +0200
|
|
@@ -118,6 +118,32 @@
|
|
AC_MSG_ERROR([** failed to detect pthreads implementation **])
|
|
fi
|
|
|
|
+AC_CHECK_FUNC(scandir,
|
|
+ if test "x$uname" = xSunOS -o "x$uname" = xQNX; then
|
|
+ AC_MSG_WARN(Not using $uname scandir emulation function.)
|
|
+ else
|
|
+ AC_DEFINE(HAVE_SCANDIR, 1, [Has scandir])
|
|
+ fi)
|
|
+
|
|
+dnl Do we have the POSIX compatible scandir() prototype?
|
|
+AC_CACHE_CHECK([whether we have the POSIX compatible scandir() prototype],
|
|
+ ac_cv_cxx_scandir_posix,[
|
|
+ AC_LANG_SAVE
|
|
+ AC_LANG_CPLUSPLUS
|
|
+ AC_TRY_COMPILE([
|
|
+ #include <dirent.h>
|
|
+ int func (const char *d, dirent ***list, void *sort) {
|
|
+ int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort);
|
|
+ }
|
|
+ ],[
|
|
+ ], ac_cv_cxx_scandir_posix=yes, ac_cv_cxx_scandir_posix=no)
|
|
+ AC_LANG_RESTORE
|
|
+ ])
|
|
+
|
|
+if test "$ac_cv_cxx_scandir_posix" = yes; then
|
|
+ AC_DEFINE(HAVE_SCANDIR_POSIX, 1, [scandir conforms to POSIX])
|
|
+fi
|
|
+
|
|
dnl GTK+ search. Enable FileChooser for gtk+>=2.4
|
|
|
|
AM_PATH_GTK_2_0(, [
|
|
@@ -490,6 +516,8 @@
|
|
AC_MSG_RESULT([Found GNOME - installing terminatorX.desktop.])
|
|
OPTION_GNOME="yes"
|
|
else
|
|
+ GNOMEpresent_TRUE='#'
|
|
+ GNOMEpresent_FALSE=
|
|
AC_MSG_RESULT([GNOME not found.])
|
|
fi
|
|
AM_CONDITIONAL(GNOMEpresent, test "$gnomepresent" = yes)
|
|
@@ -544,7 +572,7 @@
|
|
AC_SUBST(XML_CFLAGS)
|
|
|
|
if test "$prefix" != "NONE"; then
|
|
- xml_man="\\\"$datadir/terminatorX/doc/terminatorX-manual/C/terminatorX-manual.xml\\\""
|
|
+ xml_man="\\\"$datadir/help/terminatorX/C/terminatorX.xml\\\""
|
|
else
|
|
xml_man="\\\"/usr/local/share/terminatorX/doc/terminatorX-manual/C/terminatorX-manual.xml\\\""
|
|
fi
|