Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 92758 | Differences between
and this patch

Collapse All | Expand All

(-)sandbox/anjuta-2.0.0/configure.in (-216 / +248 lines)
Lines 17-35 Link Here
17
GNOME_PRINT_UI_REQUIRED=2.4.0
17
GNOME_PRINT_UI_REQUIRED=2.4.0
18
GNOME_VFS_REQUIRED=2.6.0
18
GNOME_VFS_REQUIRED=2.6.0
19
GCONF_REQUIRED=2.6.0
19
GCONF_REQUIRED=2.6.0
20
BONOBO_REQUIRED=2.6.0
20
dnl BONOBO_REQUIRED=2.6.0
21
BONOBO_UI_REQUIRED=2.6.0
21
dnl BONOBO_UI_REQUIRED=2.6.0
22
VTE_REQUIRED=0.7.0
22
VTE_REQUIRED=0.7.0
23
VTE_NEW_REQUIRED=0.9.0
23
VTE_NEW_REQUIRED=0.9.0
24
LIBXML_REQUIRED=2.4.23
24
LIBXML_REQUIRED=2.4.23
25
PANGO_REQUIRED=1.1.1
25
PANGO_REQUIRED=1.1.1
26
PCRE_REQUIRED=3.9
26
PCRE_REQUIRED=3.9
27
LIBDEVHELP_REQUIRED=0.9
27
LIBDEVHELP_REQUIRED=0.9
28
LIBGTODO_REQUIRED=0.15
29
GDL_REQUIRED=0.5.0
28
GDL_REQUIRED=0.5.0
30
GNOMEBUILD_REQUIRED=0.1.1
29
GNOMEBUILD_REQUIRED=0.1.1
31
LIBGLADEUI_REQUIRED=3.0.0
30
LIBGLADEUI_REQUIRED=3.0.0
32
LIBGRAPHVIZ_REQUIRED=2.2.1
31
LIBGRAPHVIZ_REQUIRED=2.2.1
32
NEON_REQUIRED=0.24.5
33
SUBVERSION_REQUIRED=1.0.2
34
35
dnl LIBGTODO_REQUIRED=0.15
33
36
34
AC_SUBST(GLIB_REQUIRED)
37
AC_SUBST(GLIB_REQUIRED)
35
AC_SUBST(GOBJECT_REQUIRED)
38
AC_SUBST(GOBJECT_REQUIRED)
Lines 44-108 Link Here
44
AC_SUBST(GNOME_PRINT_UI_REQUIRED)
47
AC_SUBST(GNOME_PRINT_UI_REQUIRED)
45
AC_SUBST(GNOME_VFS_REQUIRED)
48
AC_SUBST(GNOME_VFS_REQUIRED)
46
AC_SUBST(GCONF_REQUIRED)
49
AC_SUBST(GCONF_REQUIRED)
47
AC_SUBST(BONOBO_REQUIRED)
50
dnl AC_SUBST(BONOBO_REQUIRED)
48
AC_SUBST(BONOBO_UI_REQUIRED)
51
dnl AC_SUBST(BONOBO_UI_REQUIRED)
49
AC_SUBST(VTE_REQUIRED)
52
AC_SUBST(VTE_REQUIRED)
50
AC_SUBST(LIBXML_REQUIRED)
53
AC_SUBST(LIBXML_REQUIRED)
51
AC_SUBST(PANGO_REQUIRED)
54
AC_SUBST(PANGO_REQUIRED)
52
AC_SUBST(VTE_NEW_REQUIRED)
55
AC_SUBST(VTE_NEW_REQUIRED)
53
AC_SUBST(PCRE_REQUIRED)
56
AC_SUBST(PCRE_REQUIRED)
54
AC_SUBST(LIBDEVHELP_REQUIRED)
57
AC_SUBST(LIBDEVHELP_REQUIRED)
55
AC_SUBST(LIBGTODO_REQUIRED)
56
AC_SUBST(GDL_REQUIRED)
58
AC_SUBST(GDL_REQUIRED)
57
AC_SUBST(GNOMEBUILD_REQUIRED)
59
AC_SUBST(GNOMEBUILD_REQUIRED)
58
AC_SUBST(LIBGLADEUI_REQUIRED)
60
AC_SUBST(LIBGLADEUI_REQUIRED)
59
AC_SUBST(LIBGRAPHVIZ_REQUIRED)
61
AC_SUBST(LIBGRAPHVIZ_REQUIRED)
62
AC_SUBST(NEON_REQUIRED)
63
AC_SUBST(SUBVERSION_REQUIRED)
64
65
dnl AC_SUBST(LIBGTODO_REQUIRED)
60
66
61
AM_INIT_AUTOMAKE(anjuta, $ANJUTA_VERSION)
67
AM_INIT_AUTOMAKE(anjuta, $ANJUTA_VERSION)
62
AM_CONFIG_HEADER(config.h)
68
AM_CONFIG_HEADER(config.h)
69
AM_MAINTAINER_MODE
63
70
64
CFLAGS_WARNINGS="-Wall -Wmissing-prototypes -Wmissing-declarations -Wparentheses -Wpointer-arith"
71
CFLAGS_WARNINGS="-Wall -Wmissing-prototypes -Wmissing-declarations -Wparentheses -Wpointer-arith"
65
CFLAGS_DISABLE_CHECKS="-DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
72
CXXFLAGS_WARNINGS="-Wall -Wparentheses -Wpointer-arith"
66
CFLAGS_OPTIMIZE="-Os -s"
73
67
CXXFLAGS_OPTIMIZE="-Os -s -fno-exceptions -fno-check-new"
68
if test "x$GCC" = xyes; then
74
if test "x$GCC" = xyes; then
69
    CFLAGS_WARNINGS=""
