emacs: configure.in comparison

comparison configure.in @ 108058:5e867bd030c8

Merge from mainline.

author	Katsumi Yamaoka <yamaoka@jpl.org>
date	Wed, 21 Apr 2010 23:03:28 +0000
parents	8ff86e76b50f
children	98d289f97679

comparison

equal deleted inserted replaced

-:92bb32f41a3a
+:5e867bd030c8
 OPTION_DEFAULT_OFF([ns],[use nextstep (Cocoa or GNUstep) windowing system])
 OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console])
 OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support])
 OPTION_DEFAULT_ON([gconf],[don't compile with GConf support])
+OPTION_DEFAULT_ON([selinux],[don't compile with SELinux support])
 ## For the times when you want to build Emacs but don't have
 ## a suitable makeinfo, and can live without the manuals.
 dnl http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01844.html
 OPTION_DEFAULT_ON([makeinfo],[don't require makeinfo for building manuals])
 ## We use the presence of $srcdir/info/emacs to distinguish a release,
 ## with pre-built manuals, from a Bazaar checkout.
 if test "$MAKEINFO" = "no"; then
 if test "x${with_makeinfo}" = "xno"; then
 MAKEINFO=off
-elif ! test -e $srcdir/info/emacs; then
+elif test ! -e $srcdir/info/emacs; then
 AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.6, and your
 source tree does not seem to have pre-built manuals in the `info' directory.
 Either install a suitable version of makeinfo, or re-run configure
 with the `--without-makeinfo' option to build without the manuals.] )
 fi
 AC_MSG_ERROR($GTK_PKG_ERRORS)
 fi
 fi
+GTK_OBJ=
 if test x"$pkg_check_gtk" = xyes; then
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 C_SWITCH_X_SITE="$C_SWITCH_X_SITE $GTK_CFLAGS"
 AC_MSG_ERROR([Gtk+ wanted, but it does not compile, see config.log.  Maybe some x11-devel files missing?]);
 fi
 else
 HAVE_GTK=yes
 AC_DEFINE(USE_GTK, 1, [Define to 1 if using GTK.])
+GTK_OBJ=gtkutil.o
 USE_X_TOOLKIT=none
 if $PKG_CONFIG --atleast-version=2.10 gtk+-2.0; then
 :
 else
 AC_MSG_WARN([[Your version of Gtk+ will have problems with
 sleep 3
 fi
 fi
 fi
+AC_SUBST(GTK_OBJ)
 if test "${HAVE_GTK}" = "yes"; then
 dnl  GTK scrollbars resemble toolkit scrollbars a lot, so to avoid
 dnl D-Bus has been tested under GNU/Linux only.  Must be adapted for
 dnl other platforms.  Support for higher D-Bus versions than 1.0 is
 dnl also not configured.
 HAVE_DBUS=no
+DBUS_OBJ=
 if test "${with_dbus}" = "yes"; then
 PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0, HAVE_DBUS=yes, HAVE_DBUS=no)
 if test "$HAVE_DBUS" = yes; then
 LIBS="$LIBS $DBUS_LIBS"
 AC_DEFINE(HAVE_DBUS, 1, [Define to 1 if using D-Bus.])
 AC_CHECK_FUNCS([dbus_watch_get_unix_fd])
+DBUS_OBJ=dbusbind.o
 fi
 fi
+AC_SUBST(DBUS_OBJ)
 dnl GConf has been tested under GNU/Linux only.
 dnl The version is really arbitrary, it is about the same age as Gtk+ 2.6.
 HAVE_GCONF=no
 if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then
 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.13, HAVE_GCONF=yes, HAVE_GCONF=no)
 if test "$HAVE_GCONF" = yes; then
 AC_DEFINE(HAVE_GCONF, 1, [Define to 1 if using GConf.])
 fi
 fi
+dnl SELinux is available for GNU/Linux only.
+HAVE_LIBSELINUX=no
+LIBSELINUX_LIBS=
+if test "${with_selinux}" = "yes"; then
+AC_CHECK_LIB([selinux], [lgetfilecon], HAVE_LIBSELINUX=yes, HAVE_LIBSELINUX=no)
+if test "$HAVE_LIBSELINUX" = yes; then
+AC_DEFINE(HAVE_LIBSELINUX, 1, [Define to 1 if using SELinux.])
+LIBSELINUX_LIBS=-lselinux
+fi
+fi
+AC_SUBST(LIBSELINUX_LIBS)
 dnl Do not put whitespace before the #include statements below.
 dnl Older compilers (eg sunos4 cc) choke on it.
 HAVE_XAW3D=no
 if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
 fi
 ### Use session management (-lSM -lICE) if available
 HAVE_X_SM=no
+LIBXSM=
 if test "${HAVE_X11}" = "yes"; then
 AC_CHECK_HEADER(X11/SM/SMlib.h,
 [AC_CHECK_LIB(SM, SmcOpenConnection, HAVE_X_SM=yes, , -lICE)])
 if test "${HAVE_X_SM}" = "yes"; then
 AC_DEFINE(HAVE_X_SM, 1, [Define to 1 if you have the SM library (-lSM).])
+LIBXSM="-lSM -lICE"
 case "$LIBS" in
 *-lSM*) ;;
-*)      LIBS="-lSM -lICE $LIBS" ;;
+*)      LIBS="$LIBXSM $LIBS" ;;
 esac
 fi
 fi
+AC_SUBST(LIBXSM)
 # If netdb.h doesn't declare h_errno, we must declare it by hand.
 AC_CACHE_CHECK(whether netdb declares h_errno,
 	       emacs_cv_netdb_declares_h_errno,
 [AC_TRY_LINK([#include <netdb.h>],
 that your compiler can find on its own, you might want to add
 "-I/..." or something similar.])
 AC_DEFINE_UNQUOTED(UNEXEC_SRC,       ${UNEXEC_SRC},
 		   [Define to the unexec source file name.])
+XMENU_OBJ=
+XOBJ=
 if test "${HAVE_X_WINDOWS}" = "yes" ; then
 AC_DEFINE(HAVE_X_WINDOWS, 1,
 	    [Define to 1 if you want to use the X window system.])
-fi
+XMENU_OBJ=xmenu.o
+XOBJ="xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o xsettings.o xgselect.o"
+fi
+AC_SUBST(XMENU_OBJ)
+AC_SUBST(XOBJ)
 if test "${USE_X_TOOLKIT}" != "none" ; then
 AC_DEFINE(USE_X_TOOLKIT, 1, [Define to 1 if using an X toolkit.])
 if test "${USE_X_TOOLKIT}" = "LUCID"; then
 AC_DEFINE(USE_LUCID, 1, [Define to 1 if using the Lucid X toolkit.])
 elif test "${USE_X_TOOLKIT}" = "MOTIF"; then
 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.in @ 108058:5e867bd030c8