Commit 022c122a authored by Glenn Morris's avatar Glenn Morris
Browse files

Regenerate configure, src/config.in.

parent b7d65a5f
......@@ -718,6 +718,7 @@ DBUS_CFLAGS
DBUS_LIBS
GCONF_CFLAGS
GCONF_LIBS
LIBSELINUX_LIBS
FONTCONFIG_CFLAGS
FONTCONFIG_LIBS
XFT_CFLAGS
......@@ -811,6 +812,7 @@ with_ns
with_gpm
with_dbus
with_gconf
with_selinux
with_makeinfo
with_gtk
with_gcc
......@@ -1524,6 +1526,7 @@ Optional Packages:
console
--without-dbus don't compile with D-Bus support
--without-gconf don't compile with GConf support
--without-selinux don't compile with SELinux support
--without-makeinfo don't require makeinfo for building manuals
 
--with-pkg-config-prog=PATH
......@@ -2316,6 +2319,14 @@ else
fi
 
 
# Check whether --with-selinux was given.
if test "${with_selinux+set}" = set; then
withval=$with_selinux;
else
with_selinux=yes
fi
## For the times when you want to build Emacs but don't have
## a suitable makeinfo, and can live without the manuals.
 
......@@ -2773,15 +2784,6 @@ _ACEOF
esac
;;
 
## LynxOS ports
*-*-lynxos* )
opsys=lynxos
case "${canonical}" in
i[3456]86-*-lynxos*) machine=intel386 ;;
powerpc-*-lynxos*) machine=powerpc ;;
esac
;;
alpha*-*-linux-gnu* )
machine=alpha opsys=gnu-linux
;;
......@@ -2865,30 +2867,14 @@ _ACEOF
 
*-sun-solaris* \
| i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \
| x86_64-*-solaris2* | x86_64-*-sunos5* \
| powerpc*-*-solaris2* | rs6000-*-solaris2*)
| x86_64-*-solaris2* | x86_64-*-sunos5*)
case "${canonical}" in
i[3456]86-*-* ) machine=intel386 ;;
amd64-*-*|x86_64-*-*) machine=amdx86-64 ;;
powerpc* | rs6000* ) machine=ibmrs6000 ;;
sparc* ) machine=sparc ;;
* ) unported=yes ;;
esac
case "${canonical}" in
*-sunos5.3* | *-solaris2.3* )
opsys=sol2-3
NON_GNU_CPP=/usr/ccs/lib/cpp
;;
*-sunos5.4* | *-solaris2.4* )
opsys=sol2-4
NON_GNU_CPP=/usr/ccs/lib/cpp
RANLIB="ar -ts"
;;
*-sunos5.5* | *-solaris2.5* )
opsys=sol2-5
NON_GNU_CPP=/usr/ccs/lib/cpp
RANLIB="ar -ts"
;;
*-sunos5.6* | *-solaris2.6* )
opsys=sol2-6
NON_GNU_CPP=/usr/ccs/lib/cpp
......@@ -2979,22 +2965,6 @@ esac
if test x"${opsys}" = x; then
case "${canonical}" in
*-gnu* ) opsys=gnu ;;
*-sysv4.2uw* ) opsys=unixware ;;
*-sysv5uw* ) opsys=unixware ;;
*-sysv5OpenUNIX* ) opsys=unixware ;;
*-sysv4.1* | *-sysvr4.1* )
NON_GNU_CPP=/usr/lib/cpp
opsys=usg5-4 ;;
*-sysv4.[2-9]* | *-sysvr4.[2-9]* )
if [ x$NON_GNU_CPP = x ]; then
if [ -f /usr/ccs/lib/cpp ]; then
NON_GNU_CPP=/usr/ccs/lib/cpp
else
NON_GNU_CPP=/lib/cpp
fi
fi
opsys=usg5-4-2 ;;
*-sysv4* | *-sysvr4* ) opsys=usg5-4 ;;
* )
unported=yes
;;
......@@ -5816,10 +5786,6 @@ configure___ use_mmap_for_buffers=yes
configure___ use_mmap_for_buffers=no
#endif
 
#ifndef C_DEBUG_SWITCH
#define C_DEBUG_SWITCH -g
#endif
#ifndef C_OPTIMIZE_SWITCH
#ifdef __GNUC__
#define C_OPTIMIZE_SWITCH -O2
......@@ -5851,18 +5817,18 @@ configure___ ld_switch_machine=LD_SWITCH_MACHINE
 
/* Get the CFLAGS for tests in configure. */
#ifdef __GNUC__
configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${SPECIFIED_CFLAGS}'
configure___ CFLAGS=C_OPTIMIZE_SWITCH '${SPECIFIED_CFLAGS}'
#else
configure___ CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}'
configure___ CFLAGS='${SPECIFIED_CFLAGS}'
#endif
 
#else /* not THIS_IS_CONFIGURE */
 
