[Qemacs-commit] qemacs Makefile configure

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        16/12/28 02:39:46

Modified files:
        .              : Makefile configure 

Log message:
        build: fix X11 rules on OpenBSD
        - applied patch by Han Boetes
        - scan standard places for X11 includes and libraries
        - do not link with -ld on OpenBSD

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/Makefile?cvsroot=qemacs&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/qemacs/configure?cvsroot=qemacs&r1=1.26&r2=1.27

Patches:
Index: Makefile
===================================================================
RCS file: /sources/qemacs/qemacs/Makefile,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- Makefile    27 Dec 2016 11:40:42 -0000      1.92
+++ Makefile    28 Dec 2016 07:39:45 -0000      1.93
@@ -171,7 +171,7 @@
   ifdef CONFIG_XSHM
     XLIBS += -lXext
   endif
-  XLIBS += -lX11 -ldl
+  XLIBS += -lX11 $(DLLIBS)
   XLDFLAGS := $(LDFLAGS)
   ifdef CONFIG_DARWIN
     XLDFLAGS += -L/opt/X11/lib/

Index: configure
===================================================================
RCS file: /sources/qemacs/qemacs/configure,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- configure   25 Dec 2016 23:32:48 -0000      1.26
+++ configure   28 Dec 2016 07:39:45 -0000      1.27
@@ -110,6 +110,7 @@
     doc="no"
     plugins="no"
     ptsname="no"
+    dllibs=
     ;;
   FreeBSD)
     extralibs="-lm"
@@ -169,34 +170,22 @@
     png="yes"
 fi
 
-if test -f "/usr/include/X11/Xlib.h" ; then
+for x11path in /usr/include/X11 /opt/X11 /usr/X11R6; do
+    if test -f "$x11path/include/X11/Xlib.h" ; then
     x11="yes"
+        x11_libdir="$x11path/lib"
+        x11_includedir="$x11path/include"
+        LDFLAGS="$LDFLAGS -L$x11path/lib"
     html="yes"
-    if test -f "/usr/include/X11/extensions/Xv.h" ; then
+        if test -f "$x11path/include/X11/extensions/Xv.h" ; then
         xv="yes"
     fi
-    if test -f "/usr/include/X11/extensions/Xshm.h" ; then
+        if test -f "$x11path/include/X11/extensions/Xshm.h" ; then
         xshm="yes"
     fi
-fi
-
-if test -d "/opt/X11/lib" ; then
-    x11_libdir="/opt/X11/lib"
-elif test -d "/usr/X11R6/lib" ; then
-    x11_libdir="/usr/X11R6/lib"
-fi
-
-if test -f "/opt/X11/include/X11/Xlib.h" ; then
-    x11="yes"
-    x11_includedir="/opt/X11/include"
-    html="yes"
-    if test -f "/opt/X11/include/X11/extensions/Xv.h" ; then
-        xv="yes"
-    fi
-    if test -f "/opt/X11/include/X11/extensions/Xshm.h" ; then
-        xshm="yes"
+        break
     fi
-fi
+done
 
 if test -z `which texi2html` ; then
     doc="no"