Initial revision

[pf3gnuchains/sourceware.git] / libgui / configure.in

diff --git a/libgui/configure.in b/libgui/configure.in
index b37a2bf..afe79d2 100644 (file)
--- a/libgui/configure.in
+++ b/libgui/configure.in
@@ -4,6 +4,7 @@ AC_INIT(src/subcommand.h)
 AM_INIT_AUTOMAKE(libgui, 0.0)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
+AC_CANONICAL_HOST
 AC_PROG_CC
 AC_EXEEXT
 AC_OBJEXT
@@ -11,11 +12,12 @@ AC_ARG_ENABLE(install-libgui, \
   [  --enable-install-libgui Install libgui.a and library header files])
 AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
 AM_CONDITIONAL(INSTALL_LIBGUI, test x$enable_install_libgui = xyes)
-AC_PROG_RANLIB
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(AR, ar, :)
 
 AC_FUNC_ALLOCA
 AC_HAVE_HEADERS(stddef.h stdlib.h getopt.h unistd.h fcntl.h sys/file.h sys/wait.h string.h strings.h)
-AC_CHECK_FUNCS(raise strdup)
+AC_CHECK_FUNCS(raise)
 
 AC_ARG_ENABLE(ide, [  --enable-ide            Enable IDE support],
 [case "${enableval}" in
@@ -57,6 +59,10 @@ if test x$ide_cv_os_cygwin32 = xyes; then
   ac_win_build="yes"
 fi
 
+if test x"$ac_win_build" = xyes; then
+  LIBGUI_CFLAGS="-DWIN32 $LIBGUI_CFLAGS"
+fi
+
 tmp="`cd $srcdir/library; pwd`"
 if test x"$ac_cv_prog_CC" = xcl ; then
   tmp2="`cygpath --windows $tmp`"
@@ -98,11 +104,8 @@ CYG_AC_PATH_TKH
 CYG_AC_PATH_ITCLCONFIG
 CYG_AC_LOAD_ITCLCONFIG
 
-dnl what is the path to itclsh?
-AC_CANONICAL_HOST
 case ${host} in
 *cygwin*)
-       ITCL_DIR=itcl/itcl/win
         touch ac$$.c
         if ${CC} -c -mwin32 ac$$.c >/dev/null 2>&1; then
             case "$LIBGUI_CFLAGS" in
@@ -112,7 +115,8 @@ case ${host} in
         fi
         rm -f ac$$.o ac$$.c
        ;;
-*)             ITCL_DIR=itcl/itcl/unix ;;
+*)
+       ;;
 esac
 
 AC_SUBST(LIBGUI_CFLAGS) 
@@ -125,7 +129,6 @@ AC_SUBST(TCL_LIBS)
 AC_SUBST(TK_BUILD_LIB_SPEC)
 AC_SUBST(TCL_BUILD_LIB_SPEC)
 AC_SUBST(TK_LIBS)
-AC_SUBST(ITCL_DIR)
 
 AM_CONDITIONAL(TCL_SHARED, test x$TCL_SHARED_BUILD = x1)