xemacs-beta: configure.in comparison

comparison configure.in @ 155:43dd3413c7c7 r20-3b4

Import from CVS: tag r20-3b4

author	cvs
date	Mon, 13 Aug 2007 09:39:39 +0200
parents	25f70ba0133c
children	6b37e6ddd302

comparison

equal deleted inserted replaced

-:94141801dd7e
+:43dd3413c7c7
 dnl - suport for extra-verbosity
 dnl - ordinary libs are handled separately from X libs (might be a mistake)
 dnl - various random kludges (e.g. -with-dnet=no
 dnl PRINT_VAR(var, var, ...)  prints values of shell variables
-define([PRINT_VAR],[ifelse([$#] ,0, , [$#], 1, echo "[$1]=\"$[$1]\"", echo "[$1] = $[$1]"
+define([PRINT_VAR],[ifelse([$#] ,0, , [$#], 1, echo "[$1] = \"$[$1]\"", echo "[$1] = \"$[$1]\""
 [PRINT_VAR(builtin([shift],$@))])])
 dnl Disable cache files:
 dnl This is controversial, but I am convinced this is the right way to go,
 dnl at least by default.  Otherwise there are too many surprises.
 ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&AC_FD_CC'
 ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&AC_FD_CC'
 cross_compiling=no
 ])
+dnl The construct foo=`echo $w1 $w2 $w3` fails on some systems if $w1 = -e or -n
+dnl So we use the following instead.
+dnl XE_SPACE(var, words)
+define([XE_SPACE],[
+T=""
+for W in $2; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+$1="$T"
+])dnl
 dnl XE_ADD_OBJS(foo.o ...)
 define([XE_ADD_OBJS],
 [extra_objs="$extra_objs [$1]" && dnl
 if test "$extra_verbose" = "yes"; then
 srcdir=
 target=NONE
 verbose=
 x_includes=NONE
 x_libraries=NONE
+CDPATH=.; export CDPATH
 dnl Allow this script to work with zsh, by setting sh emulation options
 if test -n "$ZSH_VERSION"; then
 setopt NO_BAD_PATTERN NO_BANG_HIST NO_BG_NICE NO_EQUALS NO_FUNCTION_ARGZERO
 setopt GLOB_SUBST NO_HUP INTERACTIVE_COMMENTS KSH_ARRAYS NO_MULTIOS NO_NOMATCH
 	dnl testers, at large sites, have said they have their X files
 	dnl installed in odd places.
 	dnl Has the user specified one of the path options?
 	prefix | exec_prefix | bindir | datadir | statedir | libdir | \
-	mandir | infodir | lispdir | etcdir | lockdir | archlibdir | \
+	mandir | infodir | lispdir | etcdir | lockdir | pkgdir | archlibdir | \
 	sitelispdir | docdir )
 	   dnl If the value was omitted, get it from the next argument.
 	   if test "$valomitted" = "yes"; then
 	     if test "$#" = 0; then
 		 USAGE_ERROR("The \`--$optname' option requires a value.");
 ' > $tempcname
 dnl The value of CPP is a quoted variable reference, so we need to do this
 dnl to get its actual value...
 CPP=`eval "echo $CPP"`
 eval `$CPP -Isrc $tempcname \
-| grep 'configure___' \
+	| sed -n -e "s/ *= */='/" -e "s/ *\$/'/" -e "s/^configure___//p"`
-| sed -n -e 's/^configure___ \([[^= ]]* *=\)\(.*\)$/\1\`echo \2\`/p'`
 if test -z "$SPECIFIED_CFLAGS"; then
 eval `$CPP -Isrc -DTHIS_IS_CONFIGURE $tempcname \
-	 | grep 'configure___' \
+	| sed -n -e "s/ *= */='/" -e "s/ *\$/'/" -e "s/^configure___//p"`
-	 | sed -n -e 's/^configure___ \([[^= ]]* *=\)\(.*\)$/\1\`echo \2\`/p'`
 else
 REAL_CFLAGS="$CFLAGS"
 fi
 rm $tempcname
 then AC_MSG_RESULT("\"${dash_r}\"")
 else AC_MSG_RESULT(NONE)
 fi
 fi
+dnl XE_ADD_RUNPATH_DIR(directory)
+define([XE_ADD_RUNPATH_DIR],[
+xe_runpath_dir=$1
+if test "$xe_runpath_dir" != "/lib"     -a \
+	"$xe_runpath_dir" != "/usr/lib" -a \
+	-n "`ls ${xe_runpath_dir}/*.s[[ol]] 2>/dev/null`"; then
+test -n "$runpath" && runpath="${runpath}:"
+runpath="${runpath}${xe_runpath_dir}"
+fi
+])dnl
+dnl XE_COMPUTE_RUNPATH()
 define([XE_COMPUTE_RUNPATH],[
 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
 dnl Remove runtime paths from current ld switches
 ld_switch_site="`echo $ld_switch_site     | sed \"s/${dash_r}[[^ ]]*//\"`"
 ld_switch_x_site="`echo $ld_switch_x_site | sed \"s/${dash_r}[[^ ]]*//\"`"
 dnl PRINT_VAR(ld_switch_site, ld_switch_x_site)
 dnl Fix up Runtime path
 dnl If LD_RUN_PATH is set in environment, use that.
 dnl In this case, assume user has set the right value.
+runpath=""
 if test -n "$LD_RUN_PATH"; then
 runpath="$LD_RUN_PATH"
+elif test "$GCC" = "yes"; then
+dnl Compute runpath from gcc's -v output
+echo "int main(int argc, char *argv[[]]) {return 0;}" > conftest.c
+xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null'
+for arg in `eval "$xe_runpath_link" | grep ' -L'`; do
+case "$arg" in P,* | -L* | -R* )
+for dir in `echo "$arg" | sed -e 's/^..//' -e 'y/:/ /'`; do
+XE_ADD_RUNPATH_DIR("$dir")
+done ;;
+esac
+done
+rm -f conftest*
 else
 dnl Add all directories with .so files to runpath
-runpath=""
 for arg in $ld_switch_site $ld_switch_x_site; do
-case "$arg" in -L* )
+case "$arg" in -L*) XE_ADD_RUNPATH_DIR(`echo "$arg" | sed 's/^-L//'`);; esac
-	dir=`echo "$arg" | sed 's/^-L//'`
-	if test -n "`ls ${dir}/*.s[[ol]] 2>/dev/null`"; then
-	  test -n "$runpath" && runpath="${runpath}:"
-	  runpath="${runpath}${dir}"
-fi
-	;;
-esac
 done
 dnl Sometimes /opt/SUNWdt/lib is the only installed Motif available
 case "$canonical" in  *-solaris2.[[1-4]]* )
 test "$need_motif" = "yes" && runpath="${runpath}:/opt/SUNWdt/lib" ;;
 esac
-fi
+fi dnl Compute $runpath
 if test -n "$runpath"; then
 ld_switch_run="${dash_r}${runpath}"
 test "$extra_verbose" = "yes" && echo "Setting runpath to $runpath"
 fi
 dnl checks for UNIX variants
 AC_AIX
 dnl checks for header files
 AC_CHECK_HEADERS(mach/mach.h sys/stropts.h sys/timeb.h sys/time.h unistd.h)
-AC_CHECK_HEADERS(utime.h sys/wait.h libintl.h locale.h libgen.h)
+AC_CHECK_HEADERS(utime.h locale.h libgen.h)
 AC_CHECK_HEADERS(linux/version.h kstat.h sys/pstat.h inttypes.h)
+AC_HEADER_SYS_WAIT
 AC_HEADER_STDC
 AC_HEADER_TIME
 AC_DECL_SYS_SIGLIST
 dnl Some systems have utime.h but do not declare the struct anyplace.
 else AC_MSG_RESULT(no)
 fi
 dnl Dynodump (Solaris 2.x, x<6)
 AC_MSG_CHECKING(for dynodump)
-case "$canonical" in *-solaris2.[[0-5]]* )
+case "$opsys" in sol2* )
 AC_MSG_RESULT(yes)
 AC_DEFINE(DYNODUMP)
 XE_APPEND(dynodump, MAKE_SUBDIR)
-case "$canonical" in
+case "$machine" in
-sparc*   ) dynodump_arch=sparc ;;
+sparc   ) dynodump_arch=sparc ;;
-powerpc* ) dynodump_arch=ppc   ;;
+*86*    ) dynodump_arch=i386  ;;
-i*86*    ) dynodump_arch=i386  ;;
+powerpc ) dynodump_arch=ppc   ;;
 esac
 dnl Dynodump requires the system linker
 test "$GCC" = "yes" && XE_APPEND(-fno-gnu-linker, ld_switch_site) ;;
 *) AC_MSG_RESULT(no) ;;
