wmail: check for libdockapp/dockapp.h and fall back to dockapp.h.
This commit is contained in:
		
							parent
							
								
									46cd3297ae
								
							
						
					
					
						commit
						0a852e2639
					
				
					 2 changed files with 6 additions and 2 deletions
				
			
		| 
						 | 
					@ -13,10 +13,10 @@ PKG_CHECK_MODULES([dockapp], [dockapp])
 | 
				
			||||||
dnl Checks for header files.
 | 
					dnl Checks for header files.
 | 
				
			||||||
AC_HEADER_DIRENT
 | 
					AC_HEADER_DIRENT
 | 
				
			||||||
AC_HEADER_STDC
 | 
					AC_HEADER_STDC
 | 
				
			||||||
AC_CHECK_HEADERS(limits.h strings.h sys/time.h)
 | 
					AC_CHECK_HEADERS([limits.h strings.h sys/time.h])
 | 
				
			||||||
CPPFLAGS_old="$CPPFLAGS"
 | 
					CPPFLAGS_old="$CPPFLAGS"
 | 
				
			||||||
CPPFLAGS="$CPPFLAGS $dockapp_CFLAGS $X11_CFLAGS"
 | 
					CPPFLAGS="$CPPFLAGS $dockapp_CFLAGS $X11_CFLAGS"
 | 
				
			||||||
AC_CHECK_HEADER(dockapp.h)
 | 
					AC_CHECK_HEADERS([libdockapp/dockapp.h dockapp.h])
 | 
				
			||||||
CPPFLAGS="$CPPFLAGS_old"
 | 
					CPPFLAGS="$CPPFLAGS_old"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
dnl Checks for typedefs, structures, and compiler characteristics.
 | 
					dnl Checks for typedefs, structures, and compiler characteristics.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -56,7 +56,11 @@
 | 
				
			||||||
#include <sys/stat.h>
 | 
					#include <sys/stat.h>
 | 
				
			||||||
#include <dirent.h>
 | 
					#include <dirent.h>
 | 
				
			||||||
#include <X11/Xlib.h>
 | 
					#include <X11/Xlib.h>
 | 
				
			||||||
 | 
					#ifdef HAVE_LIBDOCKAPP_DOCKAPP_H
 | 
				
			||||||
#include <libdockapp/dockapp.h>
 | 
					#include <libdockapp/dockapp.h>
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
					#include <dockapp.h>
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "common.h"
 | 
					#include "common.h"
 | 
				
			||||||
#include "config.h"
 | 
					#include "config.h"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue