comparison configure.in @ 452:3d3049ae1304 r21-2-41

Import from CVS: tag r21-2-41
author cvs
date Mon, 13 Aug 2007 11:40:21 +0200
parents 98528da0b7fc
children c33ae14dd6d0
comparison
equal deleted inserted replaced
451:8ad70c5cd5d7 452:3d3049ae1304
367 with_scrollbars='' 367 with_scrollbars=''
368 with_widgets='' 368 with_widgets=''
369 with_dialogs='' 369 with_dialogs=''
370 with_file_coding='' 370 with_file_coding=''
371 cpp='' cppflags='' libs='' ldflags='' 371 cpp='' cppflags='' libs='' ldflags=''
372 extra_includes=''
372 dynamic='' 373 dynamic=''
373 with_x11='' 374 with_x11=''
374 with_msw='' 375 with_msw=''
375 rel_alloc='default' 376 rel_alloc='default'
376 with_system_malloc='default' 377 with_system_malloc='default'
793 l | lu | luc | luci | lucid ) val=lucid ;; 794 l | lu | luc | luci | lucid ) val=lucid ;;
794 m | mo | mot | moti | motif ) val=motif ;; 795 m | mo | mot | moti | motif ) val=motif ;;
795 a | at | ath | athe | athen | athena ) val=athena ;; 796 a | at | ath | athe | athen | athena ) val=athena ;;
796 n | no | non | none ) val=no ;; 797 n | no | non | none ) val=no ;;
797 y | ye | yes ) val=yes ;; 798 y | ye | yes ) val=yes ;;
799 m | ms | msw ) val=msw ;;
798 * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: 800 * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
799 \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;; 801 \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;;
800 esac 802 esac
801 eval "$opt=\"$val\"" 803 eval "$opt=\"$val\""
802 ;; 804 ;;
1862 ld_switch_machine ld_switch_system unexec ld_switch_shared 1864 ld_switch_machine ld_switch_system unexec ld_switch_shared
1863 ld lib_gcc ld_text_start_addr start_files ordinary_link 1865 ld lib_gcc ld_text_start_addr start_files ordinary_link
1864 have_terminfo mail_use_flock mail_use_lockf) && echo "" 1866 have_terminfo mail_use_flock mail_use_lockf) && echo ""
1865 1867
1866 dnl Pick up mingw32 include path 1868 dnl Pick up mingw32 include path
1867 case "$opsys" in mingw*) mingw_include=`eval "gcc -print-file-name=libc.a"` ; 1869 case "$opsys" in mingw* | cygwin*)
1868 mingw_include=`eval "dirname $mingw_include"` ; 1870 cygwin_include=`eval "gcc -print-file-name=libc.a"` ;
1869 mingw_include="-I$mingw_include/../include/mingw32" ; 1871 cygwin_include=`eval "dirname $cygwin_include"` ;
1870 XE_APPEND($mingw_include, c_switch_system) ;; 1872 cygwin_include="-I$cygwin_include/../include" ;
1873 extra_includes="$cygwin_include/mingw32 $cygwin_include/mingw $cygwin_include" ;
1874 case "$opsys" in mingw*)
1875 XE_APPEND($extra_includes, c_switch_system) ;;
1876 esac
1877 ;;
1871 esac 1878 esac
1872 1879
1873 dnl Non-ordinary link usually requires -lc 1880 dnl Non-ordinary link usually requires -lc
1874 test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc" 1881 test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc"
1875 1882
4162 if test "$with_msw" = "yes"; then 4169 if test "$with_msw" = "yes"; then
4163 have_dl=yes; 4170 have_dl=yes;
4164 else 4171 else
4165 dnl Find headers and libraries 4172 dnl Find headers and libraries
4166 AC_CHECK_HEADER(dlfcn.h, [ 4173 AC_CHECK_HEADER(dlfcn.h, [
4167 AC_CHECK_LIB(dl, dlopen, [ have_dl=yes libdl=dl], [ 4174 AC_MSG_CHECKING([for dlopen in -lc])
4168 AC_CHECK_LIB(c, dlopen, [ have_dl=yes ])])]) 4175 AC_TRY_LINK([#include <dlfcn.h>],dnl
4176 [dlopen ("", 0);], [ have_dl=yes ], [
4177 AC_MSG_CHECKING([for dlopen in -ldl])
4178 ac_save_LIBS="$LIBS"
4179 LIBS="-ldl $LIBS"
4180 AC_TRY_LINK([#include <dlfcn.h>],dnl
4181 [dlopen ("", 0);], [ have_dl=yes ],
4182 [LIBS="$ac_save_LIBS"])
4183 ac_save_LIBS=])])
4169 if test -n "$have_dl"; then 4184 if test -n "$have_dl"; then
4170 AC_DEFINE(HAVE_DLOPEN) 4185 AC_DEFINE(HAVE_DLOPEN)
4171 else 4186 else
4172 AC_CHECK_LIB(dld, shl_load, [ 4187 AC_CHECK_LIB(dld, shl_load, [
4173 libdl=dld have_dl=yes; 4188 libdl=dld have_dl=yes;
4337 AC_SUBST(datadir) 4352 AC_SUBST(datadir)
4338 AC_SUBST(pkgdir) 4353 AC_SUBST(pkgdir)
4339 AC_SUBST(statedir) 4354 AC_SUBST(statedir)
4340 AC_SUBST(libdir) 4355 AC_SUBST(libdir)
4341 AC_SUBST(mandir) 4356 AC_SUBST(mandir)
4357 AC_SUBST(extra_includes)
4342 4358
4343 AC_SUBST(prefix) 4359 AC_SUBST(prefix)
4344 AC_SUBST(PREFIX_USER_DEFINED) 4360 AC_SUBST(PREFIX_USER_DEFINED)
4345 dnl Yo, Stephen Bourne! I want to marry you! 4361 dnl Yo, Stephen Bourne! I want to marry you!
4346 PREFIX=$prefix 4362 PREFIX=$prefix