+esac
+dnl Link with "-z ignore" on Solaris if supported
+case "$opsys" in sol2-[[6-9]]* )
+AC_MSG_CHECKING(for \"-z ignore\" linker flag)
+case "`ld -h 2>&1`" in
+*-z\ ignore\|record* ) AC_MSG_RESULT(yes)
+XE_PREPEND(-z ignore, ld_switch_site) ;;
+*) AC_MSG_RESULT(no) ;;
+esac ;;
 esac
 dnl ----------------------
 dnl Choose a window system
 dnl ----------------------
 done
 else
 test -z "$with_toolbars" && with_toolbars=yes
 fi
-if false; then # obsolete
-runtime_arg="-R${dash_r_space}"
-case "$canonical" in
-*-sun-solaris* | *-sun-sunos5* )
-add_runtime_flag=yes ;;
-*-sgi-irix5.* )
-dnl In the IRIX 5.3 ld, only the last -rpath arg has any effect.  This is
-dnl fundamentaly incompatible with having separate LD_SWITCH_X_SITE
-dnl and LD_SWITCH_SITE variables.  Fortunately, SGI fixed this by 6.2.
-if test -n "$x_libraries" || test -n "$site_runtime_libraries" ; then
-(echo "WARNING: The IRIX 5 ld ignores all but the last -rpath argument,";
-echo "         so if you need to specify more than one additional";
-echo "         runtime library directory, you will have to do so";
-echo "         manually by setting the environment variable";
-echo "         LD_SWITCH_SITE to '-rpath <path>' before running";
-echo "         configure.  If you have only one additional directory,"
-echo "         you can specify it with --site-runtime-libraries.") >&2
-fi
-runtime_arg="-rpath " ;;
-*-sgi-irix* )
-dnl Note that IRIX gcc (as of 2.7.2) does not accept -rpath, so
-dnl using it can cause trouble.  Specifying --use-gcc=no will work
-dnl around this, but the real problem is that configure uses $LDFLAGS
-dnl as arguments to $(CC), instead of using prefix-args like the
-dnl src/Makefile does.
-add_runtime_flag=yes;
-runtime_arg="-rpath " ;;
-esac
-fi
 dnl FSF 19.29 has some bitmapdir stuff here.
 bitmapdir=
 case "$window_system" in
 x11  ) HAVE_X_WINDOWS=yes; echo "  Using X11." ;;
 AC_DEFINE(HAVE_GIF)
 XE_ADD_OBJS(dgif_lib.o gif_err.o gifalloc.o)
 fi
 dnl Autodetect Xpm
-test -z "$with_xpm" && { AC_CHECK_HEADER(X11/xpm.h,             ,with_xpm=no) }
+test -z "$with_xpm" && { AC_CHECK_HEADER(X11/xpm.h,   ,with_xpm=no) }
-test -z "$with_xpm" && { AC_CHECK_LIB(Xpm, XpmReadFileToData,[:],with_xpm=no) }
+test -z "$with_xpm" && { AC_CHECK_LIB(Xpm, XpmFree,[:],with_xpm=no) }
 test -z "$with_xpm" && with_xpm=yes
 if test "$with_xpm" = "yes"; then
 AC_DEFINE(HAVE_XPM)
 XE_PREPEND(-lXpm, libs_x)
 fi
 AC_CHECKING(for Mule-related features)
 AC_DEFINE(MULE)
 XE_ADD_OBJS(mule.o mule-ccl.o mule-charset.o mule-coding.o)
 dnl Use -lintl to get internationalized strerror for Mule
+AC_CHECK_HEADERS(libintl.h)
 AC_CHECK_LIB(intl, strerror)
 AC_CHECKING(for Mule input methods)
 dnl Do we have the XmIm* routines?  And if so, do we want to use them?
 dnl XIM seems to be flaky except on Solaris...
 fi dnl with_xim
 dnl Autodetect WNN
 test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
 test -z "$with_wnn" && { AC_CHECK_HEADER(wnn/jllib.h, ,with_wnn=no) }
-test -z "$with_wnn" && { AC_CHECK_LIB(wnn,jl_dic_list,[:],with_wnn=no) }
+test -z "$with_wnn" && { AC_CHECK_LIB(wnn,jl_dic_list_e, ,with_wnn=no) }
 test -z "$with_wnn" && with_wnn=yes
 if test "$with_wnn" = "yes"; then
 AC_DEFINE(HAVE_WNN)
 XE_PREPEND(-lwnn, libs_x)
 XE_ADD_OBJS(mule-wnnfns.o)
 if test "$with_canna" = "yes"; then
 AC_DEFINE(HAVE_CANNA)
 XE_PREPEND(-lcanna -lRKC, libs_x)
 XE_ADD_OBJS(mule-canna.o)
 fi
 else dnl "$with_mule" = "no"
 for feature in xim canna wnn; do
 if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
 AC_MSG_WARN("--with-${feature} ignored:  Not valid without Mule support")
 fi
 AC_DEFINE(GETTIMEOFDAY_ONE_ARGUMENT)])
 fi
 AC_C_INLINE
-test "$ac_cv_c_inline" != "no" && AC_DEFINE(HAVE_INLINE)
+if test "$ac_cv_c_inline" != "no"; then
+AC_DEFINE(HAVE_INLINE)
+test "$GCC" = "yes" && XE_ADD_OBJS(inline.o)
+fi
 AC_FUNC_ALLOCA
 test -n "$ALLOCA" && XE_ADD_OBJS($ALLOCA)
 AC_FUNC_STRCOLL
 dnl We used to call AC_FUNC_MMAP here
 dnl Instead we now use following, suggested by Neal Becker
 AC_MSG_CHECKING(for working mmap)
+case "$opsys" in ultrix* ) have_mmap=no ;; *)
 AC_TRY_RUN([#include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/mman.h>
 	   MAP_PRIVATE | MAP_VARIABLE | MAP_ANONYMOUS,
 	   fd, 0) != (void *) MAP_FAILED)
 return 0;
 perror ("conftest: mmap failed");
 return 1;
-}], have_mmap=yes, have_mmap=no)
+}], have_mmap=yes, have_mmap=no) ;;
+esac
 AC_MSG_RESULT($have_mmap)
 test "$have_mmap" = "yes" && AC_DEFINE(HAVE_MMAP)
 dnl rel_alloc requires either GNU malloc or system malloc with mmap
 dnl We only turn rel_alloc on by default if mmap is available.
 AC_CHECKING("for sound support")
 case "$with_sound" in
 native | both ) with_native_sound=yes;;
 nas    | no   ) with_native_sound=no;;
 esac
+test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes
 if test "$with_native_sound" != "no"; then
+dnl Maybe sound is already on include path...
+if test -n "$native_sound_lib"; then
+AC_CHECK_HEADER(multimedia/audio_device.h,
+[sound_found=yes sound_cflags=""
+XE_ADD_OBJS(sunplay.o)])
+fi
 dnl Autodetect Sun native sound from SUNWaudmo package