75
    CFLAGS_WARNINGS=""
70
    CFLAGS_OPTIMIZE=""
76
    CXXFLAGS_WARNINGS=""
71
    CXXFLAGS_OPTIMIZE=""
72
fi
77
fi
73
78
74
CFLAGS="$CFLAGS -O0 -g $CFLAGS_WARNINGS"
79
AM_CFLAGS="$AM_CFLAGS -O0 -g $CFLAGS_WARNINGS"
75
CXXFLAGS="$CXXFLAGS -O0 -g $CFLAGS_WARNINGS"
80
AM_CXXFLAGS="$AM_CXXFLAGS -O0 -g $CXXFLAGS_WARNINGS"
76
81
77
dnl Enable debugging mode
82
dnl Enable debugging mode
78
AC_ARG_ENABLE(debug,
83
AC_ARG_ENABLE(debug,
79
      [  --enable-debug           Enable debug messages],
84
  [  --enable-debug           Enable debug messages],
80
      CFLAGS="$CFLAGS -DDEBUG"
85
  AM_CFLAGS="$AM_CFLAGS -DDEBUG"
81
      CXXFLAGS="$CXXFLAGS -DDEBUG")
86
  AM_CXXFLAGS="$AM_CXXFLAGS -DDEBUG")
82
87
AC_SUBST(AM_CFLAGS)
83
dnl Enable profiling mode
88
AC_SUBST(AM_CXXFLAGS)
84
AC_ARG_ENABLE(gprof,
89
85
      [  --enable-gprof           Enable profiling with gprof],
90
dnl Disable deprecated APIs
86
      CFLAGS="$CFLAGS -pg"
91
AC_ARG_ENABLE(deprecated,
87
      CXXFLAGS="$CXXFLAGS -pg"
92
  [  --disable-deprecated     Disable deprecated APIs],
88
      LDFLAGS="$LDFLAGS -pg")
93
  [ if test "$enableval" = "no"; then
89
94
    DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED"
90
dnl Enable release builds
95
  fi ],
91
AC_ARG_ENABLE(final,
96
  [ DEPRECATED_FLAGS="" ])
92
      [  --enable-final           Build release executables (GCC only)],
97
AC_SUBST(DEPRECATED_FLAGS)
93
      CFLAGS="$CFLAGS"
94
      CXXFLAGS="$CXXFLAGS")
95
96
dnl Enable stripped and fully optimized output
97
AC_ARG_ENABLE(optimize,
98
      [  --enable-optimize           Enable stripped and full optimization],
99
      CFLAGS="$CFLAGS -DNDEBUG ${CFLAGS_OPTIMIZE} ${CFLAGS_DISABLE_CHECKS}"
100
      CXXFLAGS="$CXXFLAGS -DNDEBUG ${CXXFLAGS_OPTIMIZE} ${CFLAGS_DISABLE_CHECKS}")
101
98
102
dnl Enable versioned user preferences directory
99
dnl Enable versioned user preferences directory
103
AC_ARG_WITH(pref-suffix,
100
AC_ARG_WITH(pref-suffix,
104
      [  --with-pref-suffix=VALUE       	Suffix to add to user preferences dir.],
101
  [  --with-pref-suffix=VALUE Suffix to add to user preferences dir.],
105
      PREF_SUFFIX="$withval")
102
  PREF_SUFFIX="$withval")
