[Qemacs-commit] qemacs configure Makefile tty.c

[Charlie Gordon]

CVSROOT:        /cvsroot/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        08/04/13 23:44:39

Modified files:
        .              : configure Makefile tty.c 

Log message:
        fixed some BSD build issues

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/configure?cvsroot=qemacs&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/qemacs/Makefile?cvsroot=qemacs&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/qemacs/tty.c?cvsroot=qemacs&r1=1.45&r2=1.46

Patches:
Index: configure
===================================================================
RCS file: /cvsroot/qemacs/qemacs/configure,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- configure   5 Apr 2008 23:30:31 -0000       1.12
+++ configure   13 Apr 2008 23:44:39 -0000      1.13
@@ -41,6 +41,7 @@
     ;;
 esac
 
+unlockio="no"
 gprof="no"
 network="yes"
 win32="no"
@@ -86,12 +87,15 @@
   BSD/OS)
     extralibs="-lpoll -lgnugetopt -lm"
     make="gmake"
+    doc="no"
+    plugins="no"
     ;;
   CYGWIN*)
     cygwin="yes"
     ;;
   *)
     extralibs="-lm"
+    unlockio="yes"
     ;;
 esac
 
@@ -409,6 +413,10 @@
   echo "WORDS_BIGENDIAN=yes" >> config.mak
   echo "#define WORDS_BIGENDIAN 1" >> $TMPH
 fi
+if test "$unlockio" = "yes" ; then
+  echo "CONFIG_UNLOCKIO=yes" >> config.mak
+  echo "#define CONFIG_UNLOCKIO 1" >> $TMPH
+fi
 if test "$gprof" = "yes" ; then
   echo "TARGET_GPROF=yes" >> config.mak
   echo "#define HAVE_GPROF 1" >> $TMPH

Index: Makefile
===================================================================
RCS file: /cvsroot/qemacs/qemacs/Makefile,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- Makefile    12 Apr 2008 12:37:07 -0000      1.39
+++ Makefile    13 Apr 2008 23:44:39 -0000      1.40
@@ -159,7 +159,7 @@
 all: $(TARGETLIBS) $(TARGETS)
 
 libqhtml: force
-       make -C libqhtml all
+       $(MAKE) -C libqhtml all
 
 qe_g$(EXE): $(OBJS) $(DEP_LIBS)
        $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
@@ -169,7 +169,7 @@
        cp $< $@
        -$(STRIP) $@
        @ls -l $@
-       echo `size address@hidden `wc --bytes address@hidden qe $(OPTIONS) \
+       echo `size address@hidden `wc -c address@hidden qe $(OPTIONS) \
                | cut -d ' ' -f 7-10,13,15-40 >> STATS
 
 #
@@ -183,7 +183,7 @@
        cp $< $@
        -$(STRIP) $@
        @ls -l $@
-       echo `size address@hidden `wc --bytes address@hidden tqe $(OPTIONS) \
+       echo `size address@hidden `wc -c address@hidden tqe $(OPTIONS) \
                | cut -d ' ' -f 7-10,13,15-40 >> STATS
 
 tqe.o: qe.c qe.h qestyles.h qeconfig.h config.h config.mak Makefile
@@ -323,7 +323,7 @@
 
 # autotest target
 test:
-       make -C tests test
+       $(MAKE) -C tests test
 
 # documentation
 qe-doc.html: qe-doc.texi Makefile
@@ -333,7 +333,7 @@
 # Maintenance targets
 #
 clean:
-       make -C libqhtml clean
+       $(MAKE) -C libqhtml clean
        rm -f *~ *.o *.a *.exe *_g TAGS gmon.out core *.exe.stackdump \
            qe qfribidi kmaptoqe ligtoqe html2png fbftoqe fbffonts.c \
            cptoqe jistoqe allmodules.txt basemodules.txt '.#'*[0-9]
@@ -342,6 +342,7 @@
        rm -f config.h config.mak
 
 install: $(TARGETS) qe.1
+       install -d $(prefix)/{bin,man/man1,share}
        install -m 755 qe$(EXE) $(prefix)/bin/qemacs$(EXE)
        ln -sf qemacs $(prefix)/bin/qe$(EXE)
 ifdef CONFIG_FFMPEG

Index: tty.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/tty.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- tty.c       12 Apr 2008 19:26:05 -0000      1.45
+++ tty.c       13 Apr 2008 23:44:39 -0000      1.46
@@ -42,7 +42,7 @@
 #define TTYCHAR_GETBG(cc)   (((cc) >> 24) & 0xFF)
 #define TTYCHAR_DEFAULT     TTYCHAR(' ', 7, 0)
 
-#if defined(__GNUC__) && !defined(CONFIG_CYGWIN)
+#if defined(CONFIG_UNLOCKIO)
 #  define TTY_PUTC(c,f)         putc_unlocked(c, f)
 #  define TTY_FWRITE(b,s,n,f)   fwrite_unlocked(b, s, n, f)
 #  define TTY_FPRINTF           fprintf