| |
| |
| @@ -92,5 +92,5 @@ |
| extern int _Xmblen(char const *, size_t); |
| #else |
| /* This is different from the header but matches mblen() */ |
| -extern int _Xmblen(char *, size_t); |
| +extern int _Xmblen(char *, int); |
| #endif |
| |
| |
| @@ -2692,7 +2692,7 @@ |
| $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@ |
| |
| auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in |
| - CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh |
| + CC="$(CC) $(OSDEF_CFLAGS) -I$(PKG_PREFIX)/include" srcdir=$(srcdir) sh $(srcdir)/osdef.sh |
| |
| auto/pathdef.c: Makefile auto/config.mk |
| -@echo creating $@ |
| |
| |
| @@ -2603,7 +2603,7 @@ |
| ## -------------------- ## |
| |
| ac_ext=c |
| -ac_cpp='$CPP $CPPFLAGS' |
| +ac_cpp='$CPP $CFLAGS $CPPFLAGS' |
| ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| @@ -7607,6 +7607,7 @@ |
| |
| # Standard set of common directories for X headers. |
| # Check X11 before X11Rn because it is often a symlink to the current release. |
| +if test -z "$ac_x_header_dirs"; then |
| ac_x_header_dirs=' |
| /usr/X11/include |
| /usr/X11R7/include |
| @@ -7645,6 +7646,7 @@ |
| |
| /usr/openwin/include |
| /usr/openwin/share/include' |
| +fi |
| |
| if test "$ac_x_includes" = no; then |
| # Guess where to find include files, by looking for Xlib.h. |
| @@ -9488,7 +9490,7 @@ |
| |
| |
| |
| - |
| +SKIP_MOTIF=YES |
| if test -z "$SKIP_MOTIF"; then |
| gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX" |
| GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`" |