/* Get the CFLAGS for real compilation. */
#ifdef __GNUC__
configure___ REAL_CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH C_WARNINGS_SWITCH ${PROFILING_CFLAGS} '${SPECIFIED_CFLAGS}'
configure___ REAL_CFLAGS=C_OPTIMIZE_SWITCH C_WARNINGS_SWITCH ${PROFILING_CFLAGS} '${SPECIFIED_CFLAGS}'
#else
configure___ REAL_CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}'
configure___ REAL_CFLAGS='${SPECIFIED_CFLAGS}'
#endif
 
#endif /* not THIS_IS_CONFIGURE */
......@@ -12753,6 +12719,90 @@ _ACEOF
fi
fi
 
HAVE_LIBSELINUX=no
if test "${with_selinux}" = "yes"; then
{ $as_echo "$as_me:$LINENO: checking for lgetfilecon in -lselinux" >&5
$as_echo_n "checking for lgetfilecon in -lselinux... " >&6; }
if test "${ac_cv_lib_selinux_lgetfilecon+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lselinux $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char lgetfilecon ();
int
main ()
{
return lgetfilecon ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
ac_cv_lib_selinux_lgetfilecon=yes
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_selinux_lgetfilecon=no
fi
rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_lgetfilecon" >&5
$as_echo "$ac_cv_lib_selinux_lgetfilecon" >&6; }
if test $ac_cv_lib_selinux_lgetfilecon = yes; then
HAVE_LIBSELINUX=yes
else
HAVE_LIBSELINUX=no
fi
if test "$HAVE_LIBSELINUX" = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBSELINUX 1
_ACEOF
LIBSELINUX_LIBS=-lselinux
fi
fi
HAVE_XAW3D=no
if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
if test "$with_xaw3d" != no; then
......@@ -21156,6 +21206,7 @@ libncurses-dev(el), libterminfo-dev(el) or similar." >&2;}
{ (exit 1); exit 1; }; }
fi
# Must define this when any termcap library is found.
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBNCURSES 1
_ACEOF
......@@ -25936,6 +25987,7 @@ echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}"
echo " Does Emacs use -lgpm? ${HAVE_GPM}"
echo " Does Emacs use -ldbus? ${HAVE_DBUS}"
echo " Does Emacs use -lgconf? ${HAVE_GCONF}"
echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}"
 
echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}"
echo " Does Emacs use -lm17n-flt? ${HAVE_M17N_FLT}"
......
......@@ -318,10 +318,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <kerberos/krb.h> header file. */
#undef HAVE_KERBEROS_KRB_H
/* Define to 1 if `e_text' is a member of `krb5_error'. */
/* Define to 1 if `e_text' is member of `krb5_error'. */
#undef HAVE_KRB5_ERROR_E_TEXT
/* Define to 1 if `text' is a member of `krb5_error'. */
/* Define to 1 if `text' is member of `krb5_error'. */
#undef HAVE_KRB5_ERROR_TEXT
/* Define to 1 if you have the <krb5.h> header file. */
......@@ -399,6 +399,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the resolv library (-lresolv). */
#undef HAVE_LIBRESOLV
/* Define to 1 if using SELinux. */
#undef HAVE_LIBSELINUX
/* Define to 1 if you have the `Xext' library (-lXext). */
#undef HAVE_LIBXEXT
......@@ -615,25 +618,25 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `strsignal' function. */
#undef HAVE_STRSIGNAL
/* Define to 1 if `ifr_addr' is a member of `struct ifreq'. */
/* Define to 1 if `ifr_addr' is member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_ADDR
/* Define to 1 if `ifr_broadaddr' is a member of `struct ifreq'. */
/* Define to 1 if `ifr_broadaddr' is member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_BROADADDR
/* Define to 1 if `ifr_flags' is a member of `struct ifreq'. */
/* Define to 1 if `ifr_flags' is member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_FLAGS
/* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */
/* Define to 1 if `ifr_hwaddr' is member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_HWADDR
/* Define to 1 if `ifr_netmask' is a member of `struct ifreq'. */
/* Define to 1 if `ifr_netmask' is member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_NETMASK
/* Define to 1 if `n_un.n_name' is a member of `struct nlist'. */
/* Define to 1 if `n_un.n_name' is member of `struct nlist'. */
#undef HAVE_STRUCT_NLIST_N_UN_N_NAME
/* Define to 1 if `tm_zone' is a member of `struct tm'. */
/* Define to 1 if `tm_zone' is member of `struct tm'. */
#undef HAVE_STRUCT_TM_TM_ZONE
/* Define to 1 if `struct utimbuf' is declared by <utime.h>. */
......@@ -860,9 +863,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
......@@ -922,28 +922,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if using the Motif X toolkit. */
#undef USE_MOTIF
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Define to 1 if we should use toolkit scroll bars. */
#undef USE_TOOLKIT_SCROLL_BARS
......@@ -979,6 +957,28 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Define to rpl_ if the getopt replacement functions and variables should be
used. */
#undef __GETOPT_PREFIX
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment