comparison configure @ 80:1ce6082ce73f r20-0b90

Import from CVS: tag r20-0b90
author cvs
date Mon, 13 Aug 2007 09:06:37 +0200
parents 54cc21c15cbb
children 6a378aca36af
comparison
equal deleted inserted replaced
79:5b0a5bbffab6 80:1ce6082ce73f
3009 if test "${window_system}" != "none" ; then 3009 if test "${window_system}" != "none" ; then
3010 test -n "$silent" || echo "checking for XFree86" 3010 test -n "$silent" || echo "checking for XFree86"
3011 if test -d /usr/X386/include; then 3011 if test -d /usr/X386/include; then
3012 HAVE_XFREE386=yes 3012 HAVE_XFREE386=yes
3013 test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X386/include" 3013 test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X386/include"
3014 elif test -d /usr/X11R6/include; then 3014 elif test -f /etc/XF86Config -o \
3015 -f /etc/X11/XF86Config -o \
3016 -f /usr/X11R6/lib/X11/XF86Config; then
3015 HAVE_XFREE386=yes 3017 HAVE_XFREE386=yes
3016 test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X11R6/include" 3018 test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X11R6/include"
3017 else 3019 else
3018 HAVE_XFREE386=no 3020 HAVE_XFREE386=no
3019 fi 3021 fi
5517 fi 5519 fi
5518 rm -f conftest* 5520 rm -f conftest*
5519 5521
5520 5522
5521 # AIX export list 5523 # AIX export list
5522 for export in /usr/lpp/X11/bin/smt.exp /usr/bin/X11/smt.exp ; do 5524 if test -f /usr/lpp/X11/bin/smt.exp ; then
5523 if test -f "$export" ; then 5525
5524 5526 {
5525 { 5527 test -n "$verbose" && \
5526 test -n "$verbose" && \ 5528 echo " defining" AIX_SMT_EXP to be "-bI:/usr/lpp/X11/bin/smt.exp"
5527 echo " defining" AIX_SMT_EXP to be "-bI:$export" 5529 echo "#define" AIX_SMT_EXP "-bI:/usr/lpp/X11/bin/smt.exp" >> confdefs.h
5528 echo "#define" AIX_SMT_EXP "-bI:$export" >> confdefs.h 5530 DEFS="$DEFS -DAIX_SMT_EXP=-bI:/usr/lpp/X11/bin/smt.exp"
5529 DEFS="$DEFS -DAIX_SMT_EXP=-bI:$export" 5531 ac_sed_defs="${ac_sed_defs}\${ac_dA}AIX_SMT_EXP\${ac_dB}AIX_SMT_EXP\${ac_dC}-bI:/usr/lpp/X11/bin/smt.exp\${ac_dD}
5530 ac_sed_defs="${ac_sed_defs}\${ac_dA}AIX_SMT_EXP\${ac_dB}AIX_SMT_EXP\${ac_dC}-bI:\\\\\\\$export\${ac_dD} 5532 \${ac_uA}AIX_SMT_EXP\${ac_uB}AIX_SMT_EXP\${ac_uC}-bI:/usr/lpp/X11/bin/smt.exp\${ac_uD}
5531 \${ac_uA}AIX_SMT_EXP\${ac_uB}AIX_SMT_EXP\${ac_uC}-bI:\\\\\\\$export\${ac_uD} 5533 \${ac_eA}AIX_SMT_EXP\${ac_eB}AIX_SMT_EXP\${ac_eC}-bI:/usr/lpp/X11/bin/smt.exp\${ac_eD}
5532 \${ac_eA}AIX_SMT_EXP\${ac_eB}AIX_SMT_EXP\${ac_eC}-bI:\\\\\\\$export\${ac_eD} 5534 "
5533 " 5535 }
5534 } 5536
5535 5537 elif test -f /usr/bin/X11/smt.exp ; then
5536 break 5538
5537 fi 5539 {
5538 done 5540 test -n "$verbose" && \
5541 echo " defining" AIX_SMT_EXP to be "-bI:/usr/bin/X11/smt.exp"
5542 echo "#define" AIX_SMT_EXP "-bI:/usr/bin/X11/smt.exp" >> confdefs.h
5543 DEFS="$DEFS -DAIX_SMT_EXP=-bI:/usr/bin/X11/smt.exp"
5544 ac_sed_defs="${ac_sed_defs}\${ac_dA}AIX_SMT_EXP\${ac_dB}AIX_SMT_EXP\${ac_dC}-bI:/usr/bin/X11/smt.exp\${ac_dD}
5545 \${ac_uA}AIX_SMT_EXP\${ac_uB}AIX_SMT_EXP\${ac_uC}-bI:/usr/bin/X11/smt.exp\${ac_uD}
5546 \${ac_eA}AIX_SMT_EXP\${ac_eB}AIX_SMT_EXP\${ac_eC}-bI:/usr/bin/X11/smt.exp\${ac_eD}
5547 "
5548 }
5549
5550 fi
5539 5551
5540 CFLAGS="$REAL_CFLAGS" 5552 CFLAGS="$REAL_CFLAGS"
5541 5553
5542 file="${srcdir}/lisp/version.el" 5554 file="${srcdir}/lisp/version.el"
5543 version=`sed -ne 's/^(defconst emacs-version "\(.*\)".*/\1/p' "$file"` 5555 version=`sed -ne 's/^(defconst emacs-version "\(.*\)".*/\1/p' "$file"`