comparison configure @ 108126:fa115392c7cd

Regenerate configure.
author Glenn Morris <rgm@gnu.org>
date Mon, 26 Apr 2010 20:18:39 -0700
parents 8fead72884b2
children 4daf18b3d6e8
comparison
equal deleted inserted replaced
108125:13415f222ad9 108126:fa115392c7cd
1540 --without-selinux don't compile with SELinux support 1540 --without-selinux don't compile with SELinux support
1541 --without-makeinfo don't require makeinfo for building manuals 1541 --without-makeinfo don't require makeinfo for building manuals
1542 1542
1543 --with-pkg-config-prog=PATH 1543 --with-pkg-config-prog=PATH
1544 path to pkg-config for finding GTK and librsvg 1544 path to pkg-config for finding GTK and librsvg
1545 --with-crt-dir=DIR directory containing crtn.o etc. This option is only 1545 --with-crt-dir=DIR directory containing crtn.o etc. The default is
1546 used on x86-64 and s390x GNU/Linux architectures. 1546 /usr/lib, or /usr/lib64 on some platforms.
1547 --with-gnustep-conf=PATH 1547 --with-gnustep-conf=PATH
1548 path to GNUstep.conf; default $GNUSTEP_CONFIG_FILE, 1548 path to GNUstep.conf; default $GNUSTEP_CONFIG_FILE,
1549 or /etc/GNUstep/GNUstep.conf 1549 or /etc/GNUstep/GNUstep.conf
1550 --with-x use the X Window System 1550 --with-x use the X Window System
1551 1551
5780 tempcname="conftest.c" 5780 tempcname="conftest.c"
5781 5781
5782 echo ' 5782 echo '
5783 #include "'${srcdir}'/src/'${opsysfile}'" 5783 #include "'${srcdir}'/src/'${opsysfile}'"
5784 #include "'${srcdir}'/src/'${machfile}'" 5784 #include "'${srcdir}'/src/'${machfile}'"
5785 #ifndef LIBS_MACHINE
5786 #define LIBS_MACHINE
5787 #endif
5788 #ifndef LIBS_SYSTEM 5785 #ifndef LIBS_SYSTEM
5789 #define LIBS_SYSTEM 5786 #define LIBS_SYSTEM
5790 #endif 5787 #endif
5791 #ifndef C_SWITCH_SYSTEM 5788 #ifndef C_SWITCH_SYSTEM
5792 #define C_SWITCH_SYSTEM 5789 #define C_SWITCH_SYSTEM
5793 #endif 5790 #endif
5794 #ifndef C_SWITCH_MACHINE 5791 #ifndef C_SWITCH_MACHINE
5795 #define C_SWITCH_MACHINE 5792 #define C_SWITCH_MACHINE
5796 #endif 5793 #endif
5797 configure___ libsrc_libs=LIBS_MACHINE LIBS_SYSTEM 5794 configure___ libsrc_libs=LIBS_SYSTEM
5798 configure___ c_switch_system=C_SWITCH_SYSTEM 5795 configure___ c_switch_system=C_SWITCH_SYSTEM
5799 configure___ c_switch_machine=C_SWITCH_MACHINE 5796 configure___ c_switch_machine=C_SWITCH_MACHINE
5800 5797
5801 #ifndef LIB_X11_LIB 5798 #ifndef LIB_X11_LIB
5802 #define LIB_X11_LIB -lX11 5799 #define LIB_X11_LIB -lX11
6253 fi 6250 fi
6254 fi 6251 fi
6255 6252
6256 6253
6257 6254
6258 ## Note: at present CRT_DIR is only used for amdx86-64 and ibms390x. 6255 ## If user specified a crt-dir, use that unconditionally.
6259 ## Other machine types hard-code the location in src/[ms]/*.h. 6256 if test "X$CRT_DIR" = "X"; then
6260 case "${canonical}" in 6257
6261 x86_64-*-linux-gnu* | s390x-*-linux-gnu* ) 6258 case "$canonical" in
6262 6259 x86_64-*-linux-gnu* | s390x-*-linux-gnu*)
6263 ## On x86-64 and s390x GNU/Linux distributions, the standard library 6260 ## On x86-64 and s390x GNU/Linux distributions, the standard library
6264 ## can be in a variety of places. We only try /usr/lib64 and /usr/lib. 6261 ## can be in a variety of places. We only try /usr/lib64 and /usr/lib.
6265 ## For anything else (eg /usr/lib32), it is up the user to specify 6262 ## For anything else (eg /usr/lib32), it is up the user to specify
6266 ## the location (bug#5655). 6263 ## the location (bug#5655).
6267 ## Test for crtn.o, not just the directory, because sometimes the 6264 ## Test for crtn.o, not just the directory, because sometimes the
6268 ## directory exists but does not have the relevant files (bug#1287). 6265 ## directory exists but does not have the relevant files (bug#1287).
6269 ## If user specified a crt-dir, use that unconditionally. 6266 ## FIXME better to test for binary compatibility somehow.
6270 if test "X$CRT_DIR" = "X"; then 6267 test -e /usr/lib64/crtn.o && CRT_DIR=/usr/lib64
6271 CRT_DIR=/usr/lib 6268 ;;
6272 test -e /usr/lib64/crtn.o && CRT_DIR=/usr/lib64 6269
6273 fi 6270 powerpc64-*-linux-gnu* | sparc64-*-linux-gnu*) CRT_DIR=/usr/lib64 ;;
6274 6271 esac
6275 test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \ 6272
6276 { { $as_echo "$as_me:$LINENO: error: crt*.o not found. Use --with-crt-dir to specify the location." >&5 6273 case "$opsys" in
6277 $as_echo "$as_me: error: crt*.o not found. Use --with-crt-dir to specify the location." >&2;} 6274 hpux10-20) CRT_DIR=/lib ;;
6275 esac
6276
6277 ## Default is /usr/lib.
6278 test "X$CRT_DIR" = "X" && CRT_DIR=/usr/lib
6279
6280 else
6281
6282 ## Some platforms don't use any of these files, so it is not
6283 ## appropriate to put this test outside the if block.
6284 test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \
6285 { { $as_echo "$as_me:$LINENO: error: crt*.o not found in specified location." >&5
6286 $as_echo "$as_me: error: crt*.o not found in specified location." >&2;}
6278 { (exit 1); exit 1; }; } 6287 { (exit 1); exit 1; }; }
6279 ;; 6288
6280 6289 fi
6281 *) 6290
6282 ## For clarity, ignore any user-specified setting on other platforms.
6283 if test "X$CRT_DIR" != "X"; then
6284 { $as_echo "$as_me:$LINENO: WARNING: Ignoring user-specified crt-dir." >&5
6285 $as_echo "$as_me: WARNING: Ignoring user-specified crt-dir." >&2;}
6286 CRT_DIR=
6287 fi
6288 ;;
6289
6290 esac
6291 test "X$CRT_DIR" = "X" && CRT_DIR=/usr/lib
6292 6291
6293 6292
6294 6293
6295 6294
6296 6295