diff options
| author | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2009-10-10 06:16:23 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2009-10-10 06:16:23 +0200 |
| commit | 69a2548913619eb81dcb6c03e27585e02fe057cd (patch) | |
| tree | 21fd934d184d8de3e0f58de8f9299da98cd2fe2e /configure.in | |
| parent | 9e6ed416e3368b23c867e54dd2f7cc18f75a1c6e (diff) | |
| download | librcc-69a2548913619eb81dcb6c03e27585e02fe057cd.tar.gz librcc-69a2548913619eb81dcb6c03e27585e02fe057cd.tar.bz2 librcc-69a2548913619eb81dcb6c03e27585e02fe057cd.tar.xz librcc-69a2548913619eb81dcb6c03e27585e02fe057cd.zip | |
Support systems without lockf (OpenSolaris), check GTK1 headers in configure.in, complain on missing macros in autogen.sh, patches by Ivan Borzenkov and Colin Watson for eglibc compatibility
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 4e6b9e7..a430e3c 100644 --- a/configure.in +++ b/configure.in @@ -28,7 +28,7 @@ AC_SUBST(LIBRCC_CVS) AC_SUBST(LIBRCC_CVS_DATE) AM_INIT_AUTOMAKE($PACKAGE, $VERSION) - +AC_CONFIG_MACRO_DIR([m4]) AC_PROG_CC AM_PROG_CC_C_O @@ -54,6 +54,10 @@ AC_PATH_PROG(RM, rm, /bin/rm) AC_PATH_PROG(MV, mv, /bin/mv) AC_PATH_PROG(TAR, tar, /bin/tar) +dnl Fixing ugly libtool, see for details +dnl http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523750 +RM="$RM -f" + dnl Checks for header files. AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR(Missing iconv header)]) AC_CHECK_HEADERS(mntent.h pwd.h sys/types.h sys/stat.h sys/file.h sys/socket.h sys/un.h sys/time.h sys/select.h sys/wait.h signal.h unistd.h fcntl.h) @@ -81,16 +85,25 @@ dnl *** dnl *** GTK1 (Optional) dnl *** AC_PATH_PROG(GTK_CONFIG, gtk-config, no) -AM_CONDITIONAL(HAVE_GTK, [ test $GTK_CONFIG != no ]) if test $GTK_CONFIG = no; then - GTK1_LIBS="" - GTK1_INCLUDES="" HAVE_GTK=no else GTK1_LIBS="\`gtk-config --libs\`" GTK1_INCLUDES="\`gtk-config --cflags\`" - HAVE_GTK=yes + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS `gtk-config --cflags`" + AC_CHECK_HEADER([gtk/gtk.h], [HAVE_GTK=yes], [HAVE_GTK=no]) + CFLAGS=$saved_CFLAGS fi + +AM_CONDITIONAL(HAVE_GTK, [ test $HAVE_GTK = yes ]) + +if test $HAVE_GTK = no; then + GTK1_LIBS="" + GTK1_INCLUDES="" +fi + AC_SUBST(GTK1_LIBS) AC_SUBST(GTK1_INCLUDES) @@ -361,7 +374,7 @@ dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST dnl Checks for library functions. -AC_CHECK_FUNCS(strcasecmp strncasecmp strdup strnlen) +AC_CHECK_FUNCS(strcasecmp strncasecmp strdup strnlen flock lockf) AC_OUTPUT(src/Makefile engines/Makefile external/Makefile ui/Makefile examples/Makefile Makefile librcc.spec) |