-if test -d "/usr/demo/SOUND"; then
+if test -z "$sound_found" -a -d "/usr/demo/SOUND"; then
-sound_found="yes"
+sound_found=yes
 XE_ADD_OBJS(sunplay.o)
 if test -d "/usr/demo/SOUND/include"
 then sound_cflags="-I/usr/demo/SOUND/include"
 else sound_cflags="-I/usr/demo/SOUND"
 fi
 if test -r "/usr/demo/SOUND/lib/libaudio.a"
 then native_sound_lib="/usr/demo/SOUND/lib/libaudio.a"
 else native_sound_lib="/usr/demo/SOUND/libaudio.a"
 fi
 fi
-else
+fi
-case "$canonical" in \
+dnl Check for SGI and HP native sound libs
+if test -z "$sound_found"; then
+case "$canonical" in
 *-sgi-* )
-AC_CHECK_LIB(audio, ALopenport, native_sound_lib="-laudio")
+if test -z "$native_sound_lib"; then
-if test "$native_sound_lib" = "-laudio"; then
+AC_CHECK_LIB(audio, ALopenport, native_sound_lib="-laudio")
-sound_found="yes" sound_cflags=""
+fi
+if test -n "$native_sound_lib"; then
+sound_found=yes sound_cflags=""
 XE_ADD_OBJS(sgiplay.o)
 fi ;;
 hppa*-hp-hpux* )
-AC_CHECK_LIB(Alib, AOpenAudio, native_sound_lib="-lAlib")
+if test -z "$native_sound_lib"; then
-if test "$native_sound_lib" = "-lAlib"; then
+	AC_CHECK_LIB(Alib, AOpenAudio, native_sound_lib="-lAlib")
-sound_found="yes"
+fi
+if test -n "$native_sound_lib"; then
+sound_found=yes
 XE_ADD_OBJS(hpplay.o)
 if test "$with_gcc" = "yes" # Kludge city
 then sound_cflags="-Dconst= -Dvolatile= -I/usr/audio/examples"
 else sound_cflags="+e -I/usr/audio/examples"
 fi
 fi ;;
 esac
 fi
+dnl Check for Linux/BSD native sound
 if test -z "$sound_found"; then
 for dir in "machine" "sys" "linux"; do
 AC_CHECK_HEADER(${dir}/soundcard.h,
 sound_found=yes
 XE_ADD_OBJS(linuxplay.o)
 dnl Check for terminal I/O variants
 dnl TERMIOS systems may have termio.h, but not vice-versa, I think.
 AC_CHECK_HEADER(termios.h,  [AC_DEFINE(HAVE_TERMIOS)],
 [AC_CHECK_HEADER(termio.h, [AC_DEFINE(HAVE_TERMIO)])])
-dnl Autodetect gpm
-test -z "$with_gpm" && { AC_CHECK_HEADER(gpm.h, , with_gpm=no) }
-test -z "$with_gpm" && { AC_CHECK_LIB(gpm, Gpm_Open, with_gpm=yes, with_gpm=no) }
-if test "$with_gpm" = "yes"; then
-AC_DEFINE(HAVE_GPM)
-XE_ADD_OBJS(gpmevent.o)
-XE_PREPEND(-lgpm, LIBS)
-fi
 dnl Autodetect ncurses.
 if test -z "$with_ncurses"; then
 AC_CHECK_LIB(ncurses, tgetent, with_ncurses=yes, with_ncurses=no)
 fi
 fi
 fi
 fi
 AC_DEFINE_UNQUOTED(CURSES_H_PATH, "${curses_h_path-curses.h}")
 AC_DEFINE_UNQUOTED(TERM_H_PATH, "${term_h_path-term.h}")
+dnl Autodetect gpm
+test -z "$with_gpm" && { AC_CHECK_HEADER(gpm.h, , with_gpm=no) }
+test -z "$with_gpm" && { AC_CHECK_LIB(gpm, Gpm_Open, with_gpm=yes, with_gpm=no) }
+if test "$with_gpm" = "yes"; then
+AC_DEFINE(HAVE_GPM)
+XE_ADD_OBJS(gpmevent.o)
+XE_PREPEND(-lgpm, LIBS)
+fi
 else dnl "$with_tty" = "no"
 for feature in ncurses gpm; do
 if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
 AC_MSG_WARN("--with-${feature} ignored:  Not valid without TTY support")
 fi
 fi
 dnl --------------------------------
 dnl Compute SUBST-itutable variables
 dnl --------------------------------
 dnl We ignore (C|LD)_SWITCH_X_(MACHINE|SYSTEM)
-dnl Use `echo ...` to remove extraneous blanks
+dnl Use XE_SPACE instead of plain assignment statements to remove extraneous blanks
-c_switch_general=`echo -DHAVE_CONFIG_H $c_switch_site $c_switch_machine $c_switch_system`
+XE_SPACE(extra_objs, $extra_objs)
-c_switch_window_system=`echo $c_switch_x_site $X_CFLAGS`
+XE_SPACE(c_switch_general, -DHAVE_CONFIG_H $c_switch_site $c_switch_machine $c_switch_system)
-c_switch_all=`echo $c_switch_general $c_switch_window_system`
+XE_SPACE(c_switch_window_system, $c_switch_x_site $X_CFLAGS)
-ld_switch_general=`echo $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_run`
+XE_SPACE(c_switch_all, $c_switch_general $c_switch_window_system)
-ld_switch_window_system=`echo $ld_switch_x_site`
+XE_SPACE(ld_switch_general, $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_run)
-ld_switch_all=`echo $ld_switch_general $ld_switch_window_system`
+XE_SPACE(ld_switch_window_system, $ld_switch_x_site)
-ld_libs_general=`echo $LIBS $libs_machine $libs_system $libs_standard`
+XE_SPACE(ld_switch_all, $ld_switch_general $ld_switch_window_system)
-ld_libs_window_system=`echo $X_EXTRA_LIBS $libs_x $X_PRE_LIBS`
+XE_SPACE(ld_libs_general, $LIBS $libs_machine $libs_system $libs_standard)
-ld_libs_all=`echo $ld_libs_window_system $ld_libs_general`
+XE_SPACE(ld_libs_window_system, $X_EXTRA_LIBS $libs_x $X_PRE_LIBS)
+XE_SPACE(ld_libs_all, $ld_libs_window_system $ld_libs_general)
 dnl Compute lists of Makefiles and subdirs
 SRC_SUBDIR_DEPS="$MAKE_SUBDIR"
 AC_SUBST(SRC_SUBDIR_DEPS)
 XE_APPEND(src, MAKE_SUBDIR)
 internal_makefile_list="Makefile"
 SUBDIR_MAKEFILES=''
 test -d lock || mkdir lock
 for dir in $MAKE_SUBDIR; do
 test -d "$dir" || mkdir "$dir"
-SUBDIR_MAKEFILES=`echo $SUBDIR_MAKEFILES $dir/Makefile`
+XE_SPACE(SUBDIR_MAKEFILES, $SUBDIR_MAKEFILES $dir/Makefile)
-internal_makefile_list=`echo $internal_makefile_list $dir/Makefile.in`
+XE_SPACE(internal_makefile_list, $internal_makefile_list $dir/Makefile.in)
 done
 AC_SUBST(MAKE_SUBDIR)
 AC_SUBST(SUBDIR_MAKEFILES)
 if test "$extra_verbose" = "yes"; then
 AC_SUBST(srcdir)
 AC_SUBST(prefix)
 AC_SUBST(exec_prefix)
 AC_SUBST(bindir)
 AC_SUBST(datadir)
+AC_SUBST(pkgdir)
 AC_SUBST(statedir)
 AC_SUBST(libdir)
 AC_SUBST(mandir)
 AC_SUBST(infodir)
 AC_SUBST(infodir_user_defined)

Mercurial > hg > xemacs-beta

comparison configure.in @ 155:43dd3413c7c7 r20-3b4