Commit 4b4331bb authored by smorlat's avatar smorlat

fix and improve build process.



git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@60 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent 6696f847
......@@ -10,7 +10,7 @@ ORTP_DIR = oRTP
endif
SUBDIRS = m4 pixmaps po ipkg $(ORTP_DIR) mediastreamer2\
media_api coreapi console gtk gtk-glade share
media_api coreapi console gtk-glade share
EXTRA_DIST = config.rpath linphone2.glade BUGS linphone.kdevprj \
......
......@@ -65,21 +65,16 @@ AC_ARG_ENABLE(gtk_ui,
*) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk_ui) ;;
esac],[gtk_ui=true])
dnl conditionnal build of old gtk interface.
AC_ARG_ENABLE(old-gtk_ui,
[ --enable-old-gtk_ui=[yes/no] Turn on or off compilation of old gtk interface [default=no]],
[case "${enableval}" in
yes) old_gtk_ui=true ;;
no) old_gtk_ui=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-old-gtk_ui) ;;
esac],[old_gtk_ui=false])
if test "$gtk_ui" = "true" ; then
PKG_CHECK_MODULES(LIBGTK, gtk+-2.0 >= 2.4.0 gthread-2.0, ,gtk_ui=false)
PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= 2.4.0 , glade_ui=true, glade_ui=false)
AC_SUBST(LIBGTK_CFLAGS)
AC_SUBST(LIBGTK_LIBS)
AC_SUBST(LIBGLADE_CFLAGS)
AC_SUBST(LIBGLADE_LIBS)
if test "$gtk_ui" = "true" ; then
if test "$gtk_ui$glade_ui" = "truetrue" ; then
AC_DEFINE(HAVE_GTK,1,[Defined if we can use the gtk api])
else
missing_gtk_libs=true
......@@ -89,19 +84,6 @@ else
fi
if test "$gtk_ui" = "true" ; then
PKG_CHECK_MODULES(GNOME_APPLETS, libpanelapplet-2.0 >= 2.0.0 ,
build_gnome_applet=true,build_gnome_applet=false)
AC_SUBST(GNOME_APPLETS_CFLAGS)
AC_SUBST(GNOME_APPLETS_LIBS)
PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= 2.4.0 , glade_ui=true, glade_ui=false)
AC_SUBST(LIBGLADE_CFLAGS)
AC_SUBST(LIBGLADE_LIBS)
else
build_gnome_applet=false
fi
dnl os-specific problems not handled by existing macros.
case "$host_os" in
*freebsd*)
......@@ -261,10 +243,6 @@ AM_CONDITIONAL(BUILD_MEDIA_API, test x$media_api = xtrue)
dnl build console if required
AM_CONDITIONAL(BUILD_CONSOLE, test x$console_ui = xtrue)
dnl build gtk if required
AM_CONDITIONAL(BUILD_GTK, test x$old_gtk_ui = xtrue)
dnl build gnome applet if possible
AM_CONDITIONAL(BUILD_GNOME_APPLET, test x$build_gnome_applet = xtrue)
dnl special things for arm-linux cross compilation toolchain
AM_CONDITIONAL(ARMBUILD, test x$use_arm_toolchain = xyes)
dnl compilation of gtk-glade user interface
......@@ -347,7 +325,6 @@ ipkg/Makefile
ipkg/linphone.control
media_api/Makefile
coreapi/Makefile
gtk/Makefile
gtk-glade/Makefile
console/Makefile
share/Makefile
......
......@@ -18,6 +18,7 @@ AC_DEFUN([MS_CHECK_DEP],[
CPPFLAGS_save=$CPPFLAGS
LDFLAGS_save=$LDFLAGS
LIBS_save=$LIBS
CPPFLAGS=`echo "-I$dep_headersdir"|sed -e "s:-I/usr/include[\ ]*$::"`
LIBS="-l$dep_lib"
LDFLAGS=`echo "-L$dep_libsdir"|sed -e "s:-L/usr/lib\(64\)*[\ ]*::"`
......@@ -39,6 +40,7 @@ AC_DEFUN([MS_CHECK_DEP],[
AC_SUBST($2_LIBS)
CPPFLAGS=$CPPFLAGS_save
LDFLAGS=$LDFLAGS_save
LIBS=$LIBS_save
])
......
# List of source files containing translatable strings.
gtk-glade/calllogs.c
gtk-glade/logging.c
gtk-glade/support.c
gtk-glade/chat.c
gtk-glade/main.c
gtk-glade/friendlist.c
gtk-glade/propertybox.c
gtk/main.c
gtk/interface.c
gtk/callbacks.c
gtk/support.c
gtk/propertybox.c
gtk/gui_utils.c
gtk/linphone.c
gtk/presence.c
gtk/friends.c
gtk/addressbook.c
coreapi/linphonecore.c
coreapi/misc.c
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment