dwindows: configure.in annotate

annotate configure.in @ 456:935436731b41

Hybrid fix, seems the last change illiminated some important code that dealt with varying padding sizes in the opposite direction of the box. This readds that code but optimizes it and includes the groupbox calculations that were already present in the previous code path. This fix will be added to the OS/2 tree as well pending testing of this new code path.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 25 Jun 2003 03:39:44 +0000
parents	062ed9ddf3af
children	9e81f23b57ae

rev	line source
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1 AC_INIT(winmain.c)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2 AC_CONFIG_HEADER(config.h)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3
186 4c4e94a63748 Change DW version to 1.0.0. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 121 diff changeset	4 DW_MAJOR_VERSION=1
4c4e94a63748 Change DW version to 1.0.0. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 121 diff changeset	5 DW_MINOR_VERSION=0
80 5e4730c42014 Added dw-config script to solve build problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	6 DW_SUB_VERSION=0
5e4730c42014 Added dw-config script to solve build problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	7
412 a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	8 DW_SRC=gtk
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	9 DW_DEFINE=__UNIX__
430 636a8a19f6c8 Condifure and Makefile changes for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 412 diff changeset	10 SHAREDFLAG=-shared
434 062ed9ddf3af Shared library updates for MacOS X. Suffix should be dylib, and linker bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 430 diff changeset	11 SOSUFFIX=so
80 5e4730c42014 Added dw-config script to solve build problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	12 AC_SUBST(DW_MAJOR_VERSION)
5e4730c42014 Added dw-config script to solve build problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	13 AC_SUBST(DW_MINOR_VERSION)
5e4730c42014 Added dw-config script to solve build problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	14 AC_SUBST(DW_SUB_VERSION)
5e4730c42014 Added dw-config script to solve build problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	15
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	16 INCLUDES="-I."
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	17
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	18 AC_PROG_CC
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	19
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	20 AC_CHECK_PROG(MAKE, gmake, gmake)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	21 if test x"$MAKE" = x; then
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	22 AC_CHECK_PROG(MAKE, make, make)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	23 fi
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	24
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	25 AC_PROG_INSTALL
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	26
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	27 AC_SUBST(MAKE)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	28
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	29 AC_HEADER_STDC
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	30 AC_HEADER_DIRENT
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	31 AC_CHECK_HEADERS(unistd.h)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	32 AC_CHECK_HEADERS(sys/stat.h)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	33
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	34 AC_CHECK_FUNCS(pipe, AC_DEFINE(HAVE_PIPE,1,Determine whether we have the pipe function))
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	35
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	36 AC_CHECK_FUNCS(connect)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	37 if test x"$ac_cv_func_connect" = x"no"; then
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	38 if test -z "$libsocket"; then
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	39 AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket",)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	40 fi
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	41
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	42 dnl this is for isc. need the nsl_s library as well.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	43 if test -z "$libinet"; then
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	44 AC_CHECK_LIB(inet, socket, libnsl=1; LIBS="$LIBS -linet -lnsl_s",)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	45 fi
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	46
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	47 if test -z "$libnsl"; then
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	48 AC_CHECK_LIB(nsl, gethostname, LIBS="$LIBS -lnsl",)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	49 fi
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	50 fi
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	51
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	52 AC_CHECK_LIB(sun, getpwnam, LIBS="$LIBS -lsun",)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	53 AC_CHECK_LIB(dgc, inet_addr, LIBS="$LIBS -ldgc",)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	54 AC_CHECK_LIB(resolv, gethostbyname, LIBS="$LIBS -lresolv",)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	55
412 a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	56 OPSYSTEM=`uname -s`
251 18ecaae9cc3b Changed configure to make sure we find gtk 2.0, and not just pkg-config, bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 186 diff changeset	57
412 a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	58 if test $OPSYSTEM = "Darwin"; then
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	59 DW_SRC=mac
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	60 DW_DEFINE=__MAC__
434 062ed9ddf3af Shared library updates for MacOS X. Suffix should be dylib, and linker bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 430 diff changeset	61 SHAREDFLAG=-dynamiclib
062ed9ddf3af Shared library updates for MacOS X. Suffix should be dylib, and linker bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 430 diff changeset	62 SOSUFFIX=dylib
430 636a8a19f6c8 Condifure and Makefile changes for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 412 diff changeset	63 LIBS="$LIBS -framework Carbon"
120 7d2108cbcd3e Porting DW to GTK 2.0... and changed the percent value from into to a float bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 80 diff changeset	64 else
412 a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	65 AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config)
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	66 if test x"$PKG_CFG" != x; then
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	67 GTK_LIBS=`$PKG_CFG --silence-errors --libs gtk+-2.0 gthread-2.0`
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	68 fi
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	69
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	70 if test x"$GTK_LIBS" = x; then
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	71 AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GLIB: Is glib-config in path?)))
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	72 AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)), gthread)
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	73 AM_PATH_GDK_IMLIB(1.9.4, AC_DEFINE(USE_IMLIB), AC_MSG_ERROR(IMLIB not found or too old. Dynamic Windows cannot build without it.))
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	74 else
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	75 GTK_CFLAGS=`$PKG_CFG --cflags gtk+-2.0 gthread-2.0`
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	76 GTK_LIBS=`$PKG_CFG --libs gtk+-2.0 gthread-2.0`
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	77 fi
120 7d2108cbcd3e Porting DW to GTK 2.0... and changed the percent value from into to a float bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 80 diff changeset	78 fi
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	79
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	80 AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([pthread header not found. Dynamic Windows cannot build without it.]))
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	81 AC_CHECK_LIB(pthread, pthread_attr_init, PTHREAD_LIBS="-lpthread",
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	82 AC_CHECK_LIB(pthreads, pthread_attr_init, PTHREAD_LIBS="-lpthreads",
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	83 AC_CHECK_LIB(c_r, pthread_attr_init, PTHREAD_LIBS="-lc_r",
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	84 AC_MSG_ERROR(pthread library not found. HandyFTP cannot build without it.
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	85 )
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	86 )
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	87 )
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	88 )
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	89
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	90 CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS"
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	91 LIBS="$LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS"
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	92
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	93 RM="rm -f"
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	94 LN="ln -s"
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	95 CP="cp"
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	96 MV="mv"
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	97 MKDIR="mkdir"
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	98
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	99
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	100 AC_SUBST(INCLUDES)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	101 AC_SUBST(RM)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	102 AC_SUBST(LN)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	103 AC_SUBST(CP)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	104 AC_SUBST(MV)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	105 AC_SUBST(MKDIR)
430 636a8a19f6c8 Condifure and Makefile changes for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 412 diff changeset	106 AC_SUBST(SHAREDFLAG)
434 062ed9ddf3af Shared library updates for MacOS X. Suffix should be dylib, and linker bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 430 diff changeset	107 AC_SUBST(SOSUFFIX)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	108
412 a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	109 AC_SUBST(DW_SRC)
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	110 AC_SUBST(DW_DEFINE)
a8015e02b590 Initial configure support for MacOS X. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 251 diff changeset	111
80 5e4730c42014 Added dw-config script to solve build problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	112 AC_CONFIG_FILES([
5e4730c42014 Added dw-config script to solve build problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	113 Makefile
5e4730c42014 Added dw-config script to solve build problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	114 dw-config ])
5e4730c42014 Added dw-config script to solve build problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	115 AC_OUTPUT

Mercurial > dwindows

annotate configure.in @ 456:935436731b41