summaryrefslogtreecommitdiff
blob: 9ca89bd2bd3c11bead8c1a0bb3347487d15fafd8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
--- configure.ac~	2009-06-11 04:40:18.000000000 +0200
+++ configure.ac	2009-06-18 21:32:55.000000000 +0200
@@ -119,9 +119,11 @@
 if test "$enable_3rdparty" = "yes"; then
 	CPPFLAGS_3RDPARTY="-I\$(top_srcdir)/3rdparty -I\$(top_srcdir)/3rdparty/xylib" 
 	XYLIB_LDADD="\$(top_builddir)/3rdparty/xylib/xylib/libxy.la"
+	DIR_3RDPARTY=3rdparty
 else
 	CPPFLAGS_3RDPARTY=
         XYLIB_LDADD="-lxy"
+	DIR_3RDPARTY=
 fi
 
 
@@ -185,6 +187,7 @@
 AC_SUBST(PYBINDINGDIR)
 AC_SUBST(CPPFLAGS_3RDPARTY)
 AC_SUBST(XYLIB_LDADD)
+AC_SUBST(DIR_3RDPARTY)
 AC_SUBST(LIBRARY_VERSION_FLAG)
 
 # check for erf and erfc function
--- Makefile.am~	2009-06-10 13:28:40.000000000 +0200
+++ Makefile.am	2009-06-18 21:43:32.000000000 +0200
@@ -6,6 +6,7 @@
 	     macosx/fityk.icns
 AUTOMAKE_OPTIONS = dist-bzip2
 SUBDIRS = @DOC@ 3rdparty src samples config @PYBINDINGDIR@
+SUBDIRS = @DOC@ @DIR_3RDPARTY@ src samples config @PYBINDINGDIR@
 
 icondir = $(datadir)/pixmaps
 desktopdir = $(datadir)/applications