Mercurial > emacs

comparison configure.in @ 108096:457366a09420

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Close bug#5655. * configure.in (CRT_DIR): New output variable. (--with-crt-dir): New option. (Bug#5655) (HAVE_LIB64_DIR): Remove. * src/Makefile.in (CRT_DIR): New variable, set by configure. * src/m/amdx86-64.h, m/ibms390x.h (START_FILES, LIB_STANDARD): Use $CRT_DIR rather than HAVE_LIB64_DIR. (Bug#5655)
author Glenn Morris <rgm@gnu.org>
date Fri, 23 Apr 2010 19:23:22 -0700
parents b0957e256d91
children beeec356b30f
comparison
equal deleted inserted replaced
108095:5d8908130ff2 108096:457366a09420
183 if test "X${with_pkg_config_prog}" != X; then 183 if test "X${with_pkg_config_prog}" != X; then
184 if test "${with_pkg_config_prog}" != yes; then 184 if test "${with_pkg_config_prog}" != yes; then
185 PKG_CONFIG="${with_pkg_config_prog}" 185 PKG_CONFIG="${with_pkg_config_prog}"
186 fi 186 fi
187 fi 187 fi
188
189 CRT_DIR=
190 AC_ARG_WITH([crt-dir],dnl
191 [AS_HELP_STRING([--with-crt-dir=DIR],[directory containing crtn.o etc.
192 This option is only used on x86-64 and s390x GNU/Linux architectures.])])
193 CRT_DIR="${with_crt_dir}"
188 194
189 AC_ARG_WITH([gnustep-conf],dnl 195 AC_ARG_WITH([gnustep-conf],dnl
190 [AS_HELP_STRING([--with-gnustep-conf=PATH],[path to GNUstep.conf; default $GNUSTEP_CONFIG_FILE, or /etc/GNUstep/GNUstep.conf])]) 196 [AS_HELP_STRING([--with-gnustep-conf=PATH],[path to GNUstep.conf; default $GNUSTEP_CONFIG_FILE, or /etc/GNUstep/GNUstep.conf])])
191 test "X${with_gnustep_conf}" != X && test "${with_gnustep_conf}" != yes && \ 197 test "X${with_gnustep_conf}" != X && test "${with_gnustep_conf}" != yes && \
192 GNUSTEP_CONFIG_FILE="${with_gnustep_conf}" 198 GNUSTEP_CONFIG_FILE="${with_gnustep_conf}"
964 970
965 dnl Do this early because it can frob feature test macros for Unix-98 &c. 971 dnl Do this early because it can frob feature test macros for Unix-98 &c.
966 AC_SYS_LARGEFILE 972 AC_SYS_LARGEFILE
967 973
968 974
969 ### The standard library on x86-64 and s390x GNU/Linux distributions can 975 ## Note: at present CRT_DIR is only used for amdx86-64 and ibms390x.
970 ### be located in either /usr/lib64 or /usr/lib. 976 ## Other machine types hard-code the location in src/[ms]/*.h.
971 ### In some rare cases, /usr/lib64 exists but does not contain the
972 ### relevant files (bug#1287). Hence test for crtn.o.
973 case "${canonical}" in 977 case "${canonical}" in
974 x86_64-*-linux-gnu* | s390x-*-linux-gnu* ) 978 x86_64-*-linux-gnu* | s390x-*-linux-gnu* )
975 if test -e /usr/lib64/crtn.o; then 979
976 AC_DEFINE(HAVE_LIB64_DIR, 1, 980 ## On x86-64 and s390x GNU/Linux distributions, the standard library
977 [Define to 1 if the directory /usr/lib64 exists.]) 981 ## can be in a variety of places. We only try /usr/lib64 and /usr/lib.
978 fi 982 ## For anything else (eg /usr/lib32), it is up the user to specify
983 ## the location (bug#5655).
984 ## Test for crtn.o, not just the directory, because sometimes the
985 ## directory exists but does not have the relevant files (bug#1287).
986 ## If user specified a crt-dir, use that unconditionally.
987 if test "X$CRT_DIR" = "X"; then
988 CRT_DIR=/usr/lib
989 test -e /usr/lib64/crtn.o && CRT_DIR=/usr/lib64
990 fi
991
992 test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \
993 AC_MSG_ERROR([crt*.o not found. Use --with-crt-dir to specify the location.])
994 ;;
995
979 esac 996 esac
997 test "X$CRT_DIR" = "X" && CRT_DIR=/usr/lib
998 AC_SUBST(CRT_DIR)
999
980 1000
981 dnl This function defintion taken from Gnome 2.0 1001 dnl This function defintion taken from Gnome 2.0
982 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) 1002 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
983 dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page 1003 dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
984 dnl also defines GSTUFF_PKG_ERRORS on error 1004 dnl also defines GSTUFF_PKG_ERRORS on error