comparison configure @ 3727:3246cf3e564d

[xemacs-hg @ 2006-12-08 02:17:15 by vins] Added Rick Rankin's patch to support new xpm location on cygwin.
author vins
date Fri, 08 Dec 2006 02:17:16 +0000
parents 72e6cbbc65e0
children 96cba27916dd
comparison
equal deleted inserted replaced
3726:00ae2d5b2667 3727:3246cf3e564d
18702 if test "$ac_x_libraries" = no; then 18702 if test "$ac_x_libraries" = no; then
18703 # Check for the libraries. 18703 # Check for the libraries.
18704 # See if we find them without any special options. 18704 # See if we find them without any special options.
18705 # Don't add to $LIBS permanently. 18705 # Don't add to $LIBS permanently.
18706 ac_save_LIBS=$LIBS 18706 ac_save_LIBS=$LIBS
18707 LIBS="-lXt $LIBS" 18707 LIBS="-lX11 $LIBS"
18708 cat >conftest.$ac_ext <<_ACEOF 18708 cat >conftest.$ac_ext <<_ACEOF
18709 /* confdefs.h. */ 18709 /* confdefs.h. */
18710 _ACEOF 18710 _ACEOF
18711 cat confdefs.h >>conftest.$ac_ext 18711 cat confdefs.h >>conftest.$ac_ext
18712 cat >>conftest.$ac_ext <<_ACEOF 18712 cat >>conftest.$ac_ext <<_ACEOF
26635 { echo "$as_me:$LINENO: result: " >&5 26635 { echo "$as_me:$LINENO: result: " >&5
26636 echo "${ECHO_T}" >&6; } 26636 echo "${ECHO_T}" >&6; }
26637 26637
26638 libpath_xpm= 26638 libpath_xpm=
26639 incpath_xpm= 26639 incpath_xpm=
26640 libname_xpm="-lXpm"
26640 case "$opsys" in 26641 case "$opsys" in
26641 cygwin*) 26642 cygwin*)
26642 cygwin_top=`eval gcc -print-search-dirs | sed -ne s'/install: //p'` 26643 cygwin_top=`eval gcc -print-search-dirs | sed -ne s'/install: //p'`
26643 cygwin_top=`eval "cd $cygwin_top/../../../..; pwd"` 26644 cygwin_top=`eval "cd $cygwin_top/../../../..; pwd"`
26644 case "$window_system" in 26645 case "$window_system" in
26645 x11) ;; 26646 x11) ;;
26646 msw) libpath_xpm="-L${cygwin_top}/lib/noX" 26647 msw) libpath_xpm="-L${cygwin_top}/lib/noX"
26647 incpath_xpm="-I${cygwin_top}/include/noX" 26648 incpath_xpm="-I${cygwin_top}/include/noX"
26649 libname_xpm="-lXpm-noX"
26648 ;; 26650 ;;
26649 gtk) ;; 26651 gtk) ;;
26650 none) ;; 26652 none) ;;
26651 *) ;; 26653 *) ;;
26652 esac 26654 esac
26658 CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi 26660 CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
26659 XE_CFLAGS=""$incpath_xpm" $XE_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$XE_CFLAGS"; fi 26661 XE_CFLAGS=""$incpath_xpm" $XE_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$XE_CFLAGS"; fi
26660 LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi 26662 LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
26661 { echo "$as_me:$LINENO: checking for Xpm - no older than 3.4f" >&5 26663 { echo "$as_me:$LINENO: checking for Xpm - no older than 3.4f" >&5
26662 echo $ECHO_N "checking for Xpm - no older than 3.4f... $ECHO_C" >&6; } 26664 echo $ECHO_N "checking for Xpm - no older than 3.4f... $ECHO_C" >&6; }
26663 xe_check_libs=-lXpm 26665 xe_check_libs="$libname_xpm"
26664 if test "$cross_compiling" = yes; then 26666 if test "$cross_compiling" = yes; then
26665 { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 26667 { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
26666 See \`config.log' for more details." >&5 26668 See \`config.log' for more details." >&5
26667 echo "$as_me: error: cannot run test program while cross compiling 26669 echo "$as_me: error: cannot run test program while cross compiling
26668 See \`config.log' for more details." >&2;} 26670 See \`config.log' for more details." >&2;}
26739 cat >>confdefs.h <<\_ACEOF 26741 cat >>confdefs.h <<\_ACEOF
26740 #define HAVE_XPM 1 26742 #define HAVE_XPM 1
26741 _ACEOF 26743 _ACEOF
26742 26744
26743 LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi 26745 LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
26744 libs_x="-lXpm $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi 26746 libs_x=""$libname_xpm" $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \""$libname_xpm"\" to \$libs_x"; fi
26745 CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi 26747 CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
26746 XE_CFLAGS=""$incpath_xpm" $XE_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$XE_CFLAGS"; fi 26748 XE_CFLAGS=""$incpath_xpm" $XE_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$XE_CFLAGS"; fi
26747 { echo "$as_me:$LINENO: checking for \"FOR_MSW\" xpm" >&5 26749 { echo "$as_me:$LINENO: checking for \"FOR_MSW\" xpm" >&5
26748 echo $ECHO_N "checking for \"FOR_MSW\" xpm... $ECHO_C" >&6; } 26750 echo $ECHO_N "checking for \"FOR_MSW\" xpm... $ECHO_C" >&6; }
26749 xe_check_libs=-lXpm 26751 xe_check_libs="$libname_xpm"
26750 cat >conftest.$ac_ext <<_ACEOF 26752 cat >conftest.$ac_ext <<_ACEOF
26751 /* confdefs.h. */ 26753 /* confdefs.h. */
26752 _ACEOF 26754 _ACEOF
26753 cat confdefs.h >>conftest.$ac_ext 26755 cat confdefs.h >>conftest.$ac_ext
26754 cat >>conftest.$ac_ext <<_ACEOF 26756 cat >>conftest.$ac_ext <<_ACEOF