File: get-orig-source_patch

package info (click to toggle)
aeskulap 0.2.2b1-11
  • links: PTS, VCS
  • area: main
  • in suites: wheezy
  • size: 4,164 kB
  • sloc: sh: 8,940; cpp: 8,849; ansic: 496; makefile: 316
file content (125 lines) | stat: -rw-r--r-- 3,709 bytes parent folder | download | duplicates (5)
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
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
diff -ubrN aeskulap-0.2.2-beta1.orig/configure.in aeskulap-0.2.2-beta1/configure.in
--- aeskulap-0.2.2-beta1.orig/configure.in	2007-05-24 20:59:09.000000000 +0200
+++ aeskulap-0.2.2-beta1/configure.in	2007-11-12 23:03:37.000000000 +0100
@@ -30,7 +30,6 @@
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
-
 if test x"$MINGW32" = xno ; then
 AM_BINRELOC
 else
@@ -80,6 +79,7 @@
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
+
 if test x"$MINGW32" = xno ; then
 
 PKG_CHECK_MODULES(GCONFMM, gconfmm-2.6 >= 2.10.0)
@@ -95,32 +95,16 @@
 fi
 
 
-dnl AC_CONFIG_SUBDIRS(dcmtk)
-
-if test x"$MINGW32" = xyes ; then
-
-DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
-DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lwsock32"
-
-else
-
-DCMJPEG_LIBS="-L../dcmtk/dcmjpeg/libijg8 -L../dcmtk/dcmjpeg/libijg12 -L../dcmtk/dcmjpeg/libijg16 -lijg8 -lijg12 -lijg16"
-AC_SUBST(DCMJPEG_LIBS)
-
-DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(top_srcdir)/dcmtk/config/include -I\$(top_srcdir)/dcmtk/ofstd/include -I\$(top_srcdir)/dcmtk/dcmdata/include -I\$(top_srcdir)/dcmtk/dcmnet/include -I\$(top_srcdir)/dcmtk/dcmimage/include -I\$(top_srcdir)/dcmtk/dcmimgle/include -I\$(top_srcdir)/dcmtk/dcmjpeg/include"
-DCMTK_LIBS="-L../dcmtk/ofstd/libsrc \
--L../dcmtk/dcmdata/libsrc \
--L../dcmtk/dcmnet/libsrc \
--L../dcmtk/dcmjpeg/libsrc \
--L../dcmtk/dcmimage/libsrc \
--L../dcmtk/dcmimgle/libsrc \
-\$(DCMJPEG_LIBS) -ldcmjpeg -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lrt -lpthread"
-
-fi
+dnl use Debian packages dcmtk
+dnl AC_CHECK_LIB(dcmimage)
+AC_CHECK_HEADER(dcmtk/config/osconfig.h)
 
 AC_SUBST(DCMTK_CFLAGS)
 AC_SUBST(DCMTK_LIBS)
 
+DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
+DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lwrap"
+
 dnl set PREFIX
 if test "x${prefix}" = "xNONE"; then
     packageprefix=${ac_default_prefix}
@@ -128,16 +112,13 @@
     packageprefix=${prefix}
 fi
 
-DCMTK_SUBDIR=""
 if test x"$MINGW32" = xno ; then
-DCMTK_SUBDIR="dcmtk"
 LDFLAGS_AESKULAP_LIBS="-Wl,-rpath,${prefix}/lib/aeskulap -avoid-version"
 else
 LDFLAGS_MINGW32="-mwindows"
 LDFLAGS_AESKULAP_LIBS="-avoid-version -no-undefined"
 fi
 
-AC_SUBST(DCMTK_SUBDIR)
 AC_SUBST(LDFLAGS_MINGW32)
 AC_SUBST(LDFLAGS_AESKULAP_LIBS)
 
@@ -160,12 +141,3 @@
 packaging/win32/aeskulap.iss
 ])
 
-
-if test x"$MINGW32" = xno ; then
-
-cd $srcdir/dcmtk
-export CFLAGS="$CFLAGS"
-export CXXFLAGS="$CXXFLAGS"
-sh ./configure --without-openssl --without-zlib --without-libwrap --prefix=${prefix} --libdir=${prefix}/lib/aeskulap
-
-fi
diff -ubrN aeskulap-0.2.2-beta1.orig/Makefile.am aeskulap-0.2.2-beta1/Makefile.am
--- aeskulap-0.2.2-beta1.orig/Makefile.am	2007-05-24 21:19:55.000000000 +0200
+++ aeskulap-0.2.2-beta1/Makefile.am	2007-11-07 07:23:00.000000000 +0100
@@ -1,6 +1,5 @@
 SUBDIRS = \
 	po \
-	$(DCMTK_SUBDIR) \
 	configuration \
 	imagepool \
 	widgets \
@@ -21,7 +20,6 @@
 	AUTHORS \
 	COPYING \
 	COPYING.LIB \
-	COPYING.DCMTK \
 	INSTALL \
 	README \
 	aeskulap.cbp \
@@ -39,18 +37,7 @@
 
 @INTLTOOL_DESKTOP_RULE@
 
-dist-hook:
-	mkdir -p $(distdir)/dcmtk
-	cp -Rf $(top_srcdir)/dcmtk/* $(distdir)/dcmtk
-	cd $(distdir)/dcmtk && make distclean
-	list=`find $(distdir)/dcmtk -name "CVS"` && rm -Rf $$list
-	list=`find $(distdir)/dcmtk -name ".cvsignore"` && rm -f $$list
-	list=`find $(distdir)/dcmtk -name ".#*"` && rm -f $$list
-	list=`find $(distdir)/dcmtk -name "*.a"` && rm -f $$list
-	list=`find $(distdir)/dcmtk -name "*.so"` && rm -f $$list
-
 distclean: distclean-recursive
-	if test x"" != "x" ; then cd ./dcmtk && make distclean ; fi
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -f Makefile