106
103
107
AC_SUBST(PREF_SUFFIX)
104
AC_SUBST(PREF_SUFFIX)
108
AC_DEFINE_UNQUOTED(PREF_SUFFIX,
105
AC_DEFINE_UNQUOTED(PREF_SUFFIX,
Lines 117-122 Link Here
117
AC_PROG_CXX
114
AC_PROG_CXX
118
AC_ISC_POSIX
115
AC_ISC_POSIX
119
AC_HEADER_STDC
116
AC_HEADER_STDC
117
AM_DISABLE_STATIC
120
AM_PROG_LIBTOOL
118
AM_PROG_LIBTOOL
121
119
122
AC_TYPE_SIGNAL
120
AC_TYPE_SIGNAL
Lines 247-271 Link Here
247
245
248
dnl Check for Glade3
246
dnl Check for Glade3
249
dnl ---------------------
247
dnl ---------------------
250
PKG_CHECK_MODULES(PLUGIN_GLADE, [libgladeui-1.0 >= $LIBGLADEUI_REQUIRED], [libgladeui_found="yes"], [libgladeui_found="no"])
248
249
AC_ARG_ENABLE(plugin-glade,
250
  [  --disable-plugin-glade        Disable glade plugin support in Anjuta.],
251
  [ if test "$enableval" = "no"; then
252
        user_disabled_glade=1
253
    fi ],
254
  [ user_disabled_glade=0 ] )
255
256
AC_MSG_CHECKING(if glade plugin is disabled)
257
if test "$user_disabled_glade" = 1; then
258
	AC_MSG_RESULT(yes)
259
	libgladeui_found="no"
260
else
261
	AC_MSG_RESULT(no)
262
	PKG_CHECK_MODULES(PLUGIN_GLADE, [libgladeui-1.0 >= $LIBGLADEUI_REQUIRED], [libgladeui_found="yes"], [libgladeui_found="no"])
263
	AC_SUBST(PLUGIN_GLADE_CFLAGS)
264
	AC_SUBST(PLUGIN_GLADE_LIBS)
265
fi
266
251
AM_CONDITIONAL(HAVE_PLUGIN_GLADE, [test x$libgladeui_found = xyes])
267
AM_CONDITIONAL(HAVE_PLUGIN_GLADE, [test x$libgladeui_found = xyes])
252
AC_SUBST(PLUGIN_GLADE_CFLAGS)
253
AC_SUBST(PLUGIN_GLADE_LIBS)
254
268
255
dnl Check for graphviz (class inheritance plugin)
269
dnl Check for graphviz (class inheritance plugin)
256
dnl ----------------------------------------------
270
dnl --------------------------------------------------------------------------
257
dnl FIXME: For some strange reason graphviz-devel rpm install the *.pc files
271
dnl FIXME: For some strange reason graphviz-devel rpm install the *.pc files
258
dnl in /usr/lib/graphviz/pkgconfig, instead of usual /usr/lib/pkgconfig. This
272
dnl in /usr/lib/graphviz/pkgconfig, instead of usual /usr/lib/pkgconfig. This
259
dnl makes pkgconfig check fail if we don't add the above path in
273
dnl makes pkgconfig check fail if we don't add the above path in
260
dnl PKG_CONFIG_PATH. We have added both /usr/lib/graphviz/pkgconfig and
274
dnl PKG_CONFIG_PATH. We have added both /usr/lib/graphviz/pkgconfig and
261
dnl /usr/local/lib/pkgconfig paths. If graphviz is installed in other prefix
275
dnl /usr/local/lib/pkgconfig paths. If graphviz is installed in other prefix
262
dnl (other than /usr or /usr/local), following pkgconfig check will fail.
276
dnl (other than /usr or /usr/local or the current installation prefix),
263
dnl ----------------------------------------------
277
dnl following pkgconfig check will fail.
264
PKG_CONFIG_PATH="/usr/local/lib/graphviz/pkgconfig:/usr/lib/graphviz/pkgconfig:$PKG_CONFIG_PATH"
278
dnl --------------------------------------------------------------------------
265
PKG_CHECK_MODULES(PLUGIN_CLASS_INHERITANCE, [libdotneato >= $LIBGRAPHVIZ_REQUIRED libdotgen >= $LIBGRAPHVIZ_REQUIRED], [libgraphviz_found="yes"], [libgraphviz_found="no"])
279
PKG_CONFIG_PATH="/usr/lib/graphviz/pkgconfig:$PKG_CONFIG_PATH"
280
PKG_CONFIG_PATH="/usr/local/lib/graphviz/pkgconfig:$PKG_CONFIG_PATH"
281
PKG_CONFIG_PATH="/usr/lib64/graphviz/pkgconfig:$PKG_CONFIG_PATH"
282
PKG_CONFIG_PATH="/usr/local/lib64/graphviz/pkgconfig:$PKG_CONFIG_PATH"
283
284
anjuta_save_prefix="$prefix"
285
test "x$prefix" = xNONE && prefix=$ac_default_prefix
286
graphviz_pkgconfig=`eval echo ${libdir}/graphviz/pkgconfig`
287
PKG_CONFIG_PATH="$graphviz_pkgconfig:$PKG_CONFIG_PATH"
288
prefix="$anjuta_save_prefix"
289
290
AC_ARG_ENABLE(plugin-class-inheritance,
291
	[ --disable-plugin-class-inheritance		Disable class inheritance graphing plugin support in Anjuta], 
292
	[ if test "$enableval" = "no"; then
293
		user_disabled_inheritance=1
294
	  fi ],
295
	[ user_disabled_inheritance=0 ])
296
297
AC_MSG_CHECKING(if class inheritance plugin is disabled)
298
if test "$user_disabled_inheritance" = 1; then
299
	AC_MSG_RESULT(yes)
300
	libgraphviz_found="no"
301
else
302
	AC_MSG_RESULT(no)
303
   export PKG_CONFIG_PATH
304
	PKG_CHECK_MODULES(PLUGIN_CLASS_INHERITANCE,
305
		[libdotneato >= $LIBGRAPHVIZ_REQUIRED libdotgen >= $LIBGRAPHVIZ_REQUIRED],
306
		[libgraphviz_found="yes"],
307
		[libgraphviz_found="no"])
308
	AC_SUBST(PLUGIN_CLASS_INHERITANCE_CFLAGS)
309
	AC_SUBST(PLUGIN_CLASS_INHERITANCE_LIBS)
310
fi
311
266
AM_CONDITIONAL(HAVE_PLUGIN_CLASS_INHERITANCE, [test x$libgraphviz_found = xyes])
312
AM_CONDITIONAL(HAVE_PLUGIN_CLASS_INHERITANCE, [test x$libgraphviz_found = xyes])
267
AC_SUBST(PLUGIN_CLASS_INHERITANCE_CFLAGS)
268
AC_SUBST(PLUGIN_CLASS_INHERITANCE_LIBS)
269
313
270
dnl Setup Anjuta Library flags
314
dnl Setup Anjuta Library flags
271
dnl --------------------------
315
dnl --------------------------
Lines 310-315 Link Here
310
AC_SUBST(GETTEXT_PACKAGE)
354
AC_SUBST(GETTEXT_PACKAGE)
311
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
355
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
312
AM_GLIB_GNU_GETTEXT
356
AM_GLIB_GNU_GETTEXT
357
AM_GLIB_DEFINE_LOCALEDIR(PACKAGE_LOCALE_DIR)
313
358
314
dnl gtk-doc
359
dnl gtk-doc
315
dnl GTK_DOC_CHECK([1.0])
360
dnl GTK_DOC_CHECK([1.0])
Lines 597-665 Link Here
597
dnl  (stolen from kdevelop ;-)
642
dnl  (stolen from kdevelop ;-)
598
dnl  **********************************************************
643
dnl  **********************************************************
599
644
600
AC_MSG_CHECKING(for svn libraries)
601
602
APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
603
SVN_SUBDIR="svn"
604
AC_ARG_WITH(apr-config,
605
[[  --with-apr-config=FILE    Use the given path to apr-config when determining
606
							APR configuration; defaults to "apr-config"]],
607
[
608
if test "$withval" != "yes" -a "$withval" != ""; then
609
APR_CONFIGS=$withval
610
	fi
611
])
612
AC_MSG_CHECKING([for APR])
613
APR_CONFIG=""
614
for VALUE in $APR_CONFIGS ; do
615
		if $VALUE --cflags > /dev/null; then
616
				APR_CONFIG=$VALUE
617
				break
618
		fi
619
done
620
test $VALUE && APR_CONFIG=$VALUE
621
if test $APR_CONFIG ; then
622
	AC_MSG_RESULT([found])
623
else
624
	AC_MSG_RESULT([not found])
625
		SVN_SUBDIR=
626
dnl    AC_MSG_ERROR([APR is required. Try --with-apr-config.])
627
fi
628
		
629
APR_CFLAGS="`$APR_CONFIG --cflags`"
630
APR_INCLUDE="`$APR_CONFIG --includes`"
631
APR_LIBS="`$APR_CONFIG --link-ld --libs`"
632
633
dnl
634
dnl APR util
635
dnl
636
637
APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config"
638
AC_ARG_WITH(apu-config,
639
[[  --with-apu-config=FILE    Use the given path to apu-config when determining
640
							APR util configuration; defaults to "apu-config"]],
641
[
642
	if test "$withval" != "yes" -a "$withval" != ""; then
643
		APU_CONFIGS=$withval
644
	fi
645
])
646
AC_MSG_CHECKING([for APR util])
647
APU_CONFIG=""
648
for VALUE in $APU_CONFIGS ; do
649
		if $VALUE --includes > /dev/null; then
650
				APU_CONFIG=$VALUE
651
				break
652
		fi
653
done
654
if test $APU_CONFIG ; then
655
	AC_MSG_RESULT([found])
656
else
657
	AC_MSG_RESULT([not found])
658
		SVN_SUBDIR=
659
fi
660
APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
661
APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"
662
663
AC_MSG_CHECKING(for Subversion svn-config)
645
AC_MSG_CHECKING(for Subversion svn-config)
664
AC_ARG_WITH(subversion-dir,
646
AC_ARG_WITH(subversion-dir,
665
		[  --with-subversion-dir=DIR           where Subversion is installed ],
647
		[  --with-subversion-dir=DIR           where Subversion is installed ],
Lines 676-688 Link Here
676
658
677
AC_SUBST(SVNCONFIG)
659
AC_SUBST(SVNCONFIG)
678
if test -x "$SVNCONFIG"; then
660
if test -x "$SVNCONFIG"; then
679
		SVNLD="`$SVNCONFIG --ldflags`"
661
		SVNLD="`$SVNCONFIG --ldflags 2> /dev/null`"
680
		SVN_LIB="`$SVNCONFIG --libs --cflags` -lsvn_client-1"
662
		SVN_LIB="`$SVNCONFIG --libs --cflags 2> /dev/null` -lsvn_client-1"
681
		dnl ugly hack for subversion svn-config problems in 0.14.x, to be removed when svn-config is fixed
663
		dnl ugly hack for subversion svn-config problems in 0.14.x, to be removed when svn-config is fixed
682
		SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
664
		SVN_INCLUDE="`$SVNCONFIG --includes 2> /dev/null` -I$_SVNCONFIG/include/subversion-1/"
683
		AC_MSG_RESULT(yes)
665
		AC_MSG_RESULT(yes)
684
else
666
else
685
		AC_MSG_RESULT(not found)
667
		AC_MSG_RESULT(not found)
668
		
686
		dnl just a fallback to debian's config so that it works for me :)
669
		dnl just a fallback to debian's config so that it works for me :)
687
		AC_ARG_WITH(svn-include,
670
		AC_ARG_WITH(svn-include,
688
								[[  --with-svn-include=DIR   Use the given path to the subversion headers.]],
671
								[[  --with-svn-include=DIR   Use the given path to the subversion headers.]],
Lines 706-712 Link Here
706
				AC_MSG_RESULT([found])
689
				AC_MSG_RESULT([found])
707
		else
690
		else
708
				AC_MSG_RESULT([not found])
691
				AC_MSG_RESULT([not found])
709
				SVN_SUBDIR=
710
		fi
692
		fi
711
		SVN_LIBS="/usr/local/lib /usr/lib"
693
		SVN_LIBS="/usr/local/lib /usr/lib"
712
		AC_ARG_WITH(svn-lib,
694
		AC_ARG_WITH(svn-lib,
Lines 719-725 Link Here
719
		AC_MSG_CHECKING([for Subversion libraries])
701
		AC_MSG_CHECKING([for Subversion libraries])
720
		SVN_LIB=""
702
		SVN_LIB=""
721
		for VALUE in $SVN_LIBS ; do
703
		for VALUE in $SVN_LIBS ; do
722
				if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>1; then
704
				if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>&1; then
723
						SVN_LIB=$VALUE
705
						SVN_LIB=$VALUE
724
						break
706
						break
725
				fi
707
				fi
Lines 728-850 Link Here
728
				AC_MSG_RESULT([found])
710
				AC_MSG_RESULT([found])
729
		else
711
		else
730
				AC_MSG_RESULT([not found])
712
				AC_MSG_RESULT([not found])
731
				SVN_SUBDIR=
732
		fi
713
		fi
733
fi
714
fi
734
715
716
dnl ******************************************************************
717
dnl Check for extra libs required by subversion.
718
dnl FIXME: This should actually be done by subversion and not by us.
719
dnl ******************************************************************
720
721
AC_ARG_ENABLE(plugin-subversion,
722
  [  --disable-plugin-subversion        Disable subversion support in Anjuta.],
723
  [ if test "$enableval" = "no"; then
724
        user_disabled_subversion=1
725
    fi ],
726
  [ user_disabled_subversion=0 ] )
735
727
736
NEON_CONFIGS="neon-config"
728
AC_MSG_CHECKING(if subversion support is disabled)
737
AC_ARG_WITH(neon-config,
729
if test "$user_disabled_subversion" = 1; then
738
[[  --with-neon-config=FILE    Use the given path to neon-config when determining
730
	AC_MSG_RESULT(yes)
739
							Neon configuration; defaults to "neon-config"]],
731
	SVN_INCLUDE=""
740
[
732
	SVN_LIB=""
733
else
734
	AC_MSG_RESULT(no)
735
fi
736
737
if test -n "$SVN_INCLUDE" ; then
738
	dnl ------------------------------------
739
	dnl APR. Required by subversion (devel)
740
	dnl ------------------------------------
741
	
742
	APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
743
	AC_ARG_WITH(apr-config,
744
	[[  --with-apr-config=FILE    Use the given path to apr-config when determining
745
								APR configuration; defaults to "apr-config"]],
746
	[
741
	if test "$withval" != "yes" -a "$withval" != ""; then
747
	if test "$withval" != "yes" -a "$withval" != ""; then
742
		NEON_CONFIGS=$withval
748
	  APR_CONFIGS=$withval
743
	fi
749
	fi
744
])
750
	])
745
AC_MSG_CHECKING([for Neon])
751
	AC_MSG_CHECKING([for APR])
746
NEON_CONFIG=""
752
	APR_CONFIG=""
747
for VALUE in $NEON_CONFIGS ; do
753
	for VALUE in $APR_CONFIGS ; do
748
		if $VALUE --cflags > /dev/null; then
754
			if $VALUE --cflags > /dev/null 2>&1 ; then
749
				NEON_CONFIG=$VALUE
755
					APR_CONFIG=$VALUE
750
				break
756
					break
757
			fi
758
	done
759
	test $VALUE && APR_CONFIG=$VALUE
760
	if test $APR_CONFIG ; then
761
		AC_MSG_RESULT([found])
762
		APR_CFLAGS="`$APR_CONFIG --cflags`"
763
		APR_INCLUDE="`$APR_CONFIG --includes`"
764
		APR_LIBS="`$APR_CONFIG --link-ld --libs`"
765
	else
766
		AC_MSG_RESULT([not found])
767
		dnl AC_MSG_ERROR([APR is required. Try --with-apr-config.])
768
	fi
769
	
770
	dnl -----------------------------------------
771
	dnl APR util. Required by subversion (devel)
772
	dnl------------------------------------------
773
	
774
	APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config"
775
	AC_ARG_WITH(apu-config,
776
	[[  --with-apu-config=FILE    Use the given path to apu-config when determining
777
								APR util configuration; defaults to "apu-config"]],
778
	[
779
		if test "$withval" != "yes" -a "$withval" != ""; then
780
			APU_CONFIGS=$withval
751
		fi
781
		fi
752
done
782
	])
753
if test $NEON_CONFIG ; then
783
	AC_MSG_CHECKING([for APR util])
754
	AC_MSG_RESULT([found])
784
	APU_CONFIG=""
755
else
785
	for VALUE in $APU_CONFIGS ; do
756
	AC_MSG_RESULT([not found])
786
			if $VALUE --includes > /dev/null 2>&1 ; then
757
		SVN_SUBDIR=
787
					APU_CONFIG=$VALUE
788
					break
789
			fi
790
	done
791
	if test $APU_CONFIG ; then
792
		AC_MSG_RESULT([found])
793
		APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
794
		APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"
795
	else
796
		AC_MSG_RESULT([not found])
797
	fi
798
	
799
	dnl -----------------------------------------
800
	dnl NEON. Required by subversion (devel)
801
	dnl------------------------------------------
802
803
	dnl Check for neon. It is required by subversion libs, but for
804
	dnl for some strange reason it's not in it's dependencies.
805
	dnl subversion plugin will be disabled if neon (devel) is not
806
	dnl installed, even if subversion (devel) is installed.
807
808
	NEON_CONFIGS="neon-config"
809
	AC_ARG_WITH(neon-config,
810
	[[  --with-neon-config=FILE    Use the given path to neon-config when determining
811
								Neon configuration; defaults to "neon-config"]],
812
	[
813
		if test "$withval" != "yes" -a "$withval" != ""; then
814
			NEON_CONFIGS=$withval
815
		fi
816
	])
817
	AC_MSG_CHECKING([for Neon])
818
	NEON_CONFIG=""
819
	for VALUE in $NEON_CONFIGS ; do
820
			if $VALUE --cflags > /dev/null 2>&1 ; then
821
					NEON_CONFIG=$VALUE
822
					break
823
			fi
824
	done
825
	if test $NEON_CONFIG ; then
826
		AC_MSG_RESULT([found])
827
	else
828
		AC_MSG_RESULT([not found])
829
		SVN_INCLUDE=""
830
		SVN_LIB=""
831
	fi
758
fi
832
fi
759
833
760
SVN_LIB="-L$SVN_LIB $APR_LIBS -lsvn_client-1"
834
dnl ------------------------------------------
761
SVN_INCLUDE="-I$SVN_INCLUDE $APR_INCLUDE"
835
dnl Finally prepare subversion build flags
762
SVN_CFLAGS="$APR_CFLAGS"
836
dnl ------------------------------------------
837
838
if test -n "$SVN_INCLUDE" ; then
839
	SVN_INCLUDE="-I$SVN_INCLUDE $APR_INCLUDE"
840
	SVN_LIB="-L$SVN_LIB $APR_LIBS -lsvn_client-1"
841
	SVN_CFLAGS="$APR_CFLAGS"
842
fi
763
843
764
AM_CONDITIONAL(BUILD_SVN, [test -n "$SVN_INCLUDE"])
844
AM_CONDITIONAL(BUILD_SVN, [test -n "$SVN_INCLUDE"])
765
766
AC_SUBST(SVN_INCLUDE)
845
AC_SUBST(SVN_INCLUDE)
767
AC_SUBST(SVN_LIB)
846
AC_SUBST(SVN_LIB)
768
AC_SUBST(SVN_CFLAGS)
847
AC_SUBST(SVN_CFLAGS)
769
848
770
dnl ***************************************************************************
849
dnl *********************************************************************
771
dnl Checks for Additional stuffs
850
dnl Set PACKAGE DIRs in config.h
772
dnl ***************************************************************************
851
dnl *********************************************************************
852
853
anjuta_save_prefix="$prefix"
854
anjuta_save_exec_prefix="$exec_prefix"
855
test "x$prefix" = xNONE && prefix=$ac_default_prefix
856
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
773
857
774
dnl Set PACKAGE_LOCALE_DIR in config.h.
775
if test "x${prefix}" = "xNONE"; then
776
  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale", [Package local directory])
777
else
778
  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", [Package local directory])
779
fi
780
781
dnl Set PACKAGE SOURCE DIR in config.h.
782
packagesrcdir=`cd $srcdir && pwd`
858
packagesrcdir=`cd $srcdir && pwd`
783
859
systemdatadir=`eval echo ${datadir}`
784
dnl Set PACKAGE PREFIX
860
packagedatadir=`eval echo ${datadir}/${PACKAGE}`
785
if test "x${prefix}" = "xNONE"; then
861
packagedocdir=`eval echo ${datadir}/doc/${PACKAGE}`
786
  packageprefix=${ac_default_prefix}
862
packageplugindir=`eval echo ${libdir}/${PACKAGE}`
787
else
863
packagepixmapsdir=`eval echo ${datadir}/pixmaps/${PACKAGE}`
788
  packageprefix=${prefix}
864
packagehelpdir=`eval echo ${datadir}/gnome/help/${PACKAGE}`
789
fi
865
packagemenudir=`eval echo ${datadir}/gnome/apps`
790
866
791
dnl Set PACKAGE DATA & DOC DIR
867
prefix="$anjuta_save_prefix"
792
systemdatadir=share
868
exec_prefix="$anjuta_save_exec_prefix"
793
packagedatadir=share/${PACKAGE}
869
794
packagedocdir=share/doc/${PACKAGE}
870
AC_DEFINE_UNQUOTED(SYSTEM_DATA_DIR, "${systemdatadir}", [System data directory])
795
packageplugindir=lib/${PACKAGE}/plugins/${VERSION}
871
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${packagedatadir}", [Package data directory])
796
872
AC_DEFINE_UNQUOTED(PACKAGE_DOC_DIR, "${packagedocdir}", [Package doc directory])
797
dnl Set PACKAGE DIRs in config.h.
873
AC_DEFINE_UNQUOTED(PACKAGE_PIXMAPS_DIR, "${packagepixmapsdir}", [Package pixmaps directory])
798
packagepixmapsdir=share/pixmaps/${PACKAGE}
874
AC_DEFINE_UNQUOTED(PACKAGE_HELP_DIR, "${packagehelpdir}", [Package help directory])
799
packagehelpdir=share/gnome/help/${PACKAGE}
875
AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packagemenudir}", [Package program menu directory])
800
packagemenudir=share/gnome/apps
876
AC_DEFINE_UNQUOTED(PACKAGE_PLUGIN_DIR, "${packageplugindir}", [Package plugins directory])
801
packageplugindir=lib/${PACKAGE}
802
803
dnl Subst PACKAGE_DATA_DIR.
804
NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
805
AC_SUBST(NO_PREFIX_PACKAGE_DATA_DIR)
806
PACKAGE_DATA_DIR="${packageprefix}/${packagedatadir}"
807
AC_SUBST(PACKAGE_DATA_DIR)
808
SYSTEM_DATA_DIR="${packageprefix}/${systemdatadir}"
809
AC_SUBST(SYSTEM_DATA_DIR)
810
811
dnl Subst PACKAGE_DOC_DIR.
812
NO_PREFIX_PACKAGE_DOC_DIR="${packagedocdir}"
813
AC_SUBST(NO_PREFIX_PACKAGE_DOC_DIR)
814
PACKAGE_DOC_DIR="${packageprefix}/${packagedocdir}"
815
AC_SUBST(PACKAGE_DOC_DIR)
816
817
dnl Subst PACKAGE_PIXMAPS_DIR.
818
NO_PREFIX_PACKAGE_PIXMAPS_DIR="${packagepixmapsdir}"
819
AC_SUBST(NO_PREFIX_PACKAGE_PIXMAPS_DIR)
820
PACKAGE_PIXMAPS_DIR="${packageprefix}/${packagepixmapsdir}"
821
AC_SUBST(PACKAGE_PIXMAPS_DIR)
822
823
dnl Subst PACKAGE_HELP_DIR.
824
NO_PREFIX_PACKAGE_HELP_DIR="${packagehelpdir}"
825
AC_SUBST(NO_PREFIX_PACKAGE_HELP_DIR)
826
PACKAGE_HELP_DIR="${packageprefix}/${packagehelpdir}"
827
AC_SUBST(PACKAGE_HELP_DIR)
828
829
dnl Subst PACKAGE_MENU_DIR.
830
NO_PREFIX_PACKAGE_MENU_DIR="${packagemenudir}"
831
AC_SUBST(NO_PREFIX_PACKAGE_MENU_DIR)
832
PACKAGE_MENU_DIR="${packageprefix}/${packagemenudir}"
833
AC_SUBST(PACKAGE_MENU_DIR)
834
835
dnl Subst PACKAGE_PLUGIN_DIR.
836
NO_PREFIX_PACKAGE_PLUGIN_DIR="${packageplugindir}"
837
AC_SUBST(NO_PREFIX_PACKAGE_PLUGIN_DIR)
838
PACKAGE_PLUGIN_DIR="${packageprefix}/${packageplugindir}"
839
AC_SUBST(PACKAGE_PLUGIN_DIR)
840
841
AC_DEFINE_UNQUOTED(SYSTEM_DATA_DIR, "${packageprefix}/${systemdatadir}", [System data directory])
842
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${packageprefix}/${packagedatadir}", [Package data directory])
843
AC_DEFINE_UNQUOTED(PACKAGE_DOC_DIR, "${packageprefix}/${packagedocdir}", [Package doc directory])
844
AC_DEFINE_UNQUOTED(PACKAGE_PIXMAPS_DIR, "${packageprefix}/${packagepixmapsdir}", [Package pixmaps directory])
845
AC_DEFINE_UNQUOTED(PACKAGE_HELP_DIR, "${packageprefix}/${packagehelpdir}", [Package help directory])
846
AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packageprefix}/${packagemenudir}", [Package program menu directory])
847
AC_DEFINE_UNQUOTED(PACKAGE_PLUGIN_DIR, "${packageprefix}/${packageplugindir}", [Package plugins directory])
848
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Package source code directory])
877
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Package source code directory])
849
878
850
dnl --------- help outputs -----------
879
dnl --------- help outputs -----------
Lines 959-965 Link Here
959
        echo "Building subversion plugin: ............................YES"
988
        echo "Building subversion plugin: ............................YES"
960
else
989
else
961
        echo "Building subversion plugin: ............................NO"
990
        echo "Building subversion plugin: ............................NO"
962
		echo "        Requires subversion; http://subversion.org"
991
		echo "        Requires apr (>= 0.9.4); http://subversion.org"
992
		echo "        Requires apr-util (>= 0.9.4); http://subversion.org"
993
		echo "        Requires neon (>= 0.24.5); http://subversion.org"
994
		echo "        Requires subversion (>= 1.0.2); http://subversion.org"
963
fi
995
fi
964
996
965
if [ test x$libgladeui_found = xyes ]; then
997
if [ test x$libgladeui_found = xyes ]; then

Return to bug 92758