--- a/configure Sat Apr 05 17:57:04 2025 +0200
+++ b/configure Sun Jul 20 22:04:39 2025 +0200
@@ -107,11 +107,11 @@
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
Build Types:
---debug add extra compile flags for debug builds
---release add extra compile flags for release builds
+ --debug add extra compile flags for debug builds
+ --release add extra compile flags for release builds
Options:
- --toolkit=(libadwaita|gtk4|gtk3|gtk2|gtk2legacy|qt5|qt4|motif)
+ --toolkit=(libadwaita|gtk4|gtk3|cocoa|qt5|motif)
__EOF__
}
@@ -178,7 +178,7 @@
"--debug") BUILD_TYPE="debug" ;;
"--release") BUILD_TYPE="release" ;;
"--toolkit="*) OPT_TOOLKIT=${ARG#--toolkit=} ;;
- "--toolkit") echo "option '$ARG' needs a value:"; echo " $ARG=(libadwaita|gtk4|gtk3|gtk2|gtk2legacy|qt5|qt4|motif)"; abort_configure ;;
+ "--toolkit") echo "option '$ARG' needs a value:"; echo " $ARG=(libadwaita|gtk4|gtk3|cocoa|qt5|motif)"; abort_configure ;;
"-"*) echo "unknown option: $ARG"; abort_configure ;;
esac
done
@@ -202,6 +202,22 @@
: ${mandir:='${datarootdir}/man'}
: ${localedir:='${datarootdir}/locale'}
+# remember the above values and compare them later
+orig_bindir="$bindir"
+orig_sbindir="$sbindir"
+orig_libdir="$libdir"
+orig_libexecdir="$libexecdir"
+orig_datarootdir="$datarootdir"
+orig_datadir="$datadir"
+orig_sysconfdir="$sysconfdir"
+orig_sharedstatedir="$sharedstatedir"
+orig_localstatedir="$localstatedir"
+orig_runstatedir="$runstatedir"
+orig_includedir="$includedir"
+orig_infodir="$infodir"
+orig_mandir="$mandir"
+orig_localedir="$localedir"
+
# check if a config.site exists and load it
if [ -n "$CONFIG_SITE" ]; then
# CONFIG_SITE may contain space separated file names
@@ -251,6 +267,9 @@
# check languages
lang_c=
lang_cpp=
+if detect_cpp_compiler ; then
+ lang_cpp=1
+fi
if detect_c_compiler ; then
lang_c=1
fi
@@ -279,32 +298,6 @@
fi
}
-dependency_error_gtk2legacy()
-{
- print_check_msg "$dep_checked_gtk2legacy" "checking for gtk2legacy... "
- # dependency gtk2legacy
- while true
- do
- if [ -z "$PKG_CONFIG" ]; then
- break
- fi
- if test_pkg_config "gtk+-2.0" "" "" "" ; then
- TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags gtk+-2.0`"
- TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs gtk+-2.0`"
- else
- break
- fi
- TEMP_CFLAGS="$TEMP_CFLAGS -DUI_GTK2 -DUI_GTK2LEGACY"
- TEMP_LDFLAGS="$TEMP_LDFLAGS -lpthread"
- print_check_msg "$dep_checked_gtk2legacy" "yes\n"
- dep_checked_gtk2legacy=1
- return 1
- done
-
- print_check_msg "$dep_checked_gtk2legacy" "no\n"
- dep_checked_gtk2legacy=1
- return 0
-}
dependency_error_curl()
{
print_check_msg "$dep_checked_curl" "checking for curl... "
@@ -399,6 +392,31 @@
dep_checked_gtk2=1
return 0
}
+dependency_error_sqlite()
+{
+ print_check_msg "$dep_checked_sqlite" "checking for sqlite... "
+ # dependency sqlite
+ while true
+ do
+ if [ -z "$PKG_CONFIG" ]; then
+ break
+ fi
+ if test_pkg_config "sqlite3" "" "" "" ; then
+ TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags sqlite3`"
+ TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs sqlite3`"
+ else
+ break
+ fi
+ TEMP_CFLAGS="$TEMP_CFLAGS -DDBU_SQLITE"
+ print_check_msg "$dep_checked_sqlite" "yes\n"
+ dep_checked_sqlite=1
+ return 1
+ done
+
+ print_check_msg "$dep_checked_sqlite" "no\n"
+ dep_checked_sqlite=1
+ return 0
+}
dependency_error_gtk3()
{
print_check_msg "$dep_checked_gtk3" "checking for gtk3... "
@@ -451,6 +469,277 @@
dep_checked_gtk4=1
return 0
}
+dependency_error_webkitgtk6()
+{
+ print_check_msg "$dep_checked_webkitgtk6" "checking for webkitgtk6... "
+ # dependency webkitgtk6
+ while true
+ do
+ if [ -z "$PKG_CONFIG" ]; then
+ break
+ fi
+ if test_pkg_config "webkitgtk-6.0" "" "" "" ; then
+ TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags webkitgtk-6.0`"
+ TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs webkitgtk-6.0`"
+ else
+ break
+ fi
+ TEMP_CFLAGS="$TEMP_CFLAGS -DUI_WEBVIEW"
+ print_check_msg "$dep_checked_webkitgtk6" "yes\n"
+ dep_checked_webkitgtk6=1
+ return 1
+ done
+
+ # dependency webkitgtk6
+ while true
+ do
+ print_check_msg "$dep_checked_webkitgtk6" "yes\n"
+ dep_checked_webkitgtk6=1
+ return 1
+ done
+
+ print_check_msg "$dep_checked_webkitgtk6" "no\n"
+ dep_checked_webkitgtk6=1
+ return 0
+}
+dependency_error_libxml2()
+{
+ print_check_msg "$dep_checked_libxml2" "checking for libxml2... "
+ # dependency libxml2 platform="windows"
+ while true
+ do
+ if notisplatform "windows"; then
+ break
+ fi
+ if tmp_flags=`xml2-config --cflags` ; then
+ TEMP_CFLAGS="$TEMP_CFLAGS $tmp_flags"
+ else
+ break
+ fi
+ if tmp_flags=`xml2-config --libs` ; then
+ TEMP_LDFLAGS="$TEMP_LDFLAGS $tmp_flags"
+ else
+ break
+ fi
+ print_check_msg "$dep_checked_libxml2" "yes\n"
+ dep_checked_libxml2=1
+ return 1
+ done
+
+ # dependency libxml2 platform="macos"
+ while true
+ do
+ if notisplatform "macos"; then
+ break
+ fi
+ if tmp_flags=`xml2-config --cflags` ; then
+ TEMP_CFLAGS="$TEMP_CFLAGS $tmp_flags"
+ else
+ break
+ fi
+ if tmp_flags=`xml2-config --libs` ; then
+ TEMP_LDFLAGS="$TEMP_LDFLAGS $tmp_flags"
+ else
+ break
+ fi
+ print_check_msg "$dep_checked_libxml2" "yes\n"
+ dep_checked_libxml2=1
+ return 1
+ done
+
+ # dependency libxml2
+ while true
+ do
+ if [ -z "$PKG_CONFIG" ]; then
+ break
+ fi
+ if test_pkg_config "libxml-2.0" "" "" "" ; then
+ TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags libxml-2.0`"
+ TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs libxml-2.0`"
+ else
+ break
+ fi
+ print_check_msg "$dep_checked_libxml2" "yes\n"
+ dep_checked_libxml2=1
+ return 1
+ done
+
+ # dependency libxml2
+ while true
+ do
+ if tmp_flags=`xml2-config --cflags` ; then
+ TEMP_CFLAGS="$TEMP_CFLAGS $tmp_flags"
+ else
+ break
+ fi
+ if tmp_flags=`xml2-config --libs` ; then
+ TEMP_LDFLAGS="$TEMP_LDFLAGS $tmp_flags"
+ else
+ break
+ fi
+ print_check_msg "$dep_checked_libxml2" "yes\n"
+ dep_checked_libxml2=1
+ return 1
+ done
+
+ print_check_msg "$dep_checked_libxml2" "no\n"
+ dep_checked_libxml2=1
+ return 0
+}
+dependency_error_webkit2gtk4()
+{
+ print_check_msg "$dep_checked_webkit2gtk4" "checking for webkit2gtk4... "
+ # dependency webkit2gtk4
+ while true
+ do
+ if [ -z "$PKG_CONFIG" ]; then
+ break
+ fi
+ if test_pkg_config "webkit2gtk-4.1" "" "" "" ; then
+ TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags webkit2gtk-4.1`"
+ TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs webkit2gtk-4.1`"
+ else
+ break
+ fi
+ TEMP_CFLAGS="$TEMP_CFLAGS -DUI_WEBVIEW"
+ print_check_msg "$dep_checked_webkit2gtk4" "yes\n"
+ dep_checked_webkit2gtk4=1
+ return 1
+ done
+
+ # dependency webkit2gtk4
+ while true
+ do
+ if [ -z "$PKG_CONFIG" ]; then
+ break
+ fi
+ if test_pkg_config "webkit2gtk-4.0" "" "" "" ; then
+ TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags webkit2gtk-4.0`"
+ TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs webkit2gtk-4.0`"
+ else
+ break
+ fi
+ TEMP_CFLAGS="$TEMP_CFLAGS -DUI_WEBVIEW"
+ print_check_msg "$dep_checked_webkit2gtk4" "yes\n"
+ dep_checked_webkit2gtk4=1
+ return 1
+ done
+
+ # dependency webkit2gtk4
+ while true
+ do
+ print_check_msg "$dep_checked_webkit2gtk4" "yes\n"
+ dep_checked_webkit2gtk4=1
+ return 1
+ done
+
+ print_check_msg "$dep_checked_webkit2gtk4" "no\n"
+ dep_checked_webkit2gtk4=1
+ return 0
+}
+dependency_error_cocoa()
+{
+ print_check_msg "$dep_checked_cocoa" "checking for cocoa... "
+ # dependency cocoa platform="macos"
+ while true
+ do
+ if notisplatform "macos"; then
+ break
+ fi
+ TEMP_CFLAGS="$TEMP_CFLAGS -DUI_COCOA"
+ TEMP_LDFLAGS="$TEMP_LDFLAGS -lobjc -framework Cocoa"
+ print_check_msg "$dep_checked_cocoa" "yes\n"
+ dep_checked_cocoa=1
+ return 1
+ done
+
+ print_check_msg "$dep_checked_cocoa" "no\n"
+ dep_checked_cocoa=1
+ return 0
+}
+dependency_error_winui()
+{
+ print_check_msg "$dep_checked_winui" "checking for winui... "
+ # dependency winui platform="windows"
+ while true
+ do
+ if notisplatform "windows"; then
+ break
+ fi
+ TEMP_CFLAGS="$TEMP_CFLAGS -DUI_WINUI"
+ print_check_msg "$dep_checked_winui" "yes\n"
+ dep_checked_winui=1
+ return 1
+ done
+
+ print_check_msg "$dep_checked_winui" "no\n"
+ dep_checked_winui=1
+ return 0
+}
+dependency_error_gtk2legacy()
+{
+ print_check_msg "$dep_checked_gtk2legacy" "checking for gtk2legacy... "
+ # dependency gtk2legacy
+ while true
+ do
+ if [ -z "$PKG_CONFIG" ]; then
+ break
+ fi
+ if test_pkg_config "gtk+-2.0" "" "" "" ; then
+ TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags gtk+-2.0`"
+ TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs gtk+-2.0`"
+ else
+ break
+ fi
+ TEMP_CFLAGS="$TEMP_CFLAGS -DUI_GTK2 -DUI_GTK2LEGACY"
+ TEMP_LDFLAGS="$TEMP_LDFLAGS -lpthread"
+ print_check_msg "$dep_checked_gtk2legacy" "yes\n"
+ dep_checked_gtk2legacy=1
+ return 1
+ done
+
+ print_check_msg "$dep_checked_gtk2legacy" "no\n"
+ dep_checked_gtk2legacy=1
+ return 0
+}
+dependency_error_qt5()
+{
+ print_check_msg "$dep_checked_qt5" "checking for qt5... "
+ # dependency qt5
+ while true
+ do
+ if [ -z "$lang_cpp" ] ; then
+ break
+ fi
+ if [ -z "$PKG_CONFIG" ]; then
+ break
+ fi
+ if which qmake-qt5 > /dev/null ; then
+ :
+ else
+ break
+ fi
+ if test_pkg_config "Qt5Widgets" "" "" "" ; then
+ TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags Qt5Widgets`"
+ TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs Qt5Widgets`"
+ else
+ break
+ fi
+ TEMP_CFLAGS="$TEMP_CFLAGS -DUI_QT5"
+ cat >> $TEMP_DIR/make.mk << __EOF__
+# Dependency: qt5
+QMAKE = qmake-qt5
+QT_PRO_FILE = qt5.pro
+__EOF__
+ print_check_msg "$dep_checked_qt5" "yes\n"
+ dep_checked_qt5=1
+ return 1
+ done
+
+ print_check_msg "$dep_checked_qt5" "no\n"
+ dep_checked_qt5=1
+ return 0
+}
dependency_error_openssl()
{
print_check_msg "$dep_checked_openssl" "checking for openssl... "
@@ -570,129 +859,6 @@
dep_checked_motif=1
return 0
}
-dependency_error_libxml2()
-{
- print_check_msg "$dep_checked_libxml2" "checking for libxml2... "
- # dependency libxml2 platform="windows"
- while true
- do
- if notisplatform "windows"; then
- break
- fi
- if tmp_flags=`xml2-config --cflags` ; then
- TEMP_CFLAGS="$TEMP_CFLAGS $tmp_flags"
- else
- break
- fi
- if tmp_flags=`xml2-config --libs` ; then
- TEMP_LDFLAGS="$TEMP_LDFLAGS $tmp_flags"
- else
- break
- fi
- print_check_msg "$dep_checked_libxml2" "yes\n"
- dep_checked_libxml2=1
- return 1
- done
-
- # dependency libxml2 platform="macos"
- while true
- do
- if notisplatform "macos"; then
- break
- fi
- if tmp_flags=`xml2-config --cflags` ; then
- TEMP_CFLAGS="$TEMP_CFLAGS $tmp_flags"
- else
- break
- fi
- if tmp_flags=`xml2-config --libs` ; then
- TEMP_LDFLAGS="$TEMP_LDFLAGS $tmp_flags"
- else
- break
- fi
- print_check_msg "$dep_checked_libxml2" "yes\n"
- dep_checked_libxml2=1
- return 1
- done
-
- # dependency libxml2
- while true
- do
- if [ -z "$PKG_CONFIG" ]; then
- break
- fi
- if test_pkg_config "libxml-2.0" "" "" "" ; then
- TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags libxml-2.0`"
- TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs libxml-2.0`"
- else
- break
- fi
- print_check_msg "$dep_checked_libxml2" "yes\n"
- dep_checked_libxml2=1
- return 1
- done
-
- # dependency libxml2
- while true
- do
- if tmp_flags=`xml2-config --cflags` ; then
- TEMP_CFLAGS="$TEMP_CFLAGS $tmp_flags"
- else
- break
- fi
- if tmp_flags=`xml2-config --libs` ; then
- TEMP_LDFLAGS="$TEMP_LDFLAGS $tmp_flags"
- else
- break
- fi
- print_check_msg "$dep_checked_libxml2" "yes\n"
- dep_checked_libxml2=1
- return 1
- done
-
- print_check_msg "$dep_checked_libxml2" "no\n"
- dep_checked_libxml2=1
- return 0
-}
-dependency_error_cocoa()
-{
- print_check_msg "$dep_checked_cocoa" "checking for cocoa... "
- # dependency cocoa platform="macos"
- while true
- do
- if notisplatform "macos"; then
- break
- fi
- TEMP_CFLAGS="$TEMP_CFLAGS -DUI_COCOA"
- TEMP_LDFLAGS="$TEMP_LDFLAGS -lobjc -framework Cocoa"
- print_check_msg "$dep_checked_cocoa" "yes\n"
- dep_checked_cocoa=1
- return 1
- done
-
- print_check_msg "$dep_checked_cocoa" "no\n"
- dep_checked_cocoa=1
- return 0
-}
-dependency_error_winui()
-{
- print_check_msg "$dep_checked_winui" "checking for winui... "
- # dependency winui platform="windows"
- while true
- do
- if notisplatform "windows"; then
- break
- fi
- TEMP_CFLAGS="$TEMP_CFLAGS -DUI_WINUI"
- print_check_msg "$dep_checked_winui" "yes\n"
- dep_checked_winui=1
- return 1
- done
-
- print_check_msg "$dep_checked_winui" "no\n"
- dep_checked_winui=1
- return 0
-}
# start collecting dependency information
echo > "$TEMP_DIR/flags.mk"
@@ -712,6 +878,9 @@
break
fi
+ cat >> "$TEMP_DIR/make.mk" << __EOF__
+LD = \$(CC)
+__EOF__
break
done
break
@@ -727,6 +896,7 @@
cat >> "$TEMP_DIR/make.mk" << __EOF__
OBJ_EXT = .o
LIB_EXT = .a
+SHLIB_EXT = .dylib
LIB_PREFIX = lib
PACKAGE_SCRIPT = package_osx.sh
__EOF__
@@ -748,6 +918,7 @@
cat >> "$TEMP_DIR/make.mk" << __EOF__
OBJ_EXT = .o
LIB_EXT = .a
+SHLIB_EXT = .so
LIB_PREFIX = lib
PACKAGE_SCRIPT = package_unix.sh
__EOF__
@@ -757,6 +928,19 @@
done
while true
do
+ while true
+ do
+
+ cat >> "$TEMP_DIR/make.mk" << __EOF__
+BUILD_BIN_DIR = bin
+BUILD_LIB_DIR = lib
+__EOF__
+ break
+ done
+ break
+done
+while true
+do
if notisplatform "bsd"; then
break
fi
@@ -770,6 +954,16 @@
break
done
+# build type
+if [ "$BUILD_TYPE" = "debug" ]; then
+ TEMP_CFLAGS="\${DEBUG_CC_FLAGS} $TEMP_CFLAGS"
+ TEMP_CXXFLAGS="\${DEBUG_CXX_FLAGS} $TEMP_CXXFLAGS"
+fi
+if [ "$BUILD_TYPE" = "release" ]; then
+ TEMP_CFLAGS="\${RELEASE_CC_FLAGS} $TEMP_CFLAGS"
+ TEMP_CXXFLAGS="\${RELEASE_CXX_FLAGS} $TEMP_CXXFLAGS"
+fi
+
# add general dependency flags to flags.mk
echo "# general flags" >> "$TEMP_DIR/flags.mk"
if [ -n "${TEMP_CFLAGS}" ] && [ -n "$lang_c" ]; then
@@ -791,12 +985,17 @@
if dependency_error_libadwaita ; then
VERR=1
fi
+ if dependency_error_webkitgtk6 ; then
+ VERR=1
+ fi
if [ $VERR -ne 0 ]; then
return 1
fi
cat >> "$TEMP_DIR/make.mk" << __EOF__
TOOLKIT = gtk
GTKOBJ = draw_cairo.o
+APP_PLATFORM_SRC = gtk-text.c
+APP_PLATFORM_SRC += gtk-image.c
__EOF__
return 0
}
@@ -806,12 +1005,17 @@
if dependency_error_gtk4 ; then
VERR=1
fi
+ if dependency_error_webkitgtk6 ; then
+ VERR=1
+ fi
if [ $VERR -ne 0 ]; then
return 1
fi
cat >> "$TEMP_DIR/make.mk" << __EOF__
TOOLKIT = gtk
GTKOBJ = draw_cairo.o
+APP_PLATFORM_SRC = gtk-text.c
+APP_PLATFORM_SRC += gtk-image.c
__EOF__
return 0
}
@@ -821,19 +1025,7 @@
if dependency_error_gtk3 ; then
VERR=1
fi
- if [ $VERR -ne 0 ]; then
- return 1
- fi
- cat >> "$TEMP_DIR/make.mk" << __EOF__
-TOOLKIT = gtk
-GTKOBJ = draw_cairo.o
-__EOF__
- return 0
-}
-checkopt_toolkit_gtk2()
-{
- VERR=0
- if dependency_error_gtk2 ; then
+ if dependency_error_webkit2gtk4 ; then
VERR=1
fi
if [ $VERR -ne 0 ]; then
@@ -842,21 +1034,24 @@
cat >> "$TEMP_DIR/make.mk" << __EOF__
TOOLKIT = gtk
GTKOBJ = draw_cairo.o
+GTKOBJ = draw_cairo.o
+APP_PLATFORM_SRC = gtk-text.c
+APP_PLATFORM_SRC += gtk-image.c
__EOF__
return 0
}
-checkopt_toolkit_gtk2legacy()
+checkopt_toolkit_cocoa()
{
VERR=0
- if dependency_error_gtk2legacy ; then
+ if dependency_error_cocoa ; then
VERR=1
fi
if [ $VERR -ne 0 ]; then
return 1
fi
cat >> "$TEMP_DIR/make.mk" << __EOF__
-TOOLKIT = gtk
-GTKOBJ = draw_gdk.o
+TOOLKIT = cocoa
+APP_PLATFORM_SRC = cocoa-text.m
__EOF__
return 0
}
@@ -871,22 +1066,7 @@
fi
cat >> "$TEMP_DIR/make.mk" << __EOF__
TOOLKIT = qt
-LD = $(CXX)
-__EOF__
- return 0
-}
-checkopt_toolkit_qt4()
-{
- VERR=0
- if dependency_error_qt4 ; then
- VERR=1
- fi
- if [ $VERR -ne 0 ]; then
- return 1
- fi
- cat >> "$TEMP_DIR/make.mk" << __EOF__
-TOOLKIT = qt
-LD = $(CXX)
+LD = \$(CXX)
__EOF__
return 0
}
@@ -938,24 +1118,33 @@
if [ -n "${TEMP_CXXFLAGS}" ] && [ -n "$lang_cpp" ]; then
echo "DAV_CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk"
fi
-if [ "$BUILD_TYPE" = "debug" ]; then
- if [ -n "$lang_c" ]; then
- echo 'DAV_CFLAGS += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
- fi
- if [ -n "$lang_cpp" ]; then
- echo 'DAV_CXXFLAGS += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
- fi
+if [ -n "${TEMP_LDFLAGS}" ]; then
+ echo "DAV_LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk"
fi
-if [ "$BUILD_TYPE" = "release" ]; then
- if [ -n "$lang_c" ]; then
- echo 'DAV_CFLAGS += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
- fi
- if [ -n "$lang_cpp" ]; then
- echo 'DAV_CXXFLAGS += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
- fi
+
+echo >> "$TEMP_DIR/flags.mk"
+echo "configuring target: dbu"
+echo "# flags for target dbu" >> "$TEMP_DIR/flags.mk"
+TEMP_CFLAGS=
+TEMP_CXXFLAGS=
+TEMP_LDFLAGS=
+
+if dependency_error_sqlite; then
+ DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED sqlite "
+ ERROR=1
+fi
+
+# Features
+
+
+if [ -n "${TEMP_CFLAGS}" ] && [ -n "$lang_c" ]; then
+ echo "DBU_CFLAGS += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk"
+fi
+if [ -n "${TEMP_CXXFLAGS}" ] && [ -n "$lang_cpp" ]; then
+ echo "DBU_CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk"
fi
if [ -n "${TEMP_LDFLAGS}" ]; then
- echo "DAV_LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk"
+ echo "DBU_LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk"
fi
echo >> "$TEMP_DIR/flags.mk"
@@ -990,6 +1179,11 @@
break
fi
fi
+ if checkopt_toolkit_libadwaita ; then
+ echo " toolkit: libadwaita" >> "$TEMP_DIR/options"
+ ERROR=0
+ break
+ fi
if checkopt_toolkit_gtk4 ; then
echo " toolkit: gtk4" >> "$TEMP_DIR/options"
ERROR=0
@@ -1000,21 +1194,6 @@
ERROR=0
break
fi
- if checkopt_toolkit_qt5 ; then
- echo " toolkit: qt5" >> "$TEMP_DIR/options"
- ERROR=0
- break
- fi
- if checkopt_toolkit_gtk2 ; then
- echo " toolkit: gtk2" >> "$TEMP_DIR/options"
- ERROR=0
- break
- fi
- if checkopt_toolkit_qt4 ; then
- echo " toolkit: qt4" >> "$TEMP_DIR/options"
- ERROR=0
- break
- fi
if checkopt_toolkit_motif ; then
echo " toolkit: motif" >> "$TEMP_DIR/options"
ERROR=0
@@ -1056,17 +1235,9 @@
ERROR=1
DEPENDENCIES_FAILED="option 'toolkit' $DEPENDENCIES_FAILED"
fi
- elif [ "$OPT_TOOLKIT" = "gtk2" ]; then
+ elif [ "$OPT_TOOLKIT" = "cocoa" ]; then
echo " toolkit: $OPT_TOOLKIT" >> $TEMP_DIR/options
- if checkopt_toolkit_gtk2 ; then
- :
- else
- ERROR=1
- DEPENDENCIES_FAILED="option 'toolkit' $DEPENDENCIES_FAILED"
- fi
- elif [ "$OPT_TOOLKIT" = "gtk2legacy" ]; then
- echo " toolkit: $OPT_TOOLKIT" >> $TEMP_DIR/options
- if checkopt_toolkit_gtk2legacy ; then
+ if checkopt_toolkit_cocoa ; then
:
else
ERROR=1
@@ -1080,14 +1251,6 @@
ERROR=1
DEPENDENCIES_FAILED="option 'toolkit' $DEPENDENCIES_FAILED"
fi
- elif [ "$OPT_TOOLKIT" = "qt4" ]; then
- echo " toolkit: $OPT_TOOLKIT" >> $TEMP_DIR/options
- if checkopt_toolkit_qt4 ; then
- :
- else
- ERROR=1
- DEPENDENCIES_FAILED="option 'toolkit' $DEPENDENCIES_FAILED"
- fi
elif [ "$OPT_TOOLKIT" = "motif" ]; then
echo " toolkit: $OPT_TOOLKIT" >> $TEMP_DIR/options
if checkopt_toolkit_motif ; then
@@ -1099,7 +1262,7 @@
else
echo
echo "Invalid option value - usage:"
- echo " --toolkit=(libadwaita|gtk4|gtk3|gtk2|gtk2legacy|qt5|qt4|motif)"
+ echo " --toolkit=(libadwaita|gtk4|gtk3|cocoa|qt5|motif)"
abort_configure
fi
fi
@@ -1110,22 +1273,6 @@
if [ -n "${TEMP_CXXFLAGS}" ] && [ -n "$lang_cpp" ]; then
echo "TK_CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk"
fi
-if [ "$BUILD_TYPE" = "debug" ]; then
- if [ -n "$lang_c" ]; then
- echo 'TK_CFLAGS += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
- fi
- if [ -n "$lang_cpp" ]; then
- echo 'TK_CXXFLAGS += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
- fi
-fi
-if [ "$BUILD_TYPE" = "release" ]; then
- if [ -n "$lang_c" ]; then
- echo 'TK_CFLAGS += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
- fi
- if [ -n "$lang_cpp" ]; then
- echo 'TK_CXXFLAGS += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
- fi
-fi
if [ -n "${TEMP_LDFLAGS}" ]; then
echo "TK_LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk"
fi
@@ -1141,20 +1288,81 @@
echo "configure finished"
echo
+echo "Toolchain"
+echo " name: $TOOLCHAIN_NAME"
+if [ -n "$TOOLCHAIN_CC" ]; then
+ echo " cc: $TOOLCHAIN_CC"
+fi
+if [ -n "$TOOLCHAIN_CXX" ]; then
+ echo " cxx: $TOOLCHAIN_CXX"
+fi
+if [ -n "$TOOLCHAIN_WSIZE" ]; then
+ echo " word size: $TOOLCHAIN_WSIZE bit"
+fi
+if [ -n "$TOOLCHAIN_CSTD" ]; then
+ echo " default C std: $TOOLCHAIN_CSTD"
+fi
+echo
echo "Build Config:"
-echo " PREFIX: $prefix"
-echo " TOOLCHAIN: $TOOLCHAIN_NAME"
+echo " prefix: $prefix"
+echo " exec_prefix: $exec_prefix"
+if [ "$orig_bindir" != "$bindir" ]; then
+ echo " bindir: $bindir"
+fi
+if [ "$orig_sbindir" != "$sbindir" ]; then
+ echo " sbindir: $sbindir"
+fi
+if [ "$orig_libdir" != "$libdir" ]; then
+ echo " libdir: $libdir"
+fi
+if [ "$orig_libexecdir" != "$libexecdir" ]; then
+ echo " libexecdir: $libexecdir"
+fi
+if [ "$orig_datarootdir" != "$datarootdir" ]; then
+ echo " datarootdir: $datarootdir"
+fi
+if [ "$orig_datadir" != "$datadir" ]; then
+ echo " datadir: $datadir"
+fi
+if [ "$orig_sysconfdir" != "$sysconfdir" ]; then
+ echo " sysconfdir: $sysconfdir"
+fi
+if [ "$orig_sharedstatedir" != "$sharedstatedir" ]; then
+ echo " sharedstatedir: $sharedstatedir"
+fi
+if [ "$orig_localstatedir" != "$localstatedir" ]; then
+ echo " localstatedir: $localstatedir"
+fi
+if [ "$orig_runstatedir" != "$runstatedir" ]; then
+ echo " runstatedir: $runstatedir"
+fi
+if [ "$orig_includedir" != "$includedir" ]; then
+ echo " includedir: $includedir"
+fi
+if [ "$orig_infodir" != "$infodir" ]; then
+ echo " infodir: $infodir"
+fi
+if [ "$orig_mandir" != "$mandir" ]; then
+ echo " mandir: $mandir"
+fi
+if [ "$orig_localedir" != "$localedir" ]; then
+ echo " localedir: $localedir"
+fi
+echo
echo "Options:"
cat "$TEMP_DIR/options"
echo
# generate the config.mk file
+pwd=`pwd`
cat > "$TEMP_DIR/config.mk" << __EOF__
#
-# config.mk generated by configure
+# config.mk generated by:
+# pwd: $pwd
+# $0 $@
#
__EOF__
write_toolchain_defaults "$TEMP_DIR/toolchain.mk"
-cat "$TEMP_DIR/vars.mk" "$TEMP_DIR/toolchain.mk" "$TEMP_DIR/flags.mk" "$TEMP_DIR/make.mk" > config.mk
+cat "$TEMP_DIR/config.mk" "$TEMP_DIR/vars.mk" "$TEMP_DIR/toolchain.mk" "$TEMP_DIR/flags.mk" "$TEMP_DIR/make.mk" > config.mk
rm -Rf "$TEMP_DIR"