emacs: configure comparison

comparison configure @ 108013:393a4e5223b1

Regenerate configure, src/config.in.

author	Glenn Morris <rgm@gnu.org>
date	Tue, 20 Apr 2010 20:11:03 -0700
parents	1f5000fd5ff7
children	f3c91f3abae4

comparison

equal deleted inserted replaced

-:6c696ca35512
+:393a4e5223b1
 GTK_LIBS
 DBUS_CFLAGS
 DBUS_LIBS
 GCONF_CFLAGS
 GCONF_LIBS
+LIBSELINUX_LIBS
 FONTCONFIG_CFLAGS
 FONTCONFIG_LIBS
 XFT_CFLAGS
 XFT_LIBS
 LIBOTF_CFLAGS
 with_xim
 with_ns
 with_gpm
 with_dbus
 with_gconf
+with_selinux
 with_makeinfo
 with_gtk
 with_gcc
 with_pkg_config_prog
 with_gnustep_conf
 --with-ns               use nextstep (Cocoa or GNUstep) windowing system
 --without-gpm           don't use -lgpm for mouse support on a GNU/Linux
 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
 path to pkg-config for finding GTK and librsvg
 --with-gnustep-conf=PATH
 else
 with_gconf=yes
 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.
 # Check whether --with-makeinfo was given.
 if test "${with_makeinfo+set}" = set; then
 x86_64-*-openbsd*)       machine=amdx86-64 ;;
 hppa-*-openbsd*)         machine=hp800 ;;
 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
 ;;
 arm*-*-linux-gnu* )
 machine=sparc opsys=gnu-linux
 ;;
 *-sun-solaris* \
 | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \
-| x86_64-*-solaris2*    | x86_64-*-sunos5*    \
+| x86_64-*-solaris2*    | x86_64-*-sunos5*)
-| powerpc*-*-solaris2*  | rs6000-*-solaris2*)
 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
 		RANLIB="ar -ts"
 		;;
 ### runs, it's cleaner to make it explicit in the case statement
 ### above.
 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
 ;;
 esac
 fi
 configure___ use_mmap_for_buffers=yes
 #else
 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
 #else
 #define C_OPTIMIZE_SWITCH -O
 #ifdef THIS_IS_CONFIGURE
 /* 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 */
 ' > ${tempcname}
 _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
 { $as_echo "$as_me:$LINENO: checking for xaw3d" >&5
 $as_echo_n "checking for xaw3d... " >&6; }
 Maybe some development libraries/packages are missing?  Try installing
 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
 echo "  Does Emacs use -lpng?                                   ${HAVE_PNG}"
 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}"
 echo "  Does Emacs use -lotf?                                   ${HAVE_LIBOTF}"
 echo "  Does Emacs use -lxft?                                   ${HAVE_XFT}"

Mercurial > emacs

comparison configure @ 108013:393a4e